[clutter] Backport a patch to use XI2.3

[Kalev Lember]

commit 7a3ad85c079fc6bf61a7107d92c45fedb54e9639
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Feb 5 20:38:59 2013 +0100

    Backport a patch to use XI2.3
    
    ... so that clutter keeps working with gtk+ 3.7.8.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=692466

 clutter-1.13.4-xi23.patch |   65 +++++++++++++++++++++++++++++++++++++++++++++
 clutter.spec              |    8 +++++-
 2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/clutter-1.13.4-xi23.patch b/clutter-1.13.4-xi23.patch
new file mode 100644
index 0000000..b11c80c
--- /dev/null
+++ b/clutter-1.13.4-xi23.patch
@@ -0,0 +1,65 @@
+From b58a1d66816c19eda079a1bd7cecd1ad03644e69 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Wed, 23 Jan 2013 17:09:59 -0500
+Subject: [PATCH] x11: Always request XI2.2
+
+The X server should fill in the minor version that it supports in the
+case where it only supports the older version. We should not get a
+BadRequest or fail the version check if we pass something higher.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692466
+---
+ clutter/x11/clutter-backend-x11.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
+index 2d8f4ba..26f9581 100644
+--- a/clutter/x11/clutter-backend-x11.c
++++ b/clutter/x11/clutter-backend-x11.c
+@@ -239,12 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
+             {
+ #ifdef HAVE_XINPUT_2
+               int major = 2;
+-
+-#ifdef HAVE_XINPUT_2_2
+               int minor = 2;
+-#else
+-              int minor = 0;
+-#endif /* HAVE_XINPUT_2_2 */
+ 
+               if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
+                 {
+-- 
+1.8.1.2
+
+From 3e1450ba17fce90a8034cc525c67a87ff3cdd53d Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Wed, 23 Jan 2013 14:49:26 -0500
+Subject: [PATCH] clutter-backend: Request XI2.3
+
+Since XIQueryVersion, the bad API that it is, chooses the first client
+version that it gets, we need to ensure that we pass XIQueryVersion the
+new XI2.3 version, knowing fully well that Clutter won't be confused
+by the new features.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692466
+---
+ clutter/x11/clutter-backend-x11.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
+index 26f9581..1015f4c 100644
+--- a/clutter/x11/clutter-backend-x11.c
++++ b/clutter/x11/clutter-backend-x11.c
+@@ -239,7 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
+             {
+ #ifdef HAVE_XINPUT_2
+               int major = 2;
+-              int minor = 2;
++              int minor = 3;
+ 
+               if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
+                 {
+-- 
+1.8.1.2
+
diff --git a/clutter.spec b/clutter.spec
index b82092e..398e8a1 100644
--- a/clutter.spec
+++ b/clutter.spec
@@ -1,10 +1,12 @@
 Name:          clutter
 Version:       1.13.4
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Open Source software library for creating rich graphical user interfaces
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=692707
 Patch0:        oob-device-fix.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=692466
+Patch1:        clutter-1.13.4-xi23.patch
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -68,6 +70,7 @@ This package contains documentation for clutter.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .xi23
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -112,6 +115,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gtk-doc/html/cally
 
 %changelog
+* Tue Feb 05 2013 Kalev Lember <kalevlember at gmail.com> - 1.13.4-4
+- Backport a patch to use XI2.3, so that clutter keeps working with gtk+ 3.7.8
+
 * Wed Jan 30 2013 Matthias Clasen <mclasen at redhat.com> - 1.13.4-3
 - Fix a gnome-shell crash