[jhbuild] 3.8: Use libproxy from distro packages

[Javier JardÃn <jjardon src gnome org>]

commit d24e3220e46873589b59286d96c1be68a2136a62
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Dec 10 00:19:49 2012 +0900

    3.8: Use libproxy from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   24 --------------------
 modulesets/gnome-sysdeps-3.8.modules               |    5 ++++
 2 files changed, 5 insertions(+), 24 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index 584f9b5..4c85e3a 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -21,8 +21,6 @@
     href="ftp://xmlsoft.org/"/>
 <repository type="tarball" name="sourceforge.net"
     href="http://downloads.sourceforge.net/"/>
-<repository type="tarball" name="libproxy.googlecode.com"
-    href="http://libproxy.googlecode.com/files/"/>
 <repository type="tarball" name="0pointer.de"
     href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="github.com/metabrainz"
@@ -201,28 +199,6 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libproxy"
-         cmakeargs="-DCMAKE_BUILD_TYPE=None -DWITH_GNOME=OFF -DWITH_GNOME3=ON -DWITH_KDE4=OFF -DWITH_PYTHON=OFF -DWITH_PERL=OFF -DWITH_VALA=ON -DWITH_DOTNET=OFF -DWITH_MOZJS=OFF -DWITH_WEBKIT3=ON -DGAC_DIR=${prefix}/lib/mono">
-    <pkg-config>libproxy-1.0.pc</pkg-config>
-    <branch repo="libproxy.googlecode.com"
-            module="libproxy-0.4.7.tar.gz" version="0.4.7"
-            hash="sha256:8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797"
-            size="91092">
-      <!-- fix gcc4.7 problems. Remove when new release. Patch rev 833:
-           http://code.google.com/p/libproxy/source/detail?r=833       -->
-      <patch file="libproxy-0.4.7-gcc47.patch"/>
-    </branch>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-    <suggests>
-      <dep package="NetworkManager"/>
-    </suggests>
-    <after>
-      <dep package="WebKit"/>
-    </after>
-  </cmake>
-
   <tarball id="libsndfile" version="1.0.23" supports-non-srcdir-builds="no"
            autogenargs="--disable-flac">
     <pkg-config>sndfile.pc</pkg-config>
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index e033c2c..522870a 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -296,6 +296,11 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libproxy">
+    <pkg-config>libproxy-1.0.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="libtasn1">
     <pkg-config>libtasn1.pc</pkg-config>
     <branch repo="system"