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 D411515ACFB for ; Wed, 19 Apr 2023 04:32:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FAE6E08D9; Wed, 19 Apr 2023 04:32:05 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 04096E08D9 for ; Wed, 19 Apr 2023 04:32:05 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14501340DE9 for ; Wed, 19 Apr 2023 04:32:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31D2251F for ; Wed, 19 Apr 2023 04:32:01 +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: <1681878707.d2083bcde987b24ea09164d7fb71d46bdc77adb2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/, games-strategy/colobot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/colobot/colobot-0.2.0_alpha.ebuild games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch X-VCS-Directories: games-strategy/colobot/ games-strategy/colobot/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d2083bcde987b24ea09164d7fb71d46bdc77adb2 X-VCS-Branch: master Date: Wed, 19 Apr 2023 04:32:01 +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: 80555baa-02c5-4a29-b2a1-e00fa5c59370 X-Archives-Hash: 1eccaee70db85ac062ebbf2ab30c4fc6 commit: d2083bcde987b24ea09164d7fb71d46bdc77adb2 Author: Sam James gentoo org> AuthorDate: Wed Apr 19 04:20:41 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 19 04:31:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2083bcd games-strategy/colobot: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/899034 Signed-off-by: Sam James gentoo.org> games-strategy/colobot/colobot-0.2.0_alpha.ebuild | 4 +++- .../colobot/files/colobot-0.2.0_alpha-gcc13.patch | 26 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild index b49ad40a24db..ceef225ca257 100644 --- a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild +++ b/games-strategy/colobot/colobot-0.2.0_alpha.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=7 @@ -41,6 +41,8 @@ RDEPEND="${DEPEND} PATCHES=( # https://github.com/colobot/colobot/pull/1453 "${FILESDIR}"/colobot-0.1.12-sndfile-link.patch + # https://github.com/colobot/colobot/pull/1576 + "${FILESDIR}"/colobot-0.2.0_alpha-gcc13.patch ) src_prepare() { diff --git a/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch b/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch new file mode 100644 index 000000000000..f74dcb56db25 --- /dev/null +++ b/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch @@ -0,0 +1,26 @@ +https://github.com/colobot/colobot/pull/1576 + +From 96d32db288ccd5ab13afdb2a063ad9e03170c4ee Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 19 Apr 2023 05:18:06 +0100 +Subject: [PATCH] Fix build with GCC 13 + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some +are no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/899034 +--- a/src/CBot/CBotFileUtils.h ++++ b/src/CBot/CBotFileUtils.h +@@ -19,6 +19,7 @@ + + #pragma once + ++#include + #include + #include + +-- +2.40.0 +