Control: tags 1097156 + patch
Control: tags 1097156 + pending
Control: tags 1113893 + pending

Dear maintainer,

I've prepared an NMU for le-dico-de-rene-cougnenc (versioned as 1.4-3.1) 
and uploaded it to DELAYED/7. Please feel free to tell me if I should 
cancel it.

cu
Adrian
diffstat for le-dico-de-rene-cougnenc-1.4 le-dico-de-rene-cougnenc-1.4

 changelog            |    9 +++++++++
 patches/gcc-15.patch |   37 +++++++++++++++++++++++++++++++++++++
 patches/series       |    1 +
 rules                |    4 ----
 4 files changed, 47 insertions(+), 4 deletions(-)

diff -Nru le-dico-de-rene-cougnenc-1.4/debian/changelog le-dico-de-rene-cougnenc-1.4/debian/changelog
--- le-dico-de-rene-cougnenc-1.4/debian/changelog	2025-09-02 20:44:56.000000000 +0300
+++ le-dico-de-rene-cougnenc-1.4/debian/changelog	2025-09-20 22:47:07.000000000 +0300
@@ -1,3 +1,12 @@
+le-dico-de-rene-cougnenc (1.4-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules: Remove settings that caused FTBFS on !x86.
+    (Closes: #1113893)
+  * Fix FTBFS with GCC 15. (Closes: #1097156)
+
+ -- Adrian Bunk <[email protected]>  Sat, 20 Sep 2025 22:47:07 +0300
+
 le-dico-de-rene-cougnenc (1.4-3) unstable; urgency=medium
 
   * renamed dico to dico-rc and dico.1.gz to dico-rc.1.gz in order
diff -Nru le-dico-de-rene-cougnenc-1.4/debian/patches/gcc-15.patch le-dico-de-rene-cougnenc-1.4/debian/patches/gcc-15.patch
--- le-dico-de-rene-cougnenc-1.4/debian/patches/gcc-15.patch	1970-01-01 02:00:00.000000000 +0200
+++ le-dico-de-rene-cougnenc-1.4/debian/patches/gcc-15.patch	2025-09-20 22:47:07.000000000 +0300
@@ -0,0 +1,37 @@
+Description: Fix FTBFS with GCC 15
+Author: Adrian Bunk <[email protected]>
+Bug-Debian: https://bugs.debian.org/1097156
+
+--- le-dico-de-rene-cougnenc-1.4.orig/src/dico.c
++++ le-dico-de-rene-cougnenc-1.4/src/dico.c
+@@ -29,8 +29,6 @@ byte *StrLwr ( byte *str);
+ byte *StrAscii( byte *str);
+ byte equival( byte c  );
+ byte *beautify( byte  *str);
+-void lookfor();
+-void lookall();
+ #ifdef MSDOS
+ void GetDosPath(char *path);
+ void TakePath  (char *path);
+--- le-dico-de-rene-cougnenc-1.4.orig/src/killposte.h
++++ le-dico-de-rene-cougnenc-1.4/src/killposte.h
+@@ -46,6 +46,9 @@ typedef unsigned char byte;
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#ifdef linux
++#include <unistd.h>
++#endif
+ 
+ #ifdef MSDOS
+ void GetDosPath(char *path);
+@@ -77,7 +80,9 @@ void GetDosPath(char *path);
+ void TakePath(char *path);
+ 
+ /* only for MS-DOS ?? */
++#ifdef MSDOS
+ int getpid();
+ void unlink();
++#endif
+ 
+ #endif /* KILLPOSTE_H */
diff -Nru le-dico-de-rene-cougnenc-1.4/debian/patches/series le-dico-de-rene-cougnenc-1.4/debian/patches/series
--- le-dico-de-rene-cougnenc-1.4/debian/patches/series	2025-09-02 20:44:56.000000000 +0300
+++ le-dico-de-rene-cougnenc-1.4/debian/patches/series	2025-09-20 22:47:07.000000000 +0300
@@ -1,2 +1,3 @@
 src-Makefile.patch
 don-t_break_dico.patch
+gcc-15.patch
diff -Nru le-dico-de-rene-cougnenc-1.4/debian/rules le-dico-de-rene-cougnenc-1.4/debian/rules
--- le-dico-de-rene-cougnenc-1.4/debian/rules	2025-09-02 20:38:22.000000000 +0300
+++ le-dico-de-rene-cougnenc-1.4/debian/rules	2025-09-20 22:47:07.000000000 +0300
@@ -2,10 +2,6 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-export CFLAGS += -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection
-export CPPFLAGS += -D_FORTIFY_SOURCE=2
-export LDFLAGS += -Wl,-z,relro
 
 %:
 	dh $@

Reply via email to