Patchwork libsoup-2.4: make libsoup-gnome optional

login
register
mail settings
Submitter Andreas Oberritter
Date March 7, 2013, 5:42 p.m.
Message ID <1362678128-27865-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/45673/
State Accepted
Commit 8a5d0a2be41c1a0471456a1098270632521c0c9f
Headers show

Comments

Andreas Oberritter - March 7, 2013, 5:42 p.m.
* Weakens dependency on libgnome-keyring and sqlite3
* Defaults to no if x11 is in DISTRO_FEATURES

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Patch

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
index 9274f8c..53807af 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
@@ -5,11 +5,14 @@  BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-PR = "r0"
+PR = "r1"
 
 SECTION = "x11/gnome/libs"
 
-DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring"
+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"