Source: grdesktop Version: 0.23+d040330-3 Tags: upstream patch User: [email protected] Usertags: rebootstrap
grdesktop fails to cross build from source, because it uses the build architecture pkg-config and thus fails to find some packages at configure time. This is caused by the presence of an outdated and broken copy of the PKG_CHECK_MODULES macro that fails to consider $ac_tool_prefix. Simply removing that macro from the source (and thus using the upstream copy) makes the cross build proceed. It still fails running scrollkeeper stuff, but that's a different bug. Please consider applying the attached patch. Helmut
diff --minimal -Nru grdesktop-0.23+d040330/debian/changelog grdesktop-0.23+d040330/debian/changelog --- grdesktop-0.23+d040330/debian/changelog 2012-05-13 08:50:18.000000000 +0200 +++ grdesktop-0.23+d040330/debian/changelog 2017-08-02 12:05:56.000000000 +0200 @@ -1,3 +1,10 @@ +grdesktop (0.23+d040330-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Remove broken PKG_CHECK_MODULES copy (Closes: #-1) + + -- Helmut Grohne <[email protected]> Wed, 02 Aug 2017 12:05:56 +0200 + grdesktop (0.23+d040330-3) unstable; urgency=low * debian/rules: Enabled buildflags. diff --minimal -Nru grdesktop-0.23+d040330/debian/control grdesktop-0.23+d040330/debian/control --- grdesktop-0.23+d040330/debian/control 2012-05-13 08:48:39.000000000 +0200 +++ grdesktop-0.23+d040330/debian/control 2017-08-02 12:05:56.000000000 +0200 @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Bart Martens <[email protected]> -Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libgtk2.0-dev, libgnomeui-dev, scrollkeeper, dpkg-dev (>= 1.16.1~) +Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libgtk2.0-dev, libgnomeui-dev, scrollkeeper, dpkg-dev (>= 1.16.1~), dh-autoreconf Standards-Version: 3.9.3 Homepage: http://www.nongnu.org/grdesktop/ diff --minimal -Nru grdesktop-0.23+d040330/debian/patches/06_cross.diff grdesktop-0.23+d040330/debian/patches/06_cross.diff --- grdesktop-0.23+d040330/debian/patches/06_cross.diff 1970-01-01 01:00:00.000000000 +0100 +++ grdesktop-0.23+d040330/debian/patches/06_cross.diff 2017-08-02 12:05:56.000000000 +0200 @@ -0,0 +1,73 @@ +Subject: Remove broken PKG_CHECK_MODULES macro +From: Helmut Grohne <[email protected]> + +The upstream one from /usr/share/aclocal/pkg.m4 works. + +Index: grdesktop-0.23+d040330/aclocal.m4 +=================================================================== +--- grdesktop-0.23+d040330.orig/aclocal.m4 ++++ grdesktop-0.23+d040330/aclocal.m4 +@@ -1307,63 +1307,6 @@ + ])dnl + + +-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +-dnl also defines GSTUFF_PKG_ERRORS on error +-AC_DEFUN(PKG_CHECK_MODULES, [ +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- AC_MSG_CHECKING(for $2) +- +- if $PKG_CONFIG --exists "$2" ; then +- AC_MSG_RESULT(yes) +- succeeded=yes +- +- AC_MSG_CHECKING($1_CFLAGS) +- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` +- AC_MSG_RESULT($$1_CFLAGS) +- +- AC_MSG_CHECKING($1_LIBS) +- $1_LIBS=`$PKG_CONFIG --libs "$2"` +- AC_MSG_RESULT($$1_LIBS) +- else +- $1_CFLAGS="" +- $1_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` +- ifelse([$4], ,echo $$1_PKG_ERRORS,) +- fi +- +- AC_SUBST($1_CFLAGS) +- AC_SUBST($1_LIBS) +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig"; +- fi +- fi +- +- if test $succeeded = yes; then +- ifelse([$3], , :, [$3]) +- else +- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) +- fi +-]) +- +- +- + dnl AM_GCONF_SOURCE_2 + dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas + dnl (i.e. pass to gconftool-2 diff --minimal -Nru grdesktop-0.23+d040330/debian/patches/series grdesktop-0.23+d040330/debian/patches/series --- grdesktop-0.23+d040330/debian/patches/series 2012-05-13 08:34:20.000000000 +0200 +++ grdesktop-0.23+d040330/debian/patches/series 2017-08-02 12:05:33.000000000 +0200 @@ -3,3 +3,4 @@ 03_desktop.diff 04_typos.diff 05_format-security.diff +06_cross.diff diff --minimal -Nru grdesktop-0.23+d040330/debian/rules grdesktop-0.23+d040330/debian/rules --- grdesktop-0.23+d040330/debian/rules 2012-05-13 08:26:06.000000000 +0200 +++ grdesktop-0.23+d040330/debian/rules 2017-08-02 12:05:56.000000000 +0200 @@ -7,7 +7,7 @@ include /usr/share/dpkg/buildflags.mk %: - dh $@ + dh $@ --with=autoreconf override_dh_auto_configure: dh_auto_configure -- \
