Re: Bug#652482: FTBTFS on kfreebsd-*: No package 'libnm-glib' found
On 18.12.2011 04:01, Michael Biebl wrote:
>
> As a port of NetworkManager is unlikely, the only remaining option I
> see, is that we try to make the NM integration in gnome-shell optional.
>
> But this needs someone running gnome-shell on kfreebsd and who would be
> willing to help with testing and fixing the issues that will come up.
Attached is a untested patch which should make it possible to compile
and run gnome-shell without network-manager. It needs an autoreconf, and
mixing intltool and gettext doesn't work that well. That's what
11-no-gettext.patch is for.
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
From ce3bc8b64bc1aeaf8917ed5dd5f8437ca87fd906 Mon Sep 17 00:00:00 2001
From: Michael Biebl
Date: Thu, 22 Dec 2011 22:04:12 +0100
Subject: [PATCH] Make NM optional
---
configure.ac| 49 +++--
js/Makefile.am |5 -
js/ui/main.js | 12 ++--
src/Makefile.am | 16 +---
4 files changed, 74 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1c64122..13cd42b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,8 +95,41 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
libcanberra
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)
+ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
+
+##
+# Check for NetworkManager
+##
+NM_MIN_VERSION=0.9
+AC_ARG_ENABLE(network-manager,
+ AS_HELP_STRING([--disable-network-manager],
+ [disable NetworkManager support @<:@default=auto@:>@]),,
+ [enable_network_manager=auto])
+
+if test "x$enable_network_manager" != "xno"; then
+ PKG_CHECK_MODULES(NETWORK_MANAGER,
+ [libnm-glib libnm-util gnome-keyring-1],
+ [have_network_manager=yes],
+ [have_network_manager=no])
+
+ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORK_MANAGER_CFLAGS"
+ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORK_MANAGER_LIBS"
+
+ if test "x$have_network_manager" = "xyes"; then
+ AC_DEFINE(HAVE_NETWORK_MANAGER, [], [Define if we have NetworkManager])
+ fi
+else
+ have_network_manager="no (disabled)"
+fi
+
+if test "x$enable_network_manager" = "xyes"; then
+ if test "x$have_network_manager" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find NetworkManager.])
+ fi
+fi
+
+AM_CONDITIONAL(HAVE_NETWORK_MANAGER, test "$have_network_manager" = "yes")
+
PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
@@ -250,3 +283,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_network_manager
+ Support for GStreamer recording:$build_recorder
+"
diff --git a/js/Makefile.am b/js/Makefile.am
index 58e0489..3d1418d 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -45,7 +45,6 @@ nobase_dist_js_DATA = \
ui/main.js \
ui/messageTray.js \
ui/modalDialog.js \
- ui/networkAgent.js \
ui/shellEntry.js \
ui/shellMountOperation.js \
ui/notificationDaemon.js \
@@ -78,3 +77,7 @@ nobase_dist_js_DATA = \
ui/workspacesView.js \
ui/workspaceSwitcherPopup.js\
ui/xdndHandler.js
+
+if HAVE_NETWORK_MANAGER
+nobase_dist_js_DATA += ui/networkAgent.js
+endif
diff --git a/js/ui/main.js b/js/ui/main.js
index 4c97440..4574a7d 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;
@@ -39,6 +38,12 @@ const XdndHandler = imports.ui.xdndHandler;
const StatusIconDispatcher = imports.ui.statusIconDispatcher;
const Util = imports.misc.util;
+try {
+const NetworkAgent = imports.ui.networkAgent;
+} catch (e) {
+NetworkAgent = null;
+}
+
const DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
@@ -84,7 +89,10 @@ function _createUserSession() {
telepathyClient = new TelepathyClient.Client();
automountManager = new AutomountManager.AutomountManager();
autorunManager = new AutorunManager.AutorunManager();
-
Re: Bug#652482: FTBTFS on kfreebsd-*: No package 'libnm-glib' found
Hi, On 18.12.2011 03:22, Robert Millan wrote: > Unless upstream can be persuaded to take a different direction, my > only suggestion is to make gnome-shell a Linux-only package by setting > its Architecture field to "linux-any". > > Sorry that I can't offer a better solution. Maybe someone else can. > In any case I wouldn't want kFreeBSD support to put testing migration > of gnome-shell on hold (but feel free to disagree). Unfortunately it's a bit more complicated than that, as our meta packages like gnome-core or gnome-session are modelled around gnome-shell, especially gnome-session. If we go the route of marking gnome-shell linux-any, those meta-package and their inter-dependencies would have to be reworked quite a bit. As a port of NetworkManager is unlikely, the only remaining option I see, is that we try to make the NM integration in gnome-shell optional. But this needs someone running gnome-shell on kfreebsd and who would be willing to help with testing and fixing the issues that will come up. So far we don't even know if anyone has been running gnome-shell successfully on kfreebsd (i.e. the 3.0 version, without the NM dependency) Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? signature.asc Description: OpenPGP digital signature
Re: Bug#652482: FTBTFS on kfreebsd-*: No package 'libnm-glib' found
On 18/12/11 02:22, Robert Millan wrote: > Unless upstream can be persuaded to take a different direction, my > only suggestion is to make gnome-shell a Linux-only package by setting > its Architecture field to "linux-any". Hi, I've been unable to build libnm-util without Linux Wireless Extensions; it seems to be needed in a few places other than the wireless and wireless-security components. Maybe upstream could add a configure option and ifdefs to still be able to build it without certain features. The (unofficial?) gnome3 FreeBSD porting effort decided it was easier to just remove network-manager from gnome-shell: * http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi/ports/x11/gnome-shell/files/patch-js_ui_main.js?rev=1.1&content-type=text/x-cvsweb-markup * http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi/ports/x11/gnome-shell/files/patch-js_ui_networkAgent.js?rev=1.1&content-type=text/x-cvsweb-markup * http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi/ports/x11/gnome-shell/files/patch-js_ui_panel.js?rev=1.1&content-type=text/x-cvsweb-markup But it sounds like gnome-shell on FreeBSD is still unstable for other reasons too. Regards, -- Steven Chamberlain ste...@pyro.eu.org -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4eed5380.6030...@pyro.eu.org
Re: Bug#652482: FTBTFS on kfreebsd-*: No package 'libnm-glib' found
tags 652482 patch
thanks
Hi Michael,
El 17 de desembre de 2011 18:26, Michael Biebl ha escrit:
> We would appreciate help from the kfreebsd porters here.
Unless upstream can be persuaded to take a different direction, my
only suggestion is to make gnome-shell a Linux-only package by setting
its Architecture field to "linux-any".
Sorry that I can't offer a better solution. Maybe someone else can.
In any case I wouldn't want kFreeBSD support to put testing migration
of gnome-shell on hold (but feel free to disagree).
--
Robert Millan
=== modified file 'debian/control'
--- debian/control 2011-12-18 02:16:09 +
+++ debian/control 2011-12-18 02:16:27 +
@@ -49,7 +49,7 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-gn
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/gnome-shell/
Package: gnome-shell
-Architecture: any
+Architecture: linux-any
Depends: ${gir:Depends},
gjs (>= 0.7.11),
${shlibs:Depends},
=== modified file 'debian/control.in'
--- debian/control.in 2011-12-18 02:16:09 +
+++ debian/control.in 2011-12-18 02:16:21 +
@@ -44,7 +44,7 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-gn
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/gnome-shell/
Package: gnome-shell
-Architecture: any
+Architecture: linux-any
Depends: ${gir:Depends},
gjs (>= 0.7.11),
${shlibs:Depends},
