Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plasma6-vault for openSUSE:Factory
checked in at 2025-06-23 15:03:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma6-vault (Old)
and /work/SRC/openSUSE:Factory/.plasma6-vault.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma6-vault"
Mon Jun 23 15:03:33 2025 rev:27 rq:1287631 version:6.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma6-vault/plasma6-vault.changes
2025-06-18 16:00:33.915170942 +0200
+++ /work/SRC/openSUSE:Factory/.plasma6-vault.new.7067/plasma6-vault.changes
2025-06-23 15:04:01.386605493 +0200
@@ -1,0 +2,6 @@
+Sat Jun 21 08:48:55 UTC 2025 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to support fuse3:
+ * 0001-Use-fusermount3-if-available.patch
+
+-------------------------------------------------------------------
New:
----
0001-Use-fusermount3-if-available.patch
----------(New B)----------
New:- Add patch to support fuse3:
* 0001-Use-fusermount3-if-available.patch
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma6-vault.spec ++++++
--- /var/tmp/diff_new_pack.MYmVZv/_old 2025-06-23 15:04:02.026632194 +0200
+++ /var/tmp/diff_new_pack.MYmVZv/_new 2025-06-23 15:04:02.026632194 +0200
@@ -39,6 +39,8 @@
Source1: %{rname}-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Use-fusermount3-if-available.patch
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: cmake(KF6Config) >= %{kf6_version}
BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version}
@@ -57,8 +59,8 @@
BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
BuildRequires: cmake(Qt6Quick) >= %{qt6_version}
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
-Requires: /usr/bin/fusermount
Requires: plasma6-vault-backend
+Requires: (/usr/bin/fusermount3 or /usr/bin/fusermount)
# encfs is EOL, creating new EncFS vaults will no longer be supported
# See
https://github.com/KDE/plasma-vault/commit/ef0762f188ce6568b8fa7babbce852010366c935
Recommends: plasma6-vault-backend-gocryptfs
++++++ 0001-Use-fusermount3-if-available.patch ++++++
>From a7e75c80c41b7fa7da5d28706268f5a7e42dd66a Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Wed, 18 Jun 2025 20:40:17 +0200
Subject: [PATCH] Use fusermount3 if available
Avoid depending on an outdated version of libfuse.
---
kded/engine/fusebackend_p.cpp | 6 +++++-
kded/engine/fusebackend_p.h | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
index 9439c41..714b660 100644
--- a/kded/engine/fusebackend_p.cpp
+++ b/kded/engine/fusebackend_p.cpp
@@ -8,6 +8,7 @@
#include <QDir>
#include <QRegularExpression>
+#include <QStandardPaths>
#include <QUrl>
#include <KIO/DeleteJob>
@@ -60,7 +61,10 @@ void FuseBackend::removeDotDirectory(const MountPoint
&mountPoint)
}
FuseBackend::FuseBackend()
+ : fusermountExecutable(QStringLiteral("fusermount3"))
{
+ if (QStandardPaths::findExecutable(fusermountExecutable).isEmpty())
+ fusermountExecutable = QStringLiteral("fusermount");
}
FuseBackend::~FuseBackend()
@@ -86,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable,
const QStringList &arg
QProcess *FuseBackend::fusermount(const QStringList &arguments) const
{
- return process("fusermount", arguments, {});
+ return process(fusermountExecutable, arguments, {});
}
FutureResult<> FuseBackend::initialize(const QString &name, const Device
&device, const MountPoint &mountPoint, const Vault::Payload &payload)
diff --git a/kded/engine/fusebackend_p.h b/kded/engine/fusebackend_p.h
index 17a37ad..dea732c 100644
--- a/kded/engine/fusebackend_p.h
+++ b/kded/engine/fusebackend_p.h
@@ -47,6 +47,9 @@ protected:
// Check the contents of the dir (should be empty) and if the only item
// there is the dot-directroy, delete it.
static void removeDotDirectory(const MountPoint &mountPoint);
+
+ // fusermount3 if possible, otherwise fusermount
+ QString fusermountExecutable;
};
} // namespace PlasmaVault
--
2.49.0
