neon: add the recipe from oe-core

PATCH In review Alexander Kanavin 2 participants 5 messages Nov 22, 2017 – Nov 23, 2017

Share & tools

Alexander Kanavin

author

2017-11-22 16:30 UTC #0 lore raw

PATCH 1/1 neon: add the recipe from oe-core

It is still required by libmusicbrainz, but is no longer needed by oe-core. Switch the upstream to debian as webdav.org is down.

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta-oe/recipes-support/neon/neon/pkgconfig.patch | 15 +++++++++
 meta-oe/recipes-support/neon/neon_0.30.2.bb       | 38 +++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 meta-oe/recipes-support/neon/neon/pkgconfig.patch
 create mode 100644 meta-oe/recipes-support/neon/neon_0.30.2.bb

meta-oe/recipes-support/neon/neon/pkgconfig.patch new file +15 -0

new file mode 100644
index 000000000..239dba8e2
@@ -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@

meta-oe/recipes-support/neon/neon_0.30.2.bb new file +38 -0

new file mode 100644
index 000000000..12a2e0b37
@@ -0,0 +1,38 @@
+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"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \
+           file://pkgconfig.patch \
+          "
+
+SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"
+SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
+
+inherit autotools binconfig-disabled lib_package pkgconfig
+
+# Enable gnutls or openssl, not both
+PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
+PACKAGECONFIG_class-native = "expat gnutls webdav zlib"
+
+PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
+PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
+PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
+PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
+PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
+PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
+PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
+
+EXTRA_OECONF += "--enable-shared"
+
+do_compile_append() {
+	oe_runmake -C test
+}
+
+BINCONFIG = "${bindir}/neon-config"
+
+BBCLASSEXTEND = "native"

Signature · 1 line

2.15.0

Martin Jansa

2017-11-22 17:43 UTC #1 lore raw

Quoted 61 lines · Alexander Kanavin

It is still required by libmusicbrainz, but is no longer needed by oe-core. Switch the upstream to debian as webdav.org is down.

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta-oe/recipes-support/neon/neon/pkgconfig.patch | 15 +++++++++
 meta-oe/recipes-support/neon/neon_0.30.2.bb       | 38 +++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 meta-oe/recipes-support/neon/neon/pkgconfig.patch
 create mode 100644 meta-oe/recipes-support/neon/neon_0.30.2.bb

meta-oe/recipes-support/neon/neon/pkgconfig.patch new file +15 -0

new file mode 100644
index 000000000..239dba8e2
@@ -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@

meta-oe/recipes-support/neon/neon_0.30.2.bb new file +23 -0

new file mode 100644
index 000000000..12a2e0b37
@@ -0,0 +1,38 @@
+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"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \
+           file://pkgconfig.patch \
+          "
+
+SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"
+SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
+
+inherit autotools binconfig-disabled lib_package pkgconfig
+
+# Enable gnutls or openssl, not both
+PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
+PACKAGECONFIG_class-native = "expat gnutls webdav zlib"
+
+PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
+PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
+PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"

meta-oe/recipes-support/neon/neon_0.30.2.bb line 33

Quoted 10 lines

meta-oe/recipes-support/neon/neon_0.30.2.bb new file +10 -0

+PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
+PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
+PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
+PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
+
+EXTRA_OECONF += "--enable-shared"
+
+do_compile_append() {
+	oe_runmake -C test

Use 4 spaces for indentation instead of tabs.

Quoted 13 lines

meta-oe/recipes-support/neon/neon_0.30.2.bb new file +5 -0

+}
+
+BINCONFIG = "${bindir}/neon-config"
+
+BBCLASSEXTEND = "native"

Signature · 7 lines

2.15.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Alexander Kanavin

author

2017-11-23 09:45 UTC #2 lore raw

Quoted 4 lines · Martin Jansa

meta-oe/recipes-support/neon/neon_0.30.2.bb line 33
Quoted 2 lines
meta-oe/recipes-support/neon/neon_0.30.2.bb new file +2 -0
+do_compile_append() {
+	oe_runmake -C test
Use 4 spaces for indentation instead of tabs.

Please explain why.

Alex

Martin Jansa

2017-11-23 12:06 UTC #3 lore raw

https://www.openembedded.org/wiki/Styleguide#Format_Guidelines

Quoted 13 lines · Alexander Kanavin

Quoted 6 lines · Martin Jansa
+do_compile_append() {
Quoted 2 lines
+ oe_runmake -C test
Use 4 spaces for indentation instead of tabs.
Please explain why.
Alex

Alexander Kanavin

author

2017-11-23 13:39 UTC #4 lore raw

Quoted 1 line · Martin Jansa

https://www.openembedded.org/wiki/Styleguide#Format_Guidelines

Alright. I resent the patch, as I don't want to start a style war, but (as discussed previously) I will resist any attempts to enforce indentation in oe-core. We need to prioritize what we spend our time on ruthlessly, considering the project is constantly under-staffed.

Alex