[mate-user-share] 01/03: debian/patches: Add 0001_build-use-correct-macros-to-fix-cross-build.patch. Fix pkg-config originated FTCBFS. (Closes: #886578).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository mate-user-share.

commit 7d67e98350dd505ab751b437ae5f24823fcf53cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 15 11:12:46 2018 +0100

    debian/patches: Add 0001_build-use-correct-macros-to-fix-cross-build.patch. Fix pkg-config originated FTCBFS. (Closes: #886578).
---
 ...ild-use-correct-macros-to-fix-cross-build.patch | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 51 insertions(+)

diff --git a/debian/patches/0001_build-use-correct-macros-to-fix-cross-build.patch b/debian/patches/0001_build-use-correct-macros-to-fix-cross-build.patch
new file mode 100644
index 0000000..e49333a
--- /dev/null
+++ b/debian/patches/0001_build-use-correct-macros-to-fix-cross-build.patch
@@ -0,0 +1,50 @@
+From 4a48e270808eb51d40a071ba43d1e37433109142 Mon Sep 17 00:00:00 2001
+From: monsta <monsta at inbox.ru>
+Date: Sat, 13 Jan 2018 22:23:36 +0300
+Subject: [PATCH] build: use correct macros to fix cross-build
+
+patch by Helmut Grohne
+https://bugs.debian.org/886578
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe1d0a9..a2f6370 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,7 +24,7 @@ AC_PROG_MAKE_SET
+ AM_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ AC_PATH_XTRA
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++PKG_PROG_PKG_CONFIG
+ 
+ AC_TYPE_PID_T
+ AC_TYPE_SIGNAL
+@@ -53,13 +53,13 @@ AC_SUBST(HTTPD)
+ 
+ BLUETOOTH_PKG="mate-bluetooth-1.0 >= 1.2.0"
+ AC_ARG_ENABLE(bluetooth, AS_HELP_STRING([--disable-bluetooth],[compile without bluetooth support]),,enable_bluetooth=no)
+-if test "x$enable_bluetooth" = "xyes"; then
++AS_IF([test "x$enable_bluetooth" = "xyes"],[
+  PKG_CHECK_MODULES(BLUETOOTH, $BLUETOOTH_PKG)
+  AC_DEFINE(HAVE_BLUETOOTH, 1, [Set to true if mate-bluetooth support is available])
+-else
++],[
+  BLUETOOTH_PKG=""
+  AC_MSG_WARN([Bluetooth support is disabled.])
+-fi
++])
+ AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"])
+ 
+ GLIB_REQUIRED_VERSION=2.36.0
+@@ -144,7 +144,7 @@ AC_ARG_WITH(cajadir,
+ PKG_CHECK_MODULES(EXTENSION,
+ 		   libcaja-extension >= 1.17.1 $BLUETOOTH_PKG)
+ if test "${ac_with_cajadir}" = ""; then
+-	ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension`
++	ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+ fi
+ AC_SUBST(CAJADIR)
+ AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
diff --git a/debian/patches/series b/debian/patches/series
index 355bda0..5a6dfe8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001_build-use-correct-macros-to-fix-cross-build.patch
 1001_apache-config.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-user-share.git