diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-06 04:24:47 -0400 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-06 04:38:10 -0400 |
| commit | 3a4a482651f7d7d9e5a00efba702074c492d273f (patch) | |
| tree | 13d886e98a35ff0fff284ac195e480618bb7545d /gnome-base/gnome-settings-daemon/files | |
| parent | net-im/empathy: 3.4.0.1 → 3.4.0.2 (diff) | |
| download | gnome-3a4a482651f7d7d9e5a00efba702074c492d273f.tar.gz gnome-3a4a482651f7d7d9e5a00efba702074c492d273f.tar.bz2 gnome-3a4a482651f7d7d9e5a00efba702074c492d273f.zip | |
gnome-base/gnome-settings-daemon: 3.3.92 → 3.4.0
Now with systemd and wacom support.
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch (renamed from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch) | 12 |
1 files changed, 6 insertions, 6 deletions
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.4.0-optional-color-wacom.patch index 6af221d1..045b4d61 100644 --- 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.4.0-optional-color-wacom.patch @@ -12,14 +12,14 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3. + [with_color=$enableval], + [with_color=yes]) dnl Default value + -+if test x$WANT_COLOR = xyes; then ++if test x$with_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]) ++ AC_DEFINE(HAVE_COLOR, 1, [Define if wacom plugin is enabled]) +fi -+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xtrue") ++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes") + -+AC_SUBST(COLORD_CFLAGS) -+AC_SUBST(COLORD_LIBS) ++AC_SUBST(COLOR_CFLAGS) ++AC_SUBST(COLOR_LIBS) dnl --------------------------------------------------------------------------- dnl - wacom @@ -36,7 +36,7 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3. + 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") ++AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xyes") + +AC_SUBST(WACOM_CFLAGS) +AC_SUBST(WACOM_LIBS) |