Add gnome-base/gnome-settings-daemon-3.5.91

4 files changed, 108 insertions, 140 deletions

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
deleted file mode 100644
index a87a3d9b..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
- 
-                 args[0] = "syndaemon";
-                 args[1] = "-i";
--                args[2] = "2.0";
-+                args[2] = "0.5";
-                 args[3] = "-K";
-                 args[4] = "-R";
-                 args[5] = NULL;
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
deleted file mode 100644
index 045b4d61..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.92.new//configure.ac
---- gnome-settings-daemon-3.3.92//configure.ac	2012-03-19 14:23:38.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//configure.ac	2012-03-25 11:36:35.833356226 +0530
-@@ -194,13 +194,39 @@
- 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 wacom plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG 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_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-+       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xyes")
-+
-+AC_SUBST(WACOM_CFLAGS)
-+AC_SUBST(WACOM_LIBS)
- 
- dnl ==============================================
- dnl PackageKit section
-diff -Naur gnome-settings-daemon-3.3.92//data/Makefile.am gnome-settings-daemon-3.3.92.new//data/Makefile.am
---- gnome-settings-daemon-3.3.92//data/Makefile.am	2012-03-16 22:59:35.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//data/Makefile.am	2012-03-25 11:39:24.548364338 +0530
-@@ -11,16 +11,20 @@
- 	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	\
- 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
--	org.gnome.settings-daemon.peripherals.wacom.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
- 
- 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
-@@ -33,6 +37,12 @@
- all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
- endif
- 
-+if WITH_WACOM
-+gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-+endif
-+
- @INTLTOOL_XML_NOMERGE_RULE@
- 
- @GSETTINGS_RULES@
-diff -Naur gnome-settings-daemon-3.3.92//plugins/Makefile.am gnome-settings-daemon-3.3.92.new//plugins/Makefile.am
---- gnome-settings-daemon-3.3.92//plugins/Makefile.am	2012-03-16 22:59:35.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//plugins/Makefile.am	2012-03-25 11:37:47.296359651 +0530
-@@ -6,7 +6,6 @@
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
- 	power		\
-@@ -15,13 +14,18 @@
- 	media-keys	\
- 	mouse		\
- 	sound		\
--	wacom		\
- 	xrandr		\
- 	xsettings	\
- 	$(NULL)
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else
-@@ -46,5 +50,11 @@
- disabled_plugins += print-notifications
- endif
- 
-+if WITH_WACOM
-+enabled_plugins += wacom
-+else
-+disabled_plugins += wacom
-+endif
-+
- SUBDIRS = common $(enabled_plugins)
- DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins)
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
new file mode 100644
index 00000000..3605630d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
@@ -0,0 +1,95 @@
+--- 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
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
new file mode 100644
index 00000000..b0110095
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
@@ -0,0 +1,13 @@
+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");