Hello, Samuel Thibault, le lun. 26 janv. 2026 18:14:31 +0100, a ecrit: > I have uploaded the attached changes to DELAYED/5.
DefaultCCOptions is actually still used by some archs. I have uploaded the attached (pushed) patch to DELAYED/5 to just stuff the options to EXTRA_DEFINES, which is fine for xaw3d since we don't have cpp/cxx calls. I have put also the difference with -3 in patch0, for reference. Samuel
diff -Nru xaw3d-1.5+F/debian/changelog xaw3d-1.5+F/debian/changelog --- xaw3d-1.5+F/debian/changelog 2026-01-26 18:08:26.000000000 +0100 +++ xaw3d-1.5+F/debian/changelog 2026-02-01 14:00:13.000000000 +0100 @@ -1,3 +1,10 @@ +xaw3d (1.5+F-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * rules: Pass C options through EXTRA_DEFINES. + + -- Samuel Thibault <[email protected]> Sun, 01 Feb 2026 14:00:13 +0100 + xaw3d (1.5+F-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru xaw3d-1.5+F/debian/rules xaw3d-1.5+F/debian/rules --- xaw3d-1.5+F/debian/rules 2026-01-26 18:07:49.000000000 +0100 +++ xaw3d-1.5+F/debian/rules 2026-02-01 13:58:51.000000000 +0100 @@ -11,10 +11,9 @@ override_dh_auto_build: rm -rf $(SOURCE)/X11 && install -m755 -d $(SOURCE)/X11 - cd $(SOURCE) && ln -sf ../ X11/Xaw3d && \ - imake -DDefaultCCOptions="-ffile-prefix-map=$(CURDIR)=. -I. -std=c11" -DUseInstalled -I/usr/lib/X11/config + cd $(SOURCE) && ln -sf ../ X11/Xaw3d && xmkmf dh_auto_build -- -C $(SOURCE) \ - EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \ + EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR -ffile-prefix-map=$(CURDIR)=. -I. -std=c11" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \ override_dh_auto_clean: rm -rf $(SOURCE)/X11 $(COMPAT) lib/Xaw3d/laygram.h
diff -Nru xaw3d-1.5+F/debian/changelog xaw3d-1.5+F/debian/changelog --- xaw3d-1.5+F/debian/changelog 2026-01-05 17:57:29.000000000 +0100 +++ xaw3d-1.5+F/debian/changelog 2026-02-01 14:00:13.000000000 +0100 @@ -1,3 +1,20 @@ +xaw3d (1.5+F-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * rules: Pass C options through EXTRA_DEFINES. + + -- Samuel Thibault <[email protected]> Sun, 01 Feb 2026 14:00:13 +0100 + +xaw3d (1.5+F-3.1) unstable; urgency=medium + + * Non-maintainer upload. + + * rules: Call imake directly to be able to pass several C options. + * rules: Fix passing C options. + * rules: Force C11 language (closes: #1098120). + + -- Samuel Thibault <[email protected]> Mon, 26 Jan 2026 18:08:26 +0100 + xaw3d (1.5+F-3) unstable; urgency=medium * Relaxed strict prototyping checking at build time for gcc-15. diff -Nru xaw3d-1.5+F/debian/rules xaw3d-1.5+F/debian/rules --- xaw3d-1.5+F/debian/rules 2026-01-05 17:57:29.000000000 +0100 +++ xaw3d-1.5+F/debian/rules 2026-02-01 13:58:51.000000000 +0100 @@ -13,8 +13,7 @@ rm -rf $(SOURCE)/X11 && install -m755 -d $(SOURCE)/X11 cd $(SOURCE) && ln -sf ../ X11/Xaw3d && xmkmf dh_auto_build -- -C $(SOURCE) \ - EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \ - CFLAGS="-ffile-prefix-map=$(CURDIR)=. -I. -Wno-incompatible-pointer-types" + EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR -ffile-prefix-map=$(CURDIR)=. -I. -std=c11" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \ override_dh_auto_clean: rm -rf $(SOURCE)/X11 $(COMPAT) lib/Xaw3d/laygram.h
