[jhbuild] 3.20: Move libXi to -sysdeps

[Javier Jardón Cabezas <jjardon src gnome org>]

commit abb7f7e5e9d411c3af7ccb6acc79486418e8c5e5
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Nov 3 17:03:44 2015 +0000

    3.20: Move libXi to -sysdeps

 modulesets/gnome-suites-core-deps-3.20.modules |   12 ------------
 modulesets/gnome-sysdeps-3.20.modules          |    5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 5545155..e1d84de 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -344,18 +344,6 @@
     </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.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index efc3641..fc4475b 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -420,6 +420,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libXi">
+    <pkg-config>xi.pc</pkg-config>
+    <branch repo="system" version="1.7.4"/>
+  </systemmodule>
+
   <systemmodule id="libXdamage">
     <pkg-config>xdamage.pc</pkg-config>
     <branch repo="system"/>