gnome-base/gnome-settings-daemon: 3.8.6.1 → 3.10.2

3 files changed, 103 insertions, 78 deletions

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
new file mode 100644
index 00000000..213d0a73
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
@@ -0,0 +1,89 @@
+From a5ee890809d279c06bb5f00dec7ad71eae2af14f Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Tue, 10 Dec 2013 00:27:27 +0100
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac        | 30 ++++++++++++++++++++++++++----
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 32 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9f3b7ed..5720d36 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,7 +245,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
+@@ -276,12 +289,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 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(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
++        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 2f4840d..d517e77 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	datetime	\
+ 	dummy		\
+@@ -22,6 +21,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.3.2
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
deleted file mode 100644
index bd02900a..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d1739c4..752c09d 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,22 @@ 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])
-+	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
-     ;;
-   *)
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 69b7181..a1cdf6c 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
- 	power		\
-@@ -22,6 +21,12 @@ enabled_plugins =	\
- 
- 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.7.90-short-touchpad-timeout.patch
index b0110095..7dc410f2 100644
--- 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.7.90-short-touchpad-timeout.patch
@@ -1,8 +1,17 @@
+From bc0f7c1da87b17839ebf71dc102c19b7d7b6c65a Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.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 80f664a..c9a29fb 100644
+index a62800a..e7d39e1 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)
+@@ -583,7 +583,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
  
                  g_ptr_array_add (args, "syndaemon");
                  g_ptr_array_add (args, "-i");
@@ -11,3 +20,6 @@ index 80f664a..c9a29fb 100644
                  g_ptr_array_add (args, "-t");
                  g_ptr_array_add (args, "-K");
                  g_ptr_array_add (args, "-R");
+-- 
+1.8.1.2
+