commit:     93e1192d84d813b10f3b5f75f431660be11ee9dd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 11 17:44:34 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 17:44:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e1192d

games-strategy/s25rttr: Restore missing include patch

This issue only happens with Boost 1.77 so I didn't realise the patch
was still needed.

Closes: https://bugs.gentoo.org/812659
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...r-0.9.0_pre20200723-boost-1.77-missing-include.patch | 17 +++++++++++++++++
 games-strategy/s25rttr/s25rttr-0.9.1.ebuild             |  1 +
 2 files changed, 18 insertions(+)

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
new file mode 100644
index 00000000000..9a69797ea27
--- /dev/null
+++ 
b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
@@ -0,0 +1,17 @@
+https://github.com/Return-To-The-Roots/s25client/pull/1431
+
+From: Sam James <[email protected]>
+Date: Thu, 19 Aug 2021 02:41:42 +0100
+Subject: [PATCH] Fix build with Boost 1.77 (missing <algorithm> include)
+
+Closes: https://bugs.gentoo.org/808767
+--- a/libs/s25main/convertSounds.cpp
++++ b/libs/s25main/convertSounds.cpp
+@@ -20,6 +20,7 @@
+ #include <libsiedler2/ArchivItem_Sound_Wave.h>
+ #include <libsiedler2/loadMapping.h>
+ #include <s25util/StringConversion.h>
++#include <algorithm>
+ #include <cmath>
+ #include <samplerate.hpp>
+ #include <sstream>

diff --git a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild 
b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
index 4aa4156d566..1cf08d68bd4 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 "
 
 PATCHES=(
+       "${FILESDIR}"/${PN}-0.9.0_pre20200723-boost-1.77-missing-include.patch
        "${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
        "${FILESDIR}"/${PN}-0.9.1-libsamplerate.patch
        "${FILESDIR}"/${PN}-0.9.1-cxx-std.patch

Reply via email to