diff options
| author |   Sam James <sam@gentoo.org> | 2022-01-06 23:06:22 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-01-06 23:06:32 +0000 |
| commit | 72aa2845bba14a3291d5c73d178278a448e11d7f (patch) | |
| tree | b1d08b2f8e53ac802ad69c9c220313fa6ea2bf6b /games-strategy/endless-sky/files | |
| parent | dev-python/pillow: Keyword 9.0.0 for ~m68k (diff) | |
| download | gentoo-72aa2845bba14a3291d5c73d178278a448e11d7f.tar.gz gentoo-72aa2845bba14a3291d5c73d178278a448e11d7f.tar.bz2 gentoo-72aa2845bba14a3291d5c73d178278a448e11d7f.zip | |
games-strategy/endless-sky: initial import (restore at 0.9.14)
Closes: https://bugs.gentoo.org/735542
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-strategy/endless-sky/files')
| -rw-r--r-- | games-strategy/endless-sky/files/endless-sky-0.9.14-no-games-path.patch | 42 | ||||
| -rw-r--r-- | games-strategy/endless-sky/files/endless-sky-0.9.14-respect-cflags.patch | 20 |
2 files changed, 62 insertions, 0 deletions
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 |