commit: 36eba783b56e30c212cdb9585fcc7dade98c5e77 Author: RĂ©mi Cardona <remi <AT> gentoo <DOT> org> AuthorDate: Sat Nov 29 16:47:22 2014 +0000 Commit: Remi Cardona <remi <AT> gentoo <DOT> org> CommitDate: Sat Nov 29 16:48:38 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=36eba783
gnome-base/gnome-shell: Fix build with non-bash /bin/sh Patch comes from upstream git, so -9999 doesn't need it. --- ...around-quoting-issues-in-configure-script.patch | 33 ++++++++++++++++++++++ gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild | 3 ++ 2 files changed, 36 insertions(+) diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch new file mode 100644 index 0000000..9f5f457 --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch @@ -0,0 +1,33 @@ +From b05ab0eaebd9e6e58f1b9c092e05323c5b901a2b Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexan...@tsoy.me> +Date: Mon, 27 Oct 2014 16:45:10 +0300 +Subject: [PATCH] build: Workaround quoting issues in configure script + +Default value of BROWSER_PLUGIN_DIR variable contains special symbols. +Thus quoting and inlining it in parameter expansion is not portable. +In particular it does not work in dash. Replace ${a:-b} parameter +expansion with conditional statement. + +https://bugzilla.gnome.org/show_bug.cgi?id=739241 +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d55848b..5b8c306 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -232,7 +232,9 @@ esac + AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS" + AC_SUBST(AM_CFLAGS) + +-BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" ++if test -z "${BROWSER_PLUGIN_DIR}"; then ++ BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins" ++fi + AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to]) + + AC_CONFIG_FILES([ +-- +2.1.3 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild index 7db3234..d11763a 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild @@ -128,6 +128,9 @@ src_prepare() { # https://bugzilla.gnome.org/show_bug.cgi?id=726435 epatch "${FILESDIR}/${PN}-3.14.0-bluetooth-gold.patch" + # Fix build with non-bash /bin/sh, see bug #526408 + epatch "${FILESDIR}/${PN}-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch" + epatch_user eautoreconf