tetromino 14/05/10 20:24:38 Added: cinnamon-2.2.6-optional-networkmanager.patch cinnamon-2.2.6-automagic-gnome-bluetooth.patch Log: Version bump (bug #487678). Lots of changes, lots of new dependencies, see http://segfault.linuxmint.com/2014/04/cinnamon-2-2/ for the announcement. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path 1.1 gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch?rev=1.1&content-type=text/plain Index: cinnamon-2.2.6-optional-networkmanager.patch =================================================================== >From 26fbdd602e60baded13e203fdc5c90c063a089e4 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <tetrom...@gentoo.org> Date: Sat, 10 May 2014 15:14:05 -0400 Subject: [PATCH] Make networkmanager dependency optional for Gentoo --- configure.ac | 36 ++++++++++++++++++++++++++++++++++-- js/misc/config.js.in | 2 ++ src/Makefile.am | 5 ++++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index bc764e1..894379b 100644 --- a/configure.ac +++ b/configure.ac @@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION libcanberra - 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(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 gnome-keyring-1], + [have_networkmanager=yes], + [have_networkmanager=no]) + + CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS" + CINNAMON_LIBS="$CINNAMON_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") PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0) diff --git a/js/misc/config.js.in b/js/misc/config.js.in index 704989b..df7e014 100644 --- a/js/misc/config.js.in +++ b/js/misc/config.js.in @@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; 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 CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; diff --git a/src/Makefile.am b/src/Makefile.am index 06d7f93..fe12cb9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -267,7 +267,10 @@ libcinnamon_la_LIBADD = \ libcinnamon_la_CPPFLAGS = $(cinnamon_cflags) Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir -Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0 +Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 +if HAVE_NETWORKMANAGER +Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 +endif Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) Cinnamon_0_1_gir_LIBS = libcinnamon.la Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) -- 1.9.2 1.1 gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch?rev=1.1&content-type=text/plain Index: cinnamon-2.2.6-automagic-gnome-bluetooth.patch =================================================================== >From 40750fc87b7a1cad60d0e605732b9df50dd16c11 Mon Sep 17 00:00:00 2001 From: root <ad...@catmur.co.uk> Date: Sun, 8 Jan 2012 13:55:05 +0000 Subject: [PATCH] Fix automagic gnome-bluetooth dependency https://bugs.gentoo.org/show_bug.cgi?id=398145 Ed Catmur 2012-01-08 13:46:22 UTC libgnome-bluetooth-applet is a private library so they shouldn't be linking against it anyway. I tried to work out how to tell libtool to add it to rpath but got totally lost. I'll see if I can work out how to fix the automagic gnome-bluetooth dependency so I can at least merge USE=-bluetooth. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index c0e43e1..bc764e1 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0) AC_MSG_CHECKING([for bluetooth support]) +AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) +AS_IF([test "x$with_bluetooth" != "xno"], [ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` @@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], [AC_DEFINE([HAVE_BLUETOOTH],[0]) AC_SUBST([HAVE_BLUETOOTH],[0]) AC_MSG_RESULT([no])]) +], [AC_DEFINE([HAVE_BLUETOOTH],[0]) + AC_SUBST([HAVE_BLUETOOTH],[0]) + AC_MSG_RESULT([no])]) MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin` MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin` -- 1.9.2