[arch-commits] Commit in gnome-shell/trunk (PKGBUILD nm-libexecdir.patch)
Jan Steffens
heftig at nymeria.archlinux.org
Sun Mar 10 16:31:55 UTC 2013
Date: Sunday, March 10, 2013 @ 17:31:55
Author: heftig
Revision: 179857
workaround libexecdir problems FS#30747 FS#32730
Added:
gnome-shell/trunk/nm-libexecdir.patch
Modified:
gnome-shell/trunk/PKGBUILD
---------------------+
PKGBUILD | 10 +++++++---
nm-libexecdir.patch | 12 ++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-10 16:22:07 UTC (rev 179856)
+++ PKGBUILD 2013-03-10 16:31:55 UTC (rev 179857)
@@ -4,7 +4,7 @@
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 @@
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 @@
# 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 \
Added: nm-libexecdir.patch
===================================================================
--- nm-libexecdir.patch (rev 0)
+++ nm-libexecdir.patch 2013-03-10 16:31:55 UTC (rev 179857)
@@ -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))
More information about the arch-commits
mailing list