From b8b2e8317b29222b04391650ca712180f48c8f5a Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Tue, 5 May 2020 02:21:27 -0300
Subject: community/davfs2: fix build

---
 community/davfs2/APKBUILD               | 32 ++++++++++++--------------------
 community/davfs2/fix-neon-version.patch | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 community/davfs2/fix-neon-version.patch

diff --git a/community/davfs2/APKBUILD b/community/davfs2/APKBUILD
index cdd11f5547..23a4e1a0f2 100644
--- a/community/davfs2/APKBUILD
+++ b/community/davfs2/APKBUILD
@@ -8,33 +8,26 @@ url="http://savannah.nongnu.org/projects/davfs2"
 options="suid"
 pkggroups="davfs2"
 arch="all"
-license="GPL-3.0"
-depends=""
+license="GPL-3.0-or-later"
 depends_dev="libxml2-dev neon-dev zlib-dev linux-headers"
 makedepends="$depends_dev autoconf automake libtool"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
-source="http://mirror.lihnidos.org/GNU/savannah/davfs2/${pkgname}-${pkgver}.tar.gz
+source="http://mirror.lihnidos.org/GNU/savannah/davfs2/davfs2-$pkgver.tar.gz
 	010-main_code_fix.patch
-	100-musl-compat.patch"
+	100-musl-compat.patch
+	fix-neon-version.patch
+	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	aclocal -I config \
 	        && autoheader \
 	        && automake --add-missing --force-missing --copy \
-	        && autoconf || return 1
+	        && autoconf
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -44,18 +37,17 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		dav_user=nobody \
-		--enable-largefile \
-		|| return 1
-	make || return 1
+		--enable-largefile
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 	install -o root -g davfs2 -m 1774 -d "$pkgdir"/var/run/mount.davfs
 }
 
 sha512sums="3a660b29eab15226acf3cc896ec387beb96cb4a94beae40d5970d8d4f7f370afb7da2b637584d953b5dc342d81454d9a954990b04f3cb032fb2a0a469fd7983c  davfs2-1.5.5.tar.gz
 1d839b1435ae67209aae2501c1188880e991adece7b34b6b91d1fcba7390fd9d72d2aa7e057d03ed9f1519e682d0f0a8472c47ed64f78a25fe0f67c54a847ce3  010-main_code_fix.patch
-44ce904db9e4efc48efdb74b791c2a5d135baa1272385906f85ea99fbf3254b010d6d1b4701091f784deebc0d2ebb3ca16a68c768e4af184b2504f31b7a65b3b  100-musl-compat.patch"
+44ce904db9e4efc48efdb74b791c2a5d135baa1272385906f85ea99fbf3254b010d6d1b4701091f784deebc0d2ebb3ca16a68c768e4af184b2504f31b7a65b3b  100-musl-compat.patch
+3199ef7de29905e4da1ac8fb34bfe2d7dc595f9096e7404a8b473763afc7abd3d60cf9bbf9639c40e22dd6545acc0deb5f55c08b59c06cb2b742cdf976d3375c  fix-neon-version.patch"
diff --git a/community/davfs2/fix-neon-version.patch b/community/davfs2/fix-neon-version.patch
new file mode 100644
index 0000000000..a5b5d96521
--- /dev/null
+++ b/community/davfs2/fix-neon-version.patch
@@ -0,0 +1,16 @@
+Upstream: No
+Reason: Allow building with neon 0.31
+diff --git a/configure.ac b/configure.ac
+index 594ab6f..c8294ef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,7 +36,7 @@ AC_PROG_LN_S
+ # Checks for libraries.
+ AM_GNU_GETTEXT_VERSION(0.18.1)
+ AM_GNU_GETTEXT([external])
+-NE_REQUIRE_VERSIONS([0], [27 28 29 30])
++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
+ DAV_CHECK_NEON
+ 
+ # Checks for header files.
+
-- 
cgit v1.2.3