[oe-commits] Ross Burton : glib-networking: upgrade to 2.38.0 and PACKAGECONFIGise

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 70a063084188f659f88777d7f572841341809b42
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=70a063084188f659f88777d7f572841341809b42

Author: Ross Burton <ross.burton at intel.com>
Date:   Tue Oct  8 17:17:54 2013 +0100

glib-networking: upgrade to 2.38.0 and PACKAGECONFIGise

Use PACKAGECONFIG to add options for ca-certificates, gnutls, and libproxy.

Enable ca-certificates by default as all it needs to know is the right path,
ca-certificates not being installed isn't fatal.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 ...working_2.36.2.bb => glib-networking_2.38.0.bb} |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
similarity index 51%
rename from meta/recipes-core/glib-networking/glib-networking_2.36.2.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
index 5200b94..ad9ad64 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
@@ -6,19 +6,24 @@ LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
 SECTION = "libs"
-DEPENDS = "glib-2.0 gnutls intltool-native"
+DEPENDS = "glib-2.0 intltool-native"
 
-SRC_URI = "${GNOME_MIRROR}/${BPN}/2.36/${BPN}-${PV}.tar.xz"
+GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI[md5sum] = "fb9121742ed36d1723f296eea19dbb3c"
-SRC_URI[sha256sum] = "2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9"
+SRC_URI[archive.md5sum] = "a22907deed3d956860d83aa3233e86ff"
+SRC_URI[archive.sha256sum] = "a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "ca-certificates gnutls"
+
+# No explicit dependency as it works without ca-certificates installed
+PACKAGECONFIG[ca-certificates] = "--with-ca-certificates=${sysconfdir}/ssl/certs/ca-certificates.crt,--without-ca-certificates"
+PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
+PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
 PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit"
 
-EXTRA_OECONF = "--without-ca-certificates --without-gnome-proxy --without-libproxy"
+EXTRA_OECONF = "--without-gnome-proxy"
 
-inherit autotools pkgconfig
+inherit gnomebase
 
 FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
 FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/"