From f02b33329bd382d66756ad01292daa9441a79742 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 13 Feb 2015 15:23:11 -0800 Subject: neon: update 0.30.0 -> 0.30.1 pkgconfig.patch needed a minor refresh due to the following fix for static linking using neon.pc being merged upstream: http://lists.manyfish.co.uk/pipermail/neon/2013-October/001568.html Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- .../neon/neon-0.30.0/pkgconfig.patch | 18 ------------------ meta/recipes-support/neon/neon/pkgconfig.patch | 15 +++++++++++++++ meta/recipes-support/neon/neon_0.30.0.bb | 22 ---------------------- meta/recipes-support/neon/neon_0.30.1.bb | 22 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch create mode 100644 meta/recipes-support/neon/neon/pkgconfig.patch delete mode 100644 meta/recipes-support/neon/neon_0.30.0.bb create mode 100644 meta/recipes-support/neon/neon_0.30.1.bb (limited to 'meta/recipes-support/neon') diff --git a/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch b/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch deleted file mode 100644 index 1a2550c6fb..0000000000 --- a/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - neon.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- neon-0.28.1.orig/neon.pc.in -+++ neon-0.28.1/neon.pc.in -@@ -4,8 +4,8 @@ libdir=@libdir@ - includedir=@includedir@ - - Name: neon - Description: HTTP/WebDAV client library - Version: @NEON_VERSION@ --Libs.private: @NEON_LIBS@ -+Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls - Libs: -L${libdir} -lneon @NEON_PC_LIBS@ - Cflags: -I${includedir}/neon @NEON_CFLAGS@ diff --git a/meta/recipes-support/neon/neon/pkgconfig.patch b/meta/recipes-support/neon/neon/pkgconfig.patch new file mode 100644 index 0000000000..239dba8e25 --- /dev/null +++ b/meta/recipes-support/neon/neon/pkgconfig.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [configuration] + +--- + neon.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- neon-0.30.1.orig/neon.pc.in ++++ neon-0.30.1/neon.pc.in +@@ -7,5 +7,5 @@ Name: neon + Description: HTTP/WebDAV client library + Version: @NEON_VERSION@ + Libs: -L${libdir} -lneon @NEON_PC_LIBS@ +-Libs.private: @NEON_LIBS@ ++Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls + Cflags: -I${includedir}/neon @NEON_CFLAGS@ diff --git a/meta/recipes-support/neon/neon_0.30.0.bb b/meta/recipes-support/neon/neon_0.30.0.bb deleted file mode 100644 index 61bd7d9269..0000000000 --- a/meta/recipes-support/neon/neon_0.30.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "An HTTP and WebDAV client library with a C interface" -HOMEPAGE = "http://www.webdav.org/neon/" -SECTION = "libs" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ - file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" -DEPENDS = "zlib libxml2 expat time gnutls libproxy" -DEPENDS_class-native = "zlib-native libxml2-native expat-native gnutls-native" - -BBCLASSEXTEND = "native" - -SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ - file://pkgconfig.patch" -SRC_URI[md5sum] = "fb60b3a124eeec441937a812c456fd94" -SRC_URI[sha256sum] = "2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2" - -BINCONFIG = "${bindir}/neon-config" - -inherit autotools binconfig-disabled lib_package pkgconfig - -EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" -EXTRA_OECONF += "--without-gssapi" diff --git a/meta/recipes-support/neon/neon_0.30.1.bb b/meta/recipes-support/neon/neon_0.30.1.bb new file mode 100644 index 0000000000..9245244eb8 --- /dev/null +++ b/meta/recipes-support/neon/neon_0.30.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "An HTTP and WebDAV client library with a C interface" +HOMEPAGE = "http://www.webdav.org/neon/" +SECTION = "libs" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ + file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" +DEPENDS = "zlib libxml2 expat time gnutls libproxy" +DEPENDS_class-native = "zlib-native libxml2-native expat-native gnutls-native" + +BBCLASSEXTEND = "native" + +SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ + file://pkgconfig.patch" +SRC_URI[md5sum] = "231adebe5c2f78fded3e3df6e958878e" +SRC_URI[sha256sum] = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd" + +BINCONFIG = "${bindir}/neon-config" + +inherit autotools binconfig-disabled lib_package pkgconfig + +EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" +EXTRA_OECONF += "--without-gssapi" -- cgit 1.2.3-korg