diffstat for system-config-printer-1.5.18 system-config-printer-1.5.18

 changelog                               |    8 ++++++
 patches/0001-Fix-bootstrap-script.patch |   37 ++++++++++++++++++++++++++++++++
 patches/series                          |    1 
 3 files changed, 46 insertions(+)

diff -Nru system-config-printer-1.5.18/debian/changelog system-config-printer-1.5.18/debian/changelog
--- system-config-printer-1.5.18/debian/changelog	2025-03-14 01:41:43.000000000 +0200
+++ system-config-printer-1.5.18/debian/changelog	2026-06-06 20:58:55.000000000 +0300
@@ -1,3 +1,11 @@
+system-config-printer (1.5.18-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with gettext 0.26.
+    (Closes: #1126985)
+
+ -- Adrian Bunk <bunk@debian.org>  Sat, 06 Jun 2026 20:58:55 +0300
+
 system-config-printer (1.5.18-4) unstable; urgency=medium
 
   * Add Build-Depends: python3-setuptools (Closes: #1080811)
diff -Nru system-config-printer-1.5.18/debian/patches/0001-Fix-bootstrap-script.patch system-config-printer-1.5.18/debian/patches/0001-Fix-bootstrap-script.patch
--- system-config-printer-1.5.18/debian/patches/0001-Fix-bootstrap-script.patch	1970-01-01 02:00:00.000000000 +0200
+++ system-config-printer-1.5.18/debian/patches/0001-Fix-bootstrap-script.patch	2026-06-06 20:58:21.000000000 +0300
@@ -0,0 +1,37 @@
+From d6bc06d92c89c30f0f70de7de9c60f7a803b1f5c Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Tue, 6 Jan 2026 14:06:08 +0100
+Subject: Fix bootstrap script
+
+It fixed two issues:
+
+- AM_GNU_GETTEXT in AX_REQUIRE_DEFINED caused error during autoconf,
+  because AM_GNU_GETTEXT is now forbidden to use without arguments. Remove
+  the AX_REQUIRE_DEFINED - if AM_GNU_GETTEXT is missing, autoconf will
+  fail later anyway
+- AM_GNU_GETTEXT_VERSION and AM_GNU_GETTEXT were not found during
+  autoconf - use AC_CONFIG_MACRO_DIR to tell autoconf to search in local
+  generated directory m4
+
+Fixes #416
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9398fd3e..e32e5c21 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,8 +1,8 @@
+ AC_INIT(system-config-printer, 1.5.18)
+ AC_CONFIG_SRCDIR(system-config-printer.py)
+ AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
++AC_CONFIG_MACRO_DIR([m4])
+ AM_GNU_GETTEXT_VERSION(0.20)
+-AX_REQUIRE_DEFINED([AM_GNU_GETTEXT])
+ AM_GNU_GETTEXT([external])
+ AM_PATH_PYTHON([3])
+ PACKAGE="AC_PACKAGE_NAME"
+-- 
+2.47.3
+
diff -Nru system-config-printer-1.5.18/debian/patches/series system-config-printer-1.5.18/debian/patches/series
--- system-config-printer-1.5.18/debian/patches/series	2025-03-14 01:41:43.000000000 +0200
+++ system-config-printer-1.5.18/debian/patches/series	2026-06-06 20:58:53.000000000 +0300
@@ -4,3 +4,4 @@
 Do-not-autostart-the-applet-on-LXDE-or-Unity.patch
 Show-Printer-Settings-in-Unity-Control-Center.patch
 makefile-am-fix-setup-py-install.patch
+0001-Fix-bootstrap-script.patch
