jhbuild r2118 - in trunk: . modulesets

[lferrett svn gnome org]

Author: lferrett
Date: Thu May 29 08:26:12 2008
New Revision: 2118
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2118&view=rev

Log:
2008-05-29  Luca Ferretti  <elle uca libero it>

	* modulesets/gnome-2.24.modules:
	Remove a lot of stuff in WebKit's autogenars, now they are defaults.
	The only non-defaults ones are --enable-video and use soup as http
	backend.
	
	Switch devhelp-webkit module to use devhelp/trunk on svn.gnome.org
	instead Alp's personal git repo (I think you have to remove your
	sandbox).
	
	* modulesets/gnome-suites-2.24.modules:
	Use gnome-2-22 branch for devhelp, 'cause trunk now only use WebKit.
	Devhelp will follow Epiphany policy. See bug #477971 for details.



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

Modified: trunk/modulesets/gnome-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-2.24.modules	(original)
+++ trunk/modulesets/gnome-2.24.modules	Thu May 29 08:26:12 2008
@@ -1570,7 +1570,7 @@
   <!--   make -f GNUMakefile maintainer-clean              -->
   <!--                                                     -->
   <!-- See also http://live.gnome.org/WebKitGtk            -->
-  <autotools id="WebKit" autogenargs="--enable-video=yes --with-http-backend=soup --enable-dom-storage=yes --enable-icon-database=yes --enable-svg=yes --enable-svg-experimental=yes --enable-svg-filters=yes"
+  <autotools id="WebKit" autogenargs="--enable-video=yes --with-http-backend=soup"
       makefile="GNUmakefile">
     <branch repo="git.debian.org" module="git/pkg-webkit/upstream.git"
       checkoutdir="WebKit" revision="filtered"/>
@@ -1610,19 +1610,17 @@
     </dependencies>
   </autotools>
 
-  <repository type="git" name="git.devhelp.webkit"
-      href="git://git.ndesk.org/pub/scm/"/>
   <autotools id="devhelp-webkit">
-    <branch repo="git.devhelp.webkit"
+    <branch repo="svn.gnome.org"
             module="devhelp"
-            revision="webkit"
-            checkoutdir="devhelp-webkit" />
+            revision="../trunk"
+            checkoutdir="devhelp-webkit"/>
     <dependencies>
-      <dep package="WebKit"/>
-      <dep package="gconf"/>
-      <dep package="libwnck"/>
       <dep package="gtk+"/>
       <dep package="libglade"/>
+      <dep package="gconf"/>
+      <dep package="libwnck"/>
+      <dep package="WebKit"/>
     </dependencies>
   </autotools>
 

Modified: trunk/modulesets/gnome-suites-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.24.modules	(original)
+++ trunk/modulesets/gnome-suites-2.24.modules	Thu May 29 08:26:12 2008
@@ -1366,8 +1366,10 @@
     </dependencies>
   </autotools>  
 
+  <!-- devhelp is branched in 2-22, and default to gecko -->
+  <!-- use devhelp-webkit instead to build devhelp with Webkit -->
   <autotools id="devhelp">
-    <branch/>
+    <branch repo="gnome-2-22"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="libglade"/>