diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2015-08-23 17:38:25 +0200 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2015-08-23 17:39:08 +0200 |
commit | ee21ce0103d95a74236f23a750d65a3b6fcee8e4 (patch) | |
tree | d1226365ff2edc74a3dbf900bab7376fcb16207e /gnome-base/gnome-settings-daemon/files | |
parent | gnome-base/gnome-settings-daemon: version bump (diff) | |
download | gentoo-ee21ce0103d95a74236f23a750d65a3b6fcee8e4.tar.gz gentoo-ee21ce0103d95a74236f23a750d65a3b6fcee8e4.tar.bz2 gentoo-ee21ce0103d95a74236f23a750d65a3b6fcee8e4.zip |
gnome-base/gnome-settings-daemon: drop old revision
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
-rw-r--r-- | gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch deleted file mode 100644 index cb117d70e445..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index dd95dd4..03d651c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -248,7 +248,20 @@ dnl --------------------------------------------------------------------------- - dnl - color - dnl --------------------------------------------------------------------------- - --PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 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$with_color = xyes; then -+ PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) -+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) -+fi -+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes") -+ -+AC_SUBST(COLOR_CFLAGS) -+AC_SUBST(COLOR_LIBS) - - dnl --------------------------------------------------------------------------- - dnl - datetime -@@ -279,15 +292,25 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -+ have_wacom=no - if test x$enable_gudev != xno; then -- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -+ 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(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -+ have_wacom=yes -+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -+ fi -+ AC_SUBST(WACOM_CFLAGS) -+ AC_SUBST(WACOM_LIBS) - else - AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) - fi -- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -- have_wacom=yes - fi - ;; - *) -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 04f8e2a..55ed94c 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -4,7 +4,6 @@ enabled_plugins = \ - a11y-keyboard \ - a11y-settings \ - clipboard \ -- color \ - cursor \ - datetime \ - dummy \ -@@ -21,6 +20,12 @@ enabled_plugins = \ - - disabled_plugins = $(NULL) - -+if WITH_COLOR -+enabled_plugins += color -+else -+disabled_plugins += color -+endif -+ - if HAVE_PACKAGEKIT - enabled_plugins += updates - else |