[jhbuild] 3.10: mutter-wayland depends on the XWayland server

[Giovanni Campagna <gcampagna src gnome org>]

commit 489a405ffbdee3d37c3ed1a602f1fdd02f2aa6f1
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Tue Aug 27 15:52:07 2013 +0200

    3.10: mutter-wayland depends on the XWayland server
    
    mutter-wayland won't start in wayland mode unless it can spawn
    an Xorg binary compiled with wayland support. And the X server
    needs at least one driver.
    Because the only driver that was updated after the xserver rebase
    is the intel one, that is included in the moduleset. Sorry people
    if you run any other card.

 modulesets/gnome-suites-core-3.10.modules      |    2 ++
 modulesets/gnome-suites-core-deps-3.10.modules |    9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.10.modules b/modulesets/gnome-suites-core-3.10.modules
index 67dd36a..b269e1a 100644
--- a/modulesets/gnome-suites-core-3.10.modules
+++ b/modulesets/gnome-suites-core-3.10.modules
@@ -422,6 +422,8 @@
       <dep package="startup-notification"/>
       <dep package="wayland"/>
       <dep package="zenity"/>
+      <dep package="xwayland"/>
+      <dep package="xf86-video-intel"/>
     </dependencies>
   </autotools>
   <autotools id="network-manager-applet"
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index 953e5e1..233fcdc 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -1060,12 +1060,19 @@
   </autotools>
 
   <autotools id="xwayland">
-    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver" revision="xwayland-1.12"/>
+    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver" revision="xwayland"/>
     <dependencies>
       <dep package="wayland"/>
     </dependencies>
   </autotools>
 
+  <autotools id="xf86-video-intel">
+    <branch repo="xorg.freedesktop.org" checkoutdir="xf86-video-intel" module="driver/xf86-video-intel" 
revision="xwayland"/>
+    <dependencies>
+      <dep package="xwayland"/>
+    </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>