diff --git a/mingw-w64-neon/0001-m4-check-libintl-functions.patch b/mingw-w64-neon/0001-m4-check-libintl-functions.patch new file mode 100644 index 0000000000..2452421e12 --- /dev/null +++ b/mingw-w64-neon/0001-m4-check-libintl-functions.patch @@ -0,0 +1,22 @@ +--- a/macros/neon.m4 ++++ b/macros/neon.m4 +@@ -363,8 +363,6 @@ + + AC_CACHE_CHECK([for library containing $1], [ne_cv_libsfor_$1], [ + case $ne_cv_os_uname in +- MINGW*) +- ;; + *) + case $1 in + getaddrinfo) +@@ -407,10 +405,6 @@ + ;; + esac + ;; +- *) +- ne__prologue="" +- ne__code="" +- ;; + esac + ;; + *) diff --git a/mingw-w64-neon/0002-makefile-fix-doc-dir.patch b/mingw-w64-neon/0002-makefile-fix-doc-dir.patch new file mode 100644 index 0000000000..1691d25676 --- /dev/null +++ b/mingw-w64-neon/0002-makefile-fix-doc-dir.patch @@ -0,0 +1,22 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -129,16 +129,16 @@ + + install-html: + $(INSTALL) -d $(DESTDIR)$(docdir)/html +- for d in doc/html/*.html; do \ ++ for d in $(srcdir)/doc/html/*.html; do \ + $(INSTALL_DATA) $$d $(DESTDIR)$(docdir)/html; \ + done + + install-man: + $(INSTALL) -d $(DESTDIR)$(man3dir) + $(INSTALL) -d $(DESTDIR)$(man1dir) +- for m in doc/man/*.3; do \ ++ for m in $(srcdir)/doc/man/*.3; do \ + $(INSTALL_DATA) $$m $(DESTDIR)$(man3dir); done +- for m in doc/man/*.1; do \ ++ for m in $(srcdir)/doc/man/*.1; do \ + $(INSTALL_DATA) $$m $(DESTDIR)$(man1dir); done + + install: install-@ALLOW_INSTALL@ diff --git a/mingw-w64-neon/PKGBUILD b/mingw-w64-neon/PKGBUILD index e56b12f173..7389096bfd 100644 --- a/mingw-w64-neon/PKGBUILD +++ b/mingw-w64-neon/PKGBUILD @@ -3,39 +3,41 @@ _realname=neon pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.31.2 -pkgrel=3 +pkgver=0.32.3 +pkgrel=1 pkgdesc="HTTP and WebDAV client library with a C interface (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://notroj.github.io/neon/" license=('GPL' 'LGPL') depends=("${MINGW_PACKAGE_PREFIX}-expat" + "${MINGW_PACKAGE_PREFIX}-gettext" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-ca-certificates") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") options=('libtool' 'staticlibs') # FS#16067 source=(https://notroj.github.io/neon/${_realname}-${pkgver}.tar.gz - neon-0.30.2-mingw-w64.patch - neon-0.31.2-configure-stdcall.patch) -sha256sums=('cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678' - 'a1e19dcd755784168542930a0e351506eb1bfc5d941904aa970f81b5b489a95d' - '1eb9e381ad8ed975dafcc1718c7ef32e0b33a7d591939be614db2d799c57d336') + 0001-m4-check-libintl-functions.patch + 0002-makefile-fix-doc-dir.patch + neon-0.30.2-mingw-w64.patch) +sha256sums=('94cb875dc6dbfcdee58f039b763c674b0232886cdfd7a5de91be5cdfa2b7596a' + '36df51855f6b4047ea668a0ee88c2a119a93654bf9c945d66f8412fd34f947ee' + '0104d00028a563eddc746539fa5b0085a0dc4e8dc28baa6c71caed374b246903' + 'a1e19dcd755784168542930a0e351506eb1bfc5d941904aa970f81b5b489a95d') validpgpkeys=('190555472DCC589BEF01609C608A86DF9833CC49') #Joe Orton prepare() { cd "${srcdir}"/${_realname}-${pkgver} + patch -p1 -i "${srcdir}/0001-m4-check-libintl-functions.patch" + patch -p1 -i "${srcdir}/0002-makefile-fix-doc-dir.patch" patch -p1 -i "${srcdir}/neon-0.30.2-mingw-w64.patch" - # https://github.com/notroj/neon/commit/43a9b7e0d72ee97dcdbc102254ada20278eac80b - patch -p1 -i "${srcdir}/neon-0.31.2-configure-stdcall.patch" ./autogen.sh #autoreconf -fi } build() { - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ @@ -43,6 +45,7 @@ build() { --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --with-expat \ + --enable-nls \ --enable-shared \ --disable-static \ --with-ssl=openssl \ @@ -51,6 +54,11 @@ build() { } package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MSYSTEM}" make DESTDIR="${pkgdir}" install + + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/neon-config + sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i "${pkgdir}${MINGW_PREFIX}"/lib/libneon.la + sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/neon.pc } diff --git a/mingw-w64-neon/neon-0.31.2-configure-stdcall.patch b/mingw-w64-neon/neon-0.31.2-configure-stdcall.patch deleted file mode 100644 index de49a9a9fa..0000000000 --- a/mingw-w64-neon/neon-0.31.2-configure-stdcall.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 43a9b7e0d72ee97dcdbc102254ada20278eac80b Mon Sep 17 00:00:00 2001 -From: Christopher Degawa -Date: Wed, 23 Sep 2020 16:31:17 +0000 -Subject: [PATCH] macros/neon.m4: add prologue to NE_SEARCH_LIBS - -This check kept on failing with 32-bit windows gcc and clang - -This does remove the on-by-default `__stdcall` for ws2_32, but instead -uses the proper header - -Signed-off-by: Christopher Degawa ---- - macros/neon.m4 | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/macros/neon.m4 b/macros/neon.m4 -index ccdc4a6..9a2deaa 100644 ---- a/macros/neon.m4 -+++ b/macros/neon.m4 -@@ -371,16 +371,27 @@ ne_cv_libsfor_$1="not found" - for lib in $2; do - # The w32api libraries link using the stdcall calling convention. - case ${lib}-${ne_cv_os_uname} in -- ws2_32-MINGW*) ne__code="__stdcall $1();" ;; -- *) ne__code="$1();" ;; -+ ws2_32-MINGW*) -+ ne__prologue="#include " -+ case $1 in -+ socket) ne__code="socket(0,0,0);" ;; -+ gethostbyname) ne__code="gethostbyname(\"\")" ;; -+ *) ne__code="$1();" ;; -+ esac -+ ;; -+ *) -+ ne__prologue="" -+ ne__code="$1();" -+ ;; - esac - -+ - LIBS="$ne_sl_save_LIBS -l$lib $NEON_LIBS" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [$ne__code])], -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([$ne__prologue], [$ne__code])], - [ne_cv_libsfor_$1="-l$lib"; break]) - m4_if($3, [], [], dnl If $3 is specified, then... - [LIBS="$ne_sl_save_LIBS -l$lib $3 $NEON_LIBS" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [$ne__code])], -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([$ne__prologue], [$ne__code])], - [ne_cv_libsfor_$1="-l$lib $3"; break])]) - done - LIBS=$ne_sl_save_LIBS])])