[jhbuild] [2.32] use gnome-2-32 branch of devhelp, re-duplicate WebKit

[Frederic Peters <fpeters src gnome org>]

commit 17b054e6c209b452d82b72ed85ab4a695238b7de
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue Aug 3 07:57:27 2010 +0200

    [2.32] use gnome-2-32 branch of devhelp, re-duplicate WebKit

 modulesets/gnome-external-deps-2.32.modules |   25 ++++++++++++++++++++++++-
 modulesets/gnome-suites-2.32.modules        |    6 +++---
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-2.32.modules b/modulesets/gnome-external-deps-2.32.modules
index acd2d4c..13ba56c 100644
--- a/modulesets/gnome-external-deps-2.32.modules
+++ b/modulesets/gnome-external-deps-2.32.modules
@@ -994,7 +994,7 @@
   </tarball>
 
   <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--with-gtk=3.0 --enable-introspection">
+             autogenargs="--with-gtk=2.0 --enable-introspection">
     <branch repo="webkitgtk.org"
             module="webkit-1.3.3.tar.gz" version="1.3.3"
             hash="sha256:6520c80aa9b444ca882ee3dbe11b445d5d34bca837a6fcd46eccaf66301e6e08"
@@ -1003,6 +1003,29 @@
       <dep package="cairo"/>
       <dep package="fontconfig"/>
       <dep package="libxml2"/>
+      <dep package="gtk+"/>
+      <dep package="pango"/>
+      <dep package="libsoup"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="libxslt"/>
+      <dep package="sqlite3"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="enchant"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="WebKit-3" makefile="GNUmakefile"
+             autogenargs="--with-gtk=3.0 --enable-introspection">
+    <branch repo="webkitgtk.org" checkoutdir="webkit-1.3.3-gtk3"
+            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"/>
+      <dep package="libxml2"/>
       <dep package="gtk+-3"/>
       <dep package="pango"/>
       <dep package="libsoup"/>
diff --git a/modulesets/gnome-suites-2.32.modules b/modulesets/gnome-suites-2.32.modules
index 5eba865..42b036b 100644
--- a/modulesets/gnome-suites-2.32.modules
+++ b/modulesets/gnome-suites-2.32.modules
@@ -449,7 +449,7 @@
       <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"/>
@@ -1496,7 +1496,7 @@
       <dep package="gtk+-3"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
-      <dep package="WebKit"/>
+      <dep package="WebKit-3"/>
       <dep package="dbus-glib"/>
       <dep package="yelp-xsl"/>
     </dependencies>
@@ -1733,7 +1733,7 @@
   </autotools>
 
   <autotools id="devhelp">
-    <branch/>
+    <branch revision="gnome-2-32"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+-3"/>