[jhbuild] 2.26: Move libxkbcommon to -sysdeps

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

commit 0fb94867f494d6dbc48d5ecaa2c7025bab626b43
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Jul 20 01:33:54 2017 +0100

    2.26: Move libxkbcommon to -sysdeps

 modulesets/gnome-suites-core-deps-3.26.modules |   27 ------------------------
 modulesets/gnome-sysdeps-3.26.modules          |    6 +++++
 2 files changed, 6 insertions(+), 27 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 7b0a829..72a2dfd 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -58,8 +58,6 @@
     href="http://xorg.freedesktop.org/"/>
 <repository type="tarball" name="github-tar"
     href="https://github.com/"/>
-<repository type="tarball" name="libxkbcommon"
-    href="http://xkbcommon.org/download/"/>
 <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
 <repository type="tarball" name="pcre"
@@ -1493,23 +1491,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxkbcommon">
-    <branch repo="libxkbcommon"
-            module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
-            version="0.5.0"
-            hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
-            size="615504"/>
-    <dependencies>
-      <dep package="xkeyboard-config"/>
-      <dep package="xorg-macros"/>
-      <dep package="xorg-xproto"/>
-      <dep package="xorg-kbproto"/>
-      <dep package="libX11"/>
-      <dep package="xcb"/>
-      <dep package="xcb-xkb"/>
-    </dependencies>
-  </autotools>
-
   <!-- GNOME’s cache for autoconf-archive.
        Please keep this comment for greppability. -->
   <autotools id="m4-common">
@@ -1919,14 +1900,6 @@
     </dependencies>
   </cmake>
 
-  <autotools id="xorg-xproto">
-    <pkg-config>xproto.pc</pkg-config>
-    <branch repo="xorg-tar"
-            module="releases/individual/proto/xproto-7.0.28.tar.gz" version="7.0.28"
-            size="367523"
-            hash="sha256:6cabc8ce3fa2b1a2427871167b62c24d5b08a58bd3e81ed7aaf08f2bf6dbcfed"/>
-  </autotools>
-
   <autotools id="xtrans">
     <pkg-config>xtrans.pc</pkg-config>
     <branch repo="xorg-tar"
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index fd2e98a..c4bf3e7 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -795,6 +795,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libxkbcommon">
+    <pkg-config>xkbcommon.pc</pkg-config>
+    <branch repo="system"
+            version="0.5.0"/>
+  </systemmodule>
+
   <systemmodule id="libxkbfile">
     <pkg-config>xkbfile.pc</pkg-config>
     <branch repo="system"/>