[jhbuild] core-deps: Clean up WebKit's X11 and Wayland dependencies

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 869e16b14a330d54be6a3e2d6d9de378302fefa6
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Jul 29 12:42:21 2015 -0500

    core-deps: Clean up WebKit's X11 and Wayland dependencies
    
    Allow disabling support for X11 or Wayland, and add the proper
    dependencies when they are enabled.

 modulesets/gnome-suites-core-deps-3.18.modules |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.18.modules b/modulesets/gnome-suites-core-deps-3.18.modules
index d15a95a..2d7f85c 100644
--- a/modulesets/gnome-suites-core-deps-3.18.modules
+++ b/modulesets/gnome-suites-core-deps-3.18.modules
@@ -1317,6 +1317,12 @@
 
   <!-- TODO: gold 2.25-5.fc22 can't link WebKit. Remove -DUSE_LD_GOLD=OFF once it works again. -->
   <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release -DUSE_LD_GOLD=OFF">
+    <if condition-unset="x11">
+      <autogenargs value="-DENABLE_X11_TARGET=OFF"/>
+    </if>
+    <if condition-unset="wayland">
+      <autogenargs value="-DENABLE_WAYLAND_TARGET=OFF"/>
+    </if>
     <pkg-config>webkit2gtk-4.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
             module="webkitgtk-2.9.4.tar.xz" version="2.9.4"
@@ -1339,7 +1345,6 @@
       <dep package="gtk+-2"/>
       <dep package="harfbuzz"/>
       <dep package="hyphen"/>
-      <dep package="libXt"/>
       <dep package="libicu"/>
       <dep package="libjpeg"/>
       <dep package="libnotify"/>
@@ -1354,6 +1359,15 @@
       <dep package="pango"/>
       <dep package="ruby"/>
       <dep package="sqlite3"/>
+      <if condition-set="x11">
+        <dep package="libXcomposite"/>
+        <dep package="libXdamage"/>
+        <dep package="libXrender"/>
+        <dep package="libXt"/>
+      </if>
+      <if condition-set="wayland">
+        <dep package="wayland"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gst-plugins-bad"/>