eva 14/04/27 16:58:01 Added: gnome-settings-daemon-3.12.0-optional.patch Log: Version bump for Gnome 3.12. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Revision Changes Path 1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch?rev=1.1&content-type=text/plain Index: gnome-settings-daemon-3.12.0-optional.patch =================================================================== 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
