File gnome-shell-nmlibexecdir.patch of Package gnome-shell

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-shell-nmlibexecdir.patch of Package gnome-shell (Revision e1f658611ab3a12f482ba7f5aac29b4f)

Currently displaying revision e1f658611ab3a12f482ba7f5aac29b4f , Show latest

commit 75d67086a651a4c46a66c563c8e9618c3a4b2fe2
Author: Dominique Leuenberger <dimstar@opensuse.org>
Date:   Mon Feb 11 14:00:52 2013 +0100

networkAgent: Allow NetworkManager to use a different libexecdir path
    
    Introducing a --with-nmlibexecdir parameter to configure allows
    distributions to split libexecdir for various packages.
    
    Not specifying it results in no change in behaviour.

Index: gnome-shell-3.6.3/configure.ac
===================================================================
--- gnome-shell-3.6.3.orig/configure.ac
+++ gnome-shell-3.6.3/configure.ac
@@ -256,6 +256,13 @@ AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIP
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
 
+AC_ARG_WITH(nmlibexecdir,
+	    AS_HELP_STRING([--with-nmlibexecdir=DIR],
+			   [Specify the location where NetworkManager installs its helpers [default=$(libexecdir)]]),
+            [nmlibexecdir="$withval"],
+	    [nmlibexecdir="$libexecdir"])
+AC_SUBST(nmlibexecdir)
+
 AC_CONFIG_FILES([
   Makefile
   data/Makefile
Index: gnome-shell-3.6.3/js/Makefile.am
===================================================================
--- gnome-shell-3.6.3.orig/js/Makefile.am
+++ gnome-shell-3.6.3/js/Makefile.am
@@ -12,6 +12,7 @@ misc/config.js: misc/config.js.in Makefi
 	    -e "s|[@]datadir@|$(datadir)|g" \
 	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
 	    -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
+	    -e "s|[@]nmlibexecdir@|$(nmlibexecdir)|g" \
                $< > $@
 
 jsdir = $(pkgdatadir)/js
Index: gnome-shell-3.6.3/js/misc/config.js.in
===================================================================
--- gnome-shell-3.6.3.orig/js/misc/config.js.in
+++ gnome-shell-3.6.3/js/misc/config.js.in
@@ -13,3 +13,6 @@ const LOCALEDIR = '@datadir@/locale';
 /* other standard directories */
 const LIBEXECDIR = '@libexecdir@';
 const SYSCONFDIR = '@sysconfdir@';
+
+/* Some distros use different libexecdir for NM than for gnome-shell */
+const NMLIBEXECDIR = '@nmlibexecdir@';
Index: gnome-shell-3.6.3/js/ui/components/networkAgent.js
===================================================================
--- gnome-shell-3.6.3.orig/js/ui/components/networkAgent.js
+++ gnome-shell-3.6.3/js/ui/components/networkAgent.js
@@ -686,7 +686,7 @@ const NetworkAgent = new Lang.Class({
                     } 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([Config.NMLIBEXECDIR, path]);
                     }
 
                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

Places

File gnome-shell-nmlibexecdir.patch of Package gnome-shell (Revision e1f658611ab3a12f482ba7f5aac29b4f)

Places