[Debian GNUstep maintainers] Bug#1093994: popplerkit.framework: FTCBFS: hard codes the build architecture pkg-config

[Helmut Grohne]

Source: popplerkit.framework
Version: 0.0.20051227svn-13
Followup-For: Bug #1093994
Control: tags -1 patch

I happen to have encountered the same issue and prepared a patch. Since
I don't see anything committed I'm sharing my patch.

Helmut
-------------- next part --------------
diff --minimal -Nru popplerkit.framework-0.0.20051227svn/debian/changelog popplerkit.framework-0.0.20051227svn/debian/changelog
--- popplerkit.framework-0.0.20051227svn/debian/changelog	2024-06-28 02:28:30.000000000 +0200
+++ popplerkit.framework-0.0.20051227svn/debian/changelog	2025-02-01 11:04:46.000000000 +0100
@@ -1,3 +1,10 @@
+popplerkit.framework (0.0.20051227svn-13.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the host architecture pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 01 Feb 2025 11:04:46 +0100
+
 popplerkit.framework (0.0.20051227svn-13) unstable; urgency=medium
 
   * Team upload
diff --minimal -Nru popplerkit.framework-0.0.20051227svn/debian/patches/cross.patch popplerkit.framework-0.0.20051227svn/debian/patches/cross.patch
--- popplerkit.framework-0.0.20051227svn/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ popplerkit.framework-0.0.20051227svn/debian/patches/cross.patch	2025-02-01 11:04:20.000000000 +0100
@@ -0,0 +1,12 @@
+--- popplerkit.framework-0.0.20051227svn.orig/config.sh
++++ popplerkit.framework-0.0.20051227svn/config.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ 
+-PKG_CONFIG=`which pkg-config 2>/dev/null`
++if [ -z "${PKG_CONFIG:-}" ]; then
++   PKG_CONFIG=`which pkg-config 2>/dev/null`
++fi
+ if [ -z "${PKG_CONFIG}" ]; then
+    echo "pkg-config not found!"
+    exit 1
diff --minimal -Nru popplerkit.framework-0.0.20051227svn/debian/patches/series popplerkit.framework-0.0.20051227svn/debian/patches/series
--- popplerkit.framework-0.0.20051227svn/debian/patches/series	2024-06-28 02:28:30.000000000 +0200
+++ popplerkit.framework-0.0.20051227svn/debian/patches/series	2025-02-01 11:03:43.000000000 +0100
@@ -8,3 +8,4 @@
 poppler2206.patch
 debian-fonts.patch
 poppler2404.patch
+cross.patch
diff --minimal -Nru popplerkit.framework-0.0.20051227svn/debian/rules popplerkit.framework-0.0.20051227svn/debian/rules
--- popplerkit.framework-0.0.20051227svn/debian/rules	2024-06-28 02:28:30.000000000 +0200
+++ popplerkit.framework-0.0.20051227svn/debian/rules	2025-02-01 11:04:42.000000000 +0100
@@ -36,6 +36,8 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/buildtools.mk
+export PKG_CONFIG
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 # Support "noopt" and "terse" in DEB_BUILD_OPTIONS.