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

optional.patch.diff (text/plain), 1.84 KB, created by Allen Holl on 2014-11-20 15:37:03 UTC

--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch	2014-05-07 22:55:25.000000000 -0400
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.0-optional.patch	2014-11-06 14:19:56.189127000 -0500
@@ -1,16 +1,14 @@
-diff --git a/configure.ac b/configure.ac
-index b900c53..0656e18 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+--- /a/configure.ac
++++ /b/configure.ac
+@@ -124,7 +124,6 @@
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
  PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
                    cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
 -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
  PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
                    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
                    libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
-@@ -182,15 +181,51 @@ if test x"$enable_cups" != x"no" ; then
+@@ -201,15 +200,51 @@
    AC_SUBST(CUPS_LIBS)
  fi
  
@@ -66,11 +64,9 @@
  
  # This is a hard-dependency for the region and user-accounts panels
  PKG_CHECK_MODULES(ISOCODES, iso-codes)
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index ff8ea98..4a7fba7 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -3,7 +3,6 @@ NULL =
+--- /a/panels/Makefile.am
++++ /b/panels/Makefile.am
+@@ -3,7 +3,6 @@
  enabled_panels = \
  	common \
  	screen \
@@ -78,7 +74,7 @@
  	display \
  	region \
  	universal-access \
-@@ -15,6 +14,12 @@ enabled_panels = \
+@@ -14,6 +13,12 @@
  
  disabled_panels = $(NULL)
  
@@ -88,6 +84,6 @@
 +disabled_panels += color
 +endif
 +
- if BUILD_WACOM
- enabled_panels += wacom
+ if BUILD_NETWORK
+ enabled_panels += network
  else