| 1 |
commit: 93e1192d84d813b10f3b5f75f431660be11ee9dd |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 11 17:44:34 2021 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 11 17:44:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e1192d |
| 7 |
|
| 8 |
games-strategy/s25rttr: Restore missing include patch |
| 9 |
|
| 10 |
This issue only happens with Boost 1.77 so I didn't realise the patch |
| 11 |
was still needed. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/812659 |
| 14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 15 |
|
| 16 |
...r-0.9.0_pre20200723-boost-1.77-missing-include.patch | 17 +++++++++++++++++ |
| 17 |
games-strategy/s25rttr/s25rttr-0.9.1.ebuild | 1 + |
| 18 |
2 files changed, 18 insertions(+) |
| 19 |
|
| 20 |
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..9a69797ea27 |
| 23 |
--- /dev/null |
| 24 |
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch |
| 25 |
@@ -0,0 +1,17 @@ |
| 26 |
+https://github.com/Return-To-The-Roots/s25client/pull/1431 |
| 27 |
+ |
| 28 |
+From: Sam James <sam@g.o> |
| 29 |
+Date: Thu, 19 Aug 2021 02:41:42 +0100 |
| 30 |
+Subject: [PATCH] Fix build with Boost 1.77 (missing <algorithm> include) |
| 31 |
+ |
| 32 |
+Closes: https://bugs.gentoo.org/808767 |
| 33 |
+--- a/libs/s25main/convertSounds.cpp |
| 34 |
++++ b/libs/s25main/convertSounds.cpp |
| 35 |
+@@ -20,6 +20,7 @@ |
| 36 |
+ #include <libsiedler2/ArchivItem_Sound_Wave.h> |
| 37 |
+ #include <libsiedler2/loadMapping.h> |
| 38 |
+ #include <s25util/StringConversion.h> |
| 39 |
++#include <algorithm> |
| 40 |
+ #include <cmath> |
| 41 |
+ #include <samplerate.hpp> |
| 42 |
+ #include <sstream> |
| 43 |
|
| 44 |
diff --git a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild |
| 45 |
index 4aa4156d566..1cf08d68bd4 100644 |
| 46 |
--- a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild |
| 47 |
+++ b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild |
| 48 |
@@ -40,6 +40,7 @@ BDEPEND=" |
| 49 |
" |
| 50 |
|
| 51 |
PATCHES=( |
| 52 |
+ "${FILESDIR}"/${PN}-0.9.0_pre20200723-boost-1.77-missing-include.patch |
| 53 |
"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch |
| 54 |
"${FILESDIR}"/${PN}-0.9.1-libsamplerate.patch |
| 55 |
"${FILESDIR}"/${PN}-0.9.1-cxx-std.patch |
Archives