diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-01-22 03:00:43 -0500 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-01-22 03:10:20 -0500 |
| commit | f1bac0adbc25cc2fdea3559a5295c5bc2e7baba6 (patch) | |
| tree | db07e632800b0654672bb4e71d2e41e4c4e86728 /gnome-base/gnome-settings-daemon/files | |
| parent | gnome-extra/gnome-color-manager: sync with gx86 (diff) | |
| download | gnome-f1bac0adbc25cc2fdea3559a5295c5bc2e7baba6.tar.gz gnome-f1bac0adbc25cc2fdea3559a5295c5bc2e7baba6.tar.bz2 gnome-f1bac0adbc25cc2fdea3559a5295c5bc2e7baba6.zip | |
gnome-base/gnome-settings-daemon: sync with gx86
Update patch, rename USE=wacom to INPUT_DEVICES=wacom, modernize ebuild.
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch (renamed from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch) | 49 |
1 files changed, 15 insertions, 34 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch index 3605630d..bd02900a 100644 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch @@ -1,6 +1,8 @@ ---- configure.ac -+++ configure.ac -@@ -240,7 +240,20 @@ +diff --git a/configure.ac b/configure.ac +index d1739c4..752c09d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -241,7 +241,20 @@ dnl --------------------------------------------------------------------------- dnl - color dnl --------------------------------------------------------------------------- @@ -22,7 +24,7 @@ dnl --------------------------------------------------------------------------- dnl - wacom (disabled for s390/s390x and non Linux platforms) -@@ -252,11 +265,22 @@ +@@ -253,11 +266,22 @@ case $host_os in have_wacom=no else if test x$enable_gudev != xno; then @@ -32,12 +34,12 @@ + [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-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom]) -+ have_wacom=yes ++ have_wacom=yes + fi -+ ++ + AC_SUBST(WACOM_CFLAGS) + AC_SUBST(WACOM_LIBS) else @@ -47,32 +49,11 @@ fi ;; *) ---- data/Makefile.am -+++ data/Makefile.am -@@ -11,7 +11,6 @@ - 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 \ -@@ -20,6 +19,12 @@ - - 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 ---- plugins/Makefile.am -+++ plugins/Makefile.am -@@ -6,7 +6,6 @@ +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 69b7181..a1cdf6c 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -6,7 +6,6 @@ enabled_plugins = \ automount \ background \ clipboard \ @@ -80,7 +61,7 @@ cursor \ dummy \ power \ -@@ -21,6 +20,12 @@ +@@ -22,6 +21,12 @@ enabled_plugins = \ disabled_plugins = $(NULL) |