Accepting request 124313 from GNOME:Factory

Fixes for touchpad delay after typing, and relocating libexecdir; fixes bgo#590783, bgo#673055 and bnc#758592 (forwarded request 124248 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/124313
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=81

gnome-settings-daemon-only-inhibit-touchpad-tapping.patch

@@ -0,0 +1,23 @@
+Index: gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c
+===================================================================
+--- gnome-settings-daemon-3.4.2.orig/plugins/mouse/gsd-mouse-manager.c
++++ gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c
+@@ -542,7 +542,7 @@ set_disable_w_typing (GsdMouseManager *m
+ {
+         if (state && touchpad_is_present ()) {
+                 GError *error = NULL;
+-                char *args[6];
++                char *args[7];
+ 
+                 if (manager->priv->syndaemon_spawned)
+                         return 0;
+@@ -552,7 +552,8 @@ set_disable_w_typing (GsdMouseManager *m
+                 args[2] = "1.0";
+                 args[3] = "-K";
+                 args[4] = "-R";
+-                args[5] = NULL;
++                args[5] = "-t";
++                args[6] = NULL;
+ 
+                 if (!have_program_in_path (args[0]))
+                         return 0;

gnome-settings-daemon-reduce-tap-delay.patch

@@ -0,0 +1,22 @@
+From 2e56b5ce4d42a26146c36f5b734b99352069ebaf Mon Sep 17 00:00:00 2001
+From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
+Date: Sat, 08 Oct 2011 14:34:09 +0000
+Subject: mouse: Set default touchpad deactivation to 1.0s
+
+https://bugzilla.gnome.org/show_bug.cgi?id=590783
+---
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+index 8a1d444..17a7219 100644
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -549,7 +549,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+ 
+                 args[0] = "syndaemon";
+                 args[1] = "-i";
+-                args[2] = "2.0";
++                args[2] = "1.0";
+                 args[3] = "-K";
+                 args[4] = "-R";
+                 args[5] = NULL;
+--
+cgit v0.9.0.2

gnome-settings-daemon.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jun  6 21:05:32 UTC 2012 - badshah400@gmail.com
+
+- Add gnome-settings-daemon-reduce-tap-delay.patch to reduce the
+  delay between the last keystroke and the first touchpad tap when
+  the option "Disable touchpad when typing" is enabled in mouse
+  options in gnome-control-center (bgo#590783)
+- Add gnome-settings-daemon-only-inhibit-touchpad-tapping.patch to
+  inhibit only tapping and not affect pointer motion or scrolling
+  using the touchpad when the option "Disable touchpad when
+  typing" is enabled in mouse options in gnome-control-center
+  (bgo#673055)
+- Pass --libexecdir option to ./configure to change the
+  installation dir of program executables to
+  %{_libexecdir}/gnome-settings-daemon-3.0; fixes bnc#758592.
+
 -------------------------------------------------------------------
 Tue May 15 13:58:09 UTC 2012 - vuntz@opensuse.org
 

gnome-settings-daemon.spec

@@ -44,6 +44,10 @@ Patch14:        gnome-packagekit-fate302445.patch
 Patch15:        gnome-packagekit-BNC383261.patch
 # PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings
 Patch17:        gnome-settings-daemon-stop-reload-proxy-settings.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-reduce-tap-delay.patch bgo#590783 badshah400@gmail.com -- Reduce lag between last keystroke and first touchpad tap (patch came from upstream git)
+Patch18:        gnome-settings-daemon-reduce-tap-delay.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-reduce-tap-delay.patch bgo#673055 badshah400@gmail.com -- When touchpad is deactivated during keyboard use, only deactivate tapping, but not pointer motion
+Patch19:        gnome-settings-daemon-only-inhibit-touchpad-tapping.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
@@ -137,6 +141,8 @@ translation-update-upstream
 # PATCH-NEEDS-REBASE
 #%%patch15 -p0
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 %endif
 
 %if 0%{?BUILD_FROM_VCS}
@@ -151,7 +157,9 @@ autoreconf -f -i
 %endif
         --enable-gconf-bridge \
         --disable-static \
-        --with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids
+        --with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids \
+        --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0
+
 make %{?jobs:-j%jobs} V=1
 
 %install
@@ -183,12 +191,13 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
 %{_datadir}/gnome-settings-daemon/
 %{_datadir}/gnome-settings-daemon-3.0/
-%{_libexecdir}/gnome-fallback-mount-helper
+%dir %{_libexecdir}/gnome-settings-daemon-3.0/
-%{_libexecdir}/gnome-settings-daemon
+%{_libexecdir}/gnome-settings-daemon-3.0/gnome-fallback-mount-helper
-%{_libexecdir}/gsd-backlight-helper
+%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon
-%{_libexecdir}/gsd-locate-pointer
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
-%{_libexecdir}/gsd-printer
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer
-%{_libexecdir}/gsd-wacom-led-helper
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper
 # From patch2
 #%{_libexecdir}/novell-sysconfig-proxy-helper
 %dir %{_libdir}/gnome-settings-daemon-3.0/