Bug#856507: gnome-keyring FTCBFS: python dependency unsatisfiable/uninstallable, wrong pkg-config

[Helmut Grohne]

Source: gnome-keyring
Version: 3.20.0-3
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects 842442 + src:gnome-keyring

gnome-keyring fails to cross build from source. The immediate problem is
that its Build-Depends are not satisfiable, because it requests the host
architecture python, which is neither installable nor what is needed.
Adding a :native to select the build architecture python makes its
Build-Depends installable. Then it fails to find .pc files, because its
configure.ac forces using the build architecture pkg-config when the
host architecture one is needed. Instead of using custom detection code,
PKG_PROG_PKG_CONFIG is the way to success. The attached patch fixes both
issues. After applying it, the build runs into #842442. Please consider
applying it after stretch is released.

Helmut
-------------- next part --------------
diff --minimal -Nru gnome-keyring-3.20.0/debian/changelog gnome-keyring-3.20.0/debian/changelog
--- gnome-keyring-3.20.0/debian/changelog	2016-09-07 02:08:35.000000000 +0200
+++ gnome-keyring-3.20.0/debian/changelog	2017-03-01 19:53:30.000000000 +0100
@@ -1,3 +1,12 @@
+gnome-keyring (3.20.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Improve cross build support (Closes: #-1)
+    - Annotate python build dependency with :native
+    - cross.patch: consider $ac_tool_prefix for pkg-config
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 01 Mar 2017 19:53:30 +0100
+
 gnome-keyring (3.20.0-3) unstable; urgency=medium
 
   [ Jeremy Bicha ]
diff --minimal -Nru gnome-keyring-3.20.0/debian/control gnome-keyring-3.20.0/debian/control
--- gnome-keyring-3.20.0/debian/control	2016-09-07 02:08:35.000000000 +0200
+++ gnome-keyring-3.20.0/debian/control	2017-03-01 19:53:27.000000000 +0100
@@ -27,7 +27,7 @@
                libtasn1-6-dev,
                libtasn1-bin,
                libglib2.0-doc,
-               python,
+               python:native,
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-keyring/
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-keyring/
diff --minimal -Nru gnome-keyring-3.20.0/debian/patches/cross.patch gnome-keyring-3.20.0/debian/patches/cross.patch
--- gnome-keyring-3.20.0/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnome-keyring-3.20.0/debian/patches/cross.patch	2017-03-01 19:53:30.000000000 +0100
@@ -0,0 +1,18 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: fix cross compilation
+
+ * consider $ac_tool_prefix when searching for pkg-config
+
+Index: gnome-keyring-3.20.0/configure.ac
+===================================================================
+--- gnome-keyring-3.20.0.orig/configure.ac
++++ gnome-keyring-3.20.0/configure.ac
+@@ -46,7 +46,7 @@
+ AM_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ IT_PROG_INTLTOOL([0.35.0])
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++PKG_PROG_PKG_CONFIG
+ 
+ AC_TYPE_PID_T
+ AC_TYPE_SIGNAL
diff --minimal -Nru gnome-keyring-3.20.0/debian/patches/series gnome-keyring-3.20.0/debian/patches/series
--- gnome-keyring-3.20.0/debian/patches/series	2016-09-07 02:08:32.000000000 +0200
+++ gnome-keyring-3.20.0/debian/patches/series	2017-03-01 19:53:30.000000000 +0100
@@ -1,3 +1,4 @@
 03_kfreebsd.patch
 05_skip-known-test-failures.patch
 0001-man-Fix-.so-link-in-gnome-keyring-3.patch
+cross.patch