From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CD23D13835A for ; Tue, 11 May 2021 20:35:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CB6AE087E; Tue, 11 May 2021 20:35:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9E20E087E for ; Tue, 11 May 2021 20:35:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 762D7340E35 for ; Tue, 11 May 2021 20:35:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E84894D for ; Tue, 11 May 2021 17:41:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620754885.314021bd92f94f189fb7d8e7f39d236f701ff0e6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild X-VCS-Directories: games-strategy/s25rttr/ games-strategy/s25rttr/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 314021bd92f94f189fb7d8e7f39d236f701ff0e6 X-VCS-Branch: master Date: Tue, 11 May 2021 17:41:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fa44af35-af00-420e-914f-aa6842f46f5f X-Archives-Hash: 2c078bbb54f87d457f256b66e2a9171f commit: 314021bd92f94f189fb7d8e7f39d236f701ff0e6 Author: Sam James gentoo org> AuthorDate: Tue May 11 17:41:14 2021 +0000 Commit: Sam James gentoo 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 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 ++#include + #include + #include + 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