| 1 |
tetromino 12/09/28 08:13:30 |
| 2 |
|
| 3 |
Added: cinnamon-1.6.1-optional-networkmanager.patch |
| 4 |
cinnamon-1.6.1-automagic-gnome-bluetooth.patch |
| 5 |
Log: |
| 6 |
Version bump to the stable 1.6 series (bug #435828, thanks to Anton Bolshakov). Lots of new features - nameable workspaces, new and improved applets, and a new file manager. See http://cinnamon.linuxmint.com/?p=207 and http://cinnamon.linuxmint.com/?p=216 for the release notes. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha132/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: cinnamon-1.6.1-optional-networkmanager.patch |
| 17 |
=================================================================== |
| 18 |
From cad7852a7b2c7cfc5f418b854c960abdb265544b Mon Sep 17 00:00:00 2001 |
| 19 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 20 |
Date: Wed, 25 Jan 2012 01:58:07 -0500 |
| 21 |
Subject: [PATCH] Make NM optional |
| 22 |
|
| 23 |
Derived from a patch for gnome-shell by Michael Biebl <biebl@××××××.org> |
| 24 |
(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652482#29) |
| 25 |
--- |
| 26 |
configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- |
| 27 |
js/misc/config.js.in | 2 ++ |
| 28 |
js/ui/main.js | 3 ++- |
| 29 |
src/Makefile.am | 17 ++++++++++++----- |
| 30 |
4 files changed, 62 insertions(+), 8 deletions(-) |
| 31 |
|
| 32 |
diff --git a/configure.ac b/configure.ac |
| 33 |
index 58c35f9..360b3f8 100644 |
| 34 |
--- a/configure.ac |
| 35 |
+++ b/configure.ac |
| 36 |
@@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION |
| 37 |
libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION |
| 38 |
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION |
| 39 |
libcanberra |
| 40 |
- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes |
| 41 |
- libnm-glib libnm-util gnome-keyring-1) |
| 42 |
+ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes) |
| 43 |
+ |
| 44 |
+########################## |
| 45 |
+# Check for NetworkManager |
| 46 |
+########################## |
| 47 |
+NM_MIN_VERSION=0.9 |
| 48 |
+AC_ARG_ENABLE(networkmanager, |
| 49 |
+ AS_HELP_STRING([--disable-networkmanager], |
| 50 |
+ [disable NetworkManager support @<:@default=auto@:>@]),, |
| 51 |
+ [enable_networkmanager=auto]) |
| 52 |
+ |
| 53 |
+if test "x$enable_networkmanager" != "xno"; then |
| 54 |
+ PKG_CHECK_MODULES(NETWORKMANAGER, |
| 55 |
+ [libnm-glib libnm-util gnome-keyring-1], |
| 56 |
+ [have_networkmanager=yes], |
| 57 |
+ [have_networkmanager=no]) |
| 58 |
+ |
| 59 |
+ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS" |
| 60 |
+ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS" |
| 61 |
+else |
| 62 |
+ have_networkmanager="no (disabled)" |
| 63 |
+fi |
| 64 |
+ |
| 65 |
+if test "x$have_networkmanager" = "xyes"; then |
| 66 |
+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager]) |
| 67 |
+ AC_SUBST([HAVE_NETWORKMANAGER], [1]) |
| 68 |
+else |
| 69 |
+ if test "x$enable_networkmanager" = "xyes"; then |
| 70 |
+ AC_MSG_ERROR([Couldn't find NetworkManager.]) |
| 71 |
+ fi |
| 72 |
+ AC_SUBST([HAVE_NETWORKMANAGER], [0]) |
| 73 |
+fi |
| 74 |
+ |
| 75 |
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") |
| 76 |
|
| 77 |
PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0) |
| 78 |
|
| 79 |
@@ -239,3 +271,15 @@ AC_CONFIG_FILES([ |
| 80 |
files/Makefile |
| 81 |
]) |
| 82 |
AC_OUTPUT |
| 83 |
+ |
| 84 |
+echo " |
| 85 |
+Build configuration: |
| 86 |
+ |
| 87 |
+ Prefix: ${prefix} |
| 88 |
+ Source code location: ${srcdir} |
| 89 |
+ Compiler: ${CC} |
| 90 |
+ Compiler Warnings: $enable_compile_warnings |
| 91 |
+ |
| 92 |
+ Support for NetworkManager: $have_networkmanager |
| 93 |
+ Support for GStreamer recording: $build_recorder |
| 94 |
+" |
| 95 |
diff --git a/js/misc/config.js.in b/js/misc/config.js.in |
| 96 |
index 704989b..df7e014 100644 |
| 97 |
--- a/js/misc/config.js.in |
| 98 |
+++ b/js/misc/config.js.in |
| 99 |
@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; |
| 100 |
const GJS_VERSION = '@GJS_VERSION@'; |
| 101 |
/* 1 if gnome-bluetooth is available, 0 otherwise */ |
| 102 |
const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; |
| 103 |
+/* 1 if networkmanager is available, 0 otherwise */ |
| 104 |
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; |
| 105 |
/* The system TLS CA list */ |
| 106 |
const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; |
| 107 |
diff --git a/js/ui/main.js b/js/ui/main.js |
| 108 |
index 4aff139..39a0ed9 100644 |
| 109 |
--- a/js/ui/main.js |
| 110 |
+++ b/js/ui/main.js |
| 111 |
@@ -11,6 +11,7 @@ const St = imports.gi.St; |
| 112 |
|
| 113 |
const AutomountManager = imports.ui.automountManager; |
| 114 |
const AutorunManager = imports.ui.autorunManager; |
| 115 |
+const Config = imports.misc.config; |
| 116 |
const EndSessionDialog = imports.ui.endSessionDialog; |
| 117 |
const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent; |
| 118 |
const ExtensionSystem = imports.ui.extensionSystem; |
| 119 |
@@ -24,7 +25,7 @@ const PlacesManager = imports.ui.placesManager; |
| 120 |
const RunDialog = imports.ui.runDialog; |
| 121 |
const Layout = imports.ui.layout; |
| 122 |
const LookingGlass = imports.ui.lookingGlass; |
| 123 |
-const NetworkAgent = imports.ui.networkAgent; |
| 124 |
+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null; |
| 125 |
const NotificationDaemon = imports.ui.notificationDaemon; |
| 126 |
const WindowAttentionHandler = imports.ui.windowAttentionHandler; |
| 127 |
const Scripting = imports.ui.scripting; |
| 128 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 129 |
index 63193f0..2a984c1 100644 |
| 130 |
--- a/src/Makefile.am |
| 131 |
+++ b/src/Makefile.am |
| 132 |
@@ -110,9 +110,7 @@ cinnamon_public_headers_h = \ |
| 133 |
cinnamon-generic-container.h \ |
| 134 |
cinnamon-gtk-embed.h \ |
| 135 |
cinnamon-global.h \ |
| 136 |
- cinnamon-mobile-providers.h \ |
| 137 |
cinnamon-mount-operation.h \ |
| 138 |
- cinnamon-network-agent.h \ |
| 139 |
cinnamon-perf-log.h \ |
| 140 |
cinnamon-screenshot.h \ |
| 141 |
cinnamon-screen-grabber.h \ |
| 142 |
@@ -125,6 +123,10 @@ cinnamon_public_headers_h = \ |
| 143 |
cinnamon-wm.h \ |
| 144 |
cinnamon-xfixes-cursor.h |
| 145 |
|
| 146 |
+if HAVE_NETWORKMANAGER |
| 147 |
+cinnamon_public_headers_h += cinnamon-mobile-providers.h cinnamon-network-agent.h |
| 148 |
+endif |
| 149 |
+ |
| 150 |
libcinnamon_la_SOURCES = \ |
| 151 |
$(cinnamon_built_sources) \ |
| 152 |
$(cinnamon_public_headers_h) \ |
| 153 |
@@ -147,9 +149,7 @@ libcinnamon_la_SOURCES = \ |
| 154 |
cinnamon-generic-container.c \ |
| 155 |
cinnamon-gtk-embed.c \ |
| 156 |
cinnamon-global.c \ |
| 157 |
- cinnamon-mobile-providers.c \ |
| 158 |
cinnamon-mount-operation.c \ |
| 159 |
- cinnamon-network-agent.c \ |
| 160 |
cinnamon-perf-log.c \ |
| 161 |
cinnamon-polkit-authentication-agent.h \ |
| 162 |
cinnamon-polkit-authentication-agent.c \ |
| 163 |
@@ -164,6 +164,10 @@ libcinnamon_la_SOURCES = \ |
| 164 |
cinnamon-wm.c \ |
| 165 |
cinnamon-xfixes-cursor.c |
| 166 |
|
| 167 |
+if HAVE_NETWORKMANAGER |
| 168 |
+libcinnamon_la_SOURCES += cinnamon-mobile-providers.c cinnamon-network-agent.c |
| 169 |
+endif |
| 170 |
+ |
| 171 |
libcinnamon_la_gir_sources = \ |
| 172 |
$(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES)) |
| 173 |
|
| 174 |
@@ -275,7 +279,10 @@ libcinnamon_la_LIBADD = \ |
| 175 |
libcinnamon_la_CPPFLAGS = $(cinnamon_cflags) |
| 176 |
|
| 177 |
Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir |
| 178 |
-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 |
| 179 |
+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 Soup-2.4 GMenu-3.0 |
| 180 |
+if HAVE_NETWORKMANAGER |
| 181 |
+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 |
| 182 |
+endif |
| 183 |
Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) |
| 184 |
Cinnamon_0_1_gir_LIBS = libcinnamon.la |
| 185 |
Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) |
| 186 |
-- |
| 187 |
1.7.12 |
| 188 |
|
| 189 |
|
| 190 |
|
| 191 |
|
| 192 |
1.1 gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch |
| 193 |
|
| 194 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch?rev=1.1&view=markup |
| 195 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch?rev=1.1&content-type=text/plain |
| 196 |
|
| 197 |
Index: cinnamon-1.6.1-automagic-gnome-bluetooth.patch |
| 198 |
=================================================================== |
| 199 |
From ee11a71f55eb0860fb61f5c250792221387f09bf Mon Sep 17 00:00:00 2001 |
| 200 |
From: root <admin@×××××××××.uk> |
| 201 |
Date: Sun, 8 Jan 2012 13:55:05 +0000 |
| 202 |
Subject: [PATCH] Fix automagic gnome-bluetooth dependency |
| 203 |
|
| 204 |
https://bugs.gentoo.org/show_bug.cgi?id=398145 |
| 205 |
|
| 206 |
Ed Catmur 2012-01-08 13:46:22 UTC |
| 207 |
libgnome-bluetooth-applet is a private library so they shouldn't be linking |
| 208 |
against it anyway. I tried to work out how to tell libtool to add it to rpath |
| 209 |
but got totally lost. |
| 210 |
|
| 211 |
I'll see if I can work out how to fix the automagic gnome-bluetooth dependency |
| 212 |
so I can at least merge USE=-bluetooth. |
| 213 |
--- |
| 214 |
configure.ac | 5 +++++ |
| 215 |
1 file changed, 5 insertions(+) |
| 216 |
|
| 217 |
diff --git a/configure.ac b/configure.ac |
| 218 |
index 69728ed..58c35f9 100644 |
| 219 |
--- a/configure.ac |
| 220 |
+++ b/configure.ac |
| 221 |
@@ -113,6 +113,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) |
| 222 |
PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7) |
| 223 |
|
| 224 |
AC_MSG_CHECKING([for bluetooth support]) |
| 225 |
+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) |
| 226 |
+AS_IF([test "x$with_bluetooth" != "xno"], [ |
| 227 |
PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], |
| 228 |
[BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` |
| 229 |
BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` |
| 230 |
@@ -125,6 +127,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], |
| 231 |
[AC_DEFINE([HAVE_BLUETOOTH],[0]) |
| 232 |
AC_SUBST([HAVE_BLUETOOTH],[0]) |
| 233 |
AC_MSG_RESULT([no])]) |
| 234 |
+], [AC_DEFINE([HAVE_BLUETOOTH],[0]) |
| 235 |
+ AC_SUBST([HAVE_BLUETOOTH],[0]) |
| 236 |
+ AC_MSG_RESULT([no])]) |
| 237 |
|
| 238 |
MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin` |
| 239 |
MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin` |
| 240 |
-- |
| 241 |
1.7.12 |
Archives