Bug#858092: xdg-user-dirs-gtk FTCBFS: forces usage of build architecture pkg-config

[Helmut Grohne]

Source: xdg-user-dirs-gtk
Version: 0.10-1
Tags: patch upstream
User: helmutg at debian.org
Usertags: rebootstrap

xdg-user-dirs-gtk fails to cross build from source, because its
configure forces a bad value of PKG_CONFIG. The PKG_CHECK_MODULES macro
knows very well which pkg-config to use, so removing the offending line
fixes the cross build. Please consider applying the attached patch after
stretch is released.

Helmut
-------------- next part --------------
diff --minimal -Nru xdg-user-dirs-gtk-0.10/debian/changelog xdg-user-dirs-gtk-0.10/debian/changelog
--- xdg-user-dirs-gtk-0.10/debian/changelog	2013-06-29 18:04:52.000000000 +0200
+++ xdg-user-dirs-gtk-0.10/debian/changelog	2017-03-18 08:58:29.000000000 +0100
@@ -1,3 +1,12 @@
+xdg-user-dirs-gtk (0.10-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + cross.patch fixes configure.ac
+    + Build configure from source
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 18 Mar 2017 08:58:29 +0100
+
 xdg-user-dirs-gtk (0.10-1) unstable; urgency=low
 
   * New upstream release.
diff --minimal -Nru xdg-user-dirs-gtk-0.10/debian/control xdg-user-dirs-gtk-0.10/debian/control
--- xdg-user-dirs-gtk-0.10/debian/control	2013-06-29 18:06:13.000000000 +0200
+++ xdg-user-dirs-gtk-0.10/debian/control	2017-03-18 08:58:29.000000000 +0100
@@ -10,6 +10,7 @@
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8),
+               dh-autoreconf,
                gnome-pkg-tools,
                libgtk-3-dev,
                xdg-user-dirs,
diff --minimal -Nru xdg-user-dirs-gtk-0.10/debian/patches/cross.patch xdg-user-dirs-gtk-0.10/debian/patches/cross.patch
--- xdg-user-dirs-gtk-0.10/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ xdg-user-dirs-gtk-0.10/debian/patches/cross.patch	2017-03-18 08:58:26.000000000 +0100
@@ -0,0 +1,18 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: fix cross compilation
+
+Do not force a wrong value of PKG_CONFIG onto PKG_CHECK_MODULES. It knows how
+to find the right pkg-config.
+
+Index: xdg-user-dirs-gtk-0.10/configure.ac
+===================================================================
+--- xdg-user-dirs-gtk-0.10.orig/configure.ac
++++ xdg-user-dirs-gtk-0.10/configure.ac
+@@ -16,7 +16,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ 
+ GETTEXT_PACKAGE=xdg-user-dirs-gtk
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
diff --minimal -Nru xdg-user-dirs-gtk-0.10/debian/patches/series xdg-user-dirs-gtk-0.10/debian/patches/series
--- xdg-user-dirs-gtk-0.10/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ xdg-user-dirs-gtk-0.10/debian/patches/series	2017-03-18 08:57:13.000000000 +0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru xdg-user-dirs-gtk-0.10/debian/rules xdg-user-dirs-gtk-0.10/debian/rules
--- xdg-user-dirs-gtk-0.10/debian/rules	2013-06-28 05:18:35.000000000 +0200
+++ xdg-user-dirs-gtk-0.10/debian/rules	2017-03-18 08:58:29.000000000 +0100
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk