[jhbuild] 3.16: Move libxcb to -sysdeps

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

commit 35e0af1a60e686b9d4908cfcbdba73cdabbb59e2
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Dec 16 01:38:54 2014 +0000

    3.16: Move libxcb to -sysdeps
    
    1.10 is old enough (available in Debian stable, latest Ubuntu LTS
    and fedora)

 modulesets/gnome-suites-core-deps-3.16.modules |   19 +------------------
 modulesets/gnome-sysdeps-3.16.modules          |    5 +++++
 2 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index ecd41c2..bf66083 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -1226,23 +1226,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xcb-proto">
-    <branch repo="git.freedesktop.org"
-            checkoutdir="xcb-proto"
-            module="xcb/proto.git"
-            revision="1.10"/>
-  </autotools>
-
-  <autotools id="libxcb">
-    <branch repo="git.freedesktop.org"
-            checkoutdir="libxcb"
-            module="xcb/libxcb.git"
-            revision="1.10"/>
-    <dependencies>
-      <dep package="xcb-proto"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
     <branch repo="github.com" checkoutdir="libxkbcommon" module="xkbcommon/libxkbcommon.git"/>
     <dependencies>
@@ -1250,7 +1233,7 @@
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>
       <dep package="libX11"/>
-      <dep package="libxcb"/>
+      <dep package="xcb"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index 7bcdb2c..6718ce3 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -854,6 +854,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="xcb">
+    <pkg-config>xcb.pc</pkg-config>
+    <branch repo="system" version="1.10"/>
+  </systemmodule>
+
   <systemmodule id="xcb-dri2">
     <pkg-config>xcb-dri2.pc</pkg-config>
     <branch repo="system" version="1.8.1"/>