git: 7abc858c15be - main - devel/kf6-solid: Add patch to revert showing ZFS datasets as devices

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Mon, 30 Jun 2025 09:43:37 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7abc858c15be143c75ca55def487ab2634a44280

commit 7abc858c15be143c75ca55def487ab2634a44280
Author:     Kenneth Raplee <kenrap@kennethraplee.com>
AuthorDate: 2025-06-30 07:59:53 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-06-30 09:43:24 +0000

    devel/kf6-solid: Add patch to revert showing ZFS datasets as devices
    
    Pull Request:   https://github.com/freebsd/freebsd-ports/pull/416
---
 devel/kf6-solid/Makefile                                  |  1 +
 ...tch-src_solid_devices_backends_fstab_fstabhandling.cpp | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/devel/kf6-solid/Makefile b/devel/kf6-solid/Makefile
index 4000bd2476ea..169834b0005e 100644
--- a/devel/kf6-solid/Makefile
+++ b/devel/kf6-solid/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	solid
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 COMMENT=	Desktop hardware abstraction
diff --git a/devel/kf6-solid/file/patch-src_solid_devices_backends_fstab_fstabhandling.cpp b/devel/kf6-solid/file/patch-src_solid_devices_backends_fstab_fstabhandling.cpp
new file mode 100644
index 000000000000..8f6498ed4970
--- /dev/null
+++ b/devel/kf6-solid/file/patch-src_solid_devices_backends_fstab_fstabhandling.cpp
@@ -0,0 +1,15 @@
+--- src/solid/devices/backends/fstab/fstabhandling.cpp.orig	2025-06-13 09:40:36 UTC
++++ src/solid/devices/backends/fstab/fstabhandling.cpp
+@@ -70,11 +70,7 @@ bool _k_isFstabSupportedLocalFileSystem(const QString 
+     if (fstype == QLatin1String("fuse.encfs") //
+         || fstype == QLatin1String("fuse.cryfs") //
+         || fstype == QLatin1String("fuse.gocryptfs") //
+-        || fstype == QLatin1String("overlay")
+-
+-        // handle ZFS here as udisk2 doesn't support that yet
+-        // see https://github.com/storaged-project/udisks/issues/42
+-        || fstype == QLatin1String("zfs")) {
++        || fstype == QLatin1String("overlay")) {
+         return true;
+     }
+     return false;