--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: ghostscript@packages.debian.org, havard.f.aasen@pfft.no
Control: affects -1 + src:ghostscript
Please unblock package ghostscript
This fix from upstream to handle an issue with cross building the package,
a regression from 9.56.1~dfsg.
The bug #717825 was definitively created for a different issue, but I
thought it would serve. It has the severity of 'wishlist' though since this
is a regression the severity could probably be higher.
[ Reason ]
Fix cross build.
[ Impact ]
The package in it's present state can't be cross built.
[ Tests ]
salsa CI was used to actually test the cross building of the package.
[ Risks ]
I consider the risk to be small, most of the related issue was a wrong
command line option.
The upstream patch removes this erroneous option and updates an if
statement in 'configure.ac'.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
unblock ghostscript/10.0.0~dfsg-10
diff -Nru ghostscript-10.0.0~dfsg/debian/changelog ghostscript-10.0.0~dfsg/debian/changelog
--- ghostscript-10.0.0~dfsg/debian/changelog 2022-12-12 07:45:09.000000000 +0100
+++ ghostscript-10.0.0~dfsg/debian/changelog 2023-03-20 09:12:00.000000000 +0100
@@ -1,3 +1,10 @@
+ghostscript (10.0.0~dfsg-10) unstable; urgency=medium
+
+ * QA upload.
+ * Add patch from upstream to fix cross build. Closes: #717825
+
+ -- Håvard F. Aasen <havard.f.aasen@pfft.no> Mon, 20 Mar 2023 09:12:00 +0100
+
ghostscript (10.0.0~dfsg-9) unstable; urgency=medium
* QA upload.
diff -Nru ghostscript-10.0.0~dfsg/debian/patches/0001_fix_cross_compile.patch ghostscript-10.0.0~dfsg/debian/patches/0001_fix_cross_compile.patch
--- ghostscript-10.0.0~dfsg/debian/patches/0001_fix_cross_compile.patch 1970-01-01 01:00:00.000000000 +0100
+++ ghostscript-10.0.0~dfsg/debian/patches/0001_fix_cross_compile.patch 2023-03-20 09:12:00.000000000 +0100
@@ -0,0 +1,36 @@
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Thu, 24 Nov 2022 16:33:47 +0000
+Subject: [PATCH] Fix a little bitrot in the cross-compiling logic
+
+Removing the option to disable FAPI meant configuring for cross compiling would
+fail because the option being passed to the sub-call to configure would include
+an unknown command line option.
+
+Origin: upstream, https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=4c3575346b9c7d394ebc73b4e5fabebadd8877ec
+Bug-Debian: https://bugs.debian.org/717825
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb57825..aa5c9ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,7 +138,7 @@ if test x"$host" != x"$build" ; then
+ echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in
+
+ AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary tools)])
+- "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers=""
++ "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers=""
+ status=$?
+ cp config.log "$olddir/configaux.log"
+ if test $status -eq 0 ; then
+@@ -2482,7 +2482,7 @@ PDF=
+ PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+ PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+
+-if test x"$with_pdf" != x"no" ; then
++if test x"$with_pdf" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then
+
+ if test x"$JBIG2_DECODER" = x""; then
+ AC_MSG_ERROR([No JBIG2 decoder available, required for PDF support])
diff -Nru ghostscript-10.0.0~dfsg/debian/patches/series ghostscript-10.0.0~dfsg/debian/patches/series
--- ghostscript-10.0.0~dfsg/debian/patches/series 2022-12-12 07:45:09.000000000 +0100
+++ ghostscript-10.0.0~dfsg/debian/patches/series 2023-03-20 09:12:00.000000000 +0100
@@ -1,3 +1,4 @@
+0001_fix_cross_compile.patch
1004_enable_spot_devices.patch
2001_docdir_fix_for_debian.patch
2002_gs_man_fix_debian.patch
--- End Message ---