diff options
Diffstat (limited to 'games-roguelike/scourge')
6 files changed, 57 insertions, 24 deletions
diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest index 309f169a6bf7..4fe344423987 100644 --- a/games-roguelike/scourge/Manifest +++ b/games-roguelike/scourge/Manifest @@ -1,8 +1,10 @@ +AUX scourge-0.21.1-Wc++11-narrowing.patch 570 BLAKE2B aa29346cff63b56753b5b5716a389fe193a7b491c5ffc29f72cbf79d399270b402ad78c4b6fa4f5ace391ccb0637358c96afdbb49e8ac124214ceb8359201472 SHA512 a1d3798042186ca1f75c2191d8e6afb419fae8e3a8209b9500db2ebe0f7d363c78991ba7fc902a57b250958a6ec9fde37c10a9edbda07e0d20bd1d5c8386f9dc AUX scourge-0.21.1-automake-1.13.patch 288 BLAKE2B e9e9673b357b9ba5b52f5404d7587dfad3eac5bc714a201c9d94cbe6a113cfcd9ef58fc40a34d48c49cd6bfd3cb781a0000f5d00d18b9fe0e3e623d9940e2195 SHA512 24b212c1053fa3445507cc6808abd37cabf43997275f003eb929d7c0671663919b984c2491dc33083d20a09cd67d8e695140ff6957e662ba66f43ddbaf167394 -AUX scourge-0.21.1-freetype_pkgconfig.patch 1083 BLAKE2B a65038dfb1fb031e7566317236c3de2d2b9d50e7903013d92c793420b8c006f3677071ced8361c04c85b717f45c03b7cd2388b18d44801515b7b39a341eef3af SHA512 22dede3318061683ee3fcc2d1b5cb910cb7657d356c14ea7fffaa19921a3393364c9c4b9d12ccb0e0149599dcebeef2abf9127a47c6987cd77d9090b8961f590 -AUX scourge-0.21.1-gcc47.patch 517 BLAKE2B 30a3d2ebec5e25ce4ca9757821996d2a4e8155573b93ec76b2cded90ab4ec102e5796e21854524d3405b10ed798ddca064a2d3c6b11542ddfe2867fe30aae7f8 SHA512 69bca46c3bfad70e42736119da38d7dafba6c589231bdac5ef2591e617ea516337ebf4ed8a547e8da52412711d0eb84f2abae5652ffc19a882fea69f48a4b880 +AUX scourge-0.21.1-freetype_pkgconfig.patch 944 BLAKE2B 7aa97a5dea38a9ee25cb2f1ef91bc1ff11475e697e2f97de67882f75a1d3a78b1f4e10a72411f2c387ba4c815aae730307f0ce7db049243c2319060898e89820 SHA512 ad7fea238417c9140337728b0c5a92f98bc1bf57dc8184bd18af61c5aa3091941e6697b2677639867860bb89097b1827dab9f6374b4d604d39225a33b057df20 +AUX scourge-0.21.1-gcc47.patch 445 BLAKE2B 623b1a84ce9560d7a0aeda0e795a70962248f5f7c8c82cb11b32eddd960594291b7595397e18eacadd075b7bf55a23b3104df4ae4770444b56c95b25a38286d2 SHA512 04319bceb1820d2345d21f17ef4c693fbe91cbfe4433a915ede223e68eef476690d7983336c48ed65ae5a1c59dc6ddcbc6dda41ed85c2e08054baabc62ac3cfd AUX scourge-0.21.1-gcc6.patch 601 BLAKE2B 78114f97ac4258cde239926c7012568f76b33c7b0fe3e6a52fc0550910f547e6e70e262ab70ecb89052d126406f94a693432ec2c9a9dd05d828c461b9d822ea8 SHA512 521f5ab76423925cef7f2ead25c947fb042bda67d82c6ccdcf55757d9412c017a8eb3ca7ecb09ffd369cd69fcac919c5ed6928b5c1d16149d64b0b03a70a2104 +AUX scourge-0.21.1-respect-AR.patch 207 BLAKE2B ed9e5f7476668cb1a6063be30cc76c1d9b4dc6574ae3171c5dc2e89e6f74db3fdd3c1a83e50056b9b784dec358ed98adf96ef7f05be1cfbd695b9532ece940a7 SHA512 2254db48095c2bc64319b253e002174849601d05cd8312d3fe1a0487b3234b30522ce6cede66db6499221ce8a934ea70967468fb60714c607dfdeb4f0d2125b2 DIST scourge-0.21.1.data.tar.gz 142093436 BLAKE2B 68e4cc0bfb40e9a92bc38b3db75f36df665974595ba4978cc34e077901522ece9ec5e15203ad9ab5044a61484d6850367306eb60a0da5d168a33e03130fe5774 SHA512 3701aba0f70d71aeb0e185e808e34cea62a637809a9b4c14fd19bdfbf91d36cf8dafa2a4cfddc3ee493827b40eea657fcdddc8277c57a635bc8ca8e3286376be DIST scourge-0.21.1.src.tar.gz 8146157 BLAKE2B ed48b29a54df1b8c7444ac2985ad069f82568b1e7a5aa98e922fb4fcf10c48840c2c38361a4bf15044c71547cd41d06fdd270b379ae0827b9b5f8063b92c1d18 SHA512 e530a8f7bddc1969a02a8b9a8b272f6f60d2c4830d23d96fc671cb79a2c4097fb9c5c0c262004a8157448b601bf58f9bbff95dd6d98275a28d3d404c339ce2ad -EBUILD scourge-0.21.1-r1.ebuild 1430 BLAKE2B 253248fbd84dd5ffdbdd468bf703e53f08e0dcf948bd62b59dd6c4ab6ae082d95d3ec8ec16a2ad44e45626c2a1f19d689f54f4e94fcb086c49ff8d736e0c049d SHA512 2a17aaa637feff2d8a5b511c6b7fc2a982b21a6357256ae32d7bcc2193212e93669e036873386cdfdd64b4d45627c067967247cf61060cdea00eabf72d8e39a7 +EBUILD scourge-0.21.1-r1.ebuild 1473 BLAKE2B 9f42f5a0d1763ad98b844064d645757a127bef5fca6130e54f25f9a91456e39239f49f46662c1046dc62c90f538f3d37cb9943e4950742fcb2b3da1a788c51a2 SHA512 9e510403fe2c069b9b31aac02349dc28c3789dc99baf617c0c82ec27f1ccb764c6493e25ac52a8c7470865f815fa4f2c3c0dd86ce88b42c6b2c4e0dc89ced379 MISC metadata.xml 330 BLAKE2B 126bd0ac9b4d619acfe8978859d29f75e84e445fef6c96117d18d8fc93ad58e69c55096ed3c0e47e1907354bffe3f9e08ce105eedd183c65afe70ea7ce3dec46 SHA512 d47d4afa0adafc93aa43d05190f0a65ac486b6ad4aee54bac96b2f99da7c4a55c6df99b512e4c113c2b4232b8ae294f58966b06081eb89d31fc20b8d9de2e07b diff --git a/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch b/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch new file mode 100644 index 000000000000..a852248c9fc2 --- /dev/null +++ b/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch @@ -0,0 +1,18 @@ +Allow compiling with Clang +https://bugs.gentoo.org/739330 + +--- a/src/sdlhandler.cpp ++++ b/src/sdlhandler.cpp +@@ -1034,10 +1034,10 @@ + bool SDLHandler::intersects( int x, int y, int w, int h, + int x2, int y2, int w2, int h2 ) { + SDL_Rect ra = { +- x, y, w, h ++ static_cast<Sint16>(x), static_cast<Sint16>(y), static_cast<Uint16>(w), static_cast<Uint16>(h) + }; + SDL_Rect rb = { +- x2, y2, w2, h2 ++ static_cast<Sint16>(x2), static_cast<Sint16>(y2), static_cast<Uint16>(w2), static_cast<Uint16>(h2) + }; + return intersects( &ra, &rb ); + } diff --git a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch index d41ee1a44439..6a5a28d1c7ab 100644 --- a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch +++ b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch @@ -1,7 +1,5 @@ -Index: scourge/configure.in -=================================================================== ---- scourge/configure.in (revision 3411) -+++ scourge/configure.in (working copy) +--- a/configure.in ++++ b/configure.in @@ -56,6 +56,7 @@ # Set up binreloc (for a relocatable autopackage file) AM_BINRELOC diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch index 6f3f7b3e2a65..c018d24ee383 100644 --- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch +++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch @@ -1,5 +1,5 @@ ---- a/src/squirrel/squtils.h 2012-08-30 18:06:43.474037926 +0200 -+++ b/src/squirrel/squtils.h 2012-08-30 18:14:13.300261523 +0200 +--- a/src/squirrel/squtils.h ++++ b/src/squirrel/squtils.h @@ -8,6 +8,9 @@ #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size); #define SQ_REALLOC(__ptr,__oldsize,__size) sq_vm_realloc(__ptr,__oldsize,__size); diff --git a/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch b/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch new file mode 100644 index 000000000000..e4fea442af22 --- /dev/null +++ b/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/780450 +--- a/configure.in ++++ b/configure.in +@@ -28,6 +28,7 @@ if test "x${CXXFLAGS-notset}" = "xnotset" ; then + fi + AC_PROG_CXX + ++AM_PROG_AR + dnl Check for ranlib + AC_PROG_RANLIB + diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild index 5eeec7c52315..9d4f7eec6a20 100644 --- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild +++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools desktop wxwidgets +EAPI=7 + +inherit autotools desktop DESCRIPTION="A graphical rogue-like adventure game" HOMEPAGE="https://sourceforge.net/projects/scourge/" -SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz +SRC_URI=" + mirror://sourceforge/${PN}/${P}.src.tar.gz mirror://sourceforge/${PN}/${P}.data.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" media-libs/freetype:2 @@ -24,17 +26,18 @@ RDEPEND=" virtual/libintl virtual/opengl virtual/glu" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/gettext virtual/pkgconfig" -S="${WORKDIR}/${PN}" - PATCHES=( "${FILESDIR}"/${P}-gcc47.patch "${FILESDIR}"/${P}-gcc6.patch "${FILESDIR}"/${P}-automake-1.13.patch "${FILESDIR}"/${P}-freetype_pkgconfig.patch + "${FILESDIR}"/${P}-Wc++11-narrowing.patch + "${FILESDIR}"/${PN}-0.21.1-respect-AR.patch ) src_prepare() { @@ -47,22 +50,23 @@ src_prepare() { sed -i \ -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \ src/scourgehandler.cpp || die + mv configure.{in,ac} || die eautoreconf } src_configure() { - local myeconfargs=( - --with-data-dir=/usr/share/${PN} - --localedir=/usr/share/locale - ) - econf "${myeconfargs[@]}" + econf \ + --disable-rpath \ + --with-data-dir="${EPREFIX}"/usr/share/${PN} } src_install() { default - insinto /usr/share/${PN} - doins -r ../scourge_data/* + + insinto /usr/share/scourge + doins -r ../scourge_data/. + doicon assets/scourge.png make_desktop_entry scourge S.C.O.U.R.G.E. } |