[caja] 06/07: debian/patches: Add 1001_use-correct-macros-to-cross-build.patch. Fix cross-building.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository caja.

commit ec664c4ef8e16180a08c920ef41104599633af76
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 14 10:20:36 2018 +0100

    debian/patches: Add 1001_use-correct-macros-to-cross-build.patch. Fix cross-building.
---
 .../1001_use-correct-macros-to-cross-build.patch   | 78 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 79 insertions(+)

diff --git a/debian/patches/1001_use-correct-macros-to-cross-build.patch b/debian/patches/1001_use-correct-macros-to-cross-build.patch
new file mode 100644
index 0000000..5925b2f
--- /dev/null
+++ b/debian/patches/1001_use-correct-macros-to-cross-build.patch
@@ -0,0 +1,78 @@
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Description: build - use correct macros to fix cross-build
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@
+ AC_PROG_MAKE_SET
+ AM_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++PKG_PROG_PKG_CONFIG
+ 
+ AC_CHECK_LIB(m, floor)
+ 
+@@ -148,7 +148,7 @@
+     AC_HELP_STRING([--disable-xmp],
+                    [build without xmp support]))
+ msg_xmp=no
+-if test "x$enable_xmp" != "xno"; then
++AS_IF([test "x$enable_xmp" != "xno"],[
+     PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver,
+         [AM_CONDITIONAL(HAVE_EXEMPI, true)
+          AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support])]
+@@ -157,7 +157,7 @@
+ 
+     AC_SUBST(EXEMPI_CFLAGS)
+     AC_SUBST(EXEMPI_LIBS)
+-fi
++])
+ 
+ dnl ==========================================================================
+ 
+@@ -192,10 +192,10 @@
+     AC_HELP_STRING([--disable-packagekit],
+         [build without PackageKit support]))
+ msg_packagekit=no
+-if test "x$enable_packagekit" != "xno"; then
++AS_IF([test "x$enable_packagekit" != "xno"],[
+     msg_packagekit=yes
+     AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit mimetype installer])
+-fi
++])
+ 
+ # ==========================================================================
+ # Turn on the additional warnings last, so -Werror doesn't affect other tests.
+@@ -213,7 +213,7 @@
+ fi
+ ])
+ AC_MSG_CHECKING(for more warnings, including -Werror)
+-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
++AS_IF([test "$GCC" = "yes" -a "$set_more_warnings" != "no"],[
+     AC_MSG_RESULT(yes)
+     WARNING_CFLAGS="\
+     -Wall \
+@@ -238,9 +238,9 @@
+         unset SAVE_CFLAGS
+     done
+     unset option
+-else
++],[
+     AC_MSG_RESULT(no)
+-fi
++])
+ 
+ AC_SUBST(WARNING_CFLAGS)
+ 
+@@ -316,9 +316,9 @@
+ 
+ AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update],
+                                         [Disable icon cache update]))
+-if (test "$enable_icon_update" != no); then
++AS_IF([test "$enable_icon_update" != no],[
+         AC_PATH_PROG(UPDATE_ICON_CACHE, [gtk-update-icon-cache])
+-fi
++])
+ AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
+ 
+ AC_CONFIG_FILES([
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c3b524c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001_use-correct-macros-to-cross-build.patch

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