diff options
Diffstat (limited to 'gnome-base')
3 files changed, 4 insertions, 98 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 0c648a3a..f4b37713 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,3 +1,3 @@ -AUX 0001-Make-colord-optional.patch 4478 RMD160 a8bfd5541018cc21b2818d4813c454a53e0c5394 SHA1 3c620b4ff439bdf2603309e778ff3b0a6c1ba8be SHA256 6cd403a470e954b7312bb56a1175a80c45d440afc40719a12cc5485531afc89f -AUX gnome-settings-daemon-3.2.1-optional-colord.patch 2934 RMD160 cefc964b1c6449807043977b81ac4f593f37b7e3 SHA1 e1fa059374a429fe532af88f3a490d0ad5a2153a SHA256 2eb0e6cffd2fc579ece5cbe36950a28e9831d63764d8b5fae89df711ead4bf52 -EBUILD gnome-settings-daemon-9999-r1.ebuild 3465 RMD160 fd0c3b01ef0755b4149e7c90dcc5757b8f096ec5 SHA1 ae63c49cf876eac5380ff3056a7b69ee5bdb043c SHA256 1a361246f315ca2dade57450ae1ee88d61be37a882807aaba8b6e3c80e76813e +AUX 0001-Make-colord-optional.patch 4497 RMD160 cb26ecd2232118120f9675c9215e0248fe6b652a SHA1 570bde3786a6ae1a270ea792a15cfbe537e0381c SHA256 59f1cdbe53161e2a57037ab8c4a0a53e67b5e39c2fdf840bb7d3023d174a88e6 +AUX 0002-Disable-wacom.patch 1389 RMD160 3add8c49da1c54adaf8bd55a1c7d420db4c98903 SHA1 5347bef5683a6d3aca7d497b5761aa955e46beff SHA256 6ac2a235419b3126c7afaf22275457e34928f8453a09c403de75601eec70532d +EBUILD gnome-settings-daemon-9999-r1.ebuild 3512 RMD160 23d8205e06151842af123c496592cd5c346d8d0c SHA1 d5638f1f60f54b94194adc4c8fa4a31f9ee9aee8 SHA256 736aa9f4e28b94a69e4f1748da2bb26b6cc099aaa1bf753bc836653d8b1cc68e 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 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild index f543a14c..39fcca4d 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild @@ -103,6 +103,7 @@ src_prepare() { # Make colord optional; requires eautoreconf epatch "${FILESDIR}/0001-Make-colord-optional.patch" + epatch "${FILESDIR}/0002-Disable-wacom.patch" gnome2_src_prepare } |