[jhbuild] Build libXi from git

[Owen Taylor <otaylor src gnome org>]

commit cc3fdbf8337b33ca5d00afd0736119a756d1ee8a
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Fri Jul 25 16:55:43 2014 +0200

    Build libXi from git
    
    libXi prior to 1.7.4 contains locking bugs that will deadlock the
    compositor when touch events are received. Avoid a bleading-edge
    system dependency by building from git.

 modulesets/gnome-suites-core-deps-3.14.modules |   12 ++++++++++++
 modulesets/gnome-sysdeps-3.14.modules          |    5 -----
 2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index c54212f..55348e2 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -350,6 +350,18 @@
     </suggests>
   </autotools>
 
+  <!-- libXi prior to 1.7.4 contains locking bugs that will deadlock the
+       compositor when touch events are received. Avoid a bleading-edge
+       system dependency by building from git. -->
+  <autotools id="libXi">
+    <branch repo="xorg.freedesktop.org" module="lib/libXi" checkoutdir="libXi"/>
+    <dependencies>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
+      <dep package="xorg-xproto"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="clutter" autogenargs="--enable-installed-tests --enable-egl-backend">
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
diff --git a/modulesets/gnome-sysdeps-3.14.modules b/modulesets/gnome-sysdeps-3.14.modules
index 1c7e255..bed26e4 100644
--- a/modulesets/gnome-sysdeps-3.14.modules
+++ b/modulesets/gnome-sysdeps-3.14.modules
@@ -343,11 +343,6 @@
     <branch repo="system" version="2.0.0"/>
   </systemmodule>
 
-  <systemmodule id="libXi">
-    <pkg-config>xi.pc</pkg-config>
-    <branch repo="system" version="1.6.0"/>
-  </systemmodule>
-
   <systemmodule id="libXinerama">
     <branch repo="system"/>
     <systemdependencies>