1 files changed, 0 insertions, 95 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
deleted file mode 100644
index 98afbec6..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 27 Oct 2011 23:30:41 -0400
-Subject: [PATCH] Make colord optional
-
----
- configure.ac        |   20 +++++++++++++++++++-
- data/Makefile.am    |    7 ++++++-
- plugins/Makefile.am |    7 ++++++-
- 3 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe74674..f1a8547 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
- dnl ---------------------------------------------------------------------------
- dnl - Check for colord
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+build_color=false
-+AC_ARG_ENABLE(color,
-+  AC_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+      [case "${enableval}" in
-+              yes) WANT_COLOR=yes ;;
-+	      no) WANT_COLOR=no ;;
-+	      *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+      esac],
-+      [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+      PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+      build_color=true
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+
-+AC_SUBST(COLORD_CFLAGS)
-+AC_SUBST(COLORD_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - Check for libcanberra
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 43ba27c..1f3bbef 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -11,7 +11,6 @@ gsettings_SCHEMAS =							\
- 	org.gnome.settings-daemon.plugins.gschema.xml			\
- 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
--	org.gnome.settings-daemon.plugins.color.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
-@@ -21,6 +20,12 @@ gsettings_SCHEMAS =							\
- 
- all_schemas = $(gsettings_SCHEMAS)
- 
-+if BUILD_COLOR
-+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
-+endif
-+
- if HAVE_PACKAGEKIT
- gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
- else
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 5e26811..d2404ab 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -24,6 +23,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_GCONF_BRIDGE
- enabled_plugins += gconf
- else
--- 
-1.7.7.1
-