[jhbuild] [3.0] add webkit/gtk3, update epiphany deps

[Frederic Peters <fpeters src gnome org>]

commit 15d6647000e9a7b6289acad09da3c0efb956d9d1
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue Jun 29 10:02:51 2010 +0200

    [3.0] add webkit/gtk3, update epiphany deps

 modulesets/gnome-external-deps-3.0.modules |   29 ++++++++++++++++++++++++---
 modulesets/gnome-suites-3.0.modules        |    4 +-
 2 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 3b6272b..4234eb4 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -975,11 +975,11 @@
     </dependencies>
   </tarball>
 
-  <autotools id="WebKit" makefile="GNUmakefile">
+  <autotools id="WebKit" makefile="GNUmakefile" autogenargs="--with-gtk=2.0">
     <branch repo="webkitgtk.org"
-            module="webkit-1.3.1.tar.gz" version="1.3.1"
-            hash="sha256:982e2dcc73c1f68f2bf88f5e4f2f88ad2e9e9eea3c12cc7019f081cab28bcbe9"
-            md5sum="14839906068ae173c0f89b44779f18e1" size="7463827"/>
+            module="webkit-1.3.2.tar.gz" version="1.3.2"
+            hash="sha256:b0f265a1f339f19855572ac6e18a2c1f6aee596cf7c5f70fd3ea00b8e86901a6"
+            md5sum="8736b933d059288cdff9f9be64358954" size="7804332"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="fontconfig"/>
@@ -996,6 +996,27 @@
     </suggests>
   </autotools>
 
+  <autotools id="WebKit-3" makefile="GNUmakefile" autogenargs="--with-gtk=3.0">
+    <branch repo="webkitgtk.org" checkoutdir="webkit-1.3.2-gtk3"
+            module="webkit-1.3.2.tar.gz" version="1.3.2"
+            hash="sha256:b0f265a1f339f19855572ac6e18a2c1f6aee596cf7c5f70fd3ea00b8e86901a6"
+            md5sum="8736b933d059288cdff9f9be64358954" size="7804332"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+      <dep package="libxml2"/>
+      <dep package="gtk+-3"/>
+      <dep package="pango"/>
+      <dep package="libsoup"/>
+    </dependencies>
+    <suggests>
+      <dep package="libxslt"/>
+      <dep package="sqlite3"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="enchant"/>
+    </suggests>
+  </autotools>
+
   <tarball id="libchamplain" version="0.4.5">
     <source href="http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.5.tar.bz2";
             hash="sha256:bb7923ac76e63d9fb2e096c323d6b1502cd523f402d22e369ee9e4e31e6ab10d"
diff --git a/modulesets/gnome-suites-3.0.modules b/modulesets/gnome-suites-3.0.modules
index 934197e..536cfc3 100644
--- a/modulesets/gnome-suites-3.0.modules
+++ b/modulesets/gnome-suites-3.0.modules
@@ -440,12 +440,12 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3"/>
       <dep package="gconf"/>
       <dep package="dbus-glib"/>
       <dep package="gnome-doc-utils"/>
       <dep package="startup-notification"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit-3"/>
     </dependencies>
     <suggests>
       <dep package="avahi"/>