[jhbuild] 3.20: Move xwayland to -sysdeps

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

commit 5902cd9341c5bb8c3ca9bcd904cfe185c97da937
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Nov 3 16:48:46 2015 +0000

    3.20: Move xwayland to -sysdeps

 modulesets/gnome-suites-core-deps-3.20.modules |   35 --------------
 modulesets/gnome-sysdeps-3.20.modules          |   57 +++---------------------
 2 files changed, 7 insertions(+), 85 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index cf4daa4..5545155 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -1197,14 +1197,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xorg-randrproto">
-    <pkg-config>randrproto.pc</pkg-config>
-    <branch repo="xorg-tar"
-            module="releases/individual/proto/randrproto-1.5.0.tar.gz" version="1.5.0"
-            size="171254"
-            hash="8f8a716d6daa6ba05df97d513960d35a39e040600bf04b313633f11679006fab"/>
-  </autotools>
-
   <autotools id="xorg-xproto">
     <pkg-config>xproto.pc</pkg-config>
     <branch repo="xorg-tar"
@@ -1221,33 +1213,6 @@
             hash="sha256:b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"/>
   </autotools>
 
-  <autotools id="xwayland"
-             autogenargs="--with-xkb-bin-directory=/usr/bin --with-xkb-path=/usr/share/X11/xkb 
--with-xkb-output=${prefix}/share/X11/xkb/compiled --enable-xwayland">
-    <branch repo="xorg.freedesktop.org"
-            checkoutdir="xwayland"
-            module="xserver"/>
-    <dependencies>
-      <dep package="xfont"/>
-      <dep package="xtrans"/>
-      <dep package="wayland"/>
-      <dep package="libepoxy"/>
-      <dep package="pciaccess"/>
-      <dep package="xorg-xcmiscproto"/>
-      <dep package="xorg-bigreqsproto"/>
-      <dep package="xorg-scrnsaverproto"/>
-      <dep package="xorg-randrproto"/>
-      <dep package="xorg-xproto"/>
-      <dep package="xorg-resourceproto"/>
-      <dep package="xorg-xf86driproto"/>
-      <dep package="xorg-presentproto"/>
-      <dep package="xorg-videoproto"/>
-      <dep package="xcb-keysyms"/>
-      <if condition-set="systemd">
-        <dep package="libsystemd-daemon"/>
-      </if>
-    </dependencies>
-  </autotools>
-
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <if condition-unset="x11">
       <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 460982e..efc3641 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -487,46 +487,11 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-bigreqsproto">
-    <pkg-config>bigreqsproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="xorg-kbproto">
     <pkg-config>kbproto.pc</pkg-config>
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="xorg-presentproto">
-    <pkg-config>presentproto.pc</pkg-config>
-    <branch repo="system"/>
-    </systemmodule>
-
-  <systemmodule id="xorg-resourceproto">
-    <pkg-config>resourceproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-scrnsaverproto">
-    <pkg-config>scrnsaverproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-videoproto">
-    <pkg-config>videoproto.pc</pkg-config>
-    <branch repo="system"/>
-    </systemmodule>
-
-  <systemmodule id="xorg-xcmiscproto">
-    <pkg-config>xcmiscproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
-  <systemmodule id="xorg-xf86driproto">
-    <pkg-config>xf86driproto.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libacl">
     <branch repo="system"/>
     <systemdependencies>
@@ -859,11 +824,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="pciaccess">
-    <pkg-config>pciaccess.pc</pkg-config>
-    <branch repo="system" version="0.12.901"/>
-  </systemmodule>
-
   <systemmodule id="pixman">
     <pkg-config>pixman-1.pc</pkg-config>
     <branch repo="system"
@@ -1061,11 +1021,6 @@
     <branch repo="system" version="1.8.1"/>
   </systemmodule>
 
-  <systemmodule id="xcb-keysyms">
-    <pkg-config>xcb-keysyms.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="xcb-util">
     <pkg-config>xcb-aux.pc</pkg-config>
     <branch repo="system" version="0.1"/>
@@ -1104,11 +1059,6 @@
             version="3.0.0"/>
   </systemmodule>
 
-  <systemmodule id="xfont">
-    <pkg-config>xfont.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="gtkspell-3">
     <pkg-config>gtkspell3-3.0.pc</pkg-config>
     <branch repo="system"/>
@@ -1188,6 +1138,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="xwayland">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="Xwayland"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="zlib">
     <pkg-config>zlib.pc</pkg-config>
     <branch repo="system"/>