[jhbuild] Add WebKit1 compatibility module

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 754d0956885dbd4014bb9074a77e7e9b2937b7cf
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Aug 5 21:56:09 2014 -0500

    Add WebKit1 compatibility module
    
    Building WebKit twice will not be fun, but nothing else to do unless we
    want all of these applications to remain broken.
    
    Also, remove GIMP's suggests on WebKit since it can only use
    webkitgtk-1.0 (not to be confused with webkitgtk-3.0, the version of
    WebKit 1 we provide compatibility with).

 modulesets/gnome-apps-3.14.modules             |    2 +-
 modulesets/gnome-suites-core-3.14.modules      |    8 ++--
 modulesets/gnome-suites-core-deps-3.14.modules |   37 ++++++++++++++++++++++-
 modulesets/gnome-world-3.14.modules            |   11 +++----
 4 files changed, 45 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.14.modules b/modulesets/gnome-apps-3.14.modules
index 3638aa9..3d941e8 100644
--- a/modulesets/gnome-apps-3.14.modules
+++ b/modulesets/gnome-apps-3.14.modules
@@ -73,7 +73,7 @@
       <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="glib"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="evolution"/>
     </dependencies>
     <suggests>
diff --git a/modulesets/gnome-suites-core-3.14.modules b/modulesets/gnome-suites-core-3.14.modules
index 394c4bb..4c3d7c1 100644
--- a/modulesets/gnome-suites-core-3.14.modules
+++ b/modulesets/gnome-suites-core-3.14.modules
@@ -110,7 +110,7 @@
     <branch/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="libnotify"/>
       <dep package="librest"/>
       <dep package="json-glib"/>
@@ -540,7 +540,7 @@
       <dep package="telepathy-logger"/>
       <dep package="telepathy-mission-control"/>
       <dep package="libnotify"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </dependencies>
     <suggests>
       <dep package="enchant"/>
@@ -785,7 +785,7 @@
       <dep package="clutter-gtk"/>
       <dep package="clutter-gst"/>
       <dep package="gtksourceview"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
@@ -829,7 +829,7 @@
       <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="yelp-xsl"/>
     </dependencies>
   </autotools>
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index b3ee8d1..69999ea 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -706,7 +706,7 @@
     <branch/>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="gnome-js-common"/>
       <dep package="mpfr"/>
       <dep package="readline"/>
@@ -1313,7 +1313,7 @@
       <dep package="libxml2"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
-      <!-- GTK+ 2.x required for the plugin process when build Webkit2 -->
+      <!-- GTK+ 2.x required for the plugin process -->
       <dep package="gtk+-2"/>
       <dep package="pango"/>
       <dep package="libsoup"/>
@@ -1566,6 +1566,39 @@
     </dependencies>
   </autotools>
 
+  <autotools id="WebKit1" makefile="GNUmakefile"
+             autogenargs="--enable-introspection --disable-webkit2">
+    <pkg-config>webkitgtk-3.0.pc</pkg-config>
+    <branch repo="webkitgtk.org"
+            module="webkitgtk-2.4.4.tar.xz" version="2.4.4"
+            hash="sha256:58cbfc7e352ae1e1f5e383f9f766795794d88483e9a52377a295f56eedf53ab9"
+            size="9844048">
+    </branch>
+    <dependencies>
+      <dep package="at-spi2-core"/>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+      <dep package="geoclue"/>
+      <dep package="libxml2"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gtk+"/>
+      <dep package="pango"/>
+      <dep package="libsoup"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gperf"/>
+      <dep package="libicu"/>
+      <dep package="libXt"/>
+      <dep package="ruby"/>
+      <dep package="libsecret"/>
+      <dep package="libwebp"/>
+    </dependencies>
+    <suggests>
+      <dep package="libxslt"/>
+      <dep package="sqlite3"/>
+      <dep package="enchant"/>
+    </suggests>
+  </autotools>
+
   <autotools id="zeitgeist">
     <branch repo="git.freedesktop.org"
             module="zeitgeist/zeitgeist"
diff --git a/modulesets/gnome-world-3.14.modules b/modulesets/gnome-world-3.14.modules
index 5be8af7..c966263 100644
--- a/modulesets/gnome-world-3.14.modules
+++ b/modulesets/gnome-world-3.14.modules
@@ -196,7 +196,7 @@
       <dep package="libunique"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </dependencies>
   </cmake>
 
@@ -1956,7 +1956,7 @@
       <dep package="sqlite3"/>
       <dep package="libsoup"/>
       <dep package="libunique-1"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </dependencies>
     <suggests>
       <dep package="dbus"/>
@@ -2038,7 +2038,7 @@
     <branch repo="git.xfce.org" branch="kalikiana/midori"/>
     <dependencies>
       <dep package="gtk+-2"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
     </dependencies>
@@ -2962,7 +2962,6 @@
     </dependencies>
     <suggests>
       <dep package="iso-codes"/>
-      <dep package="WebKit"/>
       <dep package="librsvg"/>
       <dep package="poppler"/>
       <dep package="libgnome-keyring"/>
@@ -3153,7 +3152,7 @@
       <dep package="libdmapsharing"/>
       <dep package="libgnome-keyring"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </suggests>
   </autotools>
 
@@ -3188,7 +3187,7 @@
       <dep package="libxml2"/>
       <dep package="sqlite3"/>
       <dep package="vala"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit1"/>
     </dependencies>
   </autotools>