[jhbuild] [2.28] add WebKit to proposed external deps, and use it in modules

[Frederic Peters <fpeters src gnome org>]

commit 08a18aaac86512a2788772dab84f3731aa46dae0
Author: Frederic Peters <fpeters 0d be>
Date:   Tue May 5 11:39:52 2009 +0200

    [2.28] add WebKit to proposed external deps, and use it in modules
    
    Modules updated to use WebKit are Epiphany (switching to master
    branch), Devhelp (switching to master branch) and Yelp (switching
    to webkit branch).
---
 modulesets/gnome-external-deps-2.28.modules |   18 ++++++++++++++++++
 modulesets/gnome-suites-2.28.modules        |   16 ++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/modulesets/gnome-external-deps-2.28.modules b/modulesets/gnome-external-deps-2.28.modules
index 2543188..51c2dc8 100644
--- a/modulesets/gnome-external-deps-2.28.modules
+++ b/modulesets/gnome-external-deps-2.28.modules
@@ -27,6 +27,8 @@
     href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="samba.org"
     href="http://samba.org/samba/ftp/"/>
+<repository type="tarball" name="webkitgtk.org"
+    href="http://webkitgtk.org/"/>
 
   <!-- explicit disabling of qt3 and qt4 can be removed once avahi
        correctly detects what is available. -->
@@ -868,4 +870,20 @@
     </dependencies>
   </tarball>
 
+  <autotools id="WebKit" autogenargs="--enable-video=yes --with-http-backend=soup"
+      makefile="GNUmakefile">
+    <branch repo="webkitgtk.org"
+            module="webkit-1.1.6.tar.gz" version="1.1.6"
+	    size="6068467" md5sum="b311337561507b485fc2172cec7c2266"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="libsoup"/>
+      <dep package="gnome-vfs"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="sqlite3"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gnome-suites-2.28.modules b/modulesets/gnome-suites-2.28.modules
index e99a9eb..6dbd0b8 100644
--- a/modulesets/gnome-suites-2.28.modules
+++ b/modulesets/gnome-suites-2.28.modules
@@ -397,10 +397,8 @@
     </suggests>
   </autotools>
 
-  <!-- epiphany is branched in 2-26, and default to gecko -->
-  <!-- use epiphany-webkit instead to build epi with Webkit -->
   <autotools id="epiphany">
-    <branch revision="gnome-2-26"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
@@ -409,7 +407,7 @@
       <dep package="gnome-python"/>
       <dep package="gnome-doc-utils"/>
       <dep package="gnome-desktop"/>
-      <dep package="mozilla"/>
+      <dep package="WebKit"/>
     </dependencies>
     <suggests>
       <dep package="avahi"/>
@@ -1359,7 +1357,7 @@
   </autotools>
 
   <autotools id="yelp">
-    <branch/>
+    <branch revision="webkit"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -1371,7 +1369,7 @@
       <dep package="libxml2"/>
       <dep package="gnome-doc-utils"/>
       <dep package="startup-notification"/>
-      <dep package="mozilla"/>
+      <dep package="WebKit"/>
       <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
@@ -1596,17 +1594,15 @@
     </suggests>
   </autotools>  
 
-  <!-- devhelp is branched in 2-22, and default to gecko  -->
-  <!-- use devhelp-webkit instead to build it with Webkit -->
   <autotools id="devhelp">
-    <branch revision="gnome-2-22"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="libglade"/>
       <dep package="gconf"/>
       <dep package="libwnck"/>
-      <dep package="mozilla"/>
+      <dep package="WebKit"/>
     </dependencies>
   </autotools>