From 88525d322327073e176b475a6743605568b609e2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mar 09 2016 02:37:58 +0000
Subject: Stop bug warnings on three-finger pinch gestures (#1282252)


---

diff --git a/0001-Xi-don-t-deliver-emulated-motion-events-for-non-emul.patch b/0001-Xi-don-t-deliver-emulated-motion-events-for-non-emul.patch
new file mode 100644
index 0000000..840b1b2
--- /dev/null
+++ b/0001-Xi-don-t-deliver-emulated-motion-events-for-non-emul.patch
@@ -0,0 +1,34 @@
+From 1f90ba995c8f22d4e69b347f2e3a49c2949024d8 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 9 Mar 2016 10:45:48 +1000
+Subject: [PATCH xserver] Xi: don't deliver emulated motion events for
+ non-emulating touches
+
+The touchpoint knows whether it should be emulating or not and we have a check
+for that later. Check for this before we generate the event and try to deliver
+it, lest we trigger a bug warning.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1282252
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ Xi/exevents.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 74e49ed..5a0b68d 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -1379,6 +1379,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
+     if (!TouchResourceIsOwner(ti, listener->listener))
+         return !Success;
+ 
++    if (!ti->emulate_pointer)
++        return !Success;
++
+     nevents = TouchConvertToPointerEvent(ev, &motion, &button);
+     BUG_RETURN_VAL(nevents == 0, BadValue);
+ 
+-- 
+2.5.0
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 048a97f..3541a5b 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -45,7 +45,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.18.1
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -93,6 +93,9 @@ Patch9100: exa-only-draw-valid-trapezoids.patch
 
 Patch9101: 0001-present-fail-flipping-if-we-have-any-slave-outputs.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1282252
+Patch9200: 0001-Xi-don-t-deliver-emulated-motion-events-for-non-emul.patch
+
 # because the display-managers are not ready yet, do not upstream
 Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
 
@@ -632,6 +635,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Wed Mar 09 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.18.1-3
+- Stop bug warnings on three-finger pinch gestures (#1282252)
+
 * Mon Feb 15 2016 Dave Airlie <airlied@redhat.com> 1.18.1-2
 - fix issues with reverse prime and present.