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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5515C15800F for ; Mon, 23 Jan 2023 02:40:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32ED4E0824; Mon, 23 Jan 2023 02:40:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CF22E077C for ; Mon, 23 Jan 2023 02:40:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E545F33BDD0 for ; Mon, 23 Jan 2023 02:40:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3376F858 for ; Mon, 23 Jan 2023 02:40:10 +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: <1674441169.e4dcbf5e60b24ec0d33884abc026068cc3b94faf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch games-strategy/s25rttr/s25rttr-0.9.5.ebuild X-VCS-Directories: games-strategy/s25rttr/ games-strategy/s25rttr/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e4dcbf5e60b24ec0d33884abc026068cc3b94faf X-VCS-Branch: master Date: Mon, 23 Jan 2023 02:40:10 +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: 30079f9f-2e32-4020-aa8e-7a2d3f377128 X-Archives-Hash: 9636914c8e787fe98fd71022c3f8bf07 commit: e4dcbf5e60b24ec0d33884abc026068cc3b94faf Author: Sam James gentoo org> AuthorDate: Mon Jan 23 01:54:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 23 02:32:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dcbf5e games-strategy/s25rttr: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/891713 Signed-off-by: Sam James gentoo.org> .../s25rttr/files/s25rttr-0.9.5-gcc-13.patch | 50 ++++++++++++++++++++++ games-strategy/s25rttr/s25rttr-0.9.5.ebuild | 3 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch new file mode 100644 index 000000000000..117c2645cc40 --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/891713 +https://github.com/Return-To-The-Roots/s25client/pull/1548 +https://github.com/Return-To-The-Roots/libsiedler2/pull/21 + +From d59abd4b565cd6f11dd64f6e4f497c9797e52c5a Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 23 Jan 2023 01:49:47 +0000 +Subject: [PATCH] LanGameInfo: Add missing include + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so etc is no longer transitively included. + +See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. + +Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20 +Bug: https://bugs.gentoo.org/891713 +--- a/libs/s25main/gameTypes/LanGameInfo.h ++++ b/libs/s25main/gameTypes/LanGameInfo.h +@@ -4,6 +4,7 @@ + + #pragma once + ++#include + #include + + class Serializer; + +From 6a289fa3a3f50f0967a072292f3e0c628144ab8d Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 23 Jan 2023 01:47:19 +0000 +Subject: [PATCH] oem: Add missing include + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so etc is no longer transitively included. + +See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. + +Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20 +Bug: https://bugs.gentoo.org/891713 +--- a/external/libsiedler2/src/oem.cpp ++++ b/external/libsiedler2/src/oem.cpp +@@ -4,6 +4,7 @@ + + #include "oem.h" + #include ++#include + + namespace libsiedler2 { + + diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild index e5f8470614a6..4986896fd623 100644 --- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild +++ b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,6 +41,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch + "${FILESDIR}"/${PN}-0.9.5-gcc-13.patch ) S="${WORKDIR}/${MY_PN}_v${PV}"