[caja-extensions] 02/03: debian/patches: Add 1001_pkg-config-macro-not-cross-compilation-safe.patch. Make configure.ac cross-compile safe.
Mike Gabriel
sunweaver at debian.org
Wed Feb 14 14:32:06 UTC 2018
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository caja-extensions.
commit f30e3e0c8e4953d6bafa26caa4f0fc208c501eea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 14 15:29:01 2018 +0100
debian/patches: Add 1001_pkg-config-macro-not-cross-compilation-safe.patch. Make configure.ac cross-compile safe.
---
...g-config-macro-not-cross-compilation-safe.patch | 169 +++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 170 insertions(+)
diff --git a/debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch b/debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch
new file mode 100644
index 0000000..bbefa9c
--- /dev/null
+++ b/debian/patches/1001_pkg-config-macro-not-cross-compilation-safe.patch
@@ -0,0 +1,169 @@
+Description: Make configure.ac cross compile safe.
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,14 +21,12 @@
+
+ MATE_COMMON_INIT
+
+-# Check for pkgconfig first
+-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-
++PKG_PROG_PKG_CONFIG
+ # Give error and exit if we dont have pkgconfig
+-if test "x$HAVE_PKGCONFIG" = "xno"; then
++AC_CHECK_PROG(HAVE_PKGCONFIG, `basename $PKG_CONFIG`, yes, no)
++AS_IF([test "x$HAVE_PKGCONFIG" = "xno"],[
+ AC_MSG_ERROR([you need to have pkgconfig installed !])
+-fi
++])
+
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+@@ -45,14 +43,14 @@
+ [enable_image_converter=$enableval],
+ [enable_image_converter=yes])
+
+-if test "x$enable_image-converter" = "xyes"; then
++AS_IF([test "x$enable_image-converter" = "xyes"],[
+ PKG_CHECK_MODULES(IMAGE_CONVERTER,
+ gtk+-3.0 >= $GTK_REQUIRED
+ glib-2.0 >= $GLIB_REQUIRED
+ gio-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(IMAGE_CONVERTER_CFLAGS)
+ AC_SUBST(IMAGE_CONVERTER_LIBS)
+-fi
++])
+
+ AM_CONDITIONAL(ENABLE_IMAGE_CONVERTER, test x"$enable_image_converter" = "xyes")
+
+@@ -62,13 +60,13 @@
+ [enable_open_terminal=$enableval],
+ [enable_open_terminal=yes])
+
+-if test "x$enable_open_terminal" = "xyes"; then
++AS_IF([test "x$enable_open_terminal" = "xyes"],[
+ PKG_CHECK_MODULES(OPENTERMINAL,
+ glib-2.0 >= $GLIB_REQUIRED
+ mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED)
+ AC_SUBST(OPENTERMINAL_CFLAGS)
+ AC_SUBST(OPENTERMINAL_LIBS)
+-fi
++])
+
+ AM_CONDITIONAL(ENABLE_OPEN_TERMINAL, test x"$enable_open_terminal" = "xyes")
+
+@@ -78,7 +76,7 @@
+ [enable_sendto=$enableval],
+ [enable_sendto=yes])
+
+-if test "x$enable_sendto" = "xyes"; then
++AS_IF([test "x$enable_sendto" = "xyes"],[
+ GTHREAD_REQUIRED=2.6.0
+ DBUS_REQUIRED=1.0
+ DBUS_GLIB_REQUIRED=0.60
+@@ -97,11 +95,11 @@
+
+ sendto_plugin_error_or_ignore()
+ {
+- if test "${error_on_bad_sendto_plugin}" = "1" ; then
++ AS_IF([test "${error_on_bad_sendto_plugin}" = "1"],[
+ AC_MSG_ERROR([$1])
+- else
++ ],[
+ AC_MSG_WARN([$1 (disabling sendto plugin)])
+- fi
++ ])
+ }
+
+ AC_ARG_WITH([sendto-plugins],
+@@ -111,15 +109,15 @@
+ used_sendto_plugins=""
+ used_sendto_plugins2=""
+
+- if test "x${with_sendto_plugins}" = "xautodetect" ; then
++ AS_IF([test "x${with_sendto_plugins}" = "xautodetect"],[
+ # Default to all plugins and just ignore them if they won't compile
+ with_sendto_plugins="all"
+ error_on_bad_sendto_plugin="0"
+- else
++ ],[
+ # Clean up the plugin list and error if a plugin won't compile
+ with_sendto_plugins=`echo ,"${with_sendto_plugins}", | sed -e 's/[[ ,]][[ ,]]*/ /g' -e 's/,$//'`
+ error_on_bad_sendto_plugin="1"
+- fi
++ ])
+
+ # Iterate through the wanted plugins and weed out bad ones (or error)
+ for wanted_sendto_plugin in ${with_sendto_plugins}; do
+@@ -215,9 +213,9 @@
+ SENDTO_PLUGINS=$used_sendto_plugins2
+
+ dnl Error out if no plugins will be built
+- if test -z "${SENDTO_PLUGINS}" ; then
++ AS_IF([test -z "${SENDTO_PLUGINS}"],[
+ AC_MSG_ERROR([No sendto plugins will be built, and caja-sendto requires at least one])
+- fi
++ ])
+
+ AC_MSG_CHECKING([which sendto plugins to compile])
+ AC_MSG_RESULT([$SENDTO_PLUGINS])
+@@ -230,12 +228,12 @@
+
+ dnl For the GIO based plugins
+ enable_nst_common=no
+- if test "x$enable_burn" = "xyes" -o "x$enable_removable" = "xyes"; then
++ AS_IF([test "x$enable_burn" = "xyes" -o "x$enable_removable" = "xyes"],[
+ enable_nst_common=yes
+- fi
++ ])
+ AM_CONDITIONAL(HAVE_GIO, test "x$enable_nst_common" = "xyes")
+
+- if test "x${SENDTO_PLUGINS}" != "x" ; then
++ AS_IF([test "x${SENDTO_PLUGINS}" != "x"],[
+ for allowed_sendto_plugin in ${ALL_SENDTO_PLUGINS}; do
+ for sendto_plugin in ${SENDTO_PLUGINS}; do
+ case ${allowed_sendto_plugin} in
+@@ -248,10 +246,10 @@
+ done
+ AC_MSG_NOTICE([ ${allowed_sendto_plugin} sendto plugin disabled])
+ done
+- else
++ ],[
+ AC_MSG_NOTICE([ No caja-sendto plugins enabled])
+- fi
+-fi
++ ])
++])
+ AM_CONDITIONAL(ENABLE_SENDTO, test x"$enable_sendto" = "xyes")
+
+ # share extension
+@@ -260,12 +258,12 @@
+ [enable_share=$enableval],
+ [enable_share=yes])
+
+-if test "x$enable_share" = "xyes"; then
++AS_IF([test "x$enable_share" = "xyes"],[
+ PKG_CHECK_MODULES(SHARE,
+ glib-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(SHARE_CFLAGS)
+ AC_SUBST(SHARE_LIBS)
+-fi
++])
+
+ AM_CONDITIONAL(ENABLE_SHARE, test x"$enable_share" = "xyes")
+
+@@ -298,9 +296,9 @@
+ AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
+ [ac_with_cajadir=$withval],
+ [ac_with_cajadir=""])
+-if test "${ac_with_cajadir}" = ""; then
++AS_IF([test "${ac_with_cajadir}" = ""],[
+ ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+-fi
++])
+ AC_MSG_NOTICE([Installing caja plugins in ${ac_with_cajadir}])
+ AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}])
+
diff --git a/debian/patches/series b/debian/patches/series
index 211257a..8e46221 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
2001_support-icedove-in-caja-sendto.patch
+1001_pkg-config-macro-not-cross-compilation-safe.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja-extensions.git
More information about the pkg-mate-commits
mailing list