aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-24 15:29:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-08 15:40:53 +0100
commit3f093e24e78cc8a553bebc03ec9f3a32700981e6 (patch)
treeeb599ad3acb1e0ddf186bd24c39238ff0176f092
parent8e2df16e9ab7433a868da2a3db4a25441b92d0ed (diff)
downloadopenembedded-core-contrib-3f093e24e78cc8a553bebc03ec9f3a32700981e6.tar.gz
openembedded-core-contrib-3f093e24e78cc8a553bebc03ec9f3a32700981e6.tar.bz2
openembedded-core-contrib-3f093e24e78cc8a553bebc03ec9f3a32700981e6.zip
libsoup: upgrade to 2.42.1
Upgrade to the latest stable release, and fix the dependencies. gnome-keyring use has been removed from libsoup, and sqlite3 is now a hard dependency. The optional libsoup-gnome library is now a small stub, so enable it by default but allow it to be disabled via PACKAGECONFIG. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb (renamed from meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb)14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb
index 53807af3e56..ef8d43914cf 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb
@@ -5,20 +5,20 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-PR = "r1"
-
SECTION = "x11/gnome/libs"
-DEPENDS = "glib-2.0 gnutls libxml2 libproxy"
+DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)}"
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,libgnome-keyring sqlite3"
+# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Enable
+# by default but let it be easily disabled.
+PACKAGECONFIG ??= "gnome"
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
-SRC_URI[md5sum] = "211ec6b733d4de33056b56838c88436e"
-SRC_URI[sha256sum] = "32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc"
+SRC_URI[md5sum] = "aaccd590a8002b69716f885fa8589887"
+SRC_URI[sha256sum] = "20bd5365bb3e7de70fade91ac82c9dea31636318df90b8c26bc4cde2523a8c91"
S = "${WORKDIR}/libsoup-${PV}"