diff options
author | Nirbheek Chauhan <nirbheek@gentoo.org> | 2012-03-25 11:42:41 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2012-03-26 13:49:38 +0530 |
commit | 2244ea955f012fde263d0b7793b646e57d558456 (patch) | |
tree | 664e17781a1f896e5d075ceb9da9031366e79e15 /gnome-base/gnome-settings-daemon/files | |
parent | Add gnome-base/gnome-desktop-3.3.92 (diff) | |
download | gnome-2244ea955f012fde263d0b7793b646e57d558456.tar.gz gnome-2244ea955f012fde263d0b7793b646e57d558456.tar.bz2 gnome-2244ea955f012fde263d0b7793b646e57d558456.zip |
Add gnome-base/gnome-settings-daemon-3.3.92
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
2 files changed, 127 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 - diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch new file mode 100644 index 00000000..6af221d1 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch @@ -0,0 +1,127 @@ +diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.92.new//configure.ac +--- gnome-settings-daemon-3.3.92//configure.ac 2012-03-19 14:23:38.000000000 +0530 ++++ gnome-settings-daemon-3.3.92.new//configure.ac 2012-03-25 11:36:35.833356226 +0530 +@@ -194,13 +194,39 @@ + dnl - color + dnl --------------------------------------------------------------------------- + +-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++AC_ARG_ENABLE([color], ++ AS_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [with_color=$enableval], ++ [with_color=yes]) dnl Default value ++ ++if test x$WANT_COLOR = xyes; then ++ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled]) ++fi ++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xtrue") ++ ++AC_SUBST(COLORD_CFLAGS) ++AC_SUBST(COLORD_LIBS) + + dnl --------------------------------------------------------------------------- + dnl - wacom + dnl --------------------------------------------------------------------------- + +-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom]) ++AC_ARG_ENABLE([wacom], ++ AS_HELP_STRING([--disable-wacom], ++ [turn off wacom plugin]), ++ [with_wacom=$enableval], ++ [with_wacom=no]) dnl Default value ++ ++if test x$with_wacom = xyes; then ++ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom]) ++ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled]) ++fi ++AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xtrue") ++ ++AC_SUBST(WACOM_CFLAGS) ++AC_SUBST(WACOM_LIBS) + + dnl ============================================== + dnl PackageKit section +diff -Naur gnome-settings-daemon-3.3.92//data/Makefile.am gnome-settings-daemon-3.3.92.new//data/Makefile.am +--- gnome-settings-daemon-3.3.92//data/Makefile.am 2012-03-16 22:59:35.000000000 +0530 ++++ gnome-settings-daemon-3.3.92.new//data/Makefile.am 2012-03-25 11:39:24.548364338 +0530 +@@ -11,16 +11,20 @@ + 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 \ + org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \ +- org.gnome.settings-daemon.peripherals.wacom.gschema.xml \ + org.gnome.settings-daemon.plugins.xrandr.gschema.xml + + all_schemas = $(gsettings_SCHEMAS) + ++if WITH_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 +@@ -33,6 +37,12 @@ + all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml + endif + ++if WITH_WACOM ++gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml ++else ++all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml ++endif ++ + @INTLTOOL_XML_NOMERGE_RULE@ + + @GSETTINGS_RULES@ +diff -Naur gnome-settings-daemon-3.3.92//plugins/Makefile.am gnome-settings-daemon-3.3.92.new//plugins/Makefile.am +--- gnome-settings-daemon-3.3.92//plugins/Makefile.am 2012-03-16 22:59:35.000000000 +0530 ++++ gnome-settings-daemon-3.3.92.new//plugins/Makefile.am 2012-03-25 11:37:47.296359651 +0530 +@@ -6,7 +6,6 @@ + automount \ + background \ + clipboard \ +- color \ + cursor \ + dummy \ + power \ +@@ -15,13 +14,18 @@ + media-keys \ + mouse \ + sound \ +- wacom \ + xrandr \ + xsettings \ + $(NULL) + + disabled_plugins = $(NULL) + ++if WITH_COLOR ++enabled_plugins += color ++else ++disabled_plugins += color ++endif ++ + if HAVE_PACKAGEKIT + enabled_plugins += updates + else +@@ -46,5 +50,11 @@ + disabled_plugins += print-notifications + endif + ++if WITH_WACOM ++enabled_plugins += wacom ++else ++disabled_plugins += wacom ++endif ++ + SUBDIRS = common $(enabled_plugins) + DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins) |