diff options
author | Justin Berthault <justin.berthault@zaclys.net> | 2020-08-10 14:50:13 +0200 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2020-08-10 13:36:23 +0000 |
commit | 54a7c548e3115679236cdec179e04094a388f2bc (patch) | |
tree | 37466417f5fdd51563a1cc5571192bcb5a693ba8 | |
parent | ea355396133b43aa0e06e500452deb47b032080e (diff) |
community/davfs2: upgrade to 1.6.0
-rw-r--r-- | community/davfs2/100-musl-compat.patch | 3 | ||||
-rw-r--r-- | community/davfs2/APKBUILD | 13 | ||||
-rw-r--r-- | community/davfs2/fix-neon-version.patch | 13 |
3 files changed, 7 insertions, 22 deletions
diff --git a/community/davfs2/100-musl-compat.patch b/community/davfs2/100-musl-compat.patch index 89329e53b40..00f48b574dc 100644 --- a/community/davfs2/100-musl-compat.patch +++ b/community/davfs2/100-musl-compat.patch @@ -53,7 +53,8 @@ #include "config.h" +#include "compat.h" - + + #include <errno.h> -#include <error.h> #ifdef HAVE_FCNTL_H #include <fcntl.h> diff --git a/community/davfs2/APKBUILD b/community/davfs2/APKBUILD index b06b5663b28..41cbd2b1a2d 100644 --- a/community/davfs2/APKBUILD +++ b/community/davfs2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Thomas Harning Jr. <harningt@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=davfs2 -pkgver=1.5.6 +pkgver=1.6.0 pkgrel=0 pkgdesc="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" url="http://savannah.nongnu.org/projects/davfs2" @@ -9,14 +9,12 @@ options="suid" pkggroups="davfs2" arch="all" license="GPL-3.0-or-later" -depends_dev="libxml2-dev neon-dev zlib-dev linux-headers" -makedepends="$depends_dev autoconf automake libtool" +makedepends="autoconf automake libtool libxml2-dev linux-headers neon-dev zlib-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc" -source="http://mirror.lihnidos.org/GNU/savannah/davfs2/davfs2-$pkgver.tar.gz +source="https://download.savannah.gnu.org/releases/davfs2/davfs2-$pkgver.tar.gz 010-main_code_fix.patch 100-musl-compat.patch - fix-neon-version.patch " prepare() { @@ -47,7 +45,6 @@ package() { install -o root -g davfs2 -m 1774 -d "$pkgdir"/var/run/mount.davfs } -sha512sums="97c3f2eef93b418d89bb387a441d0624d4eb3de614973e3f25ded5e29d6913c7aa724022b610ff36d050ca11db63c47651413a93297e235725a42879bc8ac0c2 davfs2-1.5.6.tar.gz +sha512sums="e016eb847152b7d0c20abfdafd36f43fcff29339362be6765202a45692a186c70b1c33d3566ed8ca695c399a7f0ca1aef7b05d378cdda33d892cb684da34de33 davfs2-1.6.0.tar.gz 1d839b1435ae67209aae2501c1188880e991adece7b34b6b91d1fcba7390fd9d72d2aa7e057d03ed9f1519e682d0f0a8472c47ed64f78a25fe0f67c54a847ce3 010-main_code_fix.patch -7fd91c60ecbc9f4f88e2d3b02f1a1fb3abae64a8a0963860934b4c870b6bd45e62870899cdbfd9c6139eafc72ef12f2e9a4b2bbb5f1c2a0d6dde9c7db196d075 100-musl-compat.patch -a33b40038f1c47d0f842f907831ea13a2ca53bccca8960e39c9860e5c12b09842d220c5f0c48c15897bc45b45742088cc72cba6b6f6dd1d7073c7be700c45308 fix-neon-version.patch" +66dd968d85a18d281d8a41e15b17f0344accfe44951fa17d1d5c9f9bb67442f4d1410adda144562fa45bd561837c486d24f98ac2a0da4800a1e7dd79126caec7 100-musl-compat.patch" diff --git a/community/davfs2/fix-neon-version.patch b/community/davfs2/fix-neon-version.patch deleted file mode 100644 index d7b58f25213..00000000000 --- a/community/davfs2/fix-neon-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream: No -Reason: Allow building with neon 0.31 ---- 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. |