[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2018-09-10 Thread Gilles Dartiguelongue 
commit: b6628fdbdc50807a2519be06bf0e32ffeb05e9a1
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Mon Sep 10 11:22:57 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Mon Sep 10 14:01:30 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b6628fdb

gnome-base/gnome-shell: make bluetooth support optional again

Package-Manager: Portage-2.3.49, Repoman-2.3.10
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 .../gnome-shell/files/3.26-bluetooth-flag.patch| 72 ++
 ...26.2-r1.ebuild => gnome-shell-3.26.2-r2.ebuild} | 11 ++--
 2 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch 
b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
new file mode 100644
index ..65686954
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
@@ -0,0 +1,72 @@
+From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Mon, 10 Sep 2018 13:17:39 +0200
+Subject: [PATCH] Make bluetooth support optional
+
+https://bugs.gentoo.org/show_bug.cgi?id=398145
+---
+ js/misc/meson.build |  2 +-
+ meson.build | 15 ++-
+ meson_options.txt   |  7 +++
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/meson.build b/js/misc/meson.build
+index 20489496c..3071f9dfb 100644
+--- a/js/misc/meson.build
 b/js/misc/meson.build
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
+ jsconf.set('PACKAGE_VERSION', meson.project_version())
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name())
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
+ jsconf.set('datadir', datadir)
+ jsconf.set('libexecdir', libexecdir)
+diff --git a/meson.build b/meson.build
+index b82c41398..7d342ff61 100644
+--- a/meson.build
 b/meson.build
+@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', 
version: startup_req)
+ x11_dep = dependency('x11')
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
+ 
+-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
++bt_dep = []
++enable_bluetooth = get_option('enable-networkmanager')
++if enable_bluetooth != 'no'
++  want_bluetooth = enable_bluetooth == 'yes'
++  bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: 
want_bluetooth)
++  have_bluetooth = bt_dep.found()
++
++  if not have_bluetooth
++bt_dep = []
++  endif
++else
++  have_bluetooth = false
++endif
++
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false)
+ 
+diff --git a/meson_options.txt b/meson_options.txt
+index 18899ffdb..9191f8c0e 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -16,6 +16,13 @@ option('enable-man',
+   description: 'Generate man pages'
+ )
+ 
++option('enable-bluetooth',
++  type: 'combo',
++  choices: ['yes', 'no', 'auto'],
++  value: 'auto',
++  description: 'Enable bluetooth support'
++)
++
+ option('enable-networkmanager',
+   type: 'combo',
+   choices: ['yes', 'no', 'auto'],
+-- 
+2.18.0
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
similarity index 97%
rename from gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
index 3346d08b..84ff9806 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
@@ -6,7 +6,7 @@ GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit gnome-meson multilib pax-utils python-r1 systemd
+inherit gnome-meson multilib pax-utils python-r1 systemd virtualx
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell;
@@ -21,8 +21,6 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
 #  * gstreamer support is currently automagic
-#  * gnome-bluetooth is automagic
-#  * BROWSER_PLUGIN_DIR is not set
 COMMON_DEPEND="
>=app-accessibility/at-spi2-atk-2.5.3
>=dev-libs/atk-2[introspection]
@@ -121,6 +119,7 @@ PATCHES=(
# Change favorites defaults, bug #479918
"${FILESDIR}"/${PN}-3.22.0-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
+   "${FILESDIR}"/3.26-bluetooth-flag.patch
 )
 
 src_configure() {
@@ -129,7 +128,11 @@ src_configure() {
-Denable-documentation=false \
-Denable-systemd=$(usex !openrc-force yes no) \
-Denable-networkmanager=$(usex networkmanager yes no) \
-   $(meson_use nsplugin enable-browser-plugin) 
+

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2018-02-03 Thread Sobhan Mohammadpour 
commit: 2666153bdd627858efa635a27bd7cf06f47f8b69
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Sat Feb  3 20:32:45 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Sat Feb  3 20:32:45 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2666153b

gnome-base/gnome-shell: version bump to 3.26.1

Package-Manager: Portage-2.3.23, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../files/gnome-shell-3.22.0-defaults.patch|  26 +++
 gnome-base/gnome-shell/gnome-shell-3.26.1.ebuild   | 191 +
 gnome-base/gnome-shell/metadata.xml|   4 +
 3 files changed, 221 insertions(+)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
new file mode 100644
index ..b80dbc3a
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
@@ -0,0 +1,26 @@
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/2] Alter list of default applications
+
+Signed-off-by: Gilles Dartiguelongue 
+---
+ data/org.gnome.shell.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in 
b/data/org.gnome.shell.gschema.xml.in
+index c1e6b21..368c654 100644
+--- a/data/org.gnome.shell.gschema.xml.in
 b/data/org.gnome.shell.gschema.xml.in
+@@ -31,7 +31,7 @@
+   
+ 
+ 
+-  [ 'epiphany.desktop', 'evolution.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 
'org.gnome.Software.desktop' ]
++  [ 'chromium-browser-chromium.desktop', 'firefox.desktop', 
'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 
'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' 
]
+   List of desktop file IDs for favorite applications
+   
+ The applications corresponding to these identifiers
+-- 
+2.10.1
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.1.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.26.1.ebuild
new file mode 100644
index ..34c076ae
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit gnome-meson multilib pax-utils python-r1 systemd
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell;
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin 
-openrc-force"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers
+# FIXME:
+#  * gstreamer support is currently automagic
+#  * gnome-bluetooth is automagic
+#  * BROWSER_PLUGIN_DIR is not set
+COMMON_DEPEND="
+   >=app-accessibility/at-spi2-atk-2.5.3
+   >=dev-libs/atk-2[introspection]
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.53:2[dbus]
+   >=dev-libs/gjs-1.47.0
+   >=dev-libs/gobject-introspection-1.49.1:=
+   dev-libs/libical:=
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=dev-libs/libcroco-0.6.8:0.6
+   >=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.21.3
+   >=gnome-extra/evolution-data-server-3.17.2:=
+   >=media-libs/gstreamer-0.11.92:1.0
+   >=net-im/telepathy-logger-0.2.4[introspection]
+   >=net-libs/telepathy-glib-0.19[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=x11-libs/libXfixes-5.0
+   x11-libs/libXtst
+   >=x11-wm/mutter-3.26.0:0/0[introspection]
+   >=x11-libs/startup-notification-0.11
+
+   ${PYTHON_DEPS}
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+   dev-libs/dbus-glib
+   dev-libs/libxml2:2
+   media-libs/libcanberra[gtk3]
+   media-libs/mesa
+   >=media-sound/pulseaudio-2
+   >=net-libs/libsoup-2.40:2.4[introspection]
+   x11-libs/libX11
+   x11-libs/gdk-pixbuf:2[introspection]
+
+   x11-apps/mesa-progs
+
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   networkmanager? (
+   >=app-crypt/libsecret-0.18
+   >=gnome-extra/nm-applet-0.9.8
+   >=net-misc/networkmanager-0.9.8:=[introspection] )
+   nsplugin? ( >=dev-libs/json-glib-0.13.2 )
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session is needed for gnome-session-quit
+# 3.

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2014-12-21 Thread Gilles Dartiguelongue 
commit: 3e30c7a3b814475de587d6c4d5e24f5adb4ec8e2
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Dec 21 11:00:18 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Dec 21 11:00:18 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3e30c7a3

gnome-base/gnome-shell: 3.14.2 → 3.14.3

---
 ...around-quoting-issues-in-configure-script.patch | 33 --
 ...ell-3.14.2.ebuild = gnome-shell-3.14.3.ebuild} |  5 +---
 gnome-base/gnome-shell/gnome-shell-.ebuild |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
 
b/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
deleted file mode 100644
index 9f5f457..000
--- 
a/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b05ab0eaebd9e6e58f1b9c092e05323c5b901a2b Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy alexan...@tsoy.me
-Date: Mon, 27 Oct 2014 16:45:10 +0300
-Subject: [PATCH] build: Workaround quoting issues in configure script
-
-Default value of BROWSER_PLUGIN_DIR variable contains special symbols.
-Thus quoting and inlining it in parameter expansion is not portable.
-In particular it does not work in dash. Replace ${a:-b} parameter
-expansion with conditional statement.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=739241

- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d55848b..5b8c306 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -232,7 +232,9 @@ esac
- AM_CFLAGS=$AM_CFLAGS $WARN_CFLAGS
- AC_SUBST(AM_CFLAGS)
- 
--BROWSER_PLUGIN_DIR=${BROWSER_PLUGIN_DIR:-\${libdir}/mozilla/plugins}
-+if test -z ${BROWSER_PLUGIN_DIR}; then
-+  BROWSER_PLUGIN_DIR=\${libdir}/mozilla/plugins
-+fi
- AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
- 
- AC_CONFIG_FILES([
--- 
-2.1.3
-

diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
similarity index 97%
rename from gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
index d11763a..b740e0d 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND=
=sys-auth/polkit-0.100[introspection]
=x11-libs/libXfixes-5.0
x11-libs/libXtst
-   =x11-wm/mutter-3.14.2[introspection]
+   =x11-wm/mutter-3.14.3[introspection]
=x11-libs/startup-notification-0.11
 
${PYTHON_DEPS}
@@ -128,9 +128,6 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=726435
epatch ${FILESDIR}/${PN}-3.14.0-bluetooth-gold.patch
 
-   # Fix build with non-bash /bin/sh, see bug #526408
-   epatch 
${FILESDIR}/${PN}-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
-
epatch_user
 
eautoreconf

diff --git a/gnome-base/gnome-shell/gnome-shell-.ebuild 
b/gnome-base/gnome-shell/gnome-shell-.ebuild
index 7624368..ad3903f 100644
--- a/gnome-base/gnome-shell/gnome-shell-.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND=
=sys-auth/polkit-0.100[introspection]
=x11-libs/libXfixes-5.0
x11-libs/libXtst
-   =x11-wm/mutter-3.14.2[introspection]
+   =x11-wm/mutter-3.14.3[introspection]
=x11-libs/startup-notification-0.11
 
${PYTHON_DEPS}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2014-11-29 Thread Remi Cardona 
commit: 36eba783b56e30c212cdb9585fcc7dade98c5e77
Author: Rémi Cardona remi AT gentoo DOT org
AuthorDate: Sat Nov 29 16:47:22 2014 +
Commit: Remi Cardona remi AT gentoo DOT org
CommitDate: Sat Nov 29 16:48:38 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=36eba783

gnome-base/gnome-shell: Fix build with non-bash /bin/sh

Patch comes from upstream git, so - doesn't need it.

---
 ...around-quoting-issues-in-configure-script.patch | 33 ++
 gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild   |  3 ++
 2 files changed, 36 insertions(+)

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
 
b/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
new file mode 100644
index 000..9f5f457
--- /dev/null
+++ 
b/gnome-base/gnome-shell/files/gnome-shell-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
@@ -0,0 +1,33 @@
+From b05ab0eaebd9e6e58f1b9c092e05323c5b901a2b Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy alexan...@tsoy.me
+Date: Mon, 27 Oct 2014 16:45:10 +0300
+Subject: [PATCH] build: Workaround quoting issues in configure script
+
+Default value of BROWSER_PLUGIN_DIR variable contains special symbols.
+Thus quoting and inlining it in parameter expansion is not portable.
+In particular it does not work in dash. Replace ${a:-b} parameter
+expansion with conditional statement.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739241
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d55848b..5b8c306 100644
+--- a/configure.ac
 b/configure.ac
+@@ -232,7 +232,9 @@ esac
+ AM_CFLAGS=$AM_CFLAGS $WARN_CFLAGS
+ AC_SUBST(AM_CFLAGS)
+ 
+-BROWSER_PLUGIN_DIR=${BROWSER_PLUGIN_DIR:-\${libdir}/mozilla/plugins}
++if test -z ${BROWSER_PLUGIN_DIR}; then
++  BROWSER_PLUGIN_DIR=\${libdir}/mozilla/plugins
++fi
+ AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
+ 
+ AC_CONFIG_FILES([
+-- 
+2.1.3
+

diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild
index 7db3234..d11763a 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.14.2.ebuild
@@ -128,6 +128,9 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=726435
epatch ${FILESDIR}/${PN}-3.14.0-bluetooth-gold.patch
 
+   # Fix build with non-bash /bin/sh, see bug #526408
+   epatch 
${FILESDIR}/${PN}-3.14.2-build-Workaround-quoting-issues-in-configure-script.patch
+
epatch_user
 
eautoreconf

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

2014-04-15 Thread Gilles Dartiguelongue 
commit: be235b8f86137da0a471b6736744e47047a6b8d5
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sat Apr 12 21:48:30 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue Apr 15 22:00:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=be235b8f

gnome-base/gnome-shell: 3.10.4-r2 → 3.12.0

---
 .../gnome-shell-3.10-networkmanager-flag.patch | 228 -
 .../files/gnome-shell-3.10.4-bluetooth-gold.patch  |  31 +++
 ...patch = gnome-shell-3.12-bluetooth-flag.patch} |  32 +--
 ...l-3.10.2.1.ebuild = gnome-shell-3.12.0.ebuild} |  35 ++--
 gnome-base/gnome-shell/gnome-shell-.ebuild |  31 +--
 5 files changed, 83 insertions(+), 274 deletions(-)

diff --git 
a/gnome-base/gnome-shell/files/gnome-shell-3.10-networkmanager-flag.patch 
b/gnome-base/gnome-shell/files/gnome-shell-3.10-networkmanager-flag.patch
deleted file mode 100644
index 4e28835..000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10-networkmanager-flag.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 2ca59eb6e8ca9ba76757ede04e734c743aa21769 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue e...@gentoo.org
-Date: Tue, 10 Dec 2013 23:37:08 +0100
-Subject: [PATCH 3/3] Make networkmanager support optional
-
-  * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
-  * take care to not import ui.status.network if nm is disabled;
-  * do not try to reassign to const variables;
-  * no point really in fiddling with the list of installed js
-  * files;
-  * don't build shell-mobile-providers if nm is disabled;
-  * use networkmanager instead of network_manager because THE
-BIKESHED SHOULD BE BLUE, also because the upstream package name is
-NetworkManager, not Network_Manager.

- configure.ac | 46 --
- js/Makefile.am   |  1 +
- js/misc/config.js.in |  2 ++
- js/ui/panel.js   | 15 ---
- js/ui/sessionMode.js |  7 ++-
- src/Makefile.am  | 12 +---
- 6 files changed, 74 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e749ca6..5044302 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -91,8 +91,6 @@ SHARED_PCS=gio-unix-2.0 = $GIO_MIN_VERSION
- libcanberra libcanberra-gtk3
- telepathy-glib = $TELEPATHY_GLIB_MIN_VERSION
- polkit-agent-1 = $POLKIT_MIN_VERSION
--libnm-glib libnm-util = $NETWORKMANAGER_MIN_VERSION
--libnm-gtk = $NETWORKMANAGER_MIN_VERSION
- libsecret-unstable gcr-base-3 = $GCR_MIN_VERSION
- 
- PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
-@@ -169,6 +167,38 @@ if test $langinfo_ok = yes; then
- [Define if _NL_TIME_FIRST_WEEKDAY is available])
- fi
- 
-+AC_ARG_ENABLE(networkmanager,
-+ AS_HELP_STRING([--disable-networkmanager],
-+[disable NetworkManager support  
@:@default=auto@:@]),,
-+  [enable_networkmanager=auto])
-+
-+if test x$enable_networkmanager != xno; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER,
-+ [libnm-glib
-+  libnm-util = $NETWORKMANAGER_MIN_VERSION
-+  libnm-gtk = $NETWORKMANAGER_MIN_VERSION
-+  gnome-keyring-1],
-+ [have_networkmanager=yes],
-+ [have_networkmanager=no])
-+
-+   GNOME_SHELL_CFLAGS=$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS
-+   GNOME_SHELL_LIBS=$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS
-+else
-+   have_networkmanager=no  (disabled)
-+fi
-+
-+if test x$have_networkmanager = xyes; then
-+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-+else
-+   if test x$enable_networkmanager = xyes; then
-+  AC_MSG_ERROR([Couldn't find NetworkManager.])
-+   fi
-+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-+fi
-+
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test $have_networkmanager = yes)
-+
- # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
- AM_PATH_GLIB_2_0()
- 
-@@ -210,3 +240,15 @@ AC_CONFIG_FILES([
-   man/Makefile
- ])
- AC_OUTPUT
-+
-+echo 
-+Build configuration:
-+
-+   Prefix: ${prefix}
-+   Source code location:   ${srcdir}
-+   Compiler:   ${CC}
-+   Compiler Warnings:  $enable_compile_warnings
-+
-+   Support for NetworkManager: $have_networkmanager
-+   Support for GStreamer recording:$build_recorder
-+
-diff --git a/js/Makefile.am b/js/Makefile.am
-index d614f4f..88a3887 100644
 a/js/Makefile.am
-+++ b/js/Makefile.am
-@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
-   sed -e s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g \
-   -e s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g \
-   -e s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g \
-+  -e s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g \