[jhbuild] Revert "3.14: Remove xwayland, no module depends on it"

[Jasper St. Pierre <jstpierre src gnome org>]

commit ddcd510bde97bdd0cf0984a2cf211344ec4bf30e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Aug 13 14:34:36 2014 -0400

    Revert "3.14: Remove xwayland, no module depends on it"
    
    This reverts commit 2dcb0d193208be0fb1243c302e0c0fd78a403b2e.
    
    Conflicts:
        modulesets/gnome-suites-core-deps-3.14.modules

 modulesets/gnome-suites-core-deps-3.14.modules |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index 7907e67..ea51f2d 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -1261,6 +1261,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libepoxy">
+    <branch repo="github.com"
+            checkoutdir="libepoxy"
+            module="anholt/libepoxy.git"/>
+    <dependencies>
+      <dep package="xtrans"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libevdev" autogenargs="--disable-gcov">
     <branch repo="freedesktop.org"
             checkoutdir="libevdev"
@@ -1314,6 +1323,19 @@
     </dependencies>
   </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"/>
+    </dependencies>
+  </autotools>
+
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <branch repo="webkitgtk.org"
             module="webkitgtk-2.5.2.tar.xz" version="2.5.2"