Fri Dec 27 23:54:04 UTC 2013

1 files changed, 18 insertions, 13 deletions

diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index f7317b88f..6db41cfe3 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 198030 2013-10-30 12:22:37Z allan $
+# $Id: PKGBUILD 202388 2013-12-21 15:05:12Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.10.1
-pkgrel=1
+pkgver=3.10.2.1
+pkgrel=4
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeShell"
 license=(GPL2)
-depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus
+depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus
          gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
          libcanberra-pulse libcroco libgdm libsecret mutter mutter-wayland network-manager-applet
-         telepathy-logger telepathy-mission-control unzip)
-makedepends=(intltool gtk-doc gnome-control-center)
-optdepends=('gnome-control-center: System settings')
-options=('!emptydirs')
+         telepathy-logger telepathy-mission-control unzip gstreamer)
+makedepends=(intltool gtk-doc gnome-control-center evolution-data-server)
+optdepends=('gnome-control-center: System settings'
+            'evolution-data-server: Evolution calendar integration')
 install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        nm-libexecdir.patch)
-sha256sums=('52f43dcd6df9dd00e5fbcd16a0d7551801cbc77f8777f047e548e7803bb90e02'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+        nm-libexecdir.patch
+        git-fixes.patch)
+sha256sums=('d28cedc4f7dbcbd979ef2a0b80f722ff507989fce193fe59351b1d048d17c44c'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            '192d95387dff5ac772968680cb77abef135b3ad7218676ad51c997d474642cc5')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -29,8 +31,8 @@ prepare() {
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
 
-  # Build against mutter-wayland 3.9.92
-  sed -ri 's/^(MUTTER_MIN_VERSION)=.*/\1=3.9.92/' configure
+  # Upstream fixes from 3-10 branch. Includes security bugfix for FS#37930
+  patch -Np1 -i ../git-fixes.patch
 }
 
 build() {
@@ -49,4 +51,7 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+
+  # Must exist; FS#37412
+  mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
 }