Bug#842765: gnome-screensaver FTCBFS: uses build architecture pkg-config

[Helmut Grohne]

Source: gnome-screensaver
Version: 3.6.1-7
Tags: upstream patch
User: helmutg at debian.org
Usertags: rebootstrap

gnome-screensaver fails to cross build from source, because it uses the
build architecture pkg-config, which results in it not finding
dbus-1.pc. After changing the one wrong invocation, it cross builds just
fine. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru gnome-screensaver-3.6.1/debian/changelog gnome-screensaver-3.6.1/debian/changelog
--- gnome-screensaver-3.6.1/debian/changelog	2015-07-20 15:19:35.000000000 +0200
+++ gnome-screensaver-3.6.1/debian/changelog	2016-11-01 06:15:35.000000000 +0100
@@ -1,3 +1,10 @@
+gnome-screensaver (3.6.1-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: cross.patch: use triplet-prefixed pkg-config (Closes: #-1).
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 01 Nov 2016 06:15:23 +0100
+
 gnome-screensaver (3.6.1-7) unstable; urgency=medium
 
   * d/p/0001-gs-lock-plug-Disconnect-signal-handler-from-right-ob.patch:
diff --minimal -Nru gnome-screensaver-3.6.1/debian/patches/cross.patch gnome-screensaver-3.6.1/debian/patches/cross.patch
--- gnome-screensaver-3.6.1/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-screensaver-3.6.1/debian/patches/cross.patch	2016-11-01 06:15:20.000000000 +0100
@@ -0,0 +1,16 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: use triplet-prefixed pkg-config
+
+Index: gnome-screensaver-3.6.1/configure.ac
+===================================================================
+--- gnome-screensaver-3.6.1.orig/configure.ac
++++ gnome-screensaver-3.6.1/configure.ac
+@@ -102,7 +102,7 @@
+ 
+ # Find out the version of DBUS we're using
+ 
+-dbus_version=`pkg-config --modversion dbus-1`
++dbus_version=`$PKG_CONFIG --modversion dbus-1`
+ DBUS_VERSION_MAJOR=`echo $dbus_version | awk -F. '{print $1}'`
+ DBUS_VERSION_MINOR=`echo $dbus_version | awk -F. '{print $2}'`
+ DBUS_VERSION_MICRO=`echo $dbus_version | awk -F. '{print $3}'`
diff --minimal -Nru gnome-screensaver-3.6.1/debian/patches/series gnome-screensaver-3.6.1/debian/patches/series
--- gnome-screensaver-3.6.1/debian/patches/series	2015-07-20 15:19:24.000000000 +0200
+++ gnome-screensaver-3.6.1/debian/patches/series	2016-11-01 06:14:35.000000000 +0100
@@ -4,3 +4,4 @@
 31_lock_screen_on_suspend.patch
 libsystemd.patch
 0001-gs-lock-plug-Disconnect-signal-handler-from-right-ob.patch
+cross.patch