jhbuild r2639 - in trunk: . modulesets

[lferrett svn gnome org]

Author: lferrett
Date: Mon Jan 12 13:43:31 2009
New Revision: 2639
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2639&view=rev

Log:
2009-01-12  Luca Ferretti  <elle uca libero it>

	* modulesets/gnome-2.26.modules: (re)add devhelp-webkit module
	* modulesets/gnome-suites-2.26.modules: change devhelp (gecko) module
	to use gnome-2-22 branch on svn insted tarball 



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.26.modules
   trunk/modulesets/gnome-suites-2.26.modules

Modified: trunk/modulesets/gnome-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-2.26.modules	(original)
+++ trunk/modulesets/gnome-2.26.modules	Mon Jan 12 13:43:31 2009
@@ -1550,6 +1550,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="devhelp-webkit">
+    <branch repo="svn.gnome.org"
+            module="devhelp"
+            checkoutdir="devhelp-webkit" />
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="libglade"/>
+      <dep package="gconf"/>
+      <dep package="libwnck"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="epiphany-webkit" autogenargs="--with-engine=webkit">
     <branch repo="svn.gnome.org"
             module="epiphany"

Modified: trunk/modulesets/gnome-suites-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.26.modules	(original)
+++ trunk/modulesets/gnome-suites-2.26.modules	Mon Jan 12 13:43:31 2009
@@ -1582,35 +1582,19 @@
     </dependencies>
   </autotools>  
 
-<!-- Use the last mozilla-based version of devhelp until
-     WebKit problems are resolved
--->
-
-  <tarball id="devhelp" version="0.21">
-    <source href="http://download.gnome.org/sources/devhelp/0.21/devhelp-0.21.tar.bz2"; md5sum="24ad71080dde0778cb42c30575b5aca6" size="549576"/>
-    <branch revision="gnome-2-22"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libglade"/>
-      <dep package="gconf"/>
-      <dep package="libwnck"/>
-      <dep package="mozilla"/>
-    </dependencies>
-  </tarball>
-
-<!--
+  <!-- devhelp is branched in 2-22, and default to gecko  -->
+  <!-- use devhelp-webkit instead to build it with Webkit -->
   <autotools id="devhelp">
-    <branch/>
+    <branch revision="gnome-2-22"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
       <dep package="libglade"/>
       <dep package="gconf"/>
       <dep package="libwnck"/>
-      <dep package="WebKit"/>
+      <dep package="mozilla"/>
     </dependencies>
   </autotools>
--->
 
   <autotools id="gdl">
     <branch/>