diff options
| author | root <root@rshg054.dnsready.net> | 2013-06-09 00:51:01 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-06-09 00:51:01 -0700 |
| commit | 7b378b1b5b346bd49a5ab1652214fb34d03de3a9 (patch) | |
| tree | 9ec661d7828b93bd4d24723647adc0701d87eda2 /extra/gnome-shell | |
| parent | e90166c70f3a2bd27d8c914491f7e0510855fd3f (diff) | |
Sun Jun 9 00:50:45 PDT 2013
Diffstat (limited to 'extra/gnome-shell')
| -rw-r--r-- | extra/gnome-shell/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/gnome-shell/popupmenu.patch | 28 |
2 files changed, 6 insertions, 38 deletions
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 49bc85f1a..55c76ce08 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $ +# $Id: PKGBUILD 187902 2013-06-07 22:40:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.2 -pkgrel=4 +pkgver=3.8.3 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64) url="http://live.gnome.org/GnomeShell" @@ -19,19 +19,15 @@ 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') + nm-libexecdir.patch) +sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') 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() { diff --git a/extra/gnome-shell/popupmenu.patch b/extra/gnome-shell/popupmenu.patch deleted file mode 100644 index 035432cd5..000000000 --- a/extra/gnome-shell/popupmenu.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001 -From: Florian Müllner <fmuellner@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 |