commit:     3e30c7a3b814475de587d6c4d5e24f5adb4ec8e2
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 21 11:00:18 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 21 11:00:18 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3e30c7a3

gnome-base/gnome-shell: 3.14.2 → 3.14.3

---
 ...around-quoting-issues-in-configure-script.patch | 33 ----------------------
 ...ell-3.14.2.ebuild => gnome-shell-3.14.3.ebuild} |  5 +---
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)

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
deleted file mode 100644
index 9f5f457..0000000
--- 
a/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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.3.ebuild
similarity index 97%
rename from gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
index d11763a..b740e0d 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
        >=sys-auth/polkit-0.100[introspection]
        >=x11-libs/libXfixes-5.0
        x11-libs/libXtst
-       >=x11-wm/mutter-3.14.2[introspection]
+       >=x11-wm/mutter-3.14.3[introspection]
        >=x11-libs/startup-notification-0.11
 
        ${PYTHON_DEPS}
@@ -128,9 +128,6 @@ 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

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild 
b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 7624368..ad3903f 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
        >=sys-auth/polkit-0.100[introspection]
        >=x11-libs/libXfixes-5.0
        x11-libs/libXtst
-       >=x11-wm/mutter-3.14.2[introspection]
+       >=x11-wm/mutter-3.14.3[introspection]
        >=x11-libs/startup-notification-0.11
 
        ${PYTHON_DEPS}

Reply via email to