Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 298759 Details for
Bug 398593
gnome-base/gnome-shell: make networkmanager dependency optional
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch removing libnm-glib and libnm-util dependency
no_nm.patch (text/plain), 16.83 KB, created by
Florian Klink
on 2012-01-12 15:44:01 UTC
(
hide
)
Description:
patch removing libnm-glib and libnm-util dependency
Filename:
MIME Type:
Creator:
Florian Klink
Created:
2012-01-12 15:44:01 UTC
Size:
16.83 KB
patch
obsolete
>diff --git a/configure b/configure >index 08abe3a..76386e5 100755 >--- a/configure >+++ b/configure >@@ -14986,7 +14986,7 @@ if test -n "$GNOME_SHELL_CFLAGS"; then > 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\""; } >&5 >+ gnome-keyring-1\""; } >&5 > ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_MIN_VERSION > gio-unix-2.0 dbus-glib-1 libxml-2.0 > gtk+-3.0 >= $GTK_MIN_VERSION >@@ -15003,7 +15003,7 @@ if test -n "$GNOME_SHELL_CFLAGS"; then > 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") 2>&5 >+ gnome-keyring-1") 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then >@@ -15023,7 +15023,7 @@ if test -n "$GNOME_SHELL_CFLAGS"; then > 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" 2>/dev/null` >+ gnome-keyring-1" 2>/dev/null` > else > pkg_failed=yes > fi >@@ -15050,7 +15050,7 @@ if test -n "$GNOME_SHELL_LIBS"; then > 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\""; } >&5 >+ gnome-keyring-1\""; } >&5 > ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_MIN_VERSION > gio-unix-2.0 dbus-glib-1 libxml-2.0 > gtk+-3.0 >= $GTK_MIN_VERSION >@@ -15067,7 +15067,7 @@ if test -n "$GNOME_SHELL_LIBS"; then > 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") 2>&5 >+ gnome-keyring-1") 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then >@@ -15087,7 +15087,7 @@ if test -n "$GNOME_SHELL_LIBS"; then > 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" 2>/dev/null` >+ gnome-keyring-1" 2>/dev/null` > else > pkg_failed=yes > fi >@@ -15123,7 +15123,7 @@ fi > 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" 2>&1` >+ gnome-keyring-1" 2>&1` > else > GNOME_SHELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_MIN_VERSION > gio-unix-2.0 dbus-glib-1 libxml-2.0 >@@ -15141,7 +15141,7 @@ fi > 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" 2>&1` >+ gnome-keyring-1" 2>&1` > fi > # Put the nasty error message in config.log where it belongs > echo "$GNOME_SHELL_PKG_ERRORS" >&5 >@@ -15162,7 +15162,7 @@ fi > 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) were not met: >+ gnome-keyring-1) were not met: > > $GNOME_SHELL_PKG_ERRORS > >diff --git a/configure.ac b/configure.ac >index 1c64122..92d84d8 100644 >--- a/configure.ac >+++ b/configure.ac >@@ -96,7 +96,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION > 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) > > PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0) > >diff --git a/js/ui/main.js b/js/ui/main.js >index 4c97440..bda5c4a 100644 >--- a/js/ui/main.js >+++ b/js/ui/main.js >@@ -27,7 +27,6 @@ const PlaceDisplay = imports.ui.placeDisplay; > const RunDialog = imports.ui.runDialog; > const Layout = imports.ui.layout; > const LookingGlass = imports.ui.lookingGlass; >-const NetworkAgent = imports.ui.networkAgent; > const NotificationDaemon = imports.ui.notificationDaemon; > const WindowAttentionHandler = imports.ui.windowAttentionHandler; > const Scripting = imports.ui.scripting; >@@ -66,7 +65,6 @@ let xdndHandler = null; > let statusIconDispatcher = null; > let keyboard = null; > let layoutManager = null; >-let networkAgent = null; > let _errorLogStack = []; > let _startDate; > let _defaultCssStylesheet = null; >@@ -84,7 +82,6 @@ function _createUserSession() { > telepathyClient = new TelepathyClient.Client(); > automountManager = new AutomountManager.AutomountManager(); > autorunManager = new AutorunManager.AutorunManager(); >- networkAgent = new NetworkAgent.NetworkAgent(); > } > > function _createGDMSession() { >diff --git a/js/ui/panel.js b/js/ui/panel.js >index 2f78db9..45ee14d 100644 >--- a/js/ui/panel.js >+++ b/js/ui/panel.js >@@ -27,7 +27,7 @@ const BUTTON_DND_ACTIVATION_TIMEOUT = 250; > const ANIMATED_ICON_UPDATE_TIMEOUT = 100; > const SPINNER_ANIMATION_TIME = 0.2; > >-const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery', 'userMenu']; >+const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'battery', 'userMenu']; > const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = { > 'a11y': imports.ui.status.accessibility.ATIndicator, > 'volume': imports.ui.status.volume.Indicator, >@@ -39,12 +39,6 @@ const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = { > if (Config.HAVE_BLUETOOTH) > STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator; > >-try { >- 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'); >-} >- > const GDM_STATUS_AREA_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'battery', 'powerMenu']; > const GDM_STATUS_AREA_SHELL_IMPLEMENTATION = { > 'a11y': imports.ui.status.accessibility.ATIndicator, >diff --git a/src/Makefile.am b/src/Makefile.am >index d19f0fe..4c672a3 100644 >--- a/src/Makefile.am >+++ b/src/Makefile.am >@@ -108,9 +108,7 @@ shell_public_headers_h = \ > shell-generic-container.h \ > shell-gtk-embed.h \ > shell-global.h \ >- shell-mobile-providers.h \ > shell-mount-operation.h \ >- shell-network-agent.h \ > shell-perf-log.h \ > shell-slicer.h \ > shell-stack.h \ >@@ -145,9 +143,7 @@ libgnome_shell_la_SOURCES = \ > shell-generic-container.c \ > shell-gtk-embed.c \ > shell-global.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 \ >diff --git a/src/Makefile.in b/src/Makefile.in >index d69e58e..a54a560 100644 >--- a/src/Makefile.in >+++ b/src/Makefile.in >@@ -102,8 +102,8 @@ am__libgnome_shell_la_SOURCES_DIST = shell-marshal.h shell-marshal.c \ > shell-app-system.h shell-app-usage.h shell-arrow.h \ > shell-contact-system.h shell-doc-system.h \ > shell-embedded-window.h shell-generic-container.h \ >- shell-gtk-embed.h shell-global.h shell-mobile-providers.h \ >- shell-mount-operation.h shell-network-agent.h shell-perf-log.h \ >+ shell-gtk-embed.h shell-global.h \ >+ shell-mount-operation.h shell-perf-log.h \ > shell-slicer.h shell-stack.h shell-tp-client.h \ > shell-tray-icon.h shell-tray-manager.h shell-util.h \ > shell-window-tracker.h shell-wm.h shell-xfixes-cursor.h \ >@@ -114,8 +114,8 @@ am__libgnome_shell_la_SOURCES_DIST = shell-marshal.h shell-marshal.c \ > shell-a11y.h shell-a11y.c shell-app-system.c shell-app-usage.c \ > shell-arrow.c shell-contact-system.c shell-doc-system.c \ > shell-embedded-window.c shell-generic-container.c \ >- shell-gtk-embed.c shell-global.c shell-mobile-providers.c \ >- shell-mount-operation.c shell-network-agent.c shell-perf-log.c \ >+ shell-gtk-embed.c shell-global.c \ >+ shell-mount-operation.c shell-perf-log.c \ > shell-polkit-authentication-agent.h \ > shell-polkit-authentication-agent.c shell-slicer.c \ > shell-stack.c shell-tp-client.c shell-tray-icon.c \ >@@ -140,9 +140,7 @@ am_libgnome_shell_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ > libgnome_shell_la-shell-generic-container.lo \ > libgnome_shell_la-shell-gtk-embed.lo \ > libgnome_shell_la-shell-global.lo \ >- libgnome_shell_la-shell-mobile-providers.lo \ > libgnome_shell_la-shell-mount-operation.lo \ >- libgnome_shell_la-shell-network-agent.lo \ > libgnome_shell_la-shell-perf-log.lo \ > libgnome_shell_la-shell-polkit-authentication-agent.lo \ > libgnome_shell_la-shell-slicer.lo \ >@@ -822,9 +820,7 @@ shell_public_headers_h = \ > shell-generic-container.h \ > shell-gtk-embed.h \ > shell-global.h \ >- shell-mobile-providers.h \ > shell-mount-operation.h \ >- shell-network-agent.h \ > shell-perf-log.h \ > shell-slicer.h \ > shell-stack.h \ >@@ -845,8 +841,8 @@ libgnome_shell_la_SOURCES = $(shell_built_sources) \ > shell-app-system.c shell-app-usage.c shell-arrow.c \ > shell-contact-system.c shell-doc-system.c \ > shell-embedded-window.c shell-generic-container.c \ >- shell-gtk-embed.c shell-global.c shell-mobile-providers.c \ >- shell-mount-operation.c shell-network-agent.c shell-perf-log.c \ >+ shell-gtk-embed.c shell-global.c \ >+ shell-mount-operation.c shell-perf-log.c \ > shell-polkit-authentication-agent.h \ > shell-polkit-authentication-agent.c shell-slicer.c \ > shell-stack.c shell-tp-client.c shell-tray-icon.c \ >@@ -1172,9 +1168,7 @@ distclean-compile: > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-global.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-gtk-embed.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-marshal.Plo@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mobile-providers.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mount-operation.Plo@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-network-agent.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-perf-log.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-polkit-authentication-agent.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-recorder-src.Plo@am__quote@ >@@ -1377,14 +1371,6 @@ libgnome_shell_la-shell-global.lo: shell-global.c > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgnome_shell_la-shell-global.lo `test -f 'shell-global.c' || echo '$(srcdir)/'`shell-global.c > >-libgnome_shell_la-shell-mobile-providers.lo: shell-mobile-providers.c >-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgnome_shell_la-shell-mobile-providers.lo -MD -MP -MF $(DEPDIR)/libgnome_shell_la-shell-mobile-providers.Tpo -c -o libgnome_shell_la-shell-mobile-providers.lo `test -f 'shell-mobile-providers.c' || echo '$(srcdir)/'`shell-mobile-providers.c >-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnome_shell_la-shell-mobile-providers.Tpo $(DEPDIR)/libgnome_shell_la-shell-mobile-providers.Plo >-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ >-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shell-mobile-providers.c' object='libgnome_shell_la-shell-mobile-providers.lo' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgnome_shell_la-shell-mobile-providers.lo `test -f 'shell-mobile-providers.c' || echo '$(srcdir)/'`shell-mobile-providers.c >- > libgnome_shell_la-shell-mount-operation.lo: shell-mount-operation.c > @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgnome_shell_la-shell-mount-operation.lo -MD -MP -MF $(DEPDIR)/libgnome_shell_la-shell-mount-operation.Tpo -c -o libgnome_shell_la-shell-mount-operation.lo `test -f 'shell-mount-operation.c' || echo '$(srcdir)/'`shell-mount-operation.c > @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnome_shell_la-shell-mount-operation.Tpo $(DEPDIR)/libgnome_shell_la-shell-mount-operation.Plo >@@ -1393,14 +1379,6 @@ libgnome_shell_la-shell-mount-operation.lo: shell-mount-operation.c > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ > @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgnome_shell_la-shell-mount-operation.lo `test -f 'shell-mount-operation.c' || echo '$(srcdir)/'`shell-mount-operation.c > >-libgnome_shell_la-shell-network-agent.lo: shell-network-agent.c >-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgnome_shell_la-shell-network-agent.lo -MD -MP -MF $(DEPDIR)/libgnome_shell_la-shell-network-agent.Tpo -c -o libgnome_shell_la-shell-network-agent.lo `test -f 'shell-network-agent.c' || echo '$(srcdir)/'`shell-network-agent.c >-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnome_shell_la-shell-network-agent.Tpo $(DEPDIR)/libgnome_shell_la-shell-network-agent.Plo >-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ >-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shell-network-agent.c' object='libgnome_shell_la-shell-network-agent.lo' libtool=yes @AMDEPBACKSLASH@ >-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgnome_shell_la-shell-network-agent.lo `test -f 'shell-network-agent.c' || echo '$(srcdir)/'`shell-network-agent.c >- > libgnome_shell_la-shell-perf-log.lo: shell-perf-log.c > @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgnome_shell_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgnome_shell_la-shell-perf-log.lo -MD -MP -MF $(DEPDIR)/libgnome_shell_la-shell-perf-log.Tpo -c -o libgnome_shell_la-shell-perf-log.lo `test -f 'shell-perf-log.c' || echo '$(srcdir)/'`shell-perf-log.c > @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnome_shell_la-shell-perf-log.Tpo $(DEPDIR)/libgnome_shell_la-shell-perf-log.Plo
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=298759">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 398593
:
298759
|
298767
|
298769
|
298787
