Source: gkdebconf
Version: 2.0.4
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
gkdebconf fails to cross build from source, because configure.ac hard
codes the build architecture pkg-config. The attached patch replaces the
invocations with the PKG_CHECK_MODULES macro and makes gkdebconf cross
buildable. Please consider applying the patch.
Helmut
diff --minimal -Nru gkdebconf-2.0.4/configure.ac
gkdebconf-2.0.4+nmu1/configure.ac
--- gkdebconf-2.0.4/configure.ac 2018-10-22 21:11:13.000000000 +0200
+++ gkdebconf-2.0.4+nmu1/configure.ac 2018-12-14 06:58:18.000000000 +0100
@@ -15,10 +15,9 @@
AC_HEADER_DIRENT
AC_HEADER_STDC
-GKDEBCONF_CFLAGS=`pkg-config --cflags gtk+-2.0`
+PKG_CHECK_MODULES([GKDEBCONF],[gtk+-2.0])
AC_SUBST([GKDEBCONF_CFLAGS])
-GKDEBCONF_LDFLAGS=`pkg-config --libs gtk+-2.0`
-AC_SUBST([GKDEBCONF_LDFLAGS])
+AC_SUBST([GKDEBCONF_LIBS])
GLIB_GSETTINGS
@@ -36,15 +35,7 @@
AC_SUBST(HTML_DIR)
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
- AC_MSG_RESULT(yes)
- GTKDOC=true
-else
- AC_MSG_RESULT(no)
- GTKDOC=false
-fi
+PKG_CHECK_MODULES([GTKDOC],[gtk-doc >= 1.0],[GTKDOC=true],[GTKDOC=false])
dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation
[default=no]], enable_gtk_doc="$enableval",
diff --minimal -Nru gkdebconf-2.0.4/debian/changelog
gkdebconf-2.0.4+nmu1/debian/changelog
--- gkdebconf-2.0.4/debian/changelog 2018-10-22 22:32:32.000000000 +0200
+++ gkdebconf-2.0.4+nmu1/debian/changelog 2018-12-14 06:58:18.000000000
+0100
@@ -1,3 +1,10 @@
+gkdebconf (2.0.4+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Don't hard code pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 14 Dec 2018 06:58:18 +0100
+
gkdebconf (2.0.4) unstable; urgency=medium
* QA upload.
diff --minimal -Nru gkdebconf-2.0.4/src/Makefile.am
gkdebconf-2.0.4+nmu1/src/Makefile.am
--- gkdebconf-2.0.4/src/Makefile.am 2017-12-31 01:18:58.000000000 +0100
+++ gkdebconf-2.0.4+nmu1/src/Makefile.am 2018-12-14 06:58:18.000000000
+0100
@@ -3,5 +3,5 @@
bin_PROGRAMS = gkdebconf
-gkdebconf_LDADD = $(GKDEBCONF_LDFLAGS)
+gkdebconf_LDADD = $(GKDEBCONF_LIBS)
gkdebconf_SOURCES = main.c files.c interface.c debconf.c cbs.c config.c
