tetromino 14/05/13 14:49:46 Modified: cinnamon-settings-daemon-2.2.2-optional.patch Log: Make colord really optional (bug #510238, thanks to Ben Kohler). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path 1.2 gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch?r1=1.1&r2=1.2 Index: cinnamon-settings-daemon-2.2.2-optional.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.2.2-optional.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cinnamon-settings-daemon-2.2.2-optional.patch 6 May 2014 03:08:29 -0000 1.1 +++ cinnamon-settings-daemon-2.2.2-optional.patch 13 May 2014 14:49:46 -0000 1.2 @@ -1,15 +1,15 @@ -From 2f53841e23559581ff69a7549094ab8da5fab5c9 Mon Sep 17 00:00:00 2001 +From e11e16e2842b3861c763f0d7714717ba1ba44f66 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <[email protected]> Date: Mon, 5 May 2014 21:50:25 -0400 Subject: [PATCH] Make colord and wacom support optional and non-automagic --- - configure.ac | 19 ++++++++++++++++--- + configure.ac | 20 +++++++++++++++++--- plugins/Makefile.am | 7 ++++++- - 2 files changed, 22 insertions(+), 4 deletions(-) + 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 22db541..10c18a2 100644 +index 22db541..f9d50b1 100644 --- a/configure.ac +++ b/configure.ac @@ -253,15 +253,28 @@ fi @@ -18,9 +18,9 @@ dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(color, + AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),, -+ enable_colord=yes) ++ enable_color=yes) +build_color=false -+if test x"$enable_cups" != x"no" ; then ++if test x"$enable_color" != x"no" ; then + PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) + build_color=true +fi @@ -44,6 +44,14 @@ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") +@@ -595,6 +608,7 @@ echo " + LCMS DICT support: ${have_new_lcms} + Libnotify support: ${have_libnotify} + ++ 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
