From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- games-arcade/Manifest.gz | Bin 22230 -> 22223 bytes games-arcade/grande-KXL/Manifest | 6 ++--- .../grande-KXL/files/grande-KXL-0.6-cflags.patch | 4 +-- .../files/grande-KXL-0.6-configure.in.patch | 4 +-- games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild | 16 +++++++---- games-arcade/supertux/Manifest | 3 ++- .../supertux/files/supertux-0.5.1-ninja.patch | 30 +++++++++++++++++++++ games-arcade/supertux/supertux-0.5.1.ebuild | 19 +++++-------- 8 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 games-arcade/supertux/files/supertux-0.5.1-ninja.patch (limited to 'games-arcade') diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz index 072a468e9026..4a4fdff16902 100644 Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest index fa0cf2ff94ed..95a4baa4d52f 100644 --- a/games-arcade/grande-KXL/Manifest +++ b/games-arcade/grande-KXL/Manifest @@ -1,5 +1,5 @@ -AUX grande-KXL-0.6-cflags.patch 383 BLAKE2B d96520b378f388d5fcedf925ba4dff0d8c3503ae581ca6c6bd68087ebbb64d92a2d019051d15b182f7ef0cb4130ba9e9c45eedea0ec79bc4beb343813e944208 SHA512 2cc4f81ca9e32a8de930dec9f2f0d1b0f8ac8c0eef9267a3495f836f12a1c7e0872ab562050488af1afff5a8fee69c0279f5af74c0c0a385b6603987b5437957 -AUX grande-KXL-0.6-configure.in.patch 403 BLAKE2B 6a2ee0b40456b4b34dc4c6a6eea381686a0327ce636eecdebd13d880ab9982d8a144ca85fa251aa58472654cd331f2c2958d6b7bd69a2e65e4b1f0c05b1cabcf SHA512 0409274244136932a575673a902799725d554dfbac93f3f786b338dd37d3616df3fe02e699efc21b7f82b934d882befcc9978b7ce9618f5b4e0cf891d67c5ae8 +AUX grande-KXL-0.6-cflags.patch 387 BLAKE2B 6ea42eaaa8f3fc9d97b5de7c613f0998a7fb4b2088ef2d9949013a6d8b74e064c9913c9e8b4dda06650ea214902340d36b19d2545fa0366ddcba688fa433a797 SHA512 a330b5c8b97d941d13c90f5b78709df823d1242765890439a195f6788443c9d13bd5062399d1452eec9f311e6dd88e72d932398f99cdacaa94bc6d080550167c +AUX grande-KXL-0.6-configure.in.patch 407 BLAKE2B 4e743c52625cffcc44c95657d5dce6bb2c87b6c74e1f6838336210114b15d3aa66dca309673c075293dc8596e56d99d2dbbc1a0c05deaee007cc31026c1962e2 SHA512 a6c5b0c86b40bb8a2236e7df366a5da2510ead498d6648d5c0377f26151854ba99fec0fc0c37be011ca847ba752c135ea3996d5d3a15e5f4bd1d06c85f9fbf2f DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d SHA512 17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980 -EBUILD grande-KXL-0.6-r1.ebuild 683 BLAKE2B 067cef9660c70a50df4f37bf6a3e2ce666abbdde47106506aa7e4e9404e9cecdbdab03e3ee13c8afbd7d4ef9fcf5750796385254c38fcf4156c5cb49571b8aac SHA512 884b21e35ea7be6080bb1d14603b780997151d18bac7757b6fd154c18424cfdea00e308260c9776b5a6e46ded25264ee2842b28378335c65f92d3c9b4a1b2aae +EBUILD grande-KXL-0.6-r1.ebuild 729 BLAKE2B d5dbb090529b5f97b832d53ed3f78911271101592872ca5aa4817cdd1524a8210b8aafdb9f0b2f581d57dc7b6541d1daaee51050d15a1a3b6f6dbfee18c92901 SHA512 825f22c2358d13c1176dc6eb8d379e8291daf2c775c8daf5a7bbcdc76256d767efe7641484d46e5028ecc068b114e566d5ab610e3a1c76d5f76ac86c3e670a9d MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch index ff51e562bcb3..94f6ce759b75 100644 --- a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch +++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch @@ -4,8 +4,8 @@ Subject: build system respect CFLAGS ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = bmp wav stg diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch index 80cdcd83b898..19fec93f61a5 100644 --- a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch +++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -17,12 +17,8 @@ AC_CHECK_HEADERS(unistd.h) diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild index b256aa384205..899a615e6527 100644 --- a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild +++ b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit autotools desktop DESCRIPTION="ZANAC type game" @@ -15,20 +16,25 @@ IUSE="" DEPEND="dev-games/KXL" RDEPEND="${DEPEND} - media-fonts/font-adobe-100dpi -" + media-fonts/font-adobe-100dpi" + +PATCHES=( + "${FILESDIR}"/${P}-configure.in.patch + "${FILESDIR}"/${P}-cflags.patch +) src_prepare() { default - eapply "${FILESDIR}"/${P}-{configure.in,cflags}.patch - mv configure.{in,ac} - rm aclocal.m4 + + mv configure.{in,ac} || die + rm aclocal.m4 || die eautoreconf } src_install() { dodir /var/lib default + newicon src/bmp/boss1.bmp ${PN}.bmp make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp } diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest index 2879aa424dd4..520ddb9e7622 100644 --- a/games-arcade/supertux/Manifest +++ b/games-arcade/supertux/Manifest @@ -3,6 +3,7 @@ AUX supertux-0.4.0-icon.patch 546 BLAKE2B c5e26bdb22cee7ffd8a3d9a9f87e0c2a486c4e AUX supertux-0.4.0-license.patch 599 BLAKE2B a89b596876956f260de582d7f31e1b8ded03471e5fbefd0cf9214dd95a54c889b295707becfbf9f98d32269e414acf498713cae47ae882604e8683eac926086a SHA512 d3609c7d0053d8f2bdaf4f91449ba71d8c2a2509bb6718393e06add5ff9b59a3dc78f70fcdb7ace4f73eab9325ab5ef64cf9399c0e65a9b31f5fc4bfeb6bb751 AUX supertux-0.5.0-obstack.patch 958 BLAKE2B 41da812369a4a64040e7759a4c56a7b3fb42898f50fc58ef03d76a9c27cc904db9909223eee98f9f5a7f12b5c0fde295701633eab308fe495333df3989071de7 SHA512 aecba33369bb255c9fef8e0ed873d7c457ddd85340f2788bd3f517b1a126e943e0ec1085239f1fea7eb242d0344efaa5ddeaa14865cc61a6863dab44b854f9ed AUX supertux-0.5.0-tinygettext.patch 920 BLAKE2B 9558c2df82a03e1893ae10c0f283f257fda90493947e4fbaec24a6e4d540e0dcf28505be92be3224b4cb5f6ca978abc09adac0b86503132203e9ce0cacf2b1c2 SHA512 eaf1c0ca534cb6d0cd216bd69283856bdad46830210edb6b00d4d382b2a2045eede8e96fa7b1832e8e2246144452b59a82966621441362c56c8bd3ace758097e +AUX supertux-0.5.1-ninja.patch 1045 BLAKE2B 2f59d8fdf05e1994ae9690cdce001ea6235f8c06e7438eba41b54264e631188210591adce6d212f08a497c31cca9f08542b4dff1cac4568b0fdb4410eaaecdb6 SHA512 8b877ab382913d74db9890bf19867efc0c6ff4a5901a679ffbfbe72142341e61c804e1f4def1bd1157f3f144b50f2eca143420b08940eeaaed93a9b8fc1c8d5d DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a -EBUILD supertux-0.5.1.ebuild 1515 BLAKE2B 6dbd48b48d79051958491581892260f1e9e206d1793535dd2438402b20bdfeba2124b443e65025077a45b3df587072a4952a6062a9cb342974966fd6ad783537 SHA512 81a58cbf509ebf357b1193073cf1aeacd330373a02b01d41ced54bb57a87c88687d07d7ffcf851364050403267c40f3f9e02d048d01e6cd8297df080a8d52bb3 +EBUILD supertux-0.5.1.ebuild 1502 BLAKE2B fdda1513fc69f1c990243b3375e6e5f11dc46bef8434331a6b28aa0b3e78db1c2af81765a1b71d69b953721b68e24d64de1cc4a074773421e2312d09894851f7 SHA512 af5b234a5893f3162a88e006758f3d3ffc8631a3dd18d422a9ca598fbc00ff933fe62ed51ddbcfefecbfca9d10e74a609b06575d14398f842f5477e551292c01 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65 diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch new file mode 100644 index 000000000000..d5181177fdcd --- /dev/null +++ b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch @@ -0,0 +1,30 @@ +Allow building with ninja instead of CMake, see also: + + https://bugs.gentoo.org/649458 + https://cmake.org/pipermail/cmake/2015-April/060234.html + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -332,7 +332,10 @@ + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX} +- -DINSTALL_INC_DIR=include) ++ -DINSTALL_INC_DIR=include ++ BUILD_BYPRODUCTS ++ squirrel/lib/libsquirrel_static.a ++ squirrel/lib/libsqstdlib_static.a) + + IF(WIN32) + ADD_LIBRARY(squirrel_lib SHARED IMPORTED) +@@ -370,7 +373,9 @@ + -DHAVE_SDL=ON + -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX} + -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS} +- -DLIB_SUFFIX=${LIB_SUFFIX}) ++ -DLIB_SUFFIX=${LIB_SUFFIX} ++ BUILD_BYPRODUCTS ++ tinygettext/lib${LIB_SUFFIX}/libtinygettext.a) + + ADD_LIBRARY(tinygettext_lib STATIC IMPORTED) + SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}") diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.5.1.ebuild index af91e8b026d3..c1773f3228cd 100644 --- a/games-arcade/supertux/supertux-0.5.1.ebuild +++ b/games-arcade/supertux/supertux-0.5.1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} inherit cmake-utils flag-o-matic MY_P="SuperTux-v${PV}-Source" @@ -32,35 +34,28 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch "${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch + "${FILESDIR}"/${PN}-0.5.1-ninja.patch ) src_prepare() { cmake-utils_src_prepare # This is not a developer release so switch the logo to the non-dev one. - sed 's@logo_dev@logo@' \ + sed -e 's@logo_dev@logo@' \ -i data/images/objects/logo/logo.sprite || die } src_configure() { append-cxxflags -std=c++11 + local mycmakeargs=( -DWERROR=OFF -DINSTALL_SUBDIR_BIN=bin -DINSTALL_SUBDIR_DOC=share/doc/${PF} -DINSTALL_SUBDIR_SHARE=share/${PN}2 -DENABLE_SQDBG="$(usex debug)" - -DUSE_DEBUG="$(usex debug)" -DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required. + -DUSE_SYSTEM_PHYSFS=ON ) - cmake-utils_src_configure } - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install -} -- cgit v1.2.3