[jhbuild] [3.0] bump WebKit to 1.3.3, only build gtk+ 3 version

[Frederic Peters <fpeters src gnome org>]

commit 6c3e037d97c77b750f90b1c94db0dc572a200f50
Author: Frédéric Péters <fpeters 0d be>
Date:   Wed Jul 14 13:16:28 2010 +0200

    [3.0] bump WebKit to 1.3.3, only build gtk+ 3 version

 modulesets/gnome-external-deps-3.0.modules |   31 ++++-----------------------
 modulesets/gnome-suites-3.0.modules        |   10 ++++----
 2 files changed, 10 insertions(+), 31 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 7730290..5e79641 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -980,33 +980,12 @@
     </dependencies>
   </tarball>
 
-  <autotools id="WebKit" makefile="GNUmakefile" autogenargs="--with-gtk=2.0">
-    <branch repo="webkitgtk.org"
-            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+"/>
-      <dep package="pango"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <suggests>
-      <dep package="libxslt"/>
-      <dep package="sqlite3"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="enchant"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="WebKit-3" makefile="GNUmakefile"
+  <autotools id="WebKit" makefile="GNUmakefile"
              autogenargs="--with-gtk=3.0 --enable-introspection">
-    <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"/>
+    <branch repo="webkitgtk.org"
+            module="webkit-1.3.3.tar.gz" version="1.3.3"
+            hash="sha256:6520c80aa9b444ca882ee3dbe11b445d5d34bca837a6fcd46eccaf66301e6e08"
+            md5sum="22af6591b124610a8df55c7a87989349" size="7306862"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="fontconfig"/>
diff --git a/modulesets/gnome-suites-3.0.modules b/modulesets/gnome-suites-3.0.modules
index 74519a2..18fbcbe 100644
--- a/modulesets/gnome-suites-3.0.modules
+++ b/modulesets/gnome-suites-3.0.modules
@@ -413,7 +413,7 @@
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="libchamplain"/>
-      <dep package="WebKit-3"/>
+      <dep package="WebKit"/>
     </suggests>
   </autotools>
 
@@ -445,7 +445,7 @@
       <dep package="dbus-glib"/>
       <dep package="gnome-doc-utils"/>
       <dep package="startup-notification"/>
-      <dep package="WebKit-3"/>
+      <dep package="WebKit"/>
     </dependencies>
     <suggests>
       <dep package="avahi"/>
@@ -1514,7 +1514,7 @@
       <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
-      <dep package="WebKit-3"/>
+      <dep package="WebKit"/>
       <dep package="dbus-glib"/>
       <dep package="yelp-xsl"/>
     </dependencies>
@@ -1692,7 +1692,7 @@
     <branch/>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="WebKit-3"/>
+      <dep package="WebKit"/>
       <dep package="gnome-js-common"/>
     </dependencies>
   </autotools>
@@ -1756,7 +1756,7 @@
       <dep package="intltool"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="WebKit-3"/>
+      <dep package="WebKit"/>
       <dep package="libunique-3"/>
     </dependencies>
   </autotools>