commit: 314021bd92f94f189fb7d8e7f39d236f701ff0e6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue May 11 17:41:14 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 11 17:41:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314021bd
games-strategy/s25rttr: fix GCC 11 build Closes: https://bugs.gentoo.org/787299 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/s25rttr-0.9.0_pre20200723-gcc11-include.patch | 12 ++++++++++++ games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch new file mode 100644 index 00000000000..31cca620a3f --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch @@ -0,0 +1,12 @@ +https://github.com/Return-To-The-Roots/libsiedler2/commit/cb2994d5bb6407d4b12f681268e6b123d9b366f5.patch +https://bugs.gentoo.org/787299 +--- a/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h ++++ b/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h +@@ -18,6 +18,7 @@ + #pragma once + + #include <array> ++#include <cstddef> + #include <cstdint> + #include <vector> + diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild index 001f1128ae1..dc54ef2deaf 100644 --- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild +++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -59,6 +59,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch + "${FILESDIR}"/${P}-gcc11-include.patch ) S="${WORKDIR}/s25client-${COMMIT}" @@ -102,6 +103,9 @@ src_configure() { -DLUA_VERSION=$(lua_get_version) ) + # bug #787299 + append-cxxflags -std=gnu++14 + if use test && tc-is-gcc; then # Work around libasan and libsandbox both wanting to be first. append-ldflags -static-libasan
