kalev pushed to clutter (master). "x11: Fix touchpad detection (..more)"

[notifications at fedoraproject.org]

From e795538520678b7749cba9b2b83635a73958a4aa Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Sun, 17 May 2015 13:25:07 +0200
Subject: x11: Fix touchpad detection

https://bugzilla.redhat.com/show_bug.cgi?id=1206961

diff --git a/0001-x11-Fix-touchpad-detection.patch b/0001-x11-Fix-touchpad-detection.patch
new file mode 100644
index 0000000..d52ee26
--- /dev/null
+++ b/0001-x11-Fix-touchpad-detection.patch
@@ -0,0 +1,35 @@
+From a4aad807d5cc6842043e12897cfac3a516825c0f Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos at gmail.com>
+Date: Sun, 17 May 2015 00:50:56 +0200
+Subject: [PATCH] x11: Fix touchpad detection
+
+Commit 79849ef1d5fff9acd310cd68d59df0c7cf2cb28f had a typo in the
+device property format check. This property is formated in 8-bit
+items, not 32-bit.
+
+This went unnoticed till now because some touchpads were still being
+detected as such due to a second check below:
+
+      else if (strstr (name, "touchpad") != NULL)
+        source = CLUTTER_TOUCHPAD_DEVICE;
+
+https://bugzilla.gnome.org/show_bug.cgi?id=749482
+---
+ clutter/x11/clutter-device-manager-xi2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
+index 17c491e..1b101c4 100644
+--- a/clutter/x11/clutter-device-manager-xi2.c
++++ b/clutter/x11/clutter-device-manager-xi2.c
+@@ -242,7 +242,7 @@ is_touchpad_device (ClutterBackendX11 *backend_x11,
+   /* We don't care about the data */
+   XFree (data);
+ 
+-  if (rc != Success || type != XA_INTEGER || format != 32 || nitems != 1)
++  if (rc != Success || type != XA_INTEGER || format != 8 || nitems != 1)
+     return FALSE;
+ 
+   return TRUE;
+-- 
+2.4.0
\ No newline at end of file
diff --git a/clutter.spec b/clutter.spec
index 2952768..870748b 100644
--- a/clutter.spec
+++ b/clutter.spec
@@ -8,13 +8,15 @@
 
 Name:          clutter
 Version:       1.22.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Open Source software library for creating rich graphical user interfaces
 
 Group:         Development/Libraries
 License:       LGPLv2+
 URL:           http://www.clutter-project.org/
 Source0:       http://download.gnome.org/sources/clutter/1.22/clutter-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=749482
+Patch0:        0001-x11-Fix-touchpad-detection.patch
 
 BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel
 BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel
@@ -78,6 +80,7 @@ the functionality of the installed clutter package.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -129,6 +132,9 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* Sun May 17 2015 Kalev Lember <kalevlember at gmail.com> - 1.22.2-2
+- x11: Fix touchpad detection (#1206961)
+
 * Tue May 12 2015 Kalev Lember <kalevlember at gmail.com> - 1.22.2-1
 - Update to 1.22.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/clutter.git/commit/?h=master&id=e795538520678b7749cba9b2b83635a73958a4aa