Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openttd for openSUSE:Factory checked in at 2025-07-10 22:11:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openttd (Old) and /work/SRC/openSUSE:Factory/.openttd.new.7373 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openttd" Thu Jul 10 22:11:51 2025 rev:60 rq:1291539 version:14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/openttd/openttd.changes 2025-04-28 16:17:22.583774062 +0200 +++ /work/SRC/openSUSE:Factory/.openttd.new.7373/openttd.changes 2025-07-10 22:11:52.311024862 +0200 @@ -1,0 +2,7 @@ +Wed Jul 9 16:58:53 UTC 2025 - Jan Baier <jba...@suse.com> + +- Fix builds with GCC 15 by backporting 0002-gcc15.patch +- Fix CXXFLAGS not being properly propagated +- Fix changelog with source_validators/helpers/fix_changelog + +------------------------------------------------------------------- @@ -1294 +1300,0 @@ ------------------------------------------------------------------------- @@ -1304 +1309,0 @@ ------------------------------------------------------------------------- @@ -1309 +1313,0 @@ ------------------------------------------------------------------------- @@ -1322 +1325,0 @@ ------------------------------------------------------------------------- @@ -1334 +1336,0 @@ ------------------------------------------------------------------------- @@ -1359 +1360,0 @@ - @@ -1361 +1361,0 @@ ------------------------------------------------------------------------- @@ -1364 +1363,0 @@ - @@ -1366 +1364,0 @@ ------------------------------------------------------------------------- @@ -1435 +1432,0 @@ - @@ -1814 +1811 @@ -Fri Dec 18 2009 Marcel Gmür <amm...@openttdcoop.org> - 0.7.4 +Fri Dec 18 2009 - Marcel Gmür <amm...@openttdcoop.org> - 0.7.4 @@ -1823 +1820 @@ -Thu Oct 01 2009 Marcel Gmür <amm...@openttdcoop.org> - 0.7.3 +Thu Oct 01 2009 - Marcel Gmür <amm...@openttdcoop.org> - 0.7.3 @@ -1828 +1825 @@ -Sat Sep 26 2009 Marcel Gmür <amm...@openttdcoop.org> - 0.7.2 +Sat Sep 26 2009 - Marcel Gmür <amm...@openttdcoop.org> - 0.7.2 @@ -1836 +1833 @@ -Mon Oct 20 2008 Benedikt Brüggemeier <skid...@openttd.org> +Mon Oct 20 2008 - Benedikt Brüggemeier <skid...@openttd.org> @@ -1841 +1838 @@ -Thu Sep 23 2008 Benedikt Brüggemeier <skid...@openttd.org> +Thu Sep 23 2008 - Benedikt Brüggemeier <skid...@openttd.org> @@ -1846 +1843 @@ -Fri Aug 29 2008 Jonathan Coome <maedh...@openttd.org> +Fri Aug 29 2008 - Jonathan Coome <maedh...@openttd.org> @@ -1851 +1848 @@ -Sat Aug 02 2008 Benedikt Brüggemeier <skid...@openttd.org> +Sat Aug 02 2008 - Benedikt Brüggemeier <skid...@openttd.org> @@ -1856 +1853 @@ -Thu Mar 27 2008 Denis Burlaka <burl...@yandex.ru> +Thu Mar 27 2008 - Denis Burlaka <burl...@yandex.ru> New: ---- 0002-gcc15.patch ----------(New B)---------- New: - Fix builds with GCC 15 by backporting 0002-gcc15.patch - Fix CXXFLAGS not being properly propagated ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openttd.spec ++++++ --- /var/tmp/diff_new_pack.s50FKf/_old 2025-07-10 22:11:53.027054642 +0200 +++ /var/tmp/diff_new_pack.s50FKf/_new 2025-07-10 22:11:53.031054809 +0200 @@ -16,11 +16,11 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# use GCC 12 for Leap + +%define about OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe" with lots of new features and enhancements. To play the game, you need either the original proprietary data set from the game, or install the recommend subpackages OpenGFX, OpenSFX and OpenMSX for an alternate, free set of graphics, sounds and music, respectively. %if 0%{?sle_version} && 0%{?sle_version} < 160000 %global force_gcc_version 12 %endif -%define about OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe" with lots of new features and enhancements. To play the game, you need either the original proprietary data set from the game, or install the recommend subpackages OpenGFX, OpenSFX and OpenMSX for an alternate, free set of graphics, sounds and music, respectively. Name: openttd Version: 14.1 Release: 0 @@ -32,6 +32,7 @@ Source2: openttd.appdata.xml # PATCH-FEATURE-UPSTREAM https://bugs.openttd.org/task/6490 Patch1: 0001-icu-build-fix.patch +Patch2: 0002-gcc15.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc%{?force_gcc_version}-c++ @@ -106,7 +107,7 @@ This package provides the data files needed by %{name} or %{name}-dedicated. %prep -%autosetup +%autosetup -p1 # Remove build time references so build-compare can do its work sed -i "s/__DATE__.*__TIME__/\"${SOURCE_DATE_EPOCH}\"/" src/rev.cpp.in @@ -117,7 +118,7 @@ %else export CXX=g++ %endif -export CXXFLAGS=-fPIE +export CXXFLAGS="%{optflags} -fPIE" # first, we build the dedicated binary inside dedicated/ %define __builddir dedicated %cmake -DCMAKE_INSTALL_BINDIR="bin" -DCMAKE_INSTALL_DATADIR="share" \ ++++++ 0002-gcc15.patch ++++++ >From 866cd4381189658641a69bdeca86ceec15aa027d Mon Sep 17 00:00:00 2001 From: David Seifert <s...@gentoo.org> 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 --- src/pathfinder/yapf/yapf_road.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pathfinder/yapf/yapf_road.cpp b/src/pathfinder/yapf/yapf_road.cpp index 209b64b52afe4..82fcba1cf150d 100644 --- 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;
