Fri Feb 22 00:04:20 PST 2013

3 files changed, 39 insertions, 72 deletions

diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 019d8bc35..4c04ddf49 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178051 2013-02-14 18:47:31Z heftig $
+# $Id: PKGBUILD 178416 2013-02-21 17:18:12Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.6.3
+pkgver=3.6.3.1
 pkgrel=2
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
@@ -17,14 +17,17 @@ optdepends=('gnome-control-center: System settings'
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fs33855.patch)
-sha256sums=('05b2341a0f84835644881743873d3eaccaed12f00aa7b424d876780e81723db2'
-            '259e69256ae597f1d04c7a0070c1c90cec20afbf494d6b89e72d86b8b9c7f0ba')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+        main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch)
+sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603'
+            '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../fs33855.patch
+
+  # FS#32410
+  patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/extra/gnome-shell/fs33855.patch b/extra/gnome-shell/fs33855.patch
deleted file mode 100644
index b935e0923..000000000
--- a/extra/gnome-shell/fs33855.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 9d931b5e013475be5733fc92bd105b3a691a4097 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Fri, 30 Nov 2012 15:05:38 +0000
-Subject: MessageTray: fix notification height expansion
-
-MessageTray._tween removes all tweens now, so it removes also
-those setting the height to expanded for critical notifications.
-
-This is a regression from 1a27d7dfc02c06bd0ccf4258a9108207b8832ce4
-
-https://bugzilla.gnome.org/show_bug.cgi?id=689295
----
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index ce61e25..ef0cc02 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -2200,40 +2200,28 @@ const MessageTray = new Lang.Class({
-     _updateShowingNotification: function() {
-         this._notification.acknowledged = true;
- 
--        Tweener.removeTweens(this._notificationWidget);
--
-         // We auto-expand notifications with CRITICAL urgency.
--        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
--        // updating, in case that notification was in the process of being hidden. However,
--        // Tweener.removeTweens() would also remove a tween that was updating the position of the
--        // notification we are updating, in case that notification was already expanded and its height
--        // changed. Therefore we need to call this._expandNotification() for expanded notifications
--        // to make sure their position is updated.
--        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
-+        if (this._notification.urgency == Urgency.CRITICAL)
-             this._expandNotification(true);
- 
-         // We tween all notifications to full opacity. This ensures that both new notifications and
-         // notifications that might have been in the process of hiding get full opacity.
-         //
--        // We tween any notification showing in the banner mode to banner height
--        // (this._notificationWidget.y = -this._notificationWidget.height).
-+        // We tween any notification showing in the banner mode to the appropriate height
-+        // (which is banner height or expanded height, depending on the notification state)
-         // This ensures that both new notifications and notifications in the banner mode that might
--        // have been in the process of hiding are shown with the banner height.
-+        // have been in the process of hiding are shown with the correct height.
-         //
-         // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
-         // notification is being shown.
--        //
--        // We don't set the y parameter for the tween for expanded notifications because
--        // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
--        // fully expanded value.
-+
-         let tweenParams = { opacity: 255,
-+                            y: -this._notificationWidget.height,
-                             time: ANIMATION_TIME,
-                             transition: 'easeOutQuad',
-                             onComplete: this._showNotificationCompleted,
-                             onCompleteScope: this
-                           };
--        if (!this._notification.expanded)
--            tweenParams.y = -this._notificationWidget.height;
- 
-         this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
-    },
---
-cgit v0.9.0.2
diff --git a/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch b/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
new file mode 100644
index 000000000..b1471ce54
--- /dev/null
+++ b/extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
@@ -0,0 +1,29 @@
+From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Wed, 2 Jan 2013 09:05:32 -0500
+Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is
+ destroyed
+
+This seems to be an incorrect conversion when we moved from an array
+to an object of keys in 3a6b4f3.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=690965
+---
+ js/ui/main.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/main.js b/js/ui/main.js
+index 12daee2..1334d58 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -553,7 +553,7 @@ function pushModal(actor, params) {
+         curFocusDestroyId = curFocus.connect('destroy', function() {
+             let index = _findModal(actor);
+             if (index >= 0)
+-                modalActorFocusStack[index].actor = null;
++                modalActorFocusStack[index].focus = null;
+         });
+     }
+     modalActorFocusStack.push({ actor: actor,
+-- 
+1.8.0.2
\ No newline at end of file