Control: tags 1114246 + patch Control: tags 1114246 + pending Dear maintainer,
I've prepared an NMU for openttd (versioned as 14.1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for openttd-14.1 openttd-14.1 changelog | 7 ++ patches/0001-Codefix-Compilation-with-GCC-15-due-to-missing-CRTP-.patch | 25 ++++++++++ patches/series | 1 3 files changed, 33 insertions(+) diff -Nru openttd-14.1/debian/changelog openttd-14.1/debian/changelog --- openttd-14.1/debian/changelog 2024-06-25 12:16:23.000000000 +0300 +++ openttd-14.1/debian/changelog 2025-10-07 23:16:48.000000000 +0300 @@ -1,3 +1,10 @@ +openttd (14.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with GCC 15. (Closes: #1114246) + + -- Adrian Bunk <[email protected]> Tue, 07 Oct 2025 23:16:48 +0300 + openttd (14.1-1) unstable; urgency=medium * [2866976] New upstream release 14.1 diff -Nru openttd-14.1/debian/patches/0001-Codefix-Compilation-with-GCC-15-due-to-missing-CRTP-.patch openttd-14.1/debian/patches/0001-Codefix-Compilation-with-GCC-15-due-to-missing-CRTP-.patch --- openttd-14.1/debian/patches/0001-Codefix-Compilation-with-GCC-15-due-to-missing-CRTP-.patch 1970-01-01 02:00:00.000000000 +0200 +++ openttd-14.1/debian/patches/0001-Codefix-Compilation-with-GCC-15-due-to-missing-CRTP-.patch 2025-10-07 23:16:48.000000000 +0300 @@ -0,0 +1,25 @@ +From f4236af0355efbae95c05e72d7bbbf5bca6eaeaa Mon Sep 17 00:00:00 2001 +From: David Seifert <[email protected]> +Date: Mon, 22 Jul 2024 20:42:23 +0200 +Subject: Codefix: Compilation with GCC 15 due to missing CRTP usage (#12876) + +--- + 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 41102c2e15..6a1378b443 100644 +--- a/src/pathfinder/yapf/yapf_road.cpp ++++ b/src/pathfinder/yapf/yapf_road.cpp +@@ -462,7 +462,7 @@ public: + /* 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; +-- +2.30.2 + diff -Nru openttd-14.1/debian/patches/series openttd-14.1/debian/patches/series --- openttd-14.1/debian/patches/series 2024-06-25 12:16:23.000000000 +0300 +++ openttd-14.1/debian/patches/series 2025-10-07 23:16:48.000000000 +0300 @@ -0,0 +1 @@ +0001-Codefix-Compilation-with-GCC-15-due-to-missing-CRTP-.patch
