| 1 |
eva 14/04/27 16:58:01 |
| 2 |
|
| 3 |
Added: gnome-settings-daemon-3.12.0-optional.patch |
| 4 |
Log: |
| 5 |
Version bump for Gnome 3.12. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: gnome-settings-daemon-3.12.0-optional.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index dd95dd4..03d651c 100644 |
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -248,7 +248,20 @@ dnl --------------------------------------------------------------------------- |
| 22 |
dnl - color |
| 23 |
dnl --------------------------------------------------------------------------- |
| 24 |
|
| 25 |
-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) |
| 26 |
+AC_ARG_ENABLE([color], |
| 27 |
+ AS_HELP_STRING([--disable-color], |
| 28 |
+ [turn off color plugin]), |
| 29 |
+ [with_color=$enableval], |
| 30 |
+ [with_color=yes]) dnl Default value |
| 31 |
+ |
| 32 |
+if test x$with_color = xyes; then |
| 33 |
+ PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) |
| 34 |
+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) |
| 35 |
+fi |
| 36 |
+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes") |
| 37 |
+ |
| 38 |
+AC_SUBST(COLOR_CFLAGS) |
| 39 |
+AC_SUBST(COLOR_LIBS) |
| 40 |
|
| 41 |
dnl --------------------------------------------------------------------------- |
| 42 |
dnl - datetime |
| 43 |
@@ -279,15 +292,25 @@ case $host_os in |
| 44 |
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
| 45 |
have_wacom=no |
| 46 |
else |
| 47 |
+ have_wacom=no |
| 48 |
if test x$enable_gudev != xno; then |
| 49 |
- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
| 50 |
- 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]) |
| 51 |
- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
| 52 |
+ AC_ARG_ENABLE([wacom], |
| 53 |
+ AS_HELP_STRING([--disable-wacom], |
| 54 |
+ [turn off wacom plugin]), |
| 55 |
+ [with_wacom=$enableval], |
| 56 |
+ [with_wacom=no]) dnl Default value |
| 57 |
+ if test x$with_wacom = xyes; then |
| 58 |
+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) |
| 59 |
+ 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]) |
| 60 |
+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) |
| 61 |
+ have_wacom=yes |
| 62 |
+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
| 63 |
+ fi |
| 64 |
+ AC_SUBST(WACOM_CFLAGS) |
| 65 |
+ AC_SUBST(WACOM_LIBS) |
| 66 |
else |
| 67 |
AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) |
| 68 |
fi |
| 69 |
- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) |
| 70 |
- have_wacom=yes |
| 71 |
fi |
| 72 |
;; |
| 73 |
*) |
| 74 |
diff --git a/plugins/Makefile.am b/plugins/Makefile.am |
| 75 |
index 04f8e2a..55ed94c 100644 |
| 76 |
--- a/plugins/Makefile.am |
| 77 |
+++ b/plugins/Makefile.am |
| 78 |
@@ -4,7 +4,6 @@ enabled_plugins = \ |
| 79 |
a11y-keyboard \ |
| 80 |
a11y-settings \ |
| 81 |
clipboard \ |
| 82 |
- color \ |
| 83 |
cursor \ |
| 84 |
datetime \ |
| 85 |
dummy \ |
| 86 |
@@ -21,6 +20,12 @@ enabled_plugins = \ |
| 87 |
|
| 88 |
disabled_plugins = $(NULL) |
| 89 |
|
| 90 |
+if WITH_COLOR |
| 91 |
+enabled_plugins += color |
| 92 |
+else |
| 93 |
+disabled_plugins += color |
| 94 |
+endif |
| 95 |
+ |
| 96 |
if HAVE_PACKAGEKIT |
| 97 |
enabled_plugins += updates |
| 98 |
else |
Archives