From 659db64dbcec38dc5dcd30b2f9c3a6bbaa6dc0cb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 4 Dec 2022 09:25:20 +0100 Subject: [PATCH] neon: Update to 0.32.4 drop msysize patch add missing libintl dep --- neon/PKGBUILD | 19 ++++++++++--------- neon/neon-0.30.2-msys2.patch | 13 ------------- 2 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 neon/neon-0.30.2-msys2.patch diff --git a/neon/PKGBUILD b/neon/PKGBUILD index 78920ad9..60716c06 100644 --- a/neon/PKGBUILD +++ b/neon/PKGBUILD @@ -2,29 +2,30 @@ pkgbase=neon pkgname=("lib${pkgbase}" "lib${pkgbase}-devel") -pkgver=0.32.1 +pkgver=0.32.4 pkgrel=1 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64') url="https://notroj.github.io/neon/" license=('GPL' 'LGPL') -depends=('libexpat' 'openssl' 'ca-certificates') -makedepends=('libexpat-devel' 'openssl-devel' 'autotools' 'gcc') +depends=('libexpat' 'openssl' 'ca-certificates' 'libintl') +makedepends=('libexpat-devel' 'openssl-devel' 'autotools' 'gcc' 'gettext-devel') options=('libtool') # FS#16067 -source=(https://notroj.github.io/neon/${pkgbase}-${pkgver}.tar.gz - neon-0.30.2-msys2.patch) -sha256sums=('05c54bc115030c89e463a4fb28d3a3f8215879528ba5ca70d676d3d21bf3af52' - '37a3f2650a9c05360b4d353cfc0401ea1eb6446846a8b62b080483b730d93db2') +source=(https://notroj.github.io/neon/${pkgbase}-${pkgver}.tar.gz) +sha256sums=('b1e2120e4ae07df952c4a858731619733115c5f438965de4fab41d6bf7e7a508') prepare() { cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/neon-0.30.2-msys2.patch + ./autogen.sh } build() { cd "${srcdir}"/${pkgbase}-${pkgver} - ./configure --build=${CHOST} \ + + export MSYSTEM=CYGWIN + local CYGWIN_CHOST="${CHOST/-msys/-cygwin}" + ./configure --build=${CYGWIN_CHOST} \ --prefix=/usr \ --with-expat \ --enable-shared \ diff --git a/neon/neon-0.30.2-msys2.patch b/neon/neon-0.30.2-msys2.patch deleted file mode 100644 index 719d6c71..00000000 --- a/neon/neon-0.30.2-msys2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -durN neon-0.30.2.orig/config.guess neon-0.30.2/config.guess ---- neon-0.30.2.orig/config.guess 2016-09-30 17:33:33.000000000 +0800 -+++ neon-0.30.2/config.guess 2017-05-20 10:55:55.421875000 +0800 -@@ -866,6 +866,9 @@ - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;;