[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-settings-daemon/files: gnome-settings-daemon-3.7.90-optional-color-wacom.patch gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch

[Pacho Ramos (pacho)]

pacho       13/03/28 17:13:42

  Added:               
                        gnome-settings-daemon-3.7.90-optional-color-wacom.patch
                        gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
  Log:
  Version bump for Gnome 3.8
  
  (Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.1                  gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-optional-color-wacom.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-optional-color-wacom.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.7.90-optional-color-wacom.patch?rev=1.1&content-type=text/plain

Index: gnome-settings-daemon-3.7.90-optional-color-wacom.patch
===================================================================
From 640337bdf28df00583d142413f5e58065d6016ef Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <sobhanmohammadpour1@×××××.fr>
Date: Mon, 25 Feb 2013 17:35:35 +0330
Subject: [PATCH] gnome-settings-daemon-3.7.90-optional-color-wacom

---
 configure           | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac        | 29 ++++++++++++++++++++++++++---
 plugins/Makefile.am |  7 ++++++-
 3 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 65296f5..6927d31 100755
--- a/configure
+++ b/configure
@@ -661,6 +661,8 @@ HAVE_WACOM_FALSE
 HAVE_WACOM_TRUE
 WACOM_LIBS
 WACOM_CFLAGS
+WITH_COLOR_FALSE
+WITH_COLOR_TRUE
 COLOR_LIBS
 COLOR_CFLAGS
 BACKLIGHT_HELPER_LIBS
@@ -911,6 +913,8 @@ enable_iso_c
 enable_schemas_compile
 enable_gudev
 enable_ibus
+enable_color
+enable_wacom
 enable_packagekit
 enable_smartcard_support
 with_nssdb
@@ -1626,6 +1630,8 @@ Optional Features:
   --disable-gudev         Disable GUdev support (not optional on Linux
                           platforms)
   --disable-ibus          Disable IBus support
+  --disable-color         turn off color plugin
+  --disable-wacom         turn off wacom plugin
   --disable-packagekit    turn off PackageKit support
   --disable-smartcard-support
                           turn off smartcard support
@@ -19655,6 +19661,14 @@ fi
 fi
 
 
+# Check whether --enable-color was given.
+if test "${enable_color+set}" = set; then :
+  enableval=$enable_color; with_color=$enableval
+else
+  with_color=yes
+fi
+
+if test x$with_color = xyes; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLOR" >&5
@@ -19747,6 +19761,21 @@ $as_echo "yes" >&6; }
 
 fi
 
+$as_echo "#define HAVE_COLOR 1" >>confdefs.h
+
+fi
+ if test "x$with_color" = "xyes"; then
+  WITH_COLOR_TRUE=
+  WITH_COLOR_FALSE='#'
+else
+  WITH_COLOR_TRUE='#'
+  WITH_COLOR_FALSE=
+fi
+
+
+
+
+
 
 case $host_os in
   linux*)
@@ -19754,6 +19783,13 @@ case $host_os in
       have_wacom=no
     else
       if test x$enable_gudev != xno; then
+      	 # Check whether --enable-wacom was given.
+if test "${enable_wacom+set}" = set; then :
+  enableval=$enable_wacom; with_wacom=$enableval
+else
+  with_wacom=no
+fi
+          if test x$with_wacom = xyes; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WACOM" >&5
@@ -19845,10 +19881,14 @@ else
 $as_echo "yes" >&6; }
 
 fi
+                 have_wacom=yes
+	 fi
+
+
       else
         as_fn_error $? "GUdev is necessary to compile Wacom support" "$LINENO" 5
       fi
-      have_wacom=yes
+
     fi
     ;;
   *)
@@ -20594,6 +20634,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_COLOR_TRUE}" && test -z "${WITH_COLOR_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_COLOR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_WACOM_TRUE}" && test -z "${HAVE_WACOM_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_WACOM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 49035f3..4aa70b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,20 @@ dnl ---------------------------------------------------------------------------
 dnl - color
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 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 >= 0.1.9 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 - wacom (disabled for s390/s390x and non Linux platforms)
@@ -253,11 +266,21 @@ case $host_os in
       have_wacom=no
     else
       if test x$enable_gudev != xno; 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 librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION])
+      	 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(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])
+                 have_wacom=yes
+	 fi
+	AC_SUBST(WACOM_CFLAGS)
+	AC_SUBST(WACOM_LIBS)
       else
         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
       fi
-      have_wacom=yes
+      
     fi
     ;;
   *)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b3aed9e..a4cb188 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -4,7 +4,6 @@ enabled_plugins =	\
 	a11y-keyboard	\
 	a11y-settings	\
 	clipboard	\
-	color		\
 	cursor		\
 	dummy		\
 	power		\
@@ -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
-- 
1.8.1.2




1.1                  gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.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.7.90-short-touchpad-timeout.patch?rev=1.1&content-type=text/plain

Index: gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
===================================================================
From bc0f7c1da87b17839ebf71dc102c19b7d7b6c65a Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <sobhanmohammadpour1@×××××.fr>
Date: Mon, 25 Feb 2013 17:24:25 +0330
Subject: [PATCH] gnome-settings-daemon-3.7.90-short-touchpad-timeout

---
 plugins/mouse/gsd-mouse-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index a62800a..e7d39e1 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -583,7 +583,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
 
                 g_ptr_array_add (args, "syndaemon");
                 g_ptr_array_add (args, "-i");
-                g_ptr_array_add (args, "1.0");
+                g_ptr_array_add (args, "0.5");
                 g_ptr_array_add (args, "-t");
                 g_ptr_array_add (args, "-K");
                 g_ptr_array_add (args, "-R");
-- 
1.8.1.2