[patch] diff file for optional networkmanager patch

optional-networkmanager.patch.diff (text/plain), 2.72 KB, created by Allen Holl on 2014-11-20 16:03:47 UTC

--- a/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch	2014-05-10 16:24:37.000000000 -0400
+++ b/gnome-extra/cinnamon/files/cinnamon-2.4.3-optional-networkmanager.patch	2014-11-09 12:48:17.043691000 -0500
@@ -4,19 +4,11 @@
 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
+--- /a/configure.ac	2014-10-31 18:21:43.000000000 -0400
++++ /b/configure.ac	2014-11-04 12:47:40.142001594 -0500
+@@ -82,7 +82,39 @@
                                 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)
@@ -54,13 +46,11 @@
 +
 +AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
  
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
+ PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION)
  
-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@';
+--- /a/js/misc/config.js.in	2014-10-31 18:21:43.000000000 -0400
++++ /b/js/misc/config.js.in	2014-11-04 12:49:24.475002253 -0500
+@@ -8,5 +8,7 @@
  const GJS_VERSION = '@GJS_VERSION@';
  /* 1 if gnome-bluetooth is available, 0 otherwise */
  const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
@@ -68,11 +58,9 @@
 +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 =		\
+--- /a/src/Makefile.am	2014-11-02 14:02:15.993938578 -0500
++++ /b/src/Makefile.am	2014-11-04 12:54:44.590004274 -0500
+@@ -286,7 +286,10 @@
  libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
  
  Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
@@ -84,6 +72,3 @@
  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
-