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 71637159C96 for ; Wed, 24 Jul 2024 07:12:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2335E2AA3; Wed, 24 Jul 2024 07:12:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8BD5BE2AA3 for ; Wed, 24 Jul 2024 07:12:57 +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 89B6334133B for ; Wed, 24 Jul 2024 07:12:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B98BD1E30 for ; Wed, 24 Jul 2024 07:12:54 +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: <1721804959.675d5a016e43ba66c198d94cb2fd32f0ba6abc67.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/files/, games-simulation/openttd/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/openttd/files/openttd-13.4-gcc15.patch games-simulation/openttd/openttd-13.4.ebuild X-VCS-Directories: games-simulation/openttd/ games-simulation/openttd/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 675d5a016e43ba66c198d94cb2fd32f0ba6abc67 X-VCS-Branch: master Date: Wed, 24 Jul 2024 07:12:54 +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: 7c5152e6-4650-4ab6-9c37-9d4d53b74493 X-Archives-Hash: aa774c85b5560553ca7feca38aeffc8d commit: 675d5a016e43ba66c198d94cb2fd32f0ba6abc67 Author: Sam James gentoo org> AuthorDate: Wed Jul 24 07:09:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 24 07:09:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675d5a01 games-simulation/openttd: fix build w/ gcc-15 Closes: https://bugs.gentoo.org/936417 Thanks-to: David Seifert gentoo.org> Signed-off-by: Sam James gentoo.org> .../openttd/files/openttd-13.4-gcc15.patch | 22 ++++++++++++++++++++++ games-simulation/openttd/openttd-13.4.ebuild | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/games-simulation/openttd/files/openttd-13.4-gcc15.patch b/games-simulation/openttd/files/openttd-13.4-gcc15.patch new file mode 100644 index 000000000000..f849d82c1ed0 --- /dev/null +++ b/games-simulation/openttd/files/openttd-13.4-gcc15.patch @@ -0,0 +1,22 @@ +https://github.com/OpenTTD/OpenTTD/pull/12876 +https://github.com/OpenTTD/OpenTTD/commit/db36e61807955c896267d6585de0577efd30465d + +From 866cd4381189658641a69bdeca86ceec15aa027d Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Mon, 22 Jul 2024 09:27:01 +0200 +Subject: [PATCH] Codechange: fix for GCC 15 two-phase lookup + +* GCC 15 is more aggressive about checking dependent names + +Bug: https://bugs.gentoo.org/936417 +--- a/src/pathfinder/yapf/yapf_road.cpp ++++ b/src/pathfinder/yapf/yapf_road.cpp +@@ -470,7 +470,7 @@ class CYapfFollowRoadT + /* set origin (tile, trackdir) */ + TileIndex src_tile = v->tile; + Trackdir src_td = v->GetVehicleTrackdir(); +- if (!HasTrackdir(GetTrackdirBitsForRoad(src_tile, this->IsTram() ? RTT_TRAM : RTT_ROAD), src_td)) { ++ if (!HasTrackdir(GetTrackdirBitsForRoad(src_tile, Yapf().IsTram() ? RTT_TRAM : RTT_ROAD), src_td)) { + /* sometimes the roadveh is not on the road (it resides on non-existing track) + * how should we handle that situation? */ + return false; diff --git a/games-simulation/openttd/openttd-13.4.ebuild b/games-simulation/openttd/openttd-13.4.ebuild index 20010db20802..11d583b49c7f 100644 --- a/games-simulation/openttd/openttd-13.4.ebuild +++ b/games-simulation/openttd/openttd-13.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -64,6 +64,7 @@ DOCS=( docs/directory_structure.md ) PATCHES=( "${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch" + "${FILESDIR}/${PN}-13.4-gcc15.patch" ) src_prepare() {