jhbuild r2445 - in trunk: . modulesets

[danw svn gnome org]

Author: danw
Date: Fri Oct 31 18:14:33 2008
New Revision: 2445
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2445&view=rev

Log:
	* modulesets/gnome-external-deps-2.26.modules: add libproxy
	(proposed for 2.26)

	* modulesets/gnome-suites-2.26.modules: libsoup now suggests
	libproxy


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

Modified: trunk/modulesets/gnome-external-deps-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.26.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.26.modules	Fri Oct 31 18:14:33 2008
@@ -19,6 +19,8 @@
     href="ftp://xmlsoft.org/"/>
 <repository type="tarball" name="sourceforge.net"
     href="http://dl.sourceforge.net/sourceforge/"/>
+<repository type="tarball" name="libproxy.googlecode.com"
+    href="http://libproxy.googlecode.com/files/"/>
 
   <!-- explicit disabling of qt3 and qt4 can be removed once avahi
        correctly detects what is available. -->
@@ -558,4 +560,21 @@
     </after>
   </autotools>
 
+  <!-- Proposed -->
+
+  <autotools id="libproxy" autogenargs="--without-networkmanager">
+    <branch repo="libproxy.googlecode.com"
+            module="libproxy-0.2.3.tar.gz" version="0.2.3"
+            size="378773" md5="86b635e1eb2d665cfbef4c6134fe6604"/>
+    <dependencies>
+      <dep package="gconf"/>
+    </dependencies>
+    <suggests>
+      <dep package="mozilla"/>
+      <!-- NetworkManager doesn't build correctly in 0.2.3
+      <dep package="NetworkManager"/>
+      -->
+    </suggests>
+</autotools>
+     
 </moduleset>

Modified: trunk/modulesets/gnome-suites-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.26.modules	(original)
+++ trunk/modulesets/gnome-suites-2.26.modules	Fri Oct 31 18:14:33 2008
@@ -942,7 +942,11 @@
       <dep package="glib"/>
       <dep package="gnutls"/>
       <dep package="libxml2"/>
+      <dep package="gconf"/> <!-- only needed if libproxy not used -->
     </dependencies>
+    <suggests>
+      <dep package="libproxy"/>
+    </suggests>
   </autotools>
 
   <autotools id="libwnck">