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

[Jan Steffens]

    Date: Sunday, March 31, 2013 @ 09:23:41
  Author: heftig
Revision: 181058

3.8.0.1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-31 07:19:36 UTC (rev 181057)
+++ PKGBUILD	2013-03-31 07:23:41 UTC (rev 181058)
@@ -3,32 +3,29 @@
 # Contributor: Flamelab <panosfilip at gmail.com
 
 pkgname=gnome-shell
-pkgver=3.6.3.1
-pkgrel=3
+pkgver=3.8.0.1
+pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeShell"
 license=(GPL2)
 depends=(caribou evolution-data-server gjs gnome-bluetooth gnome-menus libcroco mutter
-         telepathy-logger telepathy-mission-control unzip gdm gnome-screensaver)
-makedepends=(intltool gnome-doc-utils docbook-xsl)
+         telepathy-logger telepathy-mission-control unzip gdm network-manager-applet
+         libsecret gcr)
+makedepends=(intltool gtk-doc gnome-control-center)
 optdepends=('gnome-control-center: System settings'
             'gnome-themes-standard: Default theme')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
 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 nm-libexecdir.patch)
-sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603'
-            '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125'
+        nm-libexecdir.patch)
+sha256sums=('cf98c3d038704fd057489c696a6cb9e2ee2ae5a10db5b45ddeba59fb82d507b8'
             'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
 
 build() {
   cd $pkgname-$pkgver
 
-  # FS#32410
-  patch -Np1 -i ../main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
-
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
 

Deleted: main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch
===================================================================
--- main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch	2013-03-31 07:19:36 UTC (rev 181057)
+++ main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch	2013-03-31 07:23:41 UTC (rev 181058)
@@ -1,29 +0,0 @@
-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