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

[Gilles Dartiguelongue (eva)]

eva         12/12/25 21:45:29

  Added:               
                        gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
                        gnome-settings-daemon-3.5.91-optional-color-wacom.patch
  Log:
  Version bump for Gnome 3.6. Switch to EAPI=5.
  
  (Portage version: 2.2.0_alpha149/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.5.91-short-touchpad-timeout.patch

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

Index: gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
===================================================================
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 80f664a..c9a29fb 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -533,7 +533,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.1                  gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch

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

Index: gnome-settings-daemon-3.5.91-optional-color-wacom.patch
===================================================================
--- configure.ac
+++ configure.ac
@@ -240,7 +240,20 @@
 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)
@@ -252,11 +265,22 @@
       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])
+	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])
+      		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
     ;;
   *)
--- data/Makefile.am
+++ data/Makefile.am
@@ -11,7 +11,6 @@
 	org.gnome.settings-daemon.plugins.gschema.xml			\
 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
-	org.gnome.settings-daemon.plugins.color.gschema.xml		\
 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
@@ -20,6 +19,12 @@
 
 all_schemas = $(gsettings_SCHEMAS)
 
+if WITH_COLOR
+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
+else
+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
+endif
+
 if HAVE_PACKAGEKIT
 gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
 else
--- plugins/Makefile.am
+++ plugins/Makefile.am
@@ -6,7 +6,6 @@
 	automount	\
 	background	\
 	clipboard	\
-	color		\
 	cursor		\
 	dummy		\
 	power		\
@@ -21,6 +20,12 @@
 
 disabled_plugins = $(NULL)
 
+if WITH_COLOR
+enabled_plugins += color
+else
+disabled_plugins += color
+endif
+
 if HAVE_PACKAGEKIT
 enabled_plugins += updates
 else