[patch] diff file for optional colord and wacom support patch

optional.patch.diff (text/plain), 1.88 KB, created by Allen Holl on 2014-11-20 15:33:10 UTC

--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch	2014-05-13 11:01:20.000000000 -0400
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch	2014-11-06 11:29:40.595032000 -0500
@@ -3,16 +3,9 @@
 Date: Mon, 5 May 2014 21:50:25 -0400
 Subject: [PATCH] Make colord and wacom support optional and non-automagic
 
----
- configure.ac        | 20 +++++++++++++++++---
- plugins/Makefile.am |  7 ++++++-
- 2 files changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 22db541..f9d50b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -253,15 +253,28 @@ fi
+--- /a/configure.ac
++++ /b/configure.ac
+@@ -260,15 +260,28 @@
  dnl ---------------------------------------------------------------------------
  dnl - color
  dnl ---------------------------------------------------------------------------
@@ -44,27 +37,25 @@
  
  AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
  
-@@ -595,6 +608,7 @@ echo "
+@@ -604,6 +617,7 @@
          LCMS DICT support:        ${have_new_lcms}
          Libnotify support:        ${have_libnotify}
  
-+        Colord support:           ${build_color}
++	Colord support:           ${build_color}
          Wacom support:            ${build_wacom}
  
          Smartcard support:        ${have_smartcard_support}
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 666bfef..2a7a4e1 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -5,7 +5,6 @@ enabled_plugins =	\
- 	a11y-settings	\
+--- /a/plugins/Makefile.am
++++ /b/plugins/Makefile.am
+@@ -6,7 +6,6 @@
  	automount	\
+ 	background  \
  	clipboard	\
 -	color		\
  	cursor		\
  	dummy		\
      datetime    \
-@@ -22,6 +21,12 @@ enabled_plugins =	\
+@@ -23,6 +22,12 @@
  
  disabled_plugins = $(NULL)
  
@@ -77,6 +68,3 @@
  if BUILD_WACOM
  enabled_plugins += wacom
  else
--- 
-1.9.2
-