summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-02-13 15:23:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 13:43:38 +0000
commitad8250868f9420d779dc5c4233ffb87e329e4565 (patch)
tree0d65c78103adb7e9fab32d9fa40989df988456f1
parent6ae933b75c1c34a9d39e1aff0a0cb26a7ce4677f (diff)
downloadpoky-ad8250868f9420d779dc5c4233ffb87e329e4565.tar.gz
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 (From OE-Core rev: f02b33329bd382d66756ad01292daa9441a79742) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/neon/neon/pkgconfig.patch (renamed from meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch)11
-rw-r--r--meta/recipes-support/neon/neon_0.30.1.bb (renamed from meta/recipes-support/neon/neon_0.30.0.bb)4
2 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch b/meta/recipes-support/neon/neon/pkgconfig.patch
index 1a2550c6fb..239dba8e25 100644
--- a/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch
+++ b/meta/recipes-support/neon/neon/pkgconfig.patch
@@ -4,15 +4,12 @@ Upstream-Status: Inappropriate [configuration]
4 neon.pc.in | 2 +- 4 neon.pc.in | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-) 5 1 file changed, 1 insertion(+), 1 deletion(-)
6 6
7--- neon-0.28.1.orig/neon.pc.in 7--- neon-0.30.1.orig/neon.pc.in
8+++ neon-0.28.1/neon.pc.in 8+++ neon-0.30.1/neon.pc.in
9@@ -4,8 +4,8 @@ libdir=@libdir@ 9@@ -7,5 +7,5 @@ Name: neon
10 includedir=@includedir@
11
12 Name: neon
13 Description: HTTP/WebDAV client library 10 Description: HTTP/WebDAV client library
14 Version: @NEON_VERSION@ 11 Version: @NEON_VERSION@
12 Libs: -L${libdir} -lneon @NEON_PC_LIBS@
15-Libs.private: @NEON_LIBS@ 13-Libs.private: @NEON_LIBS@
16+Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls 14+Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls
17 Libs: -L${libdir} -lneon @NEON_PC_LIBS@
18 Cflags: -I${includedir}/neon @NEON_CFLAGS@ 15 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.1.bb
index 61bd7d9269..9245244eb8 100644
--- a/meta/recipes-support/neon/neon_0.30.0.bb
+++ b/meta/recipes-support/neon/neon_0.30.1.bb
@@ -11,8 +11,8 @@ BBCLASSEXTEND = "native"
11 11
12SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ 12SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
13 file://pkgconfig.patch" 13 file://pkgconfig.patch"
14SRC_URI[md5sum] = "fb60b3a124eeec441937a812c456fd94" 14SRC_URI[md5sum] = "231adebe5c2f78fded3e3df6e958878e"
15SRC_URI[sha256sum] = "2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2" 15SRC_URI[sha256sum] = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"
16 16
17BINCONFIG = "${bindir}/neon-config" 17BINCONFIG = "${bindir}/neon-config"
18 18