[jhbuild] 3.10: Add xwayland

[Matthias Clasen <matthiasc src gnome org>]

commit 20a10e64c5ca0da28ff63c589f865477ff738db9
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Aug 12 14:08:41 2013 -0400

    3.10: Add xwayland
    
    This will be needed for the Wayland preview in 3.10.
    I'm not 100% sure this is building the right thing, but
    it is a start. I've also added xfont as a sysdep.
    
    The xwayland module is not added to any metamodule yet.

 modulesets/gnome-suites-core-deps-3.10.modules |    9 +++++++++
 modulesets/gnome-sysdeps-3.10.modules          |    5 +++++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index ffd634b..c28354b 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -14,6 +14,8 @@
     href="git://anongit.freedesktop.org/telepathy/"/>
 <repository type="git" name="wayland.freedesktop.org"
     href="git://anongit.freedesktop.org/git/wayland"/>
+<repository type="git" name="xorg.freedesktop.org"
+    href="git://anongit.freedesktop.org/git/xorg"/>
 <repository type="git" name="github.com"
     href="git://github.com/"/>
 <repository type="git" name="gusb.gitorious.org"
@@ -1056,6 +1058,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="xwayland">
+    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver" revision="xwayland-1.12"/>
+    <dependencies>
+      <dep package="wayland"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="WebKit" makefile="GNUmakefile"
              autogenargs="--enable-introspection --disable-silent-rules --with-gstreamer=1.0">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index 222f5f5..a42d7fc 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -756,4 +756,9 @@
             version="3.0.0"/>
   </systemmodule>
 
+  <systemmodule id="xfont">
+    <branch repo="system"/>
+    <pkg-config>xfont.pc</pkg-config>
+  </systemmodule>
+
 </moduleset>