diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-26 02:20:27 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-26 02:20:27 -0700 |
| commit | 99ee54f2484aadc464e997e54aa9c7ca7ecde198 (patch) | |
| tree | 44f52f702b3d499e99fe7fe6314d9897de17efb4 /extra/gnome-shell | |
| parent | 2333a0e547f378ad697f35312d6ba6d3fbafb2c8 (diff) | |
Sun May 26 02:19:21 PDT 2013
Diffstat (limited to 'extra/gnome-shell')
| -rw-r--r-- | extra/gnome-shell/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/gnome-shell/popupmenu.patch | 28 |
2 files changed, 40 insertions, 5 deletions
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 728b91ccd..94c7894e3 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185543 2013-05-14 21:40:21Z andrea $ +# $Id: PKGBUILD 186358 2013-05-25 15:54:34Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64) url="http://live.gnome.org/GnomeShell" @@ -19,16 +19,23 @@ 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) + nm-libexecdir.patch popupmenu.patch) sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' + '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d') -build() { +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 \ diff --git a/extra/gnome-shell/popupmenu.patch b/extra/gnome-shell/popupmenu.patch new file mode 100644 index 000000000..035432cd5 --- /dev/null +++ b/extra/gnome-shell/popupmenu.patch @@ -0,0 +1,28 @@ +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 |