gentoo resync : 07.01.2022

4 files changed, 96 insertions, 0 deletions

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
new file mode 100644
index 000000000000..d3836c088f31
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-dont-compress-man-page.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000000..bdec820de1e1
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch
@@ -0,0 +1,42 @@
+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.14-respect-cflags.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch
new file mode 100644
index 000000000000..8bea82409af0
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch
@@ -0,0 +1,20 @@
+https://src.fedoraproject.org/rpms/endless-sky/raw/rawhide/f/endless-sky-0.9.14-remove-additional-ccflags.patch
+--- a/SConstruct
++++ b/SConstruct
+@@ -46,15 +46,7 @@
+ #   $ CXXFLAGS=-msse3 scons
+ #   $ CXXFLAGS=-march=native scons
+ # or modify the `flags` variable:
+-flags = ["-std=c++11", "-Wall", "-Werror", "-Wold-style-cast"]
+-if env["mode"] != "debug":
+-	flags += ["-O3", "-flto"]
+-	env.Append(LINKFLAGS = ["-O3", "-flto"])
+-if env["mode"] == "debug":
+-	flags += ["-g"]
+-elif env["mode"] == "profile":
+-	flags += ["-pg"]
+-	env.Append(LINKFLAGS = ["-pg"])
++flags = ["-std=c++11"]
+ env.Append(CCFLAGS = flags)
+ 
+ # Always use `ar` to create the symbol table, and don't use ranlib at all, since it fails to preserve
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch b/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
new file mode 100644
index 000000000000..9b38e28a60fe
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.14-use-system-catch2.patch
@@ -0,0 +1,14 @@
+From e8119dcdcb42479896a35cec5dc85c17c1901b2e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 6 Jan 2022 23:56:59 +0000
+Subject: [PATCH 1/2] Use system copy of catch2
+
+In particular, we get glibc-2.34 fixes for free then.
+--- a/tests/include/es-test.hpp
++++ b/tests/include/es-test.hpp
+@@ -23,4 +23,4 @@ PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ // #define CATCH_CONFIG_WINDOWS_CRTDBG
+ #endif
+ 
+-#include "catch.hpp"
++#include <catch2/catch.hpp>