From 3a6fff5dd87ed559365f13e82e920492256506f3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Apr 2021 09:52:11 -0500 Subject: [PATCH] 0.9.13 --- .gitignore | 1 + endless-sky-0.9.10-gcc10.patch | 11 ------ ...sky-0.9.13-remove-additional-ccflags.patch | 19 ++++++++++ ...endless-sky-0.9.13-remove-games-path.patch | 36 +++++++++---------- ...-sky-0.9.4-remove-additional-ccflags.patch | 18 ---------- endless-sky-0.9.8-environment.patch | 12 ------- endless-sky-gcc11.patch | 24 ------------- endless-sky.spec | 15 ++++---- sources | 2 +- 9 files changed, 47 insertions(+), 91 deletions(-) delete mode 100644 endless-sky-0.9.10-gcc10.patch create mode 100644 endless-sky-0.9.13-remove-additional-ccflags.patch rename endless-sky-0.8.10-remove-games-path.patch => endless-sky-0.9.13-remove-games-path.patch (73%) delete mode 100644 endless-sky-0.9.4-remove-additional-ccflags.patch delete mode 100644 endless-sky-0.9.8-environment.patch delete mode 100644 endless-sky-gcc11.patch diff --git a/.gitignore b/.gitignore index 99e76df..1991484 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /endless-sky-0.9.10.tar.gz /endless-sky-0.9.11.tar.gz /endless-sky-0.9.12.tar.gz +/endless-sky-0.9.13.tar.gz diff --git a/endless-sky-0.9.10-gcc10.patch b/endless-sky-0.9.10-gcc10.patch deleted file mode 100644 index cd0fd27..0000000 --- a/endless-sky-0.9.10-gcc10.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrup a/source/Panel.h b/source/Panel.h ---- source/Panel.h 2017-08-12 15:37:19.000000000 -0600 -+++ source/Panel.h 2019-09-23 18:00:51.415560466 -0600 -@@ -17,6 +17,7 @@ PARTICULAR PURPOSE. See the GNU General - - #include - #include -+#include - - #include - diff --git a/endless-sky-0.9.13-remove-additional-ccflags.patch b/endless-sky-0.9.13-remove-additional-ccflags.patch new file mode 100644 index 0000000..de2efc6 --- /dev/null +++ b/endless-sky-0.9.13-remove-additional-ccflags.patch @@ -0,0 +1,19 @@ +--- SConstruct~ 2021-04-19 08:31:12.308058768 -0500 ++++ SConstruct 2021-04-19 08:33:05.998937400 -0500 +@@ -50,15 +50,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) + # Omit emitting a symbol table when creating/updating static libraries, because Scons + # will run ranlib. If we are using gcc-ranlib, assume support for thin archives as well. diff --git a/endless-sky-0.8.10-remove-games-path.patch b/endless-sky-0.9.13-remove-games-path.patch similarity index 73% rename from endless-sky-0.8.10-remove-games-path.patch rename to endless-sky-0.9.13-remove-games-path.patch index ea5bc58..32a3e24 100644 --- a/endless-sky-0.8.10-remove-games-path.patch +++ b/endless-sky-0.9.13-remove-games-path.patch @@ -1,17 +1,7 @@ -diff -up ./SConstruct.orig ./SConstruct ---- ./SConstruct.orig 2016-01-11 20:28:45.250276511 -0800 -+++ ./SConstruct 2016-01-11 20:29:13.778912624 -0800 -@@ -43,7 +43,7 @@ sky = env.Program("endless-sky", Glob("b - - - # 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") -@@ -81,11 +81,11 @@ def RecursiveInstall(env, target, source - RecursiveInstall(env, os.path.join(target, name), node.abspath) +--- SConstruct~ 2021-04-19 08:27:12.592216308 -0500 ++++ SConstruct 2021-04-19 08:29:26.504082300 -0500 +@@ -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") @@ -27,10 +17,20 @@ diff -up ./SConstruct.orig ./SConstruct # Make the word "install" in the command line do an installation. env.Alias("install", "$DESTDIR$PREFIX") -diff -up ./source/Files.cpp.orig ./source/Files.cpp ---- ./source/Files.cpp.orig 2016-01-11 20:29:22.100806482 -0800 -+++ ./source/Files.cpp 2016-01-11 20:29:35.419636593 -0800 -@@ -115,7 +115,7 @@ void Files::Init(const char * const *arg +--- SConstruct~ 2021-04-19 08:35:52.599227069 -0500 ++++ SConstruct 2021-04-19 08:49:58.917530861 -0500 +@@ -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") +--- source/Files.cpp~ 2021-04-17 09:40:38.000000000 -0500 ++++ source/Files.cpp 2021-04-19 09:05:31.921109831 -0500 +@@ -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/"; diff --git a/endless-sky-0.9.4-remove-additional-ccflags.patch b/endless-sky-0.9.4-remove-additional-ccflags.patch deleted file mode 100644 index 7620701..0000000 --- a/endless-sky-0.9.4-remove-additional-ccflags.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- SConstruct.orig 2017-09-13 20:00:51.154361127 -0700 -+++ SConstruct 2017-09-13 20:24:45.396884800 -0700 -@@ -25,14 +25,7 @@ - - Help(opts.GenerateHelpText(env)) - --flags = ["-std=c++11", "-Wall"] --if env["mode"] != "debug": -- flags += ["-O3"] --if env["mode"] == "debug": -- flags += ["-g"] --if env["mode"] == "profile": -- flags += ["-pg"] -- env.Append(LINKFLAGS = ["-pg"]) -+flags = ["-std=c++11"] - - # Required build flags. If you want to use SSE optimization, you can turn on - # -msse3 or (if just building for your own computer) -march=native. diff --git a/endless-sky-0.9.8-environment.patch b/endless-sky-0.9.8-environment.patch deleted file mode 100644 index ace85b4..0000000 --- a/endless-sky-0.9.8-environment.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up SConstruct.path SConstruct ---- SConstruct.path 2019-01-15 16:29:57.084998841 +0000 -+++ SConstruct 2019-01-15 16:33:21.014998063 +0000 -@@ -1,7 +1,7 @@ - import os - - # Load any environment variables that alter the build. --env = Environment() -+env = Environment(ENV = os.environ) - if 'CCFLAGS' in os.environ: - env.Append(CCFLAGS = os.environ['CCFLAGS']) - if 'CXXFLAGS' in os.environ: diff --git a/endless-sky-gcc11.patch b/endless-sky-gcc11.patch deleted file mode 100644 index 3255521..0000000 --- a/endless-sky-gcc11.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/source/MapDetailPanel.cpp b/source/MapDetailPanel.cpp -index 79e023d..3786d90 100644 ---- source/MapDetailPanel.cpp -+++ source/MapDetailPanel.cpp -@@ -44,6 +44,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. - #include - #include - #include -+#include - - using namespace std; - -diff --git a/source/PlayerInfo.cpp b/source/PlayerInfo.cpp -index 8630b98..003fa10 100644 ---- source/PlayerInfo.cpp -+++ source/PlayerInfo.cpp -@@ -42,6 +42,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. - #include - #include - #include -+#include - - using namespace std; - diff --git a/endless-sky.spec b/endless-sky.spec index 53dbcb7..a2c3e0b 100644 --- a/endless-sky.spec +++ b/endless-sky.spec @@ -1,8 +1,8 @@ -%define gittag0 v0.9.12 +%define gittag0 v0.9.13 Name: endless-sky -Version: 0.9.12 -Release: 4%{?dist} +Version: 0.9.13 +Release: 1%{?dist} Summary: Space exploration, trading, and combat game License: GPLv3 @@ -13,11 +13,9 @@ Source1: endless-sky-wrapper # https://fedoraproject.org/wiki/SIGs/Games/Packaging. # Patch not submitted upstream. Upstream conforms to Debian packaging # standards where the use of /usr/games is acceptable. -Patch0: endless-sky-0.8.10-remove-games-path.patch +Patch0: endless-sky-0.9.13-remove-games-path.patch # Unset CCFLAGS override inside SConstruct. -Patch1: endless-sky-0.9.4-remove-additional-ccflags.patch -Patch2: endless-sky-0.9.10-gcc10.patch -Patch3: endless-sky-gcc11.patch +Patch1: endless-sky-0.9.13-remove-additional-ccflags.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: scons @@ -106,6 +104,9 @@ sed -i 's|/app|%{_prefix}|g' %{buildroot}%{_bindir}/%{name} %changelog +* Mon Apr 19 2021 Gwyn Ciesla - 0.9.13-1 +- 0.9.13 + * Tue Jan 26 2021 Fedora Release Engineering - 0.9.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 31ec86c..b3719cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (endless-sky-0.9.12.tar.gz) = 694d3c6f50f80e8b4ff79580fa9510fde26a846dd227736af96a3eda7810d68b2ae051a72c0e02fe88eae9d839e48933614aa172a9bed6653e03ad30feaddc05 +SHA512 (endless-sky-0.9.13.tar.gz) = 8bced454ac4ca1250637aedefa47adfd2ccd20ae69958ada44a6f75c92a1ff8c78705ccbba5caa373d047a19bbc71529b8645e36023b05324c239e4df9aae9cc