diff options
Diffstat (limited to 'games-strategy')
21 files changed, 170 insertions, 653 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz Binary files differindex 58d5b69db074..10b587191ea5 100644 --- a/games-strategy/Manifest.gz +++ b/games-strategy/Manifest.gz diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest index c3aa4201da08..801a7d85395f 100644 --- a/games-strategy/endless-sky/Manifest +++ b/games-strategy/endless-sky/Manifest @@ -1,8 +1,3 @@ -AUX endless-sky-0.9.14-dont-compress-man-page.patch 602 BLAKE2B 9aaa08338ed26e53f5eaa3e42a0aaa8c9c8f56099518a688d3f91fd860945a883252345bd8f9df9b6d591751afc171f6d6e845c86083bc246316fec6e5d3eb7e SHA512 a3b951be268b8e6689da97b7ec77ebb7a5d65a6381dbbdfd0b607c62d2d0418f78290189b6cf94c33acfd238c7c8b1b5b0737629486ca2af18d9022ada1789ec -AUX endless-sky-0.9.14-no-games-path.patch 1919 BLAKE2B 7650a1e3a355a0e9a591f191fbc2eb0f5400924cac7fa2ac0ef3419a6c7c6524e19956907c3904267c9ba1e1bedbceb7b5fa19af07316c6137c9075f9a051c03 SHA512 c9b867fb0d8c82a1ebaa5bc04ba615d39d81031bcec204b5e5a3d0daff040ae30f59ba4f80e76ca671db0a9073c63ad0b3cb8f125ca628bbaa1774c212e6c2b3 -AUX endless-sky-0.9.16.1-gcc13.patch 1318 BLAKE2B 31a147234d4f071e566603fa3c29d43b421ebd762c8170a243e051f69a002ed86d2c81d581789bdbba516e7954edbb3745d1e21acbc8f0b8490e9d3a8643b27e SHA512 be5a394a939456e1a82aec5146248e9ce4ae532e9df94765f9f83222ea1235b2d27d39247605d0969ea2414e0f55fb2011dd737859fcf6c7bb2c3a16f3729c4b -AUX endless-sky-0.9.16.1-respect-cflags.patch 389 BLAKE2B 1dc481b771fc9ab5af455c623aae6941d3b81b7b74ad031e7702dfc6a3832713ea040130a81ddee1c1e129758d85a0e25eff74bca4fba66b7cd940a9373bccf9 SHA512 a309b981791ea81538d8ee47aef4b590cf01af024280e73f883ce8145621a533daa404b87c04f7545bc8922be9dec77c8c4c0142dc2b3e490cd5e252d0087cf0 -AUX endless-sky-0.9.16.1-test-libs.patch 448 BLAKE2B 41c7617f7087140cee0540e432540098f47d6c2037b02da2a594899b8140db32c40676611a081f56767f48707daf9e5eaebf48eb81ec0ee03d57cb2afa1d0d1c SHA512 fe4a698de27a48439e7a205ce36b0eed29e8f5264422717c412be5726dedf236ac20668a20e850d2cb14782b5a1351d20582dc065b502bef978ab89416658ae0 -DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B 3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650 SHA512 83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56 -EBUILD endless-sky-0.9.16.1.ebuild 1762 BLAKE2B ba2bf3543486736cd070abbb4b7a7369f3f079eba63ebc0220e0a9bc72d7e8cad0514d8c4ca19ebf0b5b2dad0b875464c40440c46af4e48de8e0549e8f0a3123 SHA512 199578d6d8e32c3006456a54987ed4e0cc7c6d97a26cf5ca0694273d62f4e5e1ea9c45d518eda253e6e059968d39d0bbbe4a982cf65d867c0aef8a3349ac5401 +DIST endless-sky-0.10.6.tar.gz 256438340 BLAKE2B 39699f458b691dd8aa0586ebbb5b537b8b999ea0084abc561803e21e97986dd6ef28582545fc79cc5cd3ef5d4c587b96860fd7b94294acf2fee31224543ac4ff SHA512 815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530 +EBUILD endless-sky-0.10.6.ebuild 2077 BLAKE2B fda16b09d2f8bb729b2bf6ee4cbe332cf9ad5478e35b2c8c3925dc9614ccf13ad179df42d0dda1281996e139cd8ef66fadcc8ebd0a511c3c67a301948c2df97b SHA512 429c3d421ce9432e73dc9d6015a1bde8ef28d2053ec5e466ba439aa05f113437e0adbc57359ef31e000cd60eb2459f8facc60a8547fe3dc85a672752c64c446a MISC metadata.xml 732 BLAKE2B 05e221e5b8bc45baf62a5361a1fa11affd5bfce04bb1ed4127251c151771df72c873e9c2deab4aa9b4800fa3314fa768c635e61bf941e3eb74241ee5f2a8aabf SHA512 2aefeccd986719aab4be77af1bf4458b36a873918c04905f9b432a591a44dfdd001faf29ab16ced565c069e846bfe5a96e2c12ffa1e4d62a7b202cf7fc356949 diff --git a/games-strategy/endless-sky/endless-sky-0.10.6.ebuild b/games-strategy/endless-sky/endless-sky-0.10.6.ebuild new file mode 100644 index 000000000000..d1f1437b24c2 --- /dev/null +++ b/games-strategy/endless-sky/endless-sky-0.10.6.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake prefix xdg + +DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity" +HOMEPAGE="https://endless-sky.github.io/" +SRC_URI=" + https://github.com/endless-sky/endless-sky/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE=" + GPL-3+ + CC-BY-2.0 CC-BY-3.0 CC-BY-4.0 + CC-BY-SA-3.0 CC-BY-SA-4.0 + CC0-1.0 public-domain +" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gles2-only test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libglvnd + media-libs/libjpeg-turbo:= + media-libs/libmad + media-libs/libpng:= + media-libs/libsdl2[video] + media-libs/openal + sys-apps/util-linux + gles2-only? ( media-libs/libsdl2[gles2] ) + !gles2-only? ( + media-libs/glew:0= + media-libs/libsdl2[opengl] + ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + cmake_src_prepare + + # no /usr/*games/ on Gentoo, adjust docdir, install even if != Release, + # and GLEW is unused if USE=gles2-only (using sed for less rebasing) + sed -e '/install(/s: games: bin:' \ + -e '/install(/s: share/games: share:' \ + -e "/install(/s: share/doc/endless-sky: share/doc/${PF}:" \ + -e '/install(/s: CONFIGURATIONS Release::' \ + -e 's:GLEW REQUIRED:GLEW:' \ + -i CMakeLists.txt || die + sed -i '/PATH/s:share/games:share:' source/Files.cpp || die + + hprefixify -w /PATH/ source/Files.cpp +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + -DES_GLES=$(usex gles2-only) + -DES_USE_SYSTEM_LIBRARIES=yes + -DES_USE_VCPKG=no + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + gzip -d -- "${ED}"/usr/share/man/man6/${PN}.6.gz || die + rm -- "${ED}"/usr/share/doc/${PF}/{copyright,license.txt} || die +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "Endless Sky provides high-res sprites for high-dpi screens." + elog "If you want to use them, download:" + elog + elog " https://github.com/endless-sky/endless-sky-high-dpi/releases" + elog + elog "and extract it to ~/.local/share/endless-sky/plugins/" + fi +} diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild deleted file mode 100644 index 709d7de7ed87..000000000000 --- a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 scons-utils toolchain-funcs xdg - -DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity" -HOMEPAGE="https://endless-sky.github.io/" -SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gles2-only" - -RDEPEND=" - media-libs/libjpeg-turbo:= - media-libs/libmad - media-libs/libpng:= - media-libs/openal - sys-apps/util-linux - gles2-only? ( - media-libs/libglvnd - media-libs/libsdl2[gles2,video] - ) - !gles2-only? ( - media-libs/glew:0= - media-libs/libglvnd[X] - media-libs/libsdl2[opengl,video] - )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.14-no-games-path.patch - "${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch - "${FILESDIR}"/${PN}-0.9.16.1-respect-cflags.patch - "${FILESDIR}"/${PN}-0.9.16.1-test-libs.patch - "${FILESDIR}"/${PN}-0.9.16.1-gcc13.patch -) - -src_compile() { - tc-export AR CXX - - MYSCONSARGS=( - PREFIX="${EPREFIX}"/usr - opengl=$(usex gles2-only gles desktop) - ) - - escons "${MYSCONSARGS[@]}" -} - -src_test() { - # TODO: unbundle dev-cpp/catch if upstream migrates to catch v3 - escons "${MYSCONSARGS[@]}" test -} - -src_install() { - escons "${MYSCONSARGS[@]}" DESTDIR="${D}" install -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "Endless Sky provides high-res sprites for high-dpi screens." - einfo "If you want to use them, download" - einfo - einfo " https://github.com/endless-sky/endless-sky-high-dpi/releases" - einfo - einfo "and extract it to ~/.local/share/endless-sky/plugins/." - einfo - einfo "Enjoy." -} diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch deleted file mode 100644 index d3836c088f31..000000000000 --- a/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 07f273e6f72a01158934158c3e8ff84c530367c9 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 6 Jan 2022 23:57:32 +0000 -Subject: [PATCH 2/2] Don't compress man page - ---- a/SConstruct -+++ b/SConstruct -@@ -176,10 +176,9 @@ if env.get("PREFIX").startswith("/usr/"): - "gtk-update-icon-cache -t $DESTDIR$PREFIX/share/icons/hicolor/") - - # Install the man page. --env.Command( -+env.Install( - "$DESTDIR$PREFIX/share/man/man6/endless-sky.6.gz", -- "endless-sky.6", -- "gzip -c $SOURCE > $TARGET") -+ "endless-sky.6") - - # Install the data files. - def RecursiveInstall(env, target, source): diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch deleted file mode 100644 index bdec820de1e1..000000000000 --- a/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://src.fedoraproject.org/rpms/endless-sky/raw/rawhide/f/endless-sky-0.9.13-remove-games-path.patch ---- a/SConstruct -+++ b/SConstruct -@@ -191,11 +191,11 @@ - RecursiveInstall(env, pathjoin(target, name), node.abspath) - else: - env.Install(target, node) --RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data") --RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images") --RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds") --env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt") --env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt") -+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/data", "data") -+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/images", "images") -+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/sounds", "sounds") -+env.Install("$DESTDIR$PREFIX/share/endless-sky", "credits.txt") -+env.Install("$DESTDIR$PREFIX/share/endless-sky", "keys.txt") - - # Make the word "install" in the command line do an installation. - env.Alias("install", "$DESTDIR$PREFIX") ---- a/SConstruct -+++ b/SConstruct -@@ -142,7 +142,7 @@ - - - # Install the binary: --env.Install("$DESTDIR$PREFIX/games", sky) -+env.Install("$DESTDIR$PREFIX/bin", sky) - - # Install the desktop file: - env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") ---- a/source/Files.cpp -+++ b/source/Files.cpp -@@ -119,7 +119,7 @@ - // the executable, but are under the same prefix (/usr or /usr/local). - static const string LOCAL_PATH = "/usr/local/"; - static const string STANDARD_PATH = "/usr/"; -- static const string RESOURCE_PATH = "share/games/endless-sky/"; -+ static const string RESOURCE_PATH = "share/endless-sky/"; - if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH)) - resources = LOCAL_PATH + RESOURCE_PATH; - else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH)) diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch deleted file mode 100644 index 428e67da568e..000000000000 --- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/894782 -https://github.com/endless-sky/endless-sky/commit/a85df936c24feba6eb5f7f484c160aff0a60d6cb -https://github.com/endless-sky/endless-sky/commit/7483f72cc72511786ba3aac13b4cbe0848a2aefc - -From a85df936c24feba6eb5f7f484c160aff0a60d6cb Mon Sep 17 00:00:00 2001 -From: Heiko Becker <mail@heiko-becker.de> -Date: Sat, 28 Jan 2023 16:29:40 +0100 -Subject: [PATCH] chore: Fix build with gcc 13 by including <cstdint> (#8235) - ---- a/source/ImageBuffer.h -+++ b/source/ImageBuffer.h -@@ -16,6 +16,7 @@ this program. If not, see <https://www.gnu.org/licenses/>. - #ifndef IMAGE_BUFFER_H_ - #define IMAGE_BUFFER_H_ - -+#include <cstdint> - #include <string> - - ---- a/source/Sound.cpp -+++ b/source/Sound.cpp -@@ -20,6 +20,7 @@ this program. If not, see <https://www.gnu.org/licenses/>. - - #include <AL/al.h> - -+#include <cstdint> - #include <cstdio> - #include <vector> - - -From 7483f72cc72511786ba3aac13b4cbe0848a2aefc Mon Sep 17 00:00:00 2001 -From: Nick <quyykk@protonmail.com> -Date: Wed, 8 Mar 2023 19:41:40 +0100 -Subject: [PATCH] chore: Add a missing #include, caught by gcc 13 (#8511) - ---- a/source/Preferences.h -+++ b/source/Preferences.h -@@ -16,6 +16,7 @@ this program. If not, see <https://www.gnu.org/licenses/>. - #ifndef PREFERENCES_H_ - #define PREFERENCES_H_ - -+#include <cstdint> - #include <string> - - diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch deleted file mode 100644 index 6790f7de647f..000000000000 --- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -53,10 +53,2 @@ - flags = ["-std=c++11", "-Wall", "-Wold-style-cast", "-fno-rtti"] --if env["mode"] != "debug": -- flags += ["-Werror", "-O3", "-flto"] -- env.Append(LINKFLAGS = ["-O3", "-flto"]) --if env["mode"] == "debug": -- flags += ["-g"] --elif env["mode"] == "profile": -- flags += ["-pg"] -- env.Append(LINKFLAGS = ["-pg"]) - env.Append(CCFLAGS = flags) diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch deleted file mode 100644 index 31b27de1d569..000000000000 --- a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch +++ /dev/null @@ -1,10 +0,0 @@ -Even if not actually used, ensure all symbols are available when linking -tests to handle cases where unused symbols were not optimized out. -https://bugs.gentoo.org/894702 ---- a/SConstruct -+++ b/SConstruct -@@ -172,4 +172,2 @@ - CPPPATH=(env.get('CPPPATH', []) + [pathjoin('tests', 'unit', 'include')]), -- # Do not link against the actual implementations of SDL, OpenGL, etc. -- LIBS=sys_libs, - # Pass the necessary link flags for a console program. diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest index 9adcccaadb50..09eccb23d49f 100644 --- a/games-strategy/freeorion/Manifest +++ b/games-strategy/freeorion/Manifest @@ -1,7 +1,3 @@ -AUX freeorion-0.5-ccache.patch 532 BLAKE2B 81decfa1898b2a3617d75a28ac27f337a9c70d6bbfa8c0b9bf32500804a42884d2c638e6969521041291eb47f006caed00703622d0a586b351da9a09e62ab56b SHA512 2fd42e72867a9dfd7e4d4daa5c7767c68a5fed70f9fe5333145fe0606f102ed89045d6e6d9c7e2976e7264545ff8c94d7f2ca20374520c752f721a0bacd9f4dc -DIST FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz 124836633 BLAKE2B 42224b84a7aef99e998cb025b5095365a65670a3a0a543ef323f444f1904557713dc995de6f7ccaf9a45e34f62b4c65d4977caa0f6ac7605a9978268bdef0ba1 SHA512 a0f327f5fec82cf15495828f60b59b59834efaa041919fe9f68e4428e89b729503b7e666214ea39e5c9afdfbb9efd343c5cbcb8dfc982d6f56b3a06fd898f428 -DIST FreeOrion_v0.5_Source.tar.gz 152861207 BLAKE2B 5263f9c2461db35b5283122889d0779f175af095e90eb782d21b6870193669b0307c2df95ebde78b3f762d2d0e1e1d8ec5f537bd44bf6810b9fbf76c58322172 SHA512 ec1247584d317ca0d0394d62754fd35b1d1212323e96e644c9efae422437daf63aac12c2798274993c9c29887fe73a51bfe11e9b53370dc261a0683efe312f19 -EBUILD freeorion-0.4.10.2-r1.ebuild 2895 BLAKE2B 849e43937132ee9608f0900320b5dcbf174cd75c38e88345065a16f19ca577e1861e1b71ebc011e5585f71daef2d05852d61a9c2242e9a0fe2fe8b0c6380fb0d SHA512 e2b6af475b1070b553450af6dd85059d2e69625c92d1ed1f4fc4125e0ec5deec9f322cf2e9e9704064f96a3d54c212c9e63b2c20a2f8ecd6d87f26d8d5a3de60 -EBUILD freeorion-0.5.ebuild 2830 BLAKE2B e8d6e5aaff4bdd23f55b18d2d805c7c312d00320b34f1cac30830cbf01a924dd5685fddb79afbd91fcaec943cca2e0663dd167b409bb8c66a26f2d840538b3fe SHA512 9e9b14526affa169ec74cbcf63abe4e5c624f3ad27f9b2e0902d936c3f7392876e04cdfb3ae6c22ff65228ce4bdec465c86b3204e8ae773a539dded8b0d73dd2 -EBUILD freeorion-9999.ebuild 2830 BLAKE2B e8d6e5aaff4bdd23f55b18d2d805c7c312d00320b34f1cac30830cbf01a924dd5685fddb79afbd91fcaec943cca2e0663dd167b409bb8c66a26f2d840538b3fe SHA512 9e9b14526affa169ec74cbcf63abe4e5c624f3ad27f9b2e0902d936c3f7392876e04cdfb3ae6c22ff65228ce4bdec465c86b3204e8ae773a539dded8b0d73dd2 +DIST FreeOrion_v0.5.0.1_Source.tar.gz 152861158 BLAKE2B 6924d4916fcd3ac93e7498b5247957a6fb62b8523aa49114e9e11ef5e3b89374966551bc14192fa7928951728ce814fb86d89365beb97aa7c2bc84408bfcadd2 SHA512 dc267231329f0615f12887f22139d57a2611f378e17e8b0f26c00efdb77e73ef737ff875350f805d34a07ca4ce0595758e4f61168878477ebbd92d0149bcdc22 +EBUILD freeorion-0.5.0.1.ebuild 2780 BLAKE2B 1c87cd78d7c23c77532c15c3d6d490b21aeb5302617ce72e5854090413919eac2113b44f56a67a1ebd7f7877cd58897ad587a7048fdfcec9a832171ba483c4d5 SHA512 762b6a6d168e63dd59575c7c2f156c745bacf53f24ca4ebed013a7209b275ed76a4a3f58d91dbf1c463725d56397ab2f1155615b5c3f0ab2821710c8e43921c1 MISC metadata.xml 757 BLAKE2B 64e1e5a856369650c9d41b75f7af091c5fde43ab2992911cc81d5e4ba12d13fea5e4e82ae960e75208979aea38eeeb07d4bfebdb1eb45c035796ed854090cbe6 SHA512 5e631e52b5dbabbb6ce1cde6e416c4ed228dbf4a1ddda7899e5565c9abd5b7080894866aef375ff66cef3facd06faadcaea2ccefd8fb34d6bb461bfd32879d6e diff --git a/games-strategy/freeorion/files/freeorion-0.5-ccache.patch b/games-strategy/freeorion/files/freeorion-0.5-ccache.patch deleted file mode 100644 index dc289fa84ec9..000000000000 --- a/games-strategy/freeorion/files/freeorion-0.5-ccache.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,7 +30,6 @@ ENDIF(NOT CMAKE_BUILD_TYPE) - message(STATUS "Build type CMAKE_BUILD_TYPE set to ${CMAKE_BUILD_TYPE}") - - include(UseCompilerCache) --find_compiler_cache(PROGRAM ccache) - - list(APPEND GODOT_CPP_CMAKE_VARS "CMAKE_BUILD_TYPE;CMAKE_CONFIGURATION_TYPES;CMAKE_TOOLCHAIN_FILE;PYTHON_EXECUTABLE") - get_cmake_property(vars CACHE_VARIABLES) -@@ -50,7 +49,6 @@ endforeach() - - project(FreeOrion) - --use_compiler_cache_with_xcode() - - include(GNUInstallDirs) - include(UseCodeCoverage) diff --git a/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild deleted file mode 100644 index 0d5f61e91177..000000000000 --- a/games-strategy/freeorion/freeorion-0.4.10.2-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit check-reqs cmake multiprocessing python-single-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" -else - FREEORION_BUILD_ID="2021-08-01.f663dad" - SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_${FREEORION_BUILD_ID}_Source.tar.gz" - S="${WORKDIR}/src-tarball" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Free turn-based space empire and galactic conquest game" -HOMEPAGE="https://www.freeorion.org/" - -LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+" -SLOT="0" -IUSE="dedicated doc test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]') - sys-libs/zlib:= - !dedicated? ( - media-libs/freetype - media-libs/glew:= - media-libs/libglvnd[X] - media-libs/libogg - media-libs/libpng:= - media-libs/libsdl2[opengl,video] - media-libs/libvorbis - media-libs/openal - )" -RDEPEND=" - ${DEPEND} - !dedicated? ( - media-fonts/dejavu - media-fonts/roboto - )" -BDEPEND=" - ${PYTHON_DEPS} - doc? ( - app-text/doxygen - media-gfx/graphviz - ) - test? ( - $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') - )" - -freeorion_check-reqs() { - # cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB - # if debug symbols) then far less for the rest, check minimal jobs*1.5 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*1500))M - check-reqs_${EBUILD_PHASE_FUNC} -} - -pkg_pretend() { - freeorion_check-reqs -} - -pkg_setup() { - freeorion_check-reqs - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - sed -i 's/-O3//' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HEADLESS=$(usex dedicated) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all $(usev doc) -} - -src_test() { - # freeoriond randomly(?) segfaults on exit, cause unknown but - # seems fixed by some refactoring in -9999 (excluding for now) - cmake_src_test -E 'SmokeTest(Game|Hostless)' - - local EPYTEST_DESELECT=( - # broken with 3.11 but is not known to cause issues, just skip for now - default/python/tests/AI/test_savegame_manager.py::test_setstate_call - ) - - epytest -o cache_dir="${T}"/pytest_cache default/python/tests -} - -src_install() { - local DOCS=( ChangeLog.md README.md ) - cmake_src_install - - use doc && dodoc -r "${BUILD_DIR}"/doc/cpp-apidoc/html - - if use dedicated; then - rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die - else - local font - for font in roboto/Roboto-{Bold,Regular}.ttf dejavu/DejaVuSans{-Bold,}.ttf; do - dosym -r /usr/share/{fonts/${font%/*},${PN}/default/data/fonts}/${font##*/} - done - rm "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die - fi -} diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild index 7bf2bf981654..29b1188c6e9f 100644 --- a/games-strategy/freeorion/freeorion-9999.ebuild +++ b/games-strategy/freeorion/freeorion-0.5.0.1.ebuild @@ -3,23 +3,17 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -inherit check-reqs cmake multiprocessing python-single-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" -else - SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz" - S="${WORKDIR}/src-tarball" - KEYWORDS="~amd64" -fi +PYTHON_COMPAT=( python3_{10..12} ) +inherit check-reqs cmake flag-o-matic multiprocessing python-single-r1 xdg DESCRIPTION="Free turn-based space empire and galactic conquest game" HOMEPAGE="https://www.freeorion.org/" +SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz" +S=${WORKDIR}/src-tarball LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+" SLOT="0" +KEYWORDS="~amd64" IUSE="+client doc test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -30,33 +24,30 @@ DEPEND=" sys-libs/zlib:= client? ( media-libs/freetype - media-libs/glew:= + media-libs/glew:0= media-libs/libglvnd media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video] media-libs/libvorbis media-libs/openal - )" + ) +" RDEPEND=" ${DEPEND} client? ( media-fonts/dejavu media-fonts/roboto - )" + ) +" BDEPEND=" ${PYTHON_DEPS} doc? ( app-text/doxygen media-gfx/graphviz ) - test? ( - $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') - )" - -PATCHES=( - "${FILESDIR}/freeorion-0.5-ccache.patch" -) + test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) +" freeorion_check-reqs() { # cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB @@ -78,12 +69,17 @@ src_prepare() { cmake_src_prepare sed -i 's/-O3//' CMakeLists.txt || die + + cmake_comment_add_subdirectory check #904124 } src_configure() { + filter-lto # -Werror=odr issues + local mycmakeargs=( + -DCCACHE_PROGRAM=no -DBUILD_CLIENT_GG=$(usex client) - -DBUILD_CLIENT_GODOT=no # TODO, perhaps with system godot (experimental) + -DBUILD_CLIENT_GODOT=no # TODO? perhaps with system godot (experimental) -DBUILD_TESTING=$(usex test) ) @@ -116,8 +112,8 @@ src_install() { for font in roboto/Roboto-{Bold,Regular}.ttf dejavu/DejaVuSans{-Bold,}.ttf; do dosym -r /usr/share/{fonts/${font%/*},${PN}/default/data/fonts}/${font##*/} done - rm "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die + rm -- "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die else - rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die + rm -r -- "${ED}"/usr/share/freeorion/default/data/fonts || die fi } diff --git a/games-strategy/freeorion/freeorion-0.5.ebuild b/games-strategy/freeorion/freeorion-0.5.ebuild deleted file mode 100644 index 7bf2bf981654..000000000000 --- a/games-strategy/freeorion/freeorion-0.5.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit check-reqs cmake multiprocessing python-single-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" -else - SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz" - S="${WORKDIR}/src-tarball" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Free turn-based space empire and galactic conquest game" -HOMEPAGE="https://www.freeorion.org/" - -LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+" -SLOT="0" -IUSE="+client doc test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]') - sys-libs/zlib:= - client? ( - media-libs/freetype - media-libs/glew:= - media-libs/libglvnd - media-libs/libogg - media-libs/libpng:= - media-libs/libsdl2[opengl,video] - media-libs/libvorbis - media-libs/openal - )" -RDEPEND=" - ${DEPEND} - client? ( - media-fonts/dejavu - media-fonts/roboto - )" -BDEPEND=" - ${PYTHON_DEPS} - doc? ( - app-text/doxygen - media-gfx/graphviz - ) - test? ( - $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') - )" - -PATCHES=( - "${FILESDIR}/freeorion-0.5-ccache.patch" -) - -freeorion_check-reqs() { - # cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB - # if debug symbols) then far less for the rest, check minimal jobs*1.5 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*1500))M - check-reqs_${EBUILD_PHASE_FUNC} -} - -pkg_pretend() { - freeorion_check-reqs -} - -pkg_setup() { - freeorion_check-reqs - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - sed -i 's/-O3//' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CLIENT_GG=$(usex client) - -DBUILD_CLIENT_GODOT=no # TODO, perhaps with system godot (experimental) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all $(usev doc) -} - -src_test() { - cmake_src_test -j1 # avoid running 2 conflicting servers - - local EPYTEST_DESELECT=( - # broken with 3.11 but is not known to cause issues, just skip for now - tests/AI/save_game_codec/test_savegame_manager.py::test_setstate_call - ) - - epytest -o cache_dir="${T}"/pytest_cache default/python/tests -} - -src_install() { - local DOCS=( ChangeLog.md README.md ) - cmake_src_install - - use doc && dodoc -r "${BUILD_DIR}"/doc/cpp-apidoc/html - - if use client; then - local font - for font in roboto/Roboto-{Bold,Regular}.ttf dejavu/DejaVuSans{-Bold,}.ttf; do - dosym -r /usr/share/{fonts/${font%/*},${PN}/default/data/fonts}/${font##*/} - done - rm "${ED}"/usr/share/${PN}/default/data/fonts/LICENSE.{Roboto,DejaVu} || die - else - rm -r "${ED}"/usr/share/freeorion/default/data/fonts || die - fi -} diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index fa074aa80083..bd8298e235ce 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,12 +1,9 @@ AUX wesnoth-1.16.10-boost-1.83.patch 787 BLAKE2B 943668f101ea223257131c83a1b4441fce9424a75dd9c9f69953a97eb30951b28d8cddf5594621ec7fda6882ecacb639a91866dc8956719dd4a1cccdf69ccb74 SHA512 0533fa7ff1fdefa8fcc1a6060c227d6c13dcd44f0e4bff33b71db18f53fd8a31dbd80115f2fe3756635b8d571ad2f21880f6997a15f5141802b5178ae0a2fede -AUX wesnoth-1.16.8-gcc-13.patch 827 BLAKE2B 5e162b5b23330266f58b05ed71f3faa32ab0dbae4c64606ee77941c20c04c01a439f929847a795750c757f99ab5cc5308e50b952280b547d99c8c6bf4a54ebdc SHA512 635f03af67a51dce5b71581a1d8f427983efc0d9489a9d16ebcbefd47be346b65430a7133dd48769fbac6a71054a99ad5f026db1d70894079ad152120ff96f43 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 7aaed481607bc58e9d0f22e4c4a36f24f19b4fc522ce3c1eb6366e70e3bd901a10f055d2add9dc1c73519368fd4a31cd6b326e42b1be0023eeda370076db0742 SHA512 0473ec4e4b7a33a37c2ff52b4e0c3dccec2e58a087517566967409dda03952127bf560b09cfccc7243f506201d98980aafdf289b7f1e5345a7e3b4316a908240 -DIST wesnoth-1.16.9.tar.gz 518511920 BLAKE2B bc9bfa9b514e72ce732a4256f765976f5be806d12dd962b2b396ffa8646acaa84c1bb1f4b20368886579782f8236c0d71f296bb5bd2451d4b0d8f6ce46bc3a18 SHA512 313aaad95c66757a952c00f1e5a515ce61bcf7564d6555802bc2619714d038a9a5607f3395e3e8afe5f216205e5b9b07b651789a749b4de37b30f8b8a47cb47f -DIST wesnoth-1.17.19.tar.bz2 424402790 BLAKE2B bfb594b2c6421f8c553fda4db7ee9df57f7a5c9ed5589354c5360abe8e7d155720c9b904e8c480ade106308e4e0202ee209bb2550455a45b2dd4dc4a32428c14 SHA512 4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4 DIST wesnoth-1.17.20.tar.bz2 424613262 BLAKE2B acf8b6a9213b1fea9370c76cc7e63001fa34777357ab791db8380ca684195e830385939d0e31fbb058e5c84ebce74f084d9884bdf27d1ecb662e28dbcb477dab SHA512 b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e +DIST wesnoth-1.18.0.tar.bz2 460686063 BLAKE2B 9dd898a6b430999873ae001dad47b2bcadcbbfc4672bf4489533c0268a4bf982a4e4451f79bf62bb1ac66d4ba2f06b62484b2b1b1fccb2e434c4ceef95a2c2bc SHA512 7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2 EBUILD wesnoth-1.16.10.ebuild 2322 BLAKE2B cd96d39da2b17ee4ab3d244e9716c53067220a24ff0323c57ef48b83ecefb67cc32288a6f53eeab8f3e0782f6074f45d4caec308807d3bbf58dc9cf288064567 SHA512 ea2be082e8ce3df3de5af279d07d344448830bc30ad69338729e8d899842fd3f122bbac2e1dc8f793ca336977627cbc4a06d44a9fd8119b0a41b4f41230f0f5c -EBUILD wesnoth-1.16.9.ebuild 2309 BLAKE2B ae5ef5da2d544367f89753c864149a1d6dfaa6c9ef66056b6e8862ca489736802e18636645ebe8c19ebcbb9e7bb3dd1c5ae84fec64cd28912389cffbb2e6c260 SHA512 9b233db9f0ee9f731d471bf8c0485bf43552b39f834bf40d0b798419c1c9084c83388e0cf61ca457e92e26afa221a8f89cf9a98648e48790445ffb0b599d1653 -EBUILD wesnoth-1.17.19.ebuild 2246 BLAKE2B 4970ac0ecc9362777b095bd18349bb55cb7e3957fe5bef4f4dfd1a9dea135c73ef9957ccf9d6ca5952ec7571d13f5d9d8893d336ead7d9b4d7edbd3b542061b3 SHA512 b7e968364900812c2fd2cbe39111b58c743ee9b9819f6bf0fc6036321c001ecf7fea7d383f0e32ac2ade771e25a5d1dfd33ae0d615ae88164af7be0dd8473db3 EBUILD wesnoth-1.17.20.ebuild 2246 BLAKE2B 4970ac0ecc9362777b095bd18349bb55cb7e3957fe5bef4f4dfd1a9dea135c73ef9957ccf9d6ca5952ec7571d13f5d9d8893d336ead7d9b4d7edbd3b542061b3 SHA512 b7e968364900812c2fd2cbe39111b58c743ee9b9819f6bf0fc6036321c001ecf7fea7d383f0e32ac2ade771e25a5d1dfd33ae0d615ae88164af7be0dd8473db3 +EBUILD wesnoth-1.18.0.ebuild 2345 BLAKE2B 6483f31b5bca9f9e11ca5345d3ca109fca2776c8f370717c1a016276e6bde02dfab3c02efeb1bc867862605f6f5b86a2df2509cb393253b96a1694304d735179 SHA512 ad79e6f7261d21926843b6c4bf7f185138cddca9c838c84c6ab1b6083407761e00035009be6c72757832ce748b29b6097749965325fd8c78f507c16b5dace3d5 MISC metadata.xml 475 BLAKE2B fe3a0b92f39b2158ec38fe2d7528463bb243cc44df562f7ad450227b35bab1d59a1638fe1d702cd70358a0137851e08be1878d590afbcc28dd19176b2a7df7fd SHA512 6293671db448eef2a211ae8dbb88624a42ac46712331db441a55d44566e7843f820047dde7936d725fea6d24a8196223e30712ffbd3864e63614f7f849cda6b4 diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch b/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch deleted file mode 100644 index f2d79ba6ad06..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/wesnoth/wesnoth/commit/5fa07ea15c1736f74d89786d5ae449ed0f91c8a8 - -From 5fa07ea15c1736f74d89786d5ae449ed0f91c8a8 Mon Sep 17 00:00:00 2001 -From: Martin Liska <mliska@suse.cz> -Date: Mon, 23 May 2022 13:44:39 +0200 -Subject: [PATCH] Fix building with GCC 13. - -Fixes the following issue: -base64.hpp:23:49: error: 'uint8_t' was not declared in this scope - -and: -deprecation.hpp:20:22: error: found ':' in nested-name-specifier, expected '::' ---- a/src/deprecation.hpp -+++ b/src/deprecation.hpp -@@ -14,6 +14,7 @@ - - #pragma once - -+#include <cstdint> - #include <string> - - /** See https://wiki.wesnoth.org/CompatibilityStandards for more info. */ ---- a/src/serialization/base64.hpp -+++ b/src/serialization/base64.hpp -@@ -15,6 +15,7 @@ - - #pragma once - -+#include <cstdint> - #include <string_view> - #include <vector> - diff --git a/games-strategy/wesnoth/wesnoth-1.16.9.ebuild b/games-strategy/wesnoth/wesnoth-1.16.9.ebuild deleted file mode 100644 index 7a0223c3d681..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.16.9.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="http://www.wesnoth.org - https://github.com/wesnoth/wesnoth" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# uneven minor versions are development versions -if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi -IUSE="dbus dedicated doc nls server" - -RDEPEND=" - acct-group/wesnoth - acct-user/wesnoth - dev-libs/boost:=[bzip2,context,icu,nls] - >=media-libs/libsdl2-2.0.4:0[joystick,video,X] - !dedicated? ( - dev-libs/glib:2 - dev-libs/openssl:0= - >=media-libs/fontconfig-2.4.1 - >=media-libs/sdl2-image-2.0.0[jpeg,png] - >=media-libs/sdl2-mixer-2.0.0[vorbis] - media-libs/libvorbis - >=x11-libs/pango-1.22.0 - >=x11-libs/cairo-1.10.0 - sys-libs/readline:0= - dbus? ( sys-apps/dbus ) - )" -DEPEND="${RDEPEND} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.16.8-gcc-13.patch -) - -src_prepare() { - cmake_src_prepare - - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local lang langs=() - for lang in $(cat po/LINGUAS) ; do - has ${lang} ${LINGUAS} && langs+=( ${lang} ) - done - echo "${langs[@]}" > po/LINGUAS || die - fi -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - - local mycmakeargs=() - - if use dedicated || use server ; then - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="ON" - -DENABLE_SERVER="ON" - -DSERVER_UID="${PN}" - -DSERVER_GID="${PN}" - -DFIFO_DIR="/run/wesnothd" - ) - else - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="OFF" - -DENABLE_SERVER="OFF" - ) - fi - mycmakeargs+=( - -Wno-dev - -DENABLE_GAME="$(usex !dedicated)" - -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_STRICT_COMPILATION="OFF" - ) - cmake_src_configure -} - -src_install() { - local DOCS=( README.md changelog.md ) - cmake_src_install - if use dedicated || use server ; then - rmdir "${ED}"/run{/wesnothd,} || die - newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd - fi -} diff --git a/games-strategy/wesnoth/wesnoth-1.17.19.ebuild b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild index eb3ae4211e88..ba33c9b827a8 100644 --- a/games-strategy/wesnoth/wesnoth-1.17.19.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild @@ -92,6 +92,11 @@ src_configure() { cmake_src_configure } +src_test() { + # Allow SDL_Mixer test to pass, bug #931551 + SDL_AUDIODRIVER=dummy cmake_src_test +} + src_install() { local DOCS=( README.md changelog.md ) cmake_src_install diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest index 8e49c2a855ee..c91a2659a04e 100644 --- a/games-strategy/xbattleai/Manifest +++ b/games-strategy/xbattleai/Manifest @@ -1,4 +1,5 @@ +AUX xbattleai-1.2.2-C99.patch 1229 BLAKE2B 9f1890e8d7e78b024082fae2f78bf3e62ffc5550e36dd396161916f3ad41413c6ab9763f710cabb9bed7667b94babfe9bae0f3cc68be8c8a449b27cb81171775 SHA512 9a096df97920cfd8155f52aa992a2b2e99c8558ee6f7aa1a1050fbe4bfc36527bb07453a5dbe658401f90a2ce0925ef323c0a513d18973ef5e6d467b2a769dd1 AUX xbattleai-1.2.2-sandbox.patch 4167 BLAKE2B e6336e72f4c466475e164e997bcef44d4c5fd96f457d08f2d1326761fade15e911ab048f05e63e4cadfdd955a90adce763c9b1facace8c33145e49b61482ad54 SHA512 013bd282c53f9a99b530b5a75907f7cc7b6829a0b20b7f77668325e1e12f2d8257019f68d1ccd147ac69d14d217412a31a3dcb3feaf2b55c39ae80545f956076 DIST xbattleai-1.2.2.tgz 1511991 BLAKE2B f4372d9521ba878b53132a00392b3254d90642e0993920b44235eeb6ef1d874a32c7583983aecabf96ad245795820bb42c59a07c850db655ef7803f9216b61ed SHA512 41ac0f558b3adc697897903f5c9ed0d411867c405f0452282958083db7637c97a19f0ac9727e5123648a12dd2dcc5a304031efaab6089068b9f542e5db185e18 -EBUILD xbattleai-1.2.2-r2.ebuild 1043 BLAKE2B e67dcaab1d14fc3a1f1e32c61af26cbc6fd083d58735406ad385cbc955336d2f5a49c2a06ec23308cdd621706e61f2fd07ad0ca52ee842529a74b3c90a59e446 SHA512 61eb7f6c7db69f66a14190efa86c5321961e664ebe60ab4957211ccf221254661b80ebf52721c89ad58a1013d9e56d73e55937c489e33d452774668e04ec00a0 +EBUILD xbattleai-1.2.2-r3.ebuild 1085 BLAKE2B 3768a6f7c0cde5965cf0bed74e08142f28cd3226af88f819daebeda949a57fac81d9a4352646629fa2ec8986cc2f12715bafe9011d39d6489fcd3e23b3a36652 SHA512 f39d5b58238feb0abe35ee49d97d80c5893e2b6799b5498581973e94eed93d676f4cbdb61458c4aeef930784d89fa1fbd413c3fda1862adf3b53b12668bc75c8 MISC metadata.xml 1357 BLAKE2B 28204cd74121fd6de8bfdc622dd9be8a0b61bb0010d0e9483e55fd24f2674d0efe2c40b6777bcab17e0d75bdf99f00c67904213569e16072fe431652d7085516 SHA512 c50c845e69a5e2b2064c62903aa9cdcd1dc88291a8851a86d3924206c30b5caa44261ca21f6ac2e9af242bb5c89ce99c4583290c566f8194154c59942f609a8f diff --git a/games-strategy/xbattleai/files/xbattleai-1.2.2-C99.patch b/games-strategy/xbattleai/files/xbattleai-1.2.2-C99.patch new file mode 100644 index 000000000000..22912c03fc58 --- /dev/null +++ b/games-strategy/xbattleai/files/xbattleai-1.2.2-C99.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/882271 +Also change to automake file as consequence of eautoreconf +--- a/Makefile.in 2024-05-10 09:49:47.696279770 -0000 ++++ b/Makefile.in 2024-05-10 09:50:14.532113463 -0000 +@@ -144,13 +144,13 @@ + .PHONY: config + config: ${SRC_DIR}/Makefile ${SRC_DIR}/config.h + +-${SRC_DIR}/configure: ${SRC_DIR}/configure.in ++${SRC_DIR}/configure: ${SRC_DIR}/configure.ac + @${ECHO} "The configure script is out of date; rebuilding..." + autoconf + @${ECHO} >> ${SRC_DIR}/config.h.in + @${ECHO} >> $@ + +-${SRC_DIR}/config.h.in: ${SRC_DIR}/configure.in ++${SRC_DIR}/config.h.in: ${SRC_DIR}/configure.ac + @${ECHO} "The config.h.in header is out of date; rebuilding..." + autoheader + @${ECHO} >> $@ +--- a/sound.c 2024-05-10 09:53:25.753928428 -0000 ++++ b/sound.c 2024-05-10 09:54:18.646600643 -0000 +@@ -51,6 +51,8 @@ + #ifdef HAVE_LINUX_SOUNDCARD_H + # include <linux/soundcard.h> + #endif ++ ++#include <sys/ioctl.h> + #include "extern.h" + #include "options2.h" + #include "constant.h" +--- a/victory.c 2024-05-10 09:53:25.752928434 -0000 ++++ b/victory.c 2024-05-10 09:55:09.470285679 -0000 +@@ -7,6 +7,9 @@ + # include <stdlib.h> + #endif + ++#include <string.h> ++#include <unistd.h> ++ + #include "constant.h" + #include "extern.h" + diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild index f76d66031ae2..2a47887ecf45 100644 --- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild +++ b/games-strategy/xbattleai/xbattleai-1.2.2-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit toolchain-funcs autotools DESCRIPTION="A multi-player game of strategy and coordination" -HOMEPAGE="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/" -SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/${P}.tgz" +HOMEPAGE="https://inf.ug.edu.pl/~piotao/zasoby/xbattle/mirror/www.lysator.liu.se/XBattleAI/" +SRC_URI="https://inf.ug.edu.pl/~piotao/zasoby/xbattle/mirror/www.lysator.liu.se/XBattleAI/${P}.tgz" LICENSE="xbattle" SLOT="0" @@ -20,7 +20,6 @@ RDEPEND=" dev-lang/tk:0 x11-libs/libX11 x11-libs/libXext - !games-strategy/xbattle " DEPEND=" ${RDEPEND} @@ -35,6 +34,7 @@ DOCS=( CONTRIBUTORS README README.AI TODO xbattle.dot ) PATCHES=( "${FILESDIR}"/${P}-sandbox.patch + "${FILESDIR}"/${P}-C99.patch ) src_prepare() { @@ -43,6 +43,7 @@ src_prepare() { rm config.cache || die tc-export CC + eautoreconf } src_install() { |