git: 1f0b5bb8af6d - main - filesystems/mergerfs: fix build on i386 due to C++17 narrowing

From: Emanuel Haupt <ehaupt_at_FreeBSD.org>
Date: Sat, 29 Nov 2025 10:17:52 UTC
The branch main has been updated by ehaupt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f0b5bb8af6d2a1b2df2bb26048ef0253a99bfe5

commit 1f0b5bb8af6d2a1b2df2bb26048ef0253a99bfe5
Author:     Emanuel Haupt <ehaupt@FreeBSD.org>
AuthorDate: 2025-11-29 10:17:34 +0000
Commit:     Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2025-11-29 10:17:34 +0000

    filesystems/mergerfs: fix build on i386 due to C++17 narrowing
    
    Reported by:    pkg-fallout
---
 filesystems/mergerfs/Makefile                         |  1 +
 filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/filesystems/mergerfs/Makefile b/filesystems/mergerfs/Makefile
index 95afcfdda00d..14705422cba4 100644
--- a/filesystems/mergerfs/Makefile
+++ b/filesystems/mergerfs/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mergerfs
 DISTVERSION=	2.41.1
+PORTREVISION=	1
 CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp
new file mode 100644
index 000000000000..18fd8b482400
--- /dev/null
+++ b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp
@@ -0,0 +1,17 @@
+--- libfuse/lib/fuse.cpp.orig	2025-11-18 14:35:27 UTC
++++ libfuse/lib/fuse.cpp
+@@ -1636,12 +1636,12 @@ fuse_lib_setattr(fuse_req_t            *req_,
+           if(arg->valid & FATTR_ATIME_NOW)
+             tv[0].tv_nsec = UTIME_NOW;
+           else if(arg->valid & FATTR_ATIME)
+-            tv[0] = (struct timespec){ static_cast<time_t>(arg->atime), arg->atimensec };
++            tv[0] = (struct timespec){ static_cast<time_t>(arg->atime), static_cast<long>(arg->atimensec) };
+ 
+           if(arg->valid & FATTR_MTIME_NOW)
+             tv[1].tv_nsec = UTIME_NOW;
+           else if(arg->valid & FATTR_MTIME)
+-            tv[1] = (struct timespec){ static_cast<time_t>(arg->mtime), arg->mtimensec };
++            tv[1] = (struct timespec){ static_cast<time_t>(arg->mtime), static_cast<long>(arg->mtimensec) };
+ 
+           err = ((fusepath != NULL) ?
+                  f.ops.utimens(&req_->ctx,&fusepath[1],tv) :