Control: tags 1133616 + pending Dear maintainer,
I've prepared an NMU for railcontrol (versioned as 24+dfsg1-9.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for railcontrol-24+dfsg1 railcontrol-24+dfsg1 changelog | 10 ++++++++++ control | 44 ++++++++++++++++++++++---------------------- patches/gcc-16.patch | 27 +++++++++++++++++++++++++++ patches/series | 1 + 4 files changed, 60 insertions(+), 22 deletions(-) diff -Nru railcontrol-24+dfsg1/debian/changelog railcontrol-24+dfsg1/debian/changelog --- railcontrol-24+dfsg1/debian/changelog 2026-01-25 06:17:07.000000000 +0200 +++ railcontrol-24+dfsg1/debian/changelog 2026-08-21 16:45:29.000000000 +0300 @@ -1,3 +1,13 @@ +railcontrol (24+dfsg1-9.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix list formatting in the package description. + + [ Sergio Durigan Junior ] + * Backport upstream fix for FTBFS with GCC 16. (Closes: #1133616) + + -- Adrian Bunk <[email protected]> Fri, 21 Aug 2026 16:45:29 +0300 + railcontrol (24+dfsg1-9) unstable; urgency=medium * Cherry-picked and refreshed upstream commit to permit absolute paths for diff -Nru railcontrol-24+dfsg1/debian/control railcontrol-24+dfsg1/debian/control --- railcontrol-24+dfsg1/debian/control 2026-01-25 05:32:19.000000000 +0200 +++ railcontrol-24+dfsg1/debian/control 2026-08-21 16:45:29.000000000 +0300 @@ -29,25 +29,25 @@ control your layout automatically. . The following controls are supported: - * Arduino DCC-EX (formerly DCC++EX formerly DCC++) - * CAN-Digital-Bahn CC-Schnitte 2.1 - * Digikejis DR5000 - * ESU Central Station Reloaded (beta) - * ESU ECoS (beta) - * Fleischmann Twin-Center - * Gerhard Bertelsmann SRSE II (configured as Märklin CS2) - * KM-1 System Control 7 - * LDT HSI-88 (RS-232-version only) - * Märklin Central Station 1 - * Märklin Central Station 2 - * Märklin Central Station 3 - * Märklin Onterface 6050/6051 - * OpenDCC Z1 - * Roco Z21/z21 - * Tams Master Control - * Tams Master Control 2 - * Tams Red Box - * Uhlenbrock Adapter 63120 - * Uhlenbrock Adapter 63820 - * Uhlenbrock Intellibox - * Uhlenbrock Intellibox II + * Arduino DCC-EX (formerly DCC++EX formerly DCC++) + * CAN-Digital-Bahn CC-Schnitte 2.1 + * Digikejis DR5000 + * ESU Central Station Reloaded (beta) + * ESU ECoS (beta) + * Fleischmann Twin-Center + * Gerhard Bertelsmann SRSE II (configured as Märklin CS2) + * KM-1 System Control 7 + * LDT HSI-88 (RS-232-version only) + * Märklin Central Station 1 + * Märklin Central Station 2 + * Märklin Central Station 3 + * Märklin Onterface 6050/6051 + * OpenDCC Z1 + * Roco Z21/z21 + * Tams Master Control + * Tams Master Control 2 + * Tams Red Box + * Uhlenbrock Adapter 63120 + * Uhlenbrock Adapter 63820 + * Uhlenbrock Intellibox + * Uhlenbrock Intellibox II diff -Nru railcontrol-24+dfsg1/debian/patches/gcc-16.patch railcontrol-24+dfsg1/debian/patches/gcc-16.patch --- railcontrol-24+dfsg1/debian/patches/gcc-16.patch 1970-01-01 02:00:00.000000000 +0200 +++ railcontrol-24+dfsg1/debian/patches/gcc-16.patch 2026-08-21 16:45:27.000000000 +0300 @@ -0,0 +1,27 @@ +From f9c512fb94ddc7d31aaa51b0ffc43fe3971946a2 Mon Sep 17 00:00:00 2001 +From: Ewoud Kohl van Wijngaarden <[email protected]> +Date: Wed, 21 Jan 2026 12:04:04 +0000 +Subject: [PATCH] Replace volatile stopSignalCounter ++ operator (#31) + +Origin: upstream, https://github.com/teddych/railcontrol/commit/f9c512fb94ddc7d31aaa51b0ffc43fe3971946a2 +Bug: https://github.com/teddych/railcontrol/issues/30 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1133616 + +--- + RailControl.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/RailControl.cpp b/RailControl.cpp +index 916bdcbb..caf8c655 100644 +--- a/RailControl.cpp ++++ b/RailControl.cpp +@@ -46,7 +46,8 @@ using std::string; + + void killRailControlIfNeeded(Logger::Logger* logger) + { +- if (++stopSignalCounter < MaxStopSignalCounter) ++ stopSignalCounter = stopSignalCounter + 1; ++ if (stopSignalCounter < MaxStopSignalCounter) + { + return; + } diff -Nru railcontrol-24+dfsg1/debian/patches/series railcontrol-24+dfsg1/debian/patches/series --- railcontrol-24+dfsg1/debian/patches/series 2026-01-25 06:14:48.000000000 +0200 +++ railcontrol-24+dfsg1/debian/patches/series 2026-08-21 16:45:27.000000000 +0300 @@ -8,3 +8,4 @@ fix-cmake-installation.patch 0001-Allow-absolute-path-in-dbfilename.patch absolute-dbfile-path-in-conf.patch +gcc-16.patch
