[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1096685: gcin: diff for NMU version 2.9.4+dfsg1-3.1



Control: tags 1096685 + patch
Control: tags 1096685 + pending

Dear maintainer,

I've prepared an NMU for gcin (versioned as 2.9.4+dfsg1-3.1) and 
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.

cu
Adrian
diffstat for gcin-2.9.4+dfsg1 gcin-2.9.4+dfsg1

 changelog |    8 ++++++++
 rules     |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff -Nru gcin-2.9.4+dfsg1/debian/changelog gcin-2.9.4+dfsg1/debian/changelog
--- gcin-2.9.4+dfsg1/debian/changelog	2024-12-23 01:47:05.000000000 +0200
+++ gcin-2.9.4+dfsg1/debian/changelog	2025-09-26 18:57:51.000000000 +0300
@@ -1,3 +1,11 @@
+gcin (2.9.4+dfsg1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build with -std=gnu17 to workaround FTBFS with GCC 15.
+    (Closes: #1096685)
+
+ -- Adrian Bunk <bunk@debian.org>  Fri, 26 Sep 2025 18:57:51 +0300
+
 gcin (2.9.4+dfsg1-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru gcin-2.9.4+dfsg1/debian/rules gcin-2.9.4+dfsg1/debian/rules
--- gcin-2.9.4+dfsg1/debian/rules	2024-12-15 06:09:09.000000000 +0200
+++ gcin-2.9.4+dfsg1/debian/rules	2025-09-26 18:57:51.000000000 +0300
@@ -7,12 +7,12 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-export DEB_CFLAGS_MAINT_APPEND = -fcommon
-
 # Circumvent FTBFS:
 # gtab-buf.cpp:1339:57: note: expected ‘char (*)[65]’ but argument is of type ‘char (*)[64]’
 export DEB_CFLAGS_MAINT_APPEND = -Wno-incompatible-pointer-types
 
+export DEB_CFLAGS_MAINT_APPEND += -std=gnu17
+
 GTK2VER := $(shell pkg-config --variable=gtk_binary_version gtk+-2.0)
 GTK3VER := $(shell pkg-config --variable=gtk_binary_version gtk+-3.0)
 GTK2_IMMODULES := $(shell pkg-config --variable=libdir gtk+-2.0)/libgtk2.0-0/gtk-query-immodules-2.0

Reply to: