r39698 - in /desktop/experimental/gnome-shell/debian: changelog patches/10-make-NetworkManager-optional.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Oct 6 09:38:10 UTC 2013
Author: pochu
Date: Sun Oct 6 09:38:09 2013
New Revision: 39698
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39698
Log:
* debian/patches/10-make-NetworkManager-optional.patch:
+ Updated from gentoo package for the new version, apply the patch
again to fix the build on !linux. Closes: #692049.
Modified:
desktop/experimental/gnome-shell/debian/changelog
desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
desktop/experimental/gnome-shell/debian/patches/series
Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=39698&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Sun Oct 6 09:38:09 2013
@@ -1,3 +1,11 @@
+gnome-shell (3.8.4-2) UNRELEASED; urgency=low
+
+ * debian/patches/10-make-NetworkManager-optional.patch:
+ + Updated from gentoo package for the new version, apply the patch
+ again to fix the build on !linux. Closes: #692049.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 06 Oct 2013 10:47:03 +0200
+
gnome-shell (3.8.4-1) experimental; urgency=low
[ Emilio Pozuelo Monfort ]
Modified: desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch?rev=39698&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] Sun Oct 6 09:38:09 2013
@@ -1,9 +1,5 @@
-From 411d751935c9bdc485b113678284edf0cc9e545e Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl at debian.org>
-Date: Thu, 22 Dec 2011 22:04:12 +0100
-Subject: [PATCH] Make NM optional
+From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/
-[ Alexandre Rostovtsev <tetromino at gentoo.org> :
* 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;
@@ -11,40 +7,150 @@
* 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 | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
- js/Makefile.am | 1 +
- js/misc/config.js.in | 2 ++
- js/ui/main.js | 8 ++++++--
- js/ui/panel.js | 3 ++-
- src/Makefile.am | 17 ++++++++++++-----
- 6 files changed, 69 insertions(+), 9 deletions(-)
-
-Index: gnome-shell-3.4.1/configure.ac
-===================================================================
---- gnome-shell-3.4.1.orig/configure.ac 2012-05-19 09:44:06.875666393 +0200
-+++ gnome-shell-3.4.1/configure.ac 2012-05-19 09:44:18.047666283 +0200
-@@ -94,9 +94,42 @@
+ NetworkManager, not Network_Manager.
+--- a/js/Makefile.am
++++ b/js/Makefile.am
+@@ -8,6 +8,7 @@
+ 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" \
+ -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
+ -e "s|[@]datadir@|$(datadir)|g" \
+ -e "s|[@]libexecdir@|$(libexecdir)|g" \
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -6,6 +6,8 @@
+ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ /* 1 if gnome-bluetooth is available, 0 otherwise */
+ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
++/* 1 if networkmanager is available, 0 otherwise */
++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+ /* gettext package */
+ const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
+ /* locale dir */
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
+@@ -933,11 +933,13 @@
+ PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
+ imports.ui.status.bluetooth.Indicator;
+
+-try {
+- PANEL_ITEM_IMPLEMENTATIONS['network'] =
+- imports.ui.status.network.NMApplet;
+-} catch(e) {
+- log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
++if (Config.HAVE_NETWORKMANAGER) {
++ try {
++ PANEL_ITEM_IMPLEMENTATIONS['network'] =
++ imports.ui.status.network.NMApplet;
++ } catch(e) {
++ log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
++ }
+ }
+
+ const Panel = new Lang.Class({
+--- a/js/ui/sessionMode.js
++++ b/js/ui/sessionMode.js
+@@ -10,6 +10,8 @@
+ const Main = imports.ui.main;
+ const Params = imports.misc.params;
+
++const Config = imports.misc.config;
++
+ const DEFAULT_MODE = 'restrictive';
+
+ const _modes = {
+@@ -102,7 +104,10 @@
+ isLocked: false,
+ isPrimary: true,
+ unlockDialog: imports.ui.unlockDialog.UnlockDialog,
+- components: ['networkAgent', 'polkitAgent', 'telepathyClient',
++ components: Config.HAVE_NETWORKMANAGER ?
++ ['networkAgent', 'polkitAgent', 'telepathyClient',
++ 'keyring', 'recorder', 'autorunManager', 'automountManager'] :
++ ['polkitAgent', 'telepathyClient',
+ 'keyring', 'recorder', 'autorunManager', 'automountManager'],
+ panel: {
+ left: ['activities', 'appMenu'],
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -116,7 +116,6 @@
+ shell-invert-lightness-effect.h \
+ shell-keybinding-modes.h \
+ shell-mount-operation.h \
+- shell-network-agent.h \
+ shell-perf-log.h \
+ shell-screenshot.h \
+ shell-slicer.h \
+@@ -129,6 +128,10 @@
+ shell-wm.h \
+ shell-xfixes-cursor.h
+
++if HAVE_NETWORKMANAGER
++shell_public_headers_h += shell-network-agent.h
++endif
++
+ shell_private_sources = \
+ gactionmuxer.h \
+ gactionmuxer.c \
+@@ -159,7 +162,6 @@
+ shell-keyring-prompt.h \
+ shell-keyring-prompt.c \
+ shell-mount-operation.c \
+- shell-network-agent.c \
+ shell-perf-log.c \
+ shell-polkit-authentication-agent.h \
+ shell-polkit-authentication-agent.c \
+@@ -177,6 +179,10 @@
+ shell-xfixes-cursor.c \
+ $(NULL)
+
++if HAVE_NETWORKMANAGER
++libgnome_shell_la_SOURCES += shell-network-agent.c
++endif
++
+ libgnome_shell_la_gir_sources = \
+ $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
+
+@@ -287,7 +293,10 @@
+ libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
+
+ Shell-0.1.gir: libgnome-shell.la St-1.0.gir
+-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0
++if HAVE_NETWORKMANAGER
++Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
++endif
+ Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
+ Shell_0_1_gir_LIBS = libgnome-shell.la
+ Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
+--- a/configure.ac
++++ b/configure.ac
+@@ -94,8 +94,6 @@
+ libcanberra libcanberra-gtk3
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
- telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
-- libnm-glib libnm-util gnome-keyring-1
-+ gnome-keyring-1
- gcr-3 >= $GCR_MIN_VERSION)
+- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
+- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
+ libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION)
-+##########################
-+# Check for NetworkManager
-+##########################
-+NM_MIN_VERSION=0.9
+ PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
+@@ -154,6 +152,38 @@
+ [Define if _NL_TIME_FIRST_WEEKDAY is available])
+ fi
+
+AC_ARG_ENABLE(networkmanager,
-+ AS_HELP_STRING([--disable-networkmanager],
-+ [disable NetworkManager support @<:@default=auto@:>@]),,
++ 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 gnome-keyring-1],
++ [libnm-glib
++ libnm-util >= $NETWORKMANAGER_MIN_VERSION
++ libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
++ gnome-keyring-1],
+ [have_networkmanager=yes],
+ [have_networkmanager=no])
+
@@ -66,10 +172,10 @@
+
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+
- PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
+ # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
+ AM_PATH_GLIB_2_0()
- PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-@@ -284,3 +317,15 @@
+@@ -199,3 +229,15 @@
man/Makefile
])
AC_OUTPUT
@@ -77,141 +183,11 @@
+echo "
+Build configuration:
+
-+ Prefix: ${prefix}
-+ Source code location: ${srcdir}
-+ Compiler: ${CC}
-+ Compiler Warnings: $enable_compile_warnings
++ Prefix: ${prefix}
++ Source code location: ${srcdir}
++ Compiler: ${CC}
++ Compiler Warnings: $enable_compile_warnings
+
-+ Support for NetworkManager: $have_networkmanager
-+ Support for GStreamer recording: $build_recorder
++ Support for NetworkManager: $have_networkmanager
++ Support for GStreamer recording: $build_recorder
+"
-Index: gnome-shell-3.4.1/js/Makefile.am
-===================================================================
---- gnome-shell-3.4.1.orig/js/Makefile.am 2012-03-01 17:19:56.000000000 +0100
-+++ gnome-shell-3.4.1/js/Makefile.am 2012-05-19 09:44:18.047666283 +0200
-@@ -8,6 +8,7 @@
- -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
- -e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \
- -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
-+ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
- -e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
- -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
- -e "s|[@]datadir@|$(datadir)|g" \
-Index: gnome-shell-3.4.1/js/misc/config.js.in
-===================================================================
---- gnome-shell-3.4.1.orig/js/misc/config.js.in 2012-05-19 04:09:20.958337829 +0200
-+++ gnome-shell-3.4.1/js/misc/config.js.in 2012-05-19 09:44:18.047666283 +0200
-@@ -8,6 +8,8 @@
- const GJS_VERSION = '@GJS_VERSION@';
- /* 1 if gnome-bluetooth is available, 0 otherwise */
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-+/* 1 if networkmanager is available, 0 otherwise */
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* The system TLS CA list */
- const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
- /* gettext package */
-Index: gnome-shell-3.4.1/js/ui/main.js
-===================================================================
---- gnome-shell-3.4.1.orig/js/ui/main.js 2012-05-19 04:09:20.958337829 +0200
-+++ gnome-shell-3.4.1/js/ui/main.js 2012-05-19 09:44:18.047666283 +0200
-@@ -12,6 +12,7 @@
-
- const AutomountManager = imports.ui.automountManager;
- const AutorunManager = imports.ui.autorunManager;
-+const Config = imports.misc.config;
- const CtrlAltTab = imports.ui.ctrlAltTab;
- const EndSessionDialog = imports.ui.endSessionDialog;
- const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
-@@ -26,7 +27,7 @@
- const RunDialog = imports.ui.runDialog;
- const Layout = imports.ui.layout;
- const LookingGlass = imports.ui.lookingGlass;
--const NetworkAgent = imports.ui.networkAgent;
-+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
- const NotificationDaemon = imports.ui.notificationDaemon;
- const WindowAttentionHandler = imports.ui.windowAttentionHandler;
- const Scripting = imports.ui.scripting;
-@@ -85,7 +86,10 @@
- telepathyClient = new TelepathyClient.Client();
- automountManager = new AutomountManager.AutomountManager();
- autorunManager = new AutorunManager.AutorunManager();
-- networkAgent = new NetworkAgent.NetworkAgent();
-+ if (Config.HAVE_NETWORKMANAGER) {
-+ networkAgent = new NetworkAgent.NetworkAgent();
-+ }
-+
- }
-
- function _createGDMSession() {
-Index: gnome-shell-3.4.1/js/ui/panel.js
-===================================================================
---- gnome-shell-3.4.1.orig/js/ui/panel.js 2012-05-19 04:09:20.958337829 +0200
-+++ gnome-shell-3.4.1/js/ui/panel.js 2012-05-19 09:44:18.047666283 +0200
-@@ -45,7 +45,8 @@
- STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
-
- try {
-- STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
-+ if (Config.HAVE_NETWORKMANAGER)
-+ STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
- } catch(e) {
- log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
- }
-Index: gnome-shell-3.4.1/src/Makefile.am
-===================================================================
---- gnome-shell-3.4.1.orig/src/Makefile.am 2012-05-19 04:09:20.958337829 +0200
-+++ gnome-shell-3.4.1/src/Makefile.am 2012-05-19 09:44:18.051666283 +0200
-@@ -110,9 +110,7 @@
- shell-gtk-embed.h \
- shell-global.h \
- shell-idle-monitor.h \
-- shell-mobile-providers.h \
- shell-mount-operation.h \
-- shell-network-agent.h \
- shell-perf-log.h \
- shell-screenshot.h \
- shell-screen-grabber.h \
-@@ -134,6 +132,10 @@
- gactionobserver.h \
- gactionobserver.c
-
-+if HAVE_NETWORKMANAGER
-+shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h
-+endif
-+
- libgnome_shell_la_SOURCES = \
- $(shell_built_sources) \
- $(shell_public_headers_h) \
-@@ -159,9 +161,7 @@
- shell-idle-monitor.c \
- shell-keyring-prompt.h \
- shell-keyring-prompt.c \
-- shell-mobile-providers.c \
- shell-mount-operation.c \
-- shell-network-agent.c \
- shell-perf-log.c \
- shell-polkit-authentication-agent.h \
- shell-polkit-authentication-agent.c \
-@@ -181,6 +181,10 @@
- $(NULL)
-
-
-+if HAVE_NETWORKMANAGER
-+libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
-+endif
-+
- libgnome_shell_la_gir_sources = \
- $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
-
-@@ -296,7 +300,10 @@
- libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
-
- Shell-0.1.gir: libgnome-shell.la St-1.0.gir
--Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
-+if HAVE_NETWORKMANAGER
-+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
-+endif
- Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
- Shell_0_1_gir_LIBS = libgnome-shell.la
- Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=39698&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Sun Oct 6 09:38:09 2013
@@ -1,3 +1,4 @@
+10-make-NetworkManager-optional.patch
11-no-gettext.patch
27-nm-libexec-path.patch
#30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
More information about the pkg-gnome-commits
mailing list