Source: hsetroot
Version: 1.0.2-5
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

hsetroot fails to cross build from source, because the patch added in
#735758 uses the build architecture pkg-config. It should be using the
PKG_PROG_PKG_CONFIG macro and access pkg-config through $PKG_CONFIG
instead. After doing so, hsetroot cross builds successfully. Please
consider applying the attached patch.

Helmut
diff --minimal -Nru hsetroot-1.0.2/debian/changelog 
hsetroot-1.0.2/debian/changelog
--- hsetroot-1.0.2/debian/changelog     2014-01-17 19:56:17.000000000 +0100
+++ hsetroot-1.0.2/debian/changelog     2017-06-24 22:23:49.000000000 +0200
@@ -1,3 +1,10 @@
+hsetroot (1.0.2-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use PKG_PROG_PKG_CONFIG (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sat, 24 Jun 2017 22:23:49 +0200
+
 hsetroot (1.0.2-5) unstable; urgency=low
 
   * Fix lintian vcs-field-not-canonical
diff --minimal -Nru hsetroot-1.0.2/debian/patches/04_link-to-X11.patch 
hsetroot-1.0.2/debian/patches/04_link-to-X11.patch
--- hsetroot-1.0.2/debian/patches/04_link-to-X11.patch  2014-01-17 
19:56:17.000000000 +0100
+++ hsetroot-1.0.2/debian/patches/04_link-to-X11.patch  2017-06-24 
22:23:33.000000000 +0200
@@ -2,18 +2,20 @@
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/735758
 Author: Alessandro Ghedini <gh...@debian.org>
-Last-Update: 2014-01-17
+Last-Update: 2017-06-24
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -50,6 +50,12 @@
+@@ -50,6 +50,14 @@
  IMLIB2_LIBS=`$imlib2config_cmd --libs`
  AC_SUBST(IMLIB2_LIBS)
  
-+X11_CFLAGS=`pkg-config x11 --cflags`
++PKG_PROG_PKG_CONFIG
++
++X11_CFLAGS=`$PKG_CONFIG x11 --cflags`
 +AC_SUBST(X11_CFLAGS)
 +
-+X11_LIBS=`pkg-config x11 --libs`
++X11_LIBS=`$PKG_CONFIG x11 --libs`
 +AC_SUBST(X11_LIBS)
 +
  # Some extra definitions for config.h

Reply via email to