Merge branch 'master' of gparabola:abslibre-mips64el

1 files changed, 18 insertions, 7 deletions

diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 23df6af4a..949e5a37b 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183399 2013-04-21 22:10:25Z heftig $
+# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.8.1
-pkgrel=1
+pkgver=3.8.2
+pkgrel=4
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64 mips64el)
 url="http://live.gnome.org/GnomeShell"
@@ -19,20 +19,31 @@ options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        nm-libexecdir.patch)
-sha256sums=('db0160d7c3fec3858805f218f961534d1a3f1486e005492433d4a28c40f83ac7'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+        nm-libexecdir.patch popupmenu.patch)
+sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
 
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
 
+  # FS#35326 (from gnome-3-8 branch)
+  patch -Np1 -i ../popupmenu.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
       --disable-schemas-compile
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }