summaryrefslogtreecommitdiff
path: root/games-arcade/supertux
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
commit21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
treee1810a4b135afce04b34862ef0fab2bfaeb8aeca /games-arcade/supertux
parent7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
gentoo resync : 15.01.2020
Diffstat (limited to 'games-arcade/supertux')
-rw-r--r--games-arcade/supertux/Manifest11
-rw-r--r--games-arcade/supertux/files/supertux-0.4.0-desktop.patch11
-rw-r--r--games-arcade/supertux/files/supertux-0.4.0-icon.patch11
-rw-r--r--games-arcade/supertux/files/supertux-0.4.0-license.patch11
-rw-r--r--games-arcade/supertux/files/supertux-0.5.0-obstack.patch19
-rw-r--r--games-arcade/supertux/files/supertux-0.5.1-ninja.patch30
-rw-r--r--games-arcade/supertux/supertux-0.6.0.ebuild6
-rw-r--r--games-arcade/supertux/supertux-0.6.1.1.ebuild (renamed from games-arcade/supertux/supertux-0.5.1.ebuild)18
8 files changed, 14 insertions, 103 deletions
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index be40991e3180..da7ba2461eaf 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,14 +1,9 @@
-AUX supertux-0.4.0-desktop.patch 347 BLAKE2B fd34f3607975c4715dbba48e87c1090b992927e8ef5cd94a9054ea62de4bd79dcaa1b74e14a7af55aba68c06abc61311cfef2e2fd5ac79c78b86698dcc1579c4 SHA512 cc73bafd7862c52e7e52a2bb6b9198e731ae3c63a2c15a99df291a121c82b0f3daf5ffcbd565a3ba8bbbabf1d339ff88cfcd01549a0ea8846ad9a0c98961cec0
-AUX supertux-0.4.0-icon.patch 546 BLAKE2B c5e26bdb22cee7ffd8a3d9a9f87e0c2a486c4eb6857a7f9754106bac3fdcd80d2e95c7b62af2dcb32f34abd25af93d4de5d69a449ee1232ebc87a27d6319b6c0 SHA512 538adade8a8fafb187f893cdf870a9b212df52cc0c7d54d94438cfc4f4ddcaf871817aacac306656a6201dae70581de608a76694530e3d1138c70e5937f5fb6c
-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
AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a906874e01fead00df73b6b9e694aa92d335bf3e69c42e4f773c3bfdd8c7a191d8610e400381e102a82a10357d2 SHA512 c1ec17a90100fb12d52561e028366264e6588e08fa1af1ace0438ebc4c2ea8b783c8720d47a9bf43e907ea8fcc3c6a91c510a221ac9c488234205a18ec567b6e
AUX supertux-0.6.0-license.patch 696 BLAKE2B 76ba58368ce9c02ce66f2a51f54e6c95ede9058130dc54e9560ad060f69806623ea6496a3cb89d823cfbae8d84ce00e4da19eb38e60519f48726a083a3633b76 SHA512 8b4baf774be6625ff253614bb68436ddc26149722af7acea0a4f0772d496c6b30013a22fd3777b11275bd901128caf11b968a37b6a7b99ab344bac78309a6e8e
AUX supertux-0.6.0-obstack.patch 1063 BLAKE2B ab251d7514f38a8a641e680df6c69bea88b8cfb360fc93b7e91a5274ca20e0ef4210429f8ab0694cd5c3e9eee89c6ee955b54a20dd04b11cb385bccc5bb6be6c SHA512 32da8175888fca98b76640739aa531fbfcc132dbce0a89e76be49bca29bc5878266c702e5f4c7499ddd0473804b344c62d03f39f6b14941f0e669e20d2c2241d
-DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
-EBUILD supertux-0.5.1.ebuild 1505 BLAKE2B 0de13bef427186ee354f5a370a7c0a1728a113cb4e060b11802774198196cfe6b21cc78450b52564cb0569b50839cf74742dec9545aeaee0bf5d0cda237263a6 SHA512 bb0f1b0db5463abf529ae7e073e95976ddd8d8c605ab11e0e8e8dee45763117920aa54448838ed0c09f1024cf14685277a1e633e95892f3df20c75c05bbca21b
-EBUILD supertux-0.6.0.ebuild 1456 BLAKE2B 575447891a0be20bf30420e03d5cfb3dc56b689510bd2bea904214b9ee4be65e75961e3adebc18fe84bbeed1064418a08f55e48dd300db78c274092daf44f18e SHA512 3c98a6973fae94edc48165c69612f1341b420bc0458387bd6ec7cbfaf8efdc083efdcd2fe9d0d73d3df33c2f09131652ed6d880b9cb5ec88e1826747bcc3d271
+DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
+EBUILD supertux-0.6.0.ebuild 1438 BLAKE2B feb9ee0fb3a5109d1d400a2dca0ae87499855f542107c0cbdeb9589dc030506f25dfa43589a152a3468dab205e959d4d6841e9f95b6615dec09a9d736beb5434 SHA512 ca5cfa35f1782c8053a10d4f78c96385e16ebd7d14503f401a23f089728087f444b01982334be05aac9709e3a808c5bbfea4d25edddce458eb471754e18f4b79
+EBUILD supertux-0.6.1.1.ebuild 1358 BLAKE2B 2dd6a37a7720a71d9751077d830cc786a7928d3ce86e7cc44079dd8b12d8aa9e5159400cbfead8f46de479f18e92c2727fb0447ad4907dc146893c55631c89e9 SHA512 9f0f0bc75a90f6aea3663259e47bfbdb40908ce0c325aff147f8ed97dabb65a9072796c33649abb54f02cb143525d410468d8d2b91dc845e2b5b52c2feb3586e
MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
deleted file mode 100644
index 74a087263368..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/supertux2.desktop
-+++ b/supertux2.desktop
-@@ -35,7 +35,7 @@
- Comment[pt]=Joga este clássico de plataformas 2D
- Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de Pular&Correr
- Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék
--Icon=supertux.png
-+Icon=supertux
- Exec=supertux2
- Terminal=false
- StartupNotify=false
diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
deleted file mode 100644
index 66be0ebe493b..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -571,7 +571,7 @@
-
- SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
-
-- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/")
-+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/")
-
- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
- ENDIF(WIN32 AND NOT UNIX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch b/games-arcade/supertux/files/supertux-0.4.0-license.patch
deleted file mode 100644
index e35f85ce416f..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -578,7 +578,7 @@
-
- INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
-
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
-
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
-
diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
deleted file mode 100644
index 1b05369f67f3..000000000000
--- a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- supertux-0.5.0/CMakeLists.txt
-+++ supertux-0.5.0/CMakeLists.txt
-@@ -382,7 +382,6 @@
- include_directories(${CMAKE_BINARY_DIR}/)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
--include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
-
- IF(WIN32)
-@@ -392,7 +391,7 @@
-
- ## Build list of sources for supertux binary
-
--FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
-+FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
-
- FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp)
- FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
deleted file mode 100644
index d5181177fdcd..000000000000
--- a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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.6.0.ebuild b/games-arcade/supertux/supertux-0.6.0.ebuild
index c12492e71e3c..4ce0d37323f4 100644
--- a/games-arcade/supertux/supertux-0.6.0.ebuild
+++ b/games-arcade/supertux/supertux-0.6.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
MY_P="SuperTux-v${PV}-Source"
@@ -37,7 +37,7 @@ PATCHES=(
)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# This is not a developer release so switch the logo to the non-dev one.
sed -e 's@logo_dev@logo@' \
@@ -56,5 +56,5 @@ src_configure() {
-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
-DUSE_SYSTEM_PHYSFS=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.6.1.1.ebuild
index f61607c368e3..0964ce28665f 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.6.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils flag-o-matic
+: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake flag-o-matic
MY_P="SuperTux-v${PV}-Source"
@@ -32,13 +32,12 @@ DEPEND="${RDEPEND}
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
+ "${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+ "${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# This is not a developer release so switch the logo to the non-dev one.
sed -e 's@logo_dev@logo@' \
@@ -54,8 +53,7 @@ src_configure() {
-DINSTALL_SUBDIR_DOC=share/doc/${PF}
-DINSTALL_SUBDIR_SHARE=share/${PN}2
-DENABLE_SQDBG="$(usex debug)"
- -DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
-DUSE_SYSTEM_PHYSFS=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 04:08:16 +0000