From 3f093e24e78cc8a553bebc03ec9f3a32700981e6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 24 Apr 2013 15:29:46 +0100 Subject: 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 Signed-off-by: Saul Wold --- meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb | 28 ---------------------- meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb create mode 100644 meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb (limited to 'meta/recipes-support/libsoup') diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb deleted file mode 100644 index 53807af3e5..0000000000 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "An HTTP library implementation in C" -HOMEPAGE = "http://www.gnome.org/" -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" - -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)}" -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,libgnome-keyring sqlite3" - -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" - -S = "${WORKDIR}/libsoup-${PV}" - -inherit autotools pkgconfig - -# glib-networking is needed for SSL, proxies, etc. -RRECOMMENDS_${PN} = "glib-networking" diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb new file mode 100644 index 0000000000..ef8d43914c --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "An HTTP library implementation in C" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +SECTION = "x11/gnome/libs" + +DEPENDS = "glib-2.0 gnutls libxml2 libproxy 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] = "aaccd590a8002b69716f885fa8589887" +SRC_URI[sha256sum] = "20bd5365bb3e7de70fade91ac82c9dea31636318df90b8c26bc4cde2523a8c91" + +S = "${WORKDIR}/libsoup-${PV}" + +inherit autotools pkgconfig + +# glib-networking is needed for SSL, proxies, etc. +RRECOMMENDS_${PN} = "glib-networking" -- cgit 1.2.3-korg