[oe-commits] org.oe.dev neon: force gnutls support as per bug #2280

[polyonymous commit]

neon: force gnutls support as per bug #2280

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: f82eb273fbe78d5e3835d3d95c85ac6d251df0de
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f82eb273fbe78d5e3835d3d95c85ac6d251df0de
Files:
1
packages/neon/files/gnutls-force-and-detect.patch
packages/neon/neon_0.25.5.bb
Diffs:

#
# mt diff -re7a885c65fac678637bdc0153d73dafaa9bb1608 -rf82eb273fbe78d5e3835d3d95c85ac6d251df0de
#
# 
# 
# add_file "packages/neon/files/gnutls-force-and-detect.patch"
#  content [562edad6376dd1ca408bcd5c23999c5ca7e5a83c]
# 
# patch "packages/neon/neon_0.25.5.bb"
#  from [fd96139d8696c4a0ff915929ff5b4a404037ff80]
#    to [06c4f6b2d404fe156e89c065c86b17015e490bb2]
# 
============================================================
--- packages/neon/files/gnutls-force-and-detect.patch	562edad6376dd1ca408bcd5c23999c5ca7e5a83c
+++ packages/neon/files/gnutls-force-and-detect.patch	562edad6376dd1ca408bcd5c23999c5ca7e5a83c
@@ -0,0 +1,23 @@
+diff --git a/macros/neon.m4 b/macros/neon.m4
+index 01072b9..6d3258f 100644
+--- a/macros/neon.m4
++++ b/macros/neon.m4
+@@ -886,15 +886,11 @@ yes|openssl)
+    NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_openssl"
+    ;;
+ gnutls)
+-   AC_MSG_ERROR([GNU TLS support is not yet complete])
++   dnl AC_MSG_ERROR([GNU TLS support is not yet complete])
+ 
+-   AC_PATH_PROG(GNUTLS_CONFIG, libgnutls-config, no)
++   GNUTLS_CONFIG="pkg-config gnutls"
+ 
+-   if test "$GNUTLS_CONFIG" = "no"; then
+-     AC_MSG_ERROR([could not find libgnutls-config in \$PATH])
+-   fi
+-
+-   ne_gnutls_ver=`$GNUTLS_CONFIG --version`
++   ne_gnutls_ver=`$GNUTLS_CONFIG --modversion`
+    case $ne_gnutls_ver in
+    1.0.?|1.0.1?|1.0.20|1.0.21) 
+       AC_MSG_ERROR([GNU TLS version $ne_gnutls_ver is too old -- 1.0.22 or later required]) ;;
============================================================
--- packages/neon/neon_0.25.5.bb	fd96139d8696c4a0ff915929ff5b4a404037ff80
+++ packages/neon/neon_0.25.5.bb	06c4f6b2d404fe156e89c065c86b17015e490bb2
@@ -1,16 +1,17 @@ LICENSE = "LGPL"
 DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface."
 HOMEPAGE = "http://www.webdav.org/neon"
 SECTION = "libs"
 LICENSE = "LGPL"
-DEPENDS = "zlib libxml2 expat time"
+DEPENDS = "zlib libxml2 expat time gnutls"
 
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz"
+SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \
+	file://gnutls-force-and-detect.patch;patch=1"
 
 inherit autotools binconfig lib_package pkgconfig
 
-EXTRA_OECONF = "--without-ssl --with-libxml2 --with-expat --enable-shared"
+EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared"
 
 do_stage() {
 	autotools_stage_all