[arch-commits] Commit in gnome-shell/repos (14 files)

Jan Steffens heftig at nymeria.archlinux.org
Sat May 25 11:54:34 EDT 2013


    Date: Saturday, May 25, 2013 @ 17:54:34
  Author: heftig
Revision: 186358

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnome-shell/repos/extra-i686/PKGBUILD
    (from rev 186357, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-i686/gnome-shell.install
    (from rev 186357, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-i686/nm-libexecdir.patch
    (from rev 186357, gnome-shell/trunk/nm-libexecdir.patch)
  gnome-shell/repos/extra-i686/popupmenu.patch
    (from rev 186357, gnome-shell/trunk/popupmenu.patch)
  gnome-shell/repos/extra-x86_64/PKGBUILD
    (from rev 186357, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-x86_64/gnome-shell.install
    (from rev 186357, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-x86_64/nm-libexecdir.patch
    (from rev 186357, gnome-shell/trunk/nm-libexecdir.patch)
  gnome-shell/repos/extra-x86_64/popupmenu.patch
    (from rev 186357, gnome-shell/trunk/popupmenu.patch)
Deleted:
  gnome-shell/repos/extra-i686/PKGBUILD
  gnome-shell/repos/extra-i686/gnome-shell.install
  gnome-shell/repos/extra-i686/nm-libexecdir.patch
  gnome-shell/repos/extra-x86_64/PKGBUILD
  gnome-shell/repos/extra-x86_64/gnome-shell.install
  gnome-shell/repos/extra-x86_64/nm-libexecdir.patch

----------------------------------+
 /PKGBUILD                        |   98 +++++++++++++++++++++++++++++++++++++
 /gnome-shell.install             |   38 ++++++++++++++
 /nm-libexecdir.patch             |   24 +++++++++
 extra-i686/PKGBUILD              |   42 ---------------
 extra-i686/gnome-shell.install   |   19 -------
 extra-i686/nm-libexecdir.patch   |   12 ----
 extra-i686/popupmenu.patch       |   28 ++++++++++
 extra-x86_64/PKGBUILD            |   42 ---------------
 extra-x86_64/gnome-shell.install |   19 -------
 extra-x86_64/nm-libexecdir.patch |   12 ----
 extra-x86_64/popupmenu.patch     |   28 ++++++++++
 11 files changed, 216 insertions(+), 146 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-05-25 15:52:25 UTC (rev 186357)
+++ extra-i686/PKGBUILD	2013-05-25 15:54:34 UTC (rev 186358)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.8.2
-pkgrel=2
-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
-         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
-         telepathy-logger telepathy-mission-control unzip)
-makedepends=(intltool gtk-doc gnome-control-center)
-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::3}/$pkgname-$pkgver.tar.xz
-        nm-libexecdir.patch)
-sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.patch
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 186357, gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.8.2
+pkgrel=3
+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
+         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
+         telepathy-logger telepathy-mission-control unzip)
+makedepends=(intltool gtk-doc gnome-control-center)
+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::3}/$pkgname-$pkgver.tar.xz
+        nm-libexecdir.patch popupmenu.patch)
+sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d')
+
+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
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-i686/gnome-shell.install
===================================================================
--- extra-i686/gnome-shell.install	2013-05-25 15:52:25 UTC (rev 186357)
+++ extra-i686/gnome-shell.install	2013-05-25 15:54:34 UTC (rev 186358)
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: gnome-shell/repos/extra-i686/gnome-shell.install (from rev 186357, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-i686/gnome-shell.install	                        (rev 0)
+++ extra-i686/gnome-shell.install	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,19 @@
+pkgname=gnome-shell
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-i686/nm-libexecdir.patch
===================================================================
--- extra-i686/nm-libexecdir.patch	2013-05-25 15:52:25 UTC (rev 186357)
+++ extra-i686/nm-libexecdir.patch	2013-05-25 15:54:34 UTC (rev 186358)
@@ -1,12 +0,0 @@
-diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
---- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
-+++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
-@@ -686,7 +686,7 @@
-                     } catch(e) { } // ignore errors if key does not exist
-                     let path = binary;
-                     if (!GLib.path_is_absolute(path)) {
--                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
-+                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
-                     }
- 
-                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-i686/nm-libexecdir.patch (from rev 186357, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-i686/nm-libexecdir.patch	                        (rev 0)
+++ extra-i686/nm-libexecdir.patch	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,12 @@
+diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
+--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
+@@ -686,7 +686,7 @@
+                     } catch(e) { } // ignore errors if key does not exist
+                     let path = binary;
+                     if (!GLib.path_is_absolute(path)) {
+-                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
++                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
+                     }
+ 
+                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-i686/popupmenu.patch (from rev 186357, gnome-shell/trunk/popupmenu.patch)
===================================================================
--- extra-i686/popupmenu.patch	                        (rev 0)
+++ extra-i686/popupmenu.patch	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,28 @@
+From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner at gnome.org>
+Date: Tue, 14 May 2013 16:55:08 +0000
+Subject: PopupMenuManager: Fix child menus
+
+Since commit c84dc6254d2d65c, popup menus are closed automatically
+when another menu opens (to catch the case where a menu is opened
+by keyboard shortcut, which wasn't handled before). However in the
+case of child menus, both child and parent are expected to be visible,
+so handle this case explicitly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=699678
+---
+diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
+index fc37dd8..ab6c795 100644
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({
+ 
+     _onMenuOpenState: function(menu, open) {
+         if (open) {
+-            if (this.activeMenu)
++            if (this.activeMenu && !this.activeMenu.isChildMenu(menu))
+                 this.activeMenu.close(BoxPointer.PopupAnimation.FADE);
+             this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor,
+                                     onUngrab: Lang.bind(this, this._closeMenu, menu) });
+--
+cgit v0.9.1

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-05-25 15:52:25 UTC (rev 186357)
+++ extra-x86_64/PKGBUILD	2013-05-25 15:54:34 UTC (rev 186358)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.8.2
-pkgrel=2
-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
-         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
-         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
-         telepathy-logger telepathy-mission-control unzip)
-makedepends=(intltool gtk-doc gnome-control-center)
-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::3}/$pkgname-$pkgver.tar.xz
-        nm-libexecdir.patch)
-sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.patch
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 186357, gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.8.2
+pkgrel=3
+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
+         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
+         telepathy-logger telepathy-mission-control unzip)
+makedepends=(intltool gtk-doc gnome-control-center)
+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::3}/$pkgname-$pkgver.tar.xz
+        nm-libexecdir.patch popupmenu.patch)
+sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d')
+
+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
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/gnome-shell.install
===================================================================
--- extra-x86_64/gnome-shell.install	2013-05-25 15:52:25 UTC (rev 186357)
+++ extra-x86_64/gnome-shell.install	2013-05-25 15:54:34 UTC (rev 186358)
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: gnome-shell/repos/extra-x86_64/gnome-shell.install (from rev 186357, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-x86_64/gnome-shell.install	                        (rev 0)
+++ extra-x86_64/gnome-shell.install	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,19 @@
+pkgname=gnome-shell
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: extra-x86_64/nm-libexecdir.patch
===================================================================
--- extra-x86_64/nm-libexecdir.patch	2013-05-25 15:52:25 UTC (rev 186357)
+++ extra-x86_64/nm-libexecdir.patch	2013-05-25 15:54:34 UTC (rev 186358)
@@ -1,12 +0,0 @@
-diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
---- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
-+++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
-@@ -686,7 +686,7 @@
-                     } catch(e) { } // ignore errors if key does not exist
-                     let path = binary;
-                     if (!GLib.path_is_absolute(path)) {
--                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
-+                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
-                     }
- 
-                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-x86_64/nm-libexecdir.patch (from rev 186357, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-x86_64/nm-libexecdir.patch	                        (rev 0)
+++ extra-x86_64/nm-libexecdir.patch	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,12 @@
+diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
+--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
+@@ -686,7 +686,7 @@
+                     } catch(e) { } // ignore errors if key does not exist
+                     let path = binary;
+                     if (!GLib.path_is_absolute(path)) {
+-                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
++                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
+                     }
+ 
+                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Copied: gnome-shell/repos/extra-x86_64/popupmenu.patch (from rev 186357, gnome-shell/trunk/popupmenu.patch)
===================================================================
--- extra-x86_64/popupmenu.patch	                        (rev 0)
+++ extra-x86_64/popupmenu.patch	2013-05-25 15:54:34 UTC (rev 186358)
@@ -0,0 +1,28 @@
+From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner at gnome.org>
+Date: Tue, 14 May 2013 16:55:08 +0000
+Subject: PopupMenuManager: Fix child menus
+
+Since commit c84dc6254d2d65c, popup menus are closed automatically
+when another menu opens (to catch the case where a menu is opened
+by keyboard shortcut, which wasn't handled before). However in the
+case of child menus, both child and parent are expected to be visible,
+so handle this case explicitly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=699678
+---
+diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
+index fc37dd8..ab6c795 100644
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({
+ 
+     _onMenuOpenState: function(menu, open) {
+         if (open) {
+-            if (this.activeMenu)
++            if (this.activeMenu && !this.activeMenu.isChildMenu(menu))
+                 this.activeMenu.close(BoxPointer.PopupAnimation.FADE);
+             this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor,
+                                     onUngrab: Lang.bind(this, this._closeMenu, menu) });
+--
+cgit v0.9.1



More information about the arch-commits mailing list