From a25cc082a26782e5d39ded4559c91ff11bc3c299 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 May 2024 00:01:18 +0100 Subject: gentoo auto-resync : 13:05:2024 - 00:01:18 --- games-strategy/endless-sky/Manifest | 7 -- .../endless-sky/endless-sky-0.9.16.1.ebuild | 74 ---------------------- ...endless-sky-0.9.14-dont-compress-man-page.patch | 20 ------ .../files/endless-sky-0.9.14-no-games-path.patch | 42 ------------ .../files/endless-sky-0.9.16.1-gcc13.patch | 45 ------------- .../endless-sky-0.9.16.1-respect-cflags.patch | 13 ---- .../files/endless-sky-0.9.16.1-test-libs.patch | 10 --- 7 files changed, 211 deletions(-) delete mode 100644 games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild delete mode 100644 games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch delete mode 100644 games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch delete mode 100644 games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch delete mode 100644 games-strategy/endless-sky/files/endless-sky-0.9.16.1-respect-cflags.patch delete mode 100644 games-strategy/endless-sky/files/endless-sky-0.9.16.1-test-libs.patch (limited to 'games-strategy/endless-sky') diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest index 70e93775b331..801a7d85395f 100644 --- a/games-strategy/endless-sky/Manifest +++ b/games-strategy/endless-sky/Manifest @@ -1,10 +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.10.6.tar.gz 256438340 BLAKE2B 39699f458b691dd8aa0586ebbb5b537b8b999ea0084abc561803e21e97986dd6ef28582545fc79cc5cd3ef5d4c587b96860fd7b94294acf2fee31224543ac4ff SHA512 815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530 -DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B 3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650 SHA512 83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56 EBUILD endless-sky-0.10.6.ebuild 2077 BLAKE2B fda16b09d2f8bb729b2bf6ee4cbe332cf9ad5478e35b2c8c3925dc9614ccf13ad179df42d0dda1281996e139cd8ef66fadcc8ebd0a511c3c67a301948c2df97b SHA512 429c3d421ce9432e73dc9d6015a1bde8ef28d2053ec5e466ba439aa05f113437e0adbc57359ef31e000cd60eb2459f8facc60a8547fe3dc85a672752c64c446a -EBUILD endless-sky-0.9.16.1.ebuild 1762 BLAKE2B ba2bf3543486736cd070abbb4b7a7369f3f079eba63ebc0220e0a9bc72d7e8cad0514d8c4ca19ebf0b5b2dad0b875464c40440c46af4e48de8e0549e8f0a3123 SHA512 199578d6d8e32c3006456a54987ed4e0cc7c6d97a26cf5ca0694273d62f4e5e1ea9c45d518eda253e6e059968d39d0bbbe4a982cf65d867c0aef8a3349ac5401 MISC metadata.xml 732 BLAKE2B 05e221e5b8bc45baf62a5361a1fa11affd5bfce04bb1ed4127251c151771df72c873e9c2deab4aa9b4800fa3314fa768c635e61bf941e3eb74241ee5f2a8aabf SHA512 2aefeccd986719aab4be77af1bf4458b36a873918c04905f9b432a591a44dfdd001faf29ab16ced565c069e846bfe5a96e2c12ffa1e4d62a7b202cf7fc356949 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 -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 -Date: Sat, 28 Jan 2023 16:29:40 +0100 -Subject: [PATCH] chore: Fix build with gcc 13 by including (#8235) - ---- a/source/ImageBuffer.h -+++ b/source/ImageBuffer.h -@@ -16,6 +16,7 @@ this program. If not, see . - #ifndef IMAGE_BUFFER_H_ - #define IMAGE_BUFFER_H_ - -+#include - #include - - ---- a/source/Sound.cpp -+++ b/source/Sound.cpp -@@ -20,6 +20,7 @@ this program. If not, see . - - #include - -+#include - #include - #include - - -From 7483f72cc72511786ba3aac13b4cbe0848a2aefc Mon Sep 17 00:00:00 2001 -From: Nick -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 . - #ifndef PREFERENCES_H_ - #define PREFERENCES_H_ - -+#include - #include - - 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. -- cgit v1.2.3