From ce74db3f4c19505a167715ad198a487e328af453 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha-org-sugar-git@silbe.org>
Date: Mon, 16 Mar 2009 11:34:54 +0000
Subject: build libsoup from source on Fedora as we need 2.4, but Fedora only got 2.2

---
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index c6166c4..1e7280d 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -21,6 +21,8 @@
 	  href="http://dbus.freedesktop.org/releases/"/>
   <repository type="git" name="git.sugarlabs.org" default="yes"
       href="git://git.sugarlabs.org"/>
+  <repository type="tarball" name="ftp.gnome.org"
+      href="http://ftp.gnome.org/pub/gnome/sources/"/>
   <tarball id="pygobject" version="2.14">
     <source href="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2"
             md5sum="0e9e9300e81847f4f7266f49d3bebbaf" size="366808"/>
@@ -100,6 +102,20 @@
       <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
+  <autotools id="libsoup">
+    <branch repo="ftp.gnome.org"
+    				version="2.4.1"
+            module="libsoup/2.4/libsoup-2.4.1.tar.bz2"
+            size="627890" md5sum="d0fc91ccb9da401e9e40d2f4612bdac9" />
+    <dependencies>
+      <!-- sysdeps: -->
+      <!-- glib 2.15.3 -->
+      <!-- libgnutls -->
+      <!-- libgcrypt 1.2.0 -->
+      <!-- optional: gtk-doc 1.0 -->
+      <!-- optional: curl -->
+    </dependencies>
+  </autotools>
   <autotools id="telepathy-salut"
              autogen-sh="configure" autogenargs="--enable-olpc">
     <branch repo="telepathy"
@@ -111,6 +127,7 @@
     </branch>
     <dependencies>
       <dep package="telepathy-glib"/>
+      <dep package="libsoup"/>
     </dependencies>
   </autotools>
   <autotools id="telepathy-glib" autogen-sh="configure">
diff --git a/config/sysdeps/debian-unstable.xml b/config/sysdeps/debian-unstable.xml
index 4ec7934..dc8417a 100644
--- a/config/sysdeps/debian-unstable.xml
+++ b/config/sysdeps/debian-unstable.xml
@@ -37,7 +37,7 @@
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
-  <package name="libsoup2.4-dev"/>
+  <package name="libsoup2.4-dev" source="libsoup"/>
   <package name="libsqlite3-dev"/>
   <package name="libtool"/>
   <package name="libwnck-dev"/>
diff --git a/config/sysdeps/fedora-10.xml b/config/sysdeps/fedora-10.xml
index eff63dc..7295999 100644
--- a/config/sysdeps/fedora-10.xml
+++ b/config/sysdeps/fedora-10.xml
@@ -29,7 +29,6 @@
   <package name="libglade2-devel"/>
   <package name="libgsf-devel"/>
   <package name="librsvg2-devel"/>
-  <package name="libsoup22-devel"/>
   <package name="libtool"/>
   <package name="libXt-devel"/>
   <package name="loudmouth-devel"/>
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index 190db8c..cdf37e5 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -46,7 +46,6 @@
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
   <package name="loudmouth-devel"/>
-  <package name="libsoup22-devel"/>
   <package name="poppler-glib-devel"/>
 
   <package name="avahi"
diff --git a/config/sysdeps/olpc-4.xml b/config/sysdeps/olpc-4.xml
index 5afef5a..2aa95ae 100644
--- a/config/sysdeps/olpc-4.xml
+++ b/config/sysdeps/olpc-4.xml
@@ -46,7 +46,6 @@
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
   <package name="loudmouth-devel"/>
-  <package name="libsoup22-devel"/>
 
   <package name="avahi"
            source="avahi"/>
diff --git a/config/sysdeps/ubuntu-8.04.xml b/config/sysdeps/ubuntu-8.04.xml
index a06f28d..578ac7f 100644
--- a/config/sysdeps/ubuntu-8.04.xml
+++ b/config/sysdeps/ubuntu-8.04.xml
@@ -54,7 +54,7 @@
 	   source="pygobject"/>
   <package name="xulrunner-1.9-dev"
 	   source="xulrunner"/>
-  <package name="libsoup2.4-dev"/>
+  <package name="libsoup2.4-dev" source="libsoup"/>
   <package name="libglib2.0-dev"/>
   <package name="libpoppler-glib-dev"/>
 </dependencies>
diff --git a/config/sysdeps/ubuntu-8.10.xml b/config/sysdeps/ubuntu-8.10.xml
index 0d2c9cd..fccf801 100644
--- a/config/sysdeps/ubuntu-8.10.xml
+++ b/config/sysdeps/ubuntu-8.10.xml
@@ -33,7 +33,7 @@
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
-  <package name="libsoup2.4-dev"/>
+  <package name="libsoup2.4-dev" source="libsoup"/>
   <package name="libtool"/>
   <package name="libwv-dev"/>
   <package name="libxapian15"/>
diff --git a/config/sysdeps/ubuntu-9.04.xml b/config/sysdeps/ubuntu-9.04.xml
index 0d2c9cd..fccf801 100644
--- a/config/sysdeps/ubuntu-9.04.xml
+++ b/config/sysdeps/ubuntu-9.04.xml
@@ -33,7 +33,7 @@
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
-  <package name="libsoup2.4-dev"/>
+  <package name="libsoup2.4-dev" source="libsoup"/>
   <package name="libtool"/>
   <package name="libwv-dev"/>
   <package name="libxapian15"/>
--
cgit v0.9.1