Bug#837605: libgksu FTCBFS: uses build architecture pkg-config in a few places

[Helmut Grohne]

Source: libgksu
Version: 2.0.13~pre1-8
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

libgksu fails to cross build from source, because it uses the build
architecture pkg-config in a few places and thus fails finding e.g. gtk.
It does discover the right pkg-config in configure but fails to use the
discovered tool. I am attaching a patch that replaces a few bare
"pkg-config" with "$(PKG_CONFGI)" and thus makes a cross build succeed.
Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru libgksu-2.0.13~pre1/debian/changelog libgksu-2.0.13~pre1/debian/changelog
--- libgksu-2.0.13~pre1/debian/changelog	2014-09-06 23:08:49.000000000 +0200
+++ libgksu-2.0.13~pre1/debian/changelog	2016-09-12 21:57:28.000000000 +0200
@@ -1,3 +1,10 @@
+libgksu (2.0.13~pre1-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Add 24_cross.patch (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 12 Sep 2016 21:42:15 +0200
+
 libgksu (2.0.13~pre1-8) unstable; urgency=medium
 
   * Adding myself to uploaders
diff --minimal -Nru libgksu-2.0.13~pre1/debian/patches/24_cross.patch libgksu-2.0.13~pre1/debian/patches/24_cross.patch
--- libgksu-2.0.13~pre1/debian/patches/24_cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ libgksu-2.0.13~pre1/debian/patches/24_cross.patch	2016-09-12 21:57:02.000000000 +0200
@@ -0,0 +1,45 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: fix cross compilation by using the cross tools discovered by configure
+
+Index: libgksu-2.0.13~pre1/libgksuui/Makefile.am
+===================================================================
+--- libgksu-2.0.13~pre1.orig/libgksuui/Makefile.am
++++ libgksu-2.0.13~pre1/libgksuui/Makefile.am
+@@ -1,10 +1,10 @@
+ AM_CFLAGS = -g -O2 -Wall
+-INCLUDES = `pkg-config --cflags gtk+-2.0 gconf-2.0`
++INCLUDES = `$(PKG_CONFIG) --cflags gtk+-2.0 gconf-2.0`
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+ 
+ noinst_LTLIBRARIES = libgksuui1.0.la
+ libgksuui1_0_la_SOURCES = gksuui-dialog.c
+-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
++libgksuui1_0_la_LDFLAGS = -Wl,-O1 `$(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0 x11`
+ 
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+@@ -12,4 +12,4 @@
+ noinst_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 x11`
++test_gksuui_LDFLAGS = `$(PKG_CONFIG) --libs glib-2.0 x11`
+Index: libgksu-2.0.13~pre1/libgksu/Makefile.am
+===================================================================
+--- libgksu-2.0.13~pre1.orig/libgksu/Makefile.am
++++ libgksu-2.0.13~pre1/libgksu/Makefile.am
+@@ -28,12 +28,12 @@
+ 
+ pkglibdir = ${libdir}/${PACKAGE}
+ pkglibexec_PROGRAMS = gksu-run-helper
+-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
++gksu_run_helper_LDFLAGS = `$(PKG_CONFIG) --libs glib-2.0`
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 
+ noinst_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gtk+-2.0`
++test_gksu_LDFLAGS = `$(PKG_CONFIG) --libs glib-2.0 gtk+-2.0`
+ 
+ EXTRA_DIST = libgksu.ver
diff --minimal -Nru libgksu-2.0.13~pre1/debian/patches/series libgksu-2.0.13~pre1/debian/patches/series
--- libgksu-2.0.13~pre1/debian/patches/series	2014-09-06 22:31:11.000000000 +0200
+++ libgksu-2.0.13~pre1/debian/patches/series	2016-09-12 21:41:43.000000000 +0200
@@ -5,4 +5,5 @@
 05_ja.patch
 06_unguarded_child_stderr.patch
 23_correct_colormap_get.patch
+24_cross.patch
 99_intltool.patch