Patchwork glib-networking: upgrade to 2.38.0 and PACKAGECONFIGise

login
register
mail settings
Submitter Ross Burton
Date Oct. 8, 2013, 4:17 p.m.
Message ID <1381249074-15302-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/59507/
State Accepted
Commit 1f03b6aa9e475f341815788613513ff63add8a5f
Headers show

Comments

Ross Burton - Oct. 8, 2013, 4:17 p.m.
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@intel.com>
---
 .../glib-networking/glib-networking_2.36.2.bb      |   26 ----------------
 .../glib-networking/glib-networking_2.38.0.bb      |   31 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 meta/recipes-core/glib-networking/glib-networking_2.36.2.bb
 create mode 100644 meta/recipes-core/glib-networking/glib-networking_2.38.0.bb

Patch

diff --git a/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb
deleted file mode 100644
index 5200b94..0000000
--- a/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb
+++ /dev/null
@@ -1,26 +0,0 @@ 
-DESCRIPTION = "glib-networking contains the implementations of certain GLib networking features that cannot be implemented directly in GLib itself because of their dependencies."
-HOMEPAGE = "http://git.gnome.org/browse/glib-networking/"
-BUGTRACKER = "http://bugzilla.gnome.org"
-
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-
-SECTION = "libs"
-DEPENDS = "glib-2.0 gnutls intltool-native"
-
-SRC_URI = "${GNOME_MIRROR}/${BPN}/2.36/${BPN}-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "fb9121742ed36d1723f296eea19dbb3c"
-SRC_URI[sha256sum] = "2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit"
-
-EXTRA_OECONF = "--without-ca-certificates --without-gnome-proxy --without-libproxy"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
-FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/"
-FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la"
-FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a"
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
new file mode 100644
index 0000000..ad9ad64
--- /dev/null
+++ b/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
@@ -0,0 +1,31 @@ 
+DESCRIPTION = "glib-networking contains the implementations of certain GLib networking features that cannot be implemented directly in GLib itself because of their dependencies."
+HOMEPAGE = "http://git.gnome.org/browse/glib-networking/"
+BUGTRACKER = "http://bugzilla.gnome.org"
+
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+SECTION = "libs"
+DEPENDS = "glib-2.0 intltool-native"
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "a22907deed3d956860d83aa3233e86ff"
+SRC_URI[archive.sha256sum] = "a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d"
+
+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-gnome-proxy"
+
+inherit gnomebase
+
+FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/"
+FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la"
+FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a"