summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@buglabs.net>2009-02-10 15:49:01 (GMT)
committerMarcin Juszkiewicz <marcin@buglabs.net>2009-02-10 15:49:01 (GMT)
commitf82f89d48a036e878787916715271df3d8f1a988 (patch)
treec6c28b141ae41ef3cb4d701439571f72def5c23d
parent2ab930bf33b53250f901110145fac55c5e1aae88 (diff)
downloadpoky-f82f89d48a036e878787916715271df3d8f1a988.tar.gz
eds-dbus: force using libsoup-2.2 (from r683 of eds-dbus)
-rw-r--r--meta/packages/eds/eds-dbus/r683-force-libsoup22.patch21
-rw-r--r--meta/packages/eds/eds-dbus_svn.bb3
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 0000000..6550216
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/r683-force-libsoup22.patch
@@ -0,0 +1,21 @@
1Index: trunk/configure.in
2===================================================================
3--- trunnk/configure.in (revision 682)
4+++ trunnk/configure.in (revision 683)
5@@ -1243,14 +1243,8 @@
6
7 dnl --- Groupwise flags
8 if test "x${with_soup}" != "xno"; then
9-PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no)
10-if test $have_libsoup_24 = yes; then
11- LIBSOUP_REQUIRED=2.3.0
12- LIBSOUP=libsoup-2.4
13-else
14- LIBSOUP_REQUIRED=2.2.2
15- LIBSOUP=libsoup-2.2
16-fi
17+LIBSOUP_REQUIRED=2.2.2
18+LIBSOUP=libsoup-2.2
19 AC_SUBST(LIBSOUP_REQUIRED)
20 AC_SUBST(LIBSOUP)
21 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 2321848..81bc984 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -4,13 +4,14 @@ LICENSE = "LGPL"
4DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup" 4DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup"
5 5
6PV = "1.4.0+svnr${SRCREV}" 6PV = "1.4.0+svnr${SRCREV}"
7PR = "r3" 7PR = "r4"
8 8
9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ 9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
10 file://oh-contact.patch;patch=1;pnum=0 \ 10 file://oh-contact.patch;patch=1;pnum=0 \
11 file://no_libdb.patch;patch=1 \ 11 file://no_libdb.patch;patch=1 \
12 file://no_iconv_test.patch;patch=1 \ 12 file://no_iconv_test.patch;patch=1 \
13 file://no_libedataserverui.patch;patch=1 \ 13 file://no_libedataserverui.patch;patch=1 \
14 file://r683-force-libsoup22.patch;patch=1 \
14 file://iconv-detect.h" 15 file://iconv-detect.h"
15 16
16S = "${WORKDIR}/trunk" 17S = "${WORKDIR}/trunk"