From 9ec35711f04f10bad8962d8e17590b412a73a267 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= Date: Tue, 5 May 2020 21:11:19 -0400 Subject: [PATCH] net-fs/davfs2: add support for neon-0.31 #719954 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Thanks thulle for the patch! Closes: https://bugs.gentoo.org/719954 Package-Manager: Portage-2.3.69, Repoman-2.3.14 Signed-off-by: Göktürk Yüksek --- net-fs/davfs2/davfs2-1.5.6.ebuild | 3 +- .../files/davfs2-1.5.6-neon31-support.patch | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 net-fs/davfs2/files/davfs2-1.5.6-neon31-support.patch diff --git a/net-fs/davfs2/davfs2-1.5.6.ebuild b/net-fs/davfs2/davfs2-1.5.6.ebuild index 320e82d5c52d..6f227c812123 100644 --- a/net-fs/davfs2/davfs2-1.5.6.ebuild +++ b/net-fs/davfs2/davfs2-1.5.6.ebuild @@ -31,7 +31,8 @@ src_prepare() { sed -e '/^manual[58]_DATA/ s/\.gz//g' \ -i "${S}"/man/Makefile.in || die - eapply "${FILESDIR}"/${PN}-1.5.5-gcc-10.patch + eapply "${FILESDIR}"/${PN}-1.5.5-gcc-10.patch \ + "${FILESDIR}"/${P}-neon31-support.patch default } diff --git a/net-fs/davfs2/files/davfs2-1.5.6-neon31-support.patch b/net-fs/davfs2/files/davfs2-1.5.6-neon31-support.patch new file mode 100644 index 000000000000..1f5b0b376db9 --- /dev/null +++ b/net-fs/davfs2/files/davfs2-1.5.6-neon31-support.patch @@ -0,0 +1,45 @@ +Update configure to support neon-0.31.1 +Bug: https://bugs.gentoo.org/719954 + +--- a/configure ++++ b/configure +@@ -6800,7 +6800,7 @@ + $as_echo "$ne_cv_lib_neon" >&6; } + if test "$ne_cv_lib_neon" = "yes"; then + ne_cv_lib_neonver=no +- for v in 27 28 29 30; do ++ for v in 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac +@@ -6983,8 +6983,8 @@ + neon_got_library=yes + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5 +-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5 ++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;} + neon_got_library=no + fi + +@@ -7040,7 +7040,7 @@ + $as_echo "$ne_cv_lib_neon" >&6; } + if test "$ne_cv_lib_neon" = "yes"; then + ne_cv_lib_neonver=no +- for v in 27 28 29 30; do ++ for v in 27 28 29 30 31; do + case $ne_libver in + 0.$v.*) ne_cv_lib_neonver=yes ;; + esac +@@ -7223,8 +7223,8 @@ + neon_got_library=yes + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5 +-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5 ++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;} + neon_got_library=no + fi + -- 2.26.2