eds-dbus: force using libsoup-2.2 (from r683 of eds-dbus)

2 files changed, 23 insertions, 1 deletions

diff --git a/meta/packages/eds/eds-dbus/r683-force-libsoup22.patch b/meta/packages/eds/eds-dbus/r683-force-libsoup22.patch
new file mode 100644
index 0000000000..6550216295
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/r683-force-libsoup22.patch
@@ -0,0 +1,21 @@
+Index: trunk/configure.in
+===================================================================
+--- trunnk/configure.in (revision 682)
++++ trunnk/configure.in (revision 683)
+@@ -1243,14 +1243,8 @@
+ 
+ dnl --- Groupwise flags
+ if test "x${with_soup}" != "xno"; then
+-PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no)
+-if test $have_libsoup_24 = yes; then
+-    LIBSOUP_REQUIRED=2.3.0
+-    LIBSOUP=libsoup-2.4
+-else
+-    LIBSOUP_REQUIRED=2.2.2
+-    LIBSOUP=libsoup-2.2
+-fi
++LIBSOUP_REQUIRED=2.2.2
++LIBSOUP=libsoup-2.2
+ AC_SUBST(LIBSOUP_REQUIRED)
+ AC_SUBST(LIBSOUP)
+ EVO_SET_COMPILE_FLAGS(SOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index 232184851d..81bc98489f 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -4,13 +4,14 @@ LICENSE = "LGPL"
 DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup"
 
 PV = "1.4.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://oh-contact.patch;patch=1;pnum=0 \
            file://no_libdb.patch;patch=1 \
            file://no_iconv_test.patch;patch=1 \
            file://no_libedataserverui.patch;patch=1 \
+           file://r683-force-libsoup22.patch;patch=1 \
            file://iconv-detect.h"
 
 S = "${WORKDIR}/trunk"