diff options
Diffstat (limited to 'extra/gnome-shell')
| -rw-r--r-- | extra/gnome-shell/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/gnome-shell/nm-libexecdir.patch | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 4c04ddf49..8ecc52e2e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178416 2013-02-21 17:18:12Z heftig $ +# $Id: PKGBUILD 179858 2013-03-10 16:33:19Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.6.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64) url="http://live.gnome.org/GnomeShell" @@ -18,9 +18,10 @@ 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) + main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch nm-libexecdir.patch) sha256sums=('4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603' - '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125') + '968245e7db1c6921627cf0fbce4e4504cffbdb24898f834769a23a254ed6e125' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') build() { cd $pkgname-$pkgver @@ -28,6 +29,9 @@ build() { # 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 + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ diff --git a/extra/gnome-shell/nm-libexecdir.patch b/extra/gnome-shell/nm-libexecdir.patch new file mode 100644 index 000000000..5360abdc7 --- /dev/null +++ b/extra/gnome-shell/nm-libexecdir.patch @@ -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)) |