Hi, On Wed, Nov 13, 2024 at 09:53:33AM +0800, YunQiang Su wrote:
I guess that you missed the changes of d/rules? - $(MAKE) CDEBUGFLAGS="$(CFLAGS) $(LDFLAGS) $(CDEBUGFLAGS)" + $(MAKE) DEB_CDEBUGFLAGS="$(CFLAGS) $(LDFLAGS)"
Sorry, my bad, I messed up this when generating a new debdiff with re-download xxkb source code. Syning it to mentors also, thanks for your time again. -- Regards, -- Bo YU
diff -Nru xxkb-1.11.1/debian/changelog xxkb-1.11.1/debian/changelog --- xxkb-1.11.1/debian/changelog 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/changelog 2024-11-12 23:36:05.000000000 +0800 @@ -1,3 +1,17 @@ +xxkb (1.11.1-3) unstable; urgency=medium + + * QA upload. + * Add 0004-fix-ftbfs-on-gcc-14.patch to fix the ftbfs issue. + (Closes: #1075694) + * Set std-ver to 4.7.0. + * Set standard of d/watch to 4. + * Add Rules-Requires-Root on d/control. + * Add doc-base for xxkb. + * debian/rules: clean up Makefile explicitly. + * Update 0003-*.patch and pass DEB_CDEBUGFLAGS to fix hardening issue. + + -- Bo YU <tsu.y...@gmail.com> Tue, 12 Nov 2024 23:36:05 +0800 + xxkb (1.11.1-2) unstable; urgency=medium * QA upload. diff -Nru xxkb-1.11.1/debian/control xxkb-1.11.1/debian/control --- xxkb-1.11.1/debian/control 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/control 2024-11-12 23:24:04.000000000 +0800 @@ -9,10 +9,11 @@ libxt-dev, xutils-dev, Maintainer: Debian QA Group <packa...@qa.debian.org> -Standards-Version: 4.6.1 +Standards-Version: 4.7.0 Homepage: http://sourceforge.net/projects/xxkb/ Vcs-Git: https://salsa.debian.org/debian/xxkb.git Vcs-Browser: https://salsa.debian.org/debian/xxkb +Rules-Requires-Root: no Package: xxkb Architecture: any diff -Nru xxkb-1.11.1/debian/patches/0003-Imakefile-enable-debug-flag.patch xxkb-1.11.1/debian/patches/0003-Imakefile-enable-debug-flag.patch --- xxkb-1.11.1/debian/patches/0003-Imakefile-enable-debug-flag.patch 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/patches/0003-Imakefile-enable-debug-flag.patch 2024-11-12 23:29:50.000000000 +0800 @@ -6,16 +6,14 @@ Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Imakefile b/Imakefile -index 931ca42..36010b8 100644 --- a/Imakefile +++ b/Imakefile -@@ -24,7 +24,7 @@ CFLAGS += `pkg-config --cflags glib-2.0 gdk-pixbuf-xlib-2.0 librsvg-2.0` +@@ -24,7 +24,7 @@ LOCAL_LIBRARIES += `pkg-config --libs glib-2.0 gdk-pixbuf-xlib-2.0 librsvg-2.0` #endif -CDEBUGFLAGS = -O2 -Wall -+CDEBUGFLAGS = -O2 -Wall -g ++CDEBUGFLAGS = -O2 -Wall -g $(DEB_CDEBUGFLAGS) SED = sed ComplexProgramTarget(xxkb) diff -Nru xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch --- xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch 1970-01-01 07:30:00.000000000 +0730 +++ xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch 2024-11-12 23:22:16.000000000 +0800 @@ -0,0 +1,17 @@ +Description: fix ftbfs on gcc-14 +Author: Bo YU <tsu.y...@gmail.com> +Bug: https://bugs.debian.org/1075694 +Last-Update: 2024-11-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/resource.c ++++ b/resource.c +@@ -622,7 +622,7 @@ + if (filename) + stat = XrmCombineFileDatabase(filename, &db, True); + else +- stat = NULL; ++ stat = 0; + if (stat == 0 && db == NULL) { + /* failed */ + warnx("Unable to find configuration data"); diff -Nru xxkb-1.11.1/debian/patches/series xxkb-1.11.1/debian/patches/series --- xxkb-1.11.1/debian/patches/series 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/patches/series 2024-11-12 23:22:16.000000000 +0800 @@ -1,3 +1,4 @@ 0001-debian-patch.patch 0002-Fix-manpage-semantics.patch 0003-Imakefile-enable-debug-flag.patch +0004-fix-ftbfs-on-gcc-14.patch diff -Nru xxkb-1.11.1/debian/rules xxkb-1.11.1/debian/rules --- xxkb-1.11.1/debian/rules 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/rules 2024-11-12 23:36:05.000000000 +0800 @@ -3,11 +3,19 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export CFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS) +export LDFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS) + %: dh $@ -execute_before_dh_auto_build: +execute_after_dh_auto_clean: + dh_auto_clean + rm -f Makefile + +override_dh_auto_build: xmkmf + $(MAKE) DEB_CDEBUGFLAGS="$(CFLAGS) $(LDFLAGS)" override_dh_auto_install: $(MAKE) install install.man DESTDIR=$(CURDIR)/debian/tmp/ diff -Nru xxkb-1.11.1/debian/watch xxkb-1.11.1/debian/watch --- xxkb-1.11.1/debian/watch 2022-11-21 00:04:37.000000000 +0800 +++ xxkb-1.11.1/debian/watch 2024-11-12 23:35:12.000000000 +0800 @@ -1,2 +1,2 @@ -version=3 +version=4 http://sf.net/xxkb/xxkb-(\d+(?:\.\d+)+)-src\.tar\.gz diff -Nru xxkb-1.11.1/debian/xxkb.doc-base xxkb-1.11.1/debian/xxkb.doc-base --- xxkb-1.11.1/debian/xxkb.doc-base 1970-01-01 07:30:00.000000000 +0730 +++ xxkb-1.11.1/debian/xxkb.doc-base 2024-11-12 23:25:04.000000000 +0800 @@ -0,0 +1,10 @@ +Document: xxkb +Title: Debian xxkb Manual +Author: Ivan Pascal +Abstract: This manual describes what xxkb is + and how to use it. +Section: Programming + +Format: HTML +Index: /usr/share/doc/xxkb/3gr.html +Files: /usr/share/doc/xxkb/3gr.html
signature.asc
Description: PGP signature
