1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00

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

This commit is contained in:
Marcin Juszkiewicz
2009-02-10 16:49:01 +01:00
parent 2ab930bf33
commit f82f89d48a
2 changed files with 23 additions and 1 deletions
@@ -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)
+2 -1
View File
@@ -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"