Control: tags 1054278 + patch
Control: tags 1054278 + pending

I've prepared an NMU for unifont (versioned as 1:16.0.04-1.1) and uploaded it to DELAYED/2, to unblock cleanup of libwx-perl on s390x.

debdiff attached, also available here:
https://salsa.debian.org/fonts-team/unifont/-/merge_requests/1

Thanks,
    smcv
diffstat for unifont-16.0.04 unifont-16.0.04

 changelog                              |   16 ++++++++++++++++
 control                                |    4 ++--
 patches/set-LDFLAGS-and-CPPFLAGS.patch |    1 +
 patches/use-default-cc.patch           |    1 +
 rules                                  |    4 ++++
 unifont-bin.examples                   |    2 ++
 6 files changed, 26 insertions(+), 2 deletions(-)

diff -Nru unifont-16.0.04/debian/changelog unifont-16.0.04/debian/changelog
--- unifont-16.0.04/debian/changelog	2025-09-05 09:58:51.000000000 +0100
+++ unifont-16.0.04/debian/changelog	2026-10-01 19:44:20.000000000 +0100
@@ -1,3 +1,19 @@
+unifont (1:16.0.04-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+
+  [ Hideki Yamane ]
+  * Note in patches to forwarded to upstream
+
+  [ Simon McVittie, Cyril Brulebois ]
+  * d/rules, d/unifont-bin.examples: Only install unifont-viewer as
+    an example.
+    This allows libwx-perl to be downgraded from Depends to Suggests,
+    so that it will no longer be a key package, and indirectly unblocks
+    a new version of webkit2gtk. (Closes: #1054278)
+
+ -- Simon McVittie <[email protected]>  Thu, 01 Oct 2026 19:44:20 +0100
+
 unifont (1:16.0.04-1) unstable; urgency=medium
 
   * New upstream version 16.0.04
diff -Nru unifont-16.0.04/debian/control unifont-16.0.04/debian/control
--- unifont-16.0.04/debian/control	2025-09-05 09:52:12.000000000 +0100
+++ unifont-16.0.04/debian/control	2026-10-01 19:44:20.000000000 +0100
@@ -137,8 +137,8 @@
 Package: unifont-bin
 Architecture: any
 Depends: xfonts-utils, bdf2psf, fontforge, ${shlibs:Depends}, ${misc:Depends},
- ${perl:Depends}, libwx-perl, libgd-perl
-Suggests: unifont, texinfo, texlive
+ ${perl:Depends}, libgd-perl
+Suggests: unifont, texinfo, texlive, libwx-perl
 Description: utilities for manipulating GNU Unifont
  This is a set of Perl scripts, C programs, and FontForge scripts
  to manipulate Roman Czyborra's GNU Unifont ".hex" format font
diff -Nru unifont-16.0.04/debian/patches/set-LDFLAGS-and-CPPFLAGS.patch unifont-16.0.04/debian/patches/set-LDFLAGS-and-CPPFLAGS.patch
--- unifont-16.0.04/debian/patches/set-LDFLAGS-and-CPPFLAGS.patch	2025-09-05 09:58:51.000000000 +0100
+++ unifont-16.0.04/debian/patches/set-LDFLAGS-and-CPPFLAGS.patch	2026-10-01 19:44:20.000000000 +0100
@@ -2,6 +2,7 @@
  See https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html
 
  And we encourage CFLAGS in packaging build, so specify it as "+=", not "="
+Forwarded: https://savannah.gnu.org/bugs/index.php?67483
 
 Index: unifont/src/Makefile
 ===================================================================
diff -Nru unifont-16.0.04/debian/patches/use-default-cc.patch unifont-16.0.04/debian/patches/use-default-cc.patch
--- unifont-16.0.04/debian/patches/use-default-cc.patch	2025-09-05 09:58:51.000000000 +0100
+++ unifont-16.0.04/debian/patches/use-default-cc.patch	2026-10-01 19:44:20.000000000 +0100
@@ -5,6 +5,7 @@
  And set "-std=c99" is not good idea, since we can introduce more modern
  standard versions (I've tested to build with clang-19 and set -std=c23 works.
  We can use c23 now, see https://www.open-std.org/JTC1/SC22/WG14/ )
+Forwarded: https://savannah.gnu.org/bugs/index.php?67483
 
 Index: unifont/src/Makefile
 ===================================================================
diff -Nru unifont-16.0.04/debian/rules unifont-16.0.04/debian/rules
--- unifont-16.0.04/debian/rules	2025-09-05 09:58:51.000000000 +0100
+++ unifont-16.0.04/debian/rules	2026-10-01 19:44:20.000000000 +0100
@@ -33,6 +33,10 @@
 	dh_auto_install --builddirectory=src -- PREFIX='$$(DESTDIR)/usr'
 	dh_auto_install --builddirectory=man -- PREFIX='$$(DESTDIR)/usr'
 
+execute_before_dh_install:
+	rm -f debian/tmp/usr/bin/unifont-viewer
+	rm -f debian/tmp/usr/share/man/man1/unifont-viewer.1*
+
 #
 # Exclude ChangeLog until dh_installchangelogs is updated,
 # to comply with Debian Policy Version 4.2.0.
diff -Nru unifont-16.0.04/debian/unifont-bin.examples unifont-16.0.04/debian/unifont-bin.examples
--- unifont-16.0.04/debian/unifont-bin.examples	1970-01-01 01:00:00.000000000 +0100
+++ unifont-16.0.04/debian/unifont-bin.examples	2026-10-01 19:44:20.000000000 +0100
@@ -0,0 +1,2 @@
+man/unifont-viewer.1
+src/unifont-viewer

Reply via email to