Control: tags 1097304 + patch Control: tags 1097304 + pending Dear maintainer,
I've prepared an NMU for liquidwar (versioned as 5.6.5-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for liquidwar-5.6.5 liquidwar-5.6.5 changelog | 8 ++++++++ patches/gcc-15.patch | 26 ++++++++++++++++++++++++++ patches/no-m64.patch | 19 +++++++++++++++++++ patches/series | 2 ++ 4 files changed, 55 insertions(+) diff -Nru liquidwar-5.6.5/debian/changelog liquidwar-5.6.5/debian/changelog --- liquidwar-5.6.5/debian/changelog 2020-07-26 15:13:53.000000000 +0300 +++ liquidwar-5.6.5/debian/changelog 2025-10-03 22:33:32.000000000 +0300 @@ -1,3 +1,11 @@ +liquidwar (5.6.5-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 15. (Closes: #1097304) + * Don't build with -m64, it breaks the x32 build. + + -- Adrian Bunk <[email protected]> Fri, 03 Oct 2025 22:33:32 +0300 + liquidwar (5.6.5-2) unstable; urgency=medium * Team upload. diff -Nru liquidwar-5.6.5/debian/patches/gcc-15.patch liquidwar-5.6.5/debian/patches/gcc-15.patch --- liquidwar-5.6.5/debian/patches/gcc-15.patch 1970-01-01 02:00:00.000000000 +0200 +++ liquidwar-5.6.5/debian/patches/gcc-15.patch 2025-10-03 22:33:32.000000000 +0300 @@ -0,0 +1,26 @@ +Description: Fix FTBFS with GCC 15 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1097304 + +--- liquidwar-5.6.5.orig/src/srvcont.c ++++ liquidwar-5.6.5/src/srvcont.c +@@ -520,7 +520,7 @@ lw_srvcont_wait_teams (LW_SRVCONT * cont + { + log_print_str ("Unable to bind socket on port "); + log_print_int (port); +- log_println ("!"); ++ log_println (); + + /* + * We consider this a fatal error and quit the program +--- liquidwar-5.6.5.orig/utils/liquidwarcol.c ++++ liquidwar-5.6.5/utils/liquidwarcol.c +@@ -430,7 +430,7 @@ main (int argc, char **argv) + { + if (FLAG_BACKUP) + save_backup (FILENAMES[i]); +- convert_bitmap (FILENAMES[i]); ++ convert_bitmap (); + save_file (FILENAMES[i]); + } + } diff -Nru liquidwar-5.6.5/debian/patches/no-m64.patch liquidwar-5.6.5/debian/patches/no-m64.patch --- liquidwar-5.6.5/debian/patches/no-m64.patch 1970-01-01 02:00:00.000000000 +0200 +++ liquidwar-5.6.5/debian/patches/no-m64.patch 2025-10-03 22:33:32.000000000 +0300 @@ -0,0 +1,19 @@ +Description: Don't build with -m64, it breaks the x32 build +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1097304 + +--- liquidwar-5.6.5.orig/src/Makefile.in ++++ liquidwar-5.6.5/src/Makefile.in +@@ -27,12 +27,6 @@ else + HOST_CPU_CC = + endif + +-# -mcpu=x86_64 doesn't work, here's a workarround +-ifeq ("@host_cpu@","x86_64") +- HOST_CPU_CC = "-m64" +-endif +- +- + ifeq ($(DEBUG),yes) + DEBUG_FLAGS = -g3 + DEBUG_OPTIONS = -DDEBUG diff -Nru liquidwar-5.6.5/debian/patches/series liquidwar-5.6.5/debian/patches/series --- liquidwar-5.6.5/debian/patches/series 2020-07-26 15:13:53.000000000 +0300 +++ liquidwar-5.6.5/debian/patches/series 2025-10-03 22:33:32.000000000 +0300 @@ -5,3 +5,5 @@ buildflags.patch python3.patch gcc10.patch +gcc-15.patch +no-m64.patch
