From 712534de40af9c53b282ba7941187798f3cd4080 Mon Sep 17 00:00:00 2001 From: triallax Date: Fri, 25 Aug 2023 21:46:04 +0100 Subject: [PATCH] fuse3: update to 3.16.1. --- srcpkgs/fuse3/patches/804.patch | 38 --------------------------------- srcpkgs/fuse3/template | 4 ++-- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/fuse3/patches/804.patch diff --git a/srcpkgs/fuse3/patches/804.patch b/srcpkgs/fuse3/patches/804.patch deleted file mode 100644 index 6894337fe1983..0000000000000 --- a/srcpkgs/fuse3/patches/804.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6d21930baa4379023414706ce1750e0d729b99f0 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Mon, 12 Jun 2023 12:15:35 +0000 -Subject: [PATCH] Wrapper around test applications for cross compiler - environment in meson.build - -This enhances commit 7be56c57f93e3436b1fbd9ecc320de5c03a3e4b8 to allow build -fuse to be built using a cross compiler - -Fixes: -../meson.build:180:12: ERROR: Can not run test applications in this cross environment. ---- -https://github.com/libfuse/libfuse/pull/804 - - meson.build | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index 7aa4e0d47..9707ea3e2 100644 ---- a/meson.build -+++ b/meson.build -@@ -177,10 +177,12 @@ int main() - } - ''' - --result = cc.run(detect_getmntent_needs_unescape) --if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping' -- message('getmntent does not unescape') -- add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c') -+if not meson.is_cross_build() -+ result = cc.run(detect_getmntent_needs_unescape) -+ if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping' -+ message('getmntent does not unescape') -+ add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c') -+ endif - endif - - # Write private test results into fuse_config.h (stored in build directory) diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template index 612f909c8e6f6..5900ea51611da 100644 --- a/srcpkgs/fuse3/template +++ b/srcpkgs/fuse3/template @@ -1,6 +1,6 @@ # Template file for 'fuse3' pkgname=fuse3 -version=3.15.1 +version=3.16.1 revision=1 build_style=meson configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false @@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/libfuse/libfuse" changelog="https://raw.githubusercontent.com/libfuse/libfuse/master/ChangeLog.rst" distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.gz" -checksum=13ef77cda531a21c2131f9576042970e98035c0a5f019abf661506efd2d38a4e +checksum=75a7140ce2d4589eda2784d2279be9d2b273a9b6b0f79ecb871dc4dded046fb5 conf_files="/etc/fuse.conf" # Tests require root make_check=no