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

Jan Steffens heftig at nymeria.archlinux.org
Thu Jun 27 04:03:27 UTC 2013


    Date: Thursday, June 27, 2013 @ 06:03:27
  Author: heftig
Revision: 188954

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

Added:
  gnome-shell/repos/extra-i686/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch
    (from rev 188953, gnome-shell/trunk/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch)
  gnome-shell/repos/extra-i686/PKGBUILD
    (from rev 188953, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-i686/gnome-shell.install
    (from rev 188953, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-i686/nm-libexecdir.patch
    (from rev 188953, gnome-shell/trunk/nm-libexecdir.patch)
  gnome-shell/repos/extra-x86_64/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch
    (from rev 188953, gnome-shell/trunk/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch)
  gnome-shell/repos/extra-x86_64/PKGBUILD
    (from rev 188953, gnome-shell/trunk/PKGBUILD)
  gnome-shell/repos/extra-x86_64/gnome-shell.install
    (from rev 188953, gnome-shell/trunk/gnome-shell.install)
  gnome-shell/repos/extra-x86_64/nm-libexecdir.patch
    (from rev 188953, gnome-shell/trunk/nm-libexecdir.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                                                                    |  108 ++++++++++
 /gnome-shell.install                                                         |   38 +++
 /nm-libexecdir.patch                                                         |   24 ++
 extra-i686/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch   |   37 +++
 extra-i686/PKGBUILD                                                          |   49 ----
 extra-i686/gnome-shell.install                                               |   19 -
 extra-i686/nm-libexecdir.patch                                               |   12 -
 extra-x86_64/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch |   37 +++
 extra-x86_64/PKGBUILD                                                        |   49 ----
 extra-x86_64/gnome-shell.install                                             |   19 -
 extra-x86_64/nm-libexecdir.patch                                             |   12 -
 11 files changed, 244 insertions(+), 160 deletions(-)

Copied: gnome-shell/repos/extra-i686/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch (from rev 188953, gnome-shell/trunk/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch)
===================================================================
--- extra-i686/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch	                        (rev 0)
+++ extra-i686/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch	2013-06-27 04:03:27 UTC (rev 188954)
@@ -0,0 +1,37 @@
+From ace549c1bf1861b4cbaec6f2451a6341aa738bae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Mon, 24 Jun 2013 18:09:04 +0200
+Subject: [PATCH] st: Be more forgiving when calling get_theme_node() on
+ unstaged widgets
+
+While it is obviously still an error to call get_theme_node() on a
+widget that hasn't been added to the stage hierarchy yet, asserting
+on it hasn't proven too successful in avoiding those errors - it's
+likely the most frequent reason for crash reports. Just accept that
+there'll always be code paths where we can hit this case and make
+it non-fatal.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=610279
+---
+ src/st/st-widget.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/st/st-widget.c b/src/st/st-widget.c
+index 42992ec..4875acc 100644
+--- a/src/st/st-widget.c
++++ b/src/st/st-widget.c
+@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget)
+ 
+       if (stage == NULL)
+         {
+-          g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.",
+-                    st_describe_actor (CLUTTER_ACTOR (widget)));
++          g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.",
++                      st_describe_actor (CLUTTER_ACTOR (widget)));
++          return g_object_new (ST_TYPE_THEME_NODE, NULL);
+         }
+ 
+       if (parent_node == NULL)
+-- 
+1.8.3.1
+

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-06-27 04:01:21 UTC (rev 188953)
+++ extra-i686/PKGBUILD	2013-06-27 04:03:27 UTC (rev 188954)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.8.3
-pkgrel=1
-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=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.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
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-shell/repos/extra-i686/PKGBUILD (from rev 188953, gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-06-27 04:03:27 UTC (rev 188954)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.8.3
+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
+        0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch)
+sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            'c5f0c9b071d5c31e11289c45743e1f82f6bba8201a28e0efb7a197f57cbb2105')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # FS#30747 FS#32730 Problems due to libexecdir different from NM
+  patch -Np1 -i ../nm-libexecdir.patch
+
+  # FS#35174 Nautilus crashes GS
+  patch -Np1 -i ../0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.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
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-i686/gnome-shell.install
===================================================================
--- extra-i686/gnome-shell.install	2013-06-27 04:01:21 UTC (rev 188953)
+++ extra-i686/gnome-shell.install	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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 188953, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-i686/gnome-shell.install	                        (rev 0)
+++ extra-i686/gnome-shell.install	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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-06-27 04:01:21 UTC (rev 188953)
+++ extra-i686/nm-libexecdir.patch	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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 188953, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-i686/nm-libexecdir.patch	                        (rev 0)
+++ extra-i686/nm-libexecdir.patch	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch (from rev 188953, gnome-shell/trunk/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch)
===================================================================
--- extra-x86_64/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch	                        (rev 0)
+++ extra-x86_64/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch	2013-06-27 04:03:27 UTC (rev 188954)
@@ -0,0 +1,37 @@
+From ace549c1bf1861b4cbaec6f2451a6341aa738bae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Mon, 24 Jun 2013 18:09:04 +0200
+Subject: [PATCH] st: Be more forgiving when calling get_theme_node() on
+ unstaged widgets
+
+While it is obviously still an error to call get_theme_node() on a
+widget that hasn't been added to the stage hierarchy yet, asserting
+on it hasn't proven too successful in avoiding those errors - it's
+likely the most frequent reason for crash reports. Just accept that
+there'll always be code paths where we can hit this case and make
+it non-fatal.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=610279
+---
+ src/st/st-widget.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/st/st-widget.c b/src/st/st-widget.c
+index 42992ec..4875acc 100644
+--- a/src/st/st-widget.c
++++ b/src/st/st-widget.c
+@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget)
+ 
+       if (stage == NULL)
+         {
+-          g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.",
+-                    st_describe_actor (CLUTTER_ACTOR (widget)));
++          g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.",
++                      st_describe_actor (CLUTTER_ACTOR (widget)));
++          return g_object_new (ST_TYPE_THEME_NODE, NULL);
+         }
+ 
+       if (parent_node == NULL)
+-- 
+1.8.3.1
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-06-27 04:01:21 UTC (rev 188953)
+++ extra-x86_64/PKGBUILD	2013-06-27 04:03:27 UTC (rev 188954)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Flamelab <panosfilip at gmail.com
-
-pkgname=gnome-shell
-pkgver=3.8.3
-pkgrel=1
-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=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # FS#30747 FS#32730 Problems due to libexecdir different from NM
-  patch -Np1 -i ../nm-libexecdir.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
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-shell/repos/extra-x86_64/PKGBUILD (from rev 188953, gnome-shell/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-06-27 04:03:27 UTC (rev 188954)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Flamelab <panosfilip at gmail.com
+
+pkgname=gnome-shell
+pkgver=3.8.3
+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
+        0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch)
+sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            'c5f0c9b071d5c31e11289c45743e1f82f6bba8201a28e0efb7a197f57cbb2105')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # FS#30747 FS#32730 Problems due to libexecdir different from NM
+  patch -Np1 -i ../nm-libexecdir.patch
+
+  # FS#35174 Nautilus crashes GS
+  patch -Np1 -i ../0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.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
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/gnome-shell.install
===================================================================
--- extra-x86_64/gnome-shell.install	2013-06-27 04:01:21 UTC (rev 188953)
+++ extra-x86_64/gnome-shell.install	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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 188953, gnome-shell/trunk/gnome-shell.install)
===================================================================
--- extra-x86_64/gnome-shell.install	                        (rev 0)
+++ extra-x86_64/gnome-shell.install	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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-06-27 04:01:21 UTC (rev 188953)
+++ extra-x86_64/nm-libexecdir.patch	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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 188953, gnome-shell/trunk/nm-libexecdir.patch)
===================================================================
--- extra-x86_64/nm-libexecdir.patch	                        (rev 0)
+++ extra-x86_64/nm-libexecdir.patch	2013-06-27 04:03:27 UTC (rev 188954)
@@ -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