[arch-commits] Commit in gnome-shell/trunk (2 files)

Jan Steffens heftig at nymeria.archlinux.org
Thu Feb 21 17:13:11 UTC 2013


    Date: Thursday, February 21, 2013 @ 18:13:11
  Author: heftig
Revision: 178414

Fix FS#32410

Added:
  gnome-shell/trunk/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
Modified:
  gnome-shell/trunk/PKGBUILD

----------------------------------------------------------+
 PKGBUILD                                                 |   10 +++-
 main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch |   29 +++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-21 17:09:32 UTC (rev 178413)
+++ PKGBUILD	2013-02-21 17:13:11 UTC (rev 178414)
@@ -17,11 +17,17 @@
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603')
+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
+
+  # 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 \

Added: main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
===================================================================
--- main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch	                        (rev 0)
+++ main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch	2013-02-21 17:13:11 UTC (rev 178414)
@@ -0,0 +1,29 @@
+From 742587dce258adf436f360eed183a7ca0c58fa18 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at 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




More information about the arch-commits mailing list