61 lines
3.3 KiB
Diff
61 lines
3.3 KiB
Diff
From ef52b16862caa43dd4abc0aedf1814796342b664 Mon Sep 17 00:00:00 2001
|
|
From: K900 <me@0upti.me>
|
|
Date: Tue, 16 Dec 2025 11:48:37 +0300
|
|
Subject: [PATCH] kdePackages.plasma-vault: refresh patch
|
|
|
|
No idea how this happened.
|
|
---
|
|
.../plasma/plasma-vault/hardcode-paths.patch | 26 +++++++++----------
|
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
|
|
index d8a5f4a025de3..090df77eb15b0 100644
|
|
--- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
|
|
+++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch
|
|
@@ -1,5 +1,5 @@
|
|
diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
|
|
-index f425eb3..5b8cd43 100644
|
|
+index 64138b6..5d249aa 100644
|
|
--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
|
|
+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
|
|
@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
|
|
@@ -44,7 +44,7 @@ index b992f6f..eb828dd 100644
|
|
|
|
QString GocryptfsBackend::getConfigFilePath(const Device &device) const
|
|
diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
|
|
-index 8763304..e6860d2 100644
|
|
+index 714b660..61d8bf5 100644
|
|
--- a/kded/engine/fusebackend_p.cpp
|
|
+++ b/kded/engine/fusebackend_p.cpp
|
|
@@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
|
|
@@ -57,19 +57,19 @@ index 8763304..e6860d2 100644
|
|
|
|
FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
|
|
diff --git a/kded/engine/vault.cpp b/kded/engine/vault.cpp
|
|
-index c101079..67c8a83 100644
|
|
+index a7a4741..773b671 100644
|
|
--- a/kded/engine/vault.cpp
|
|
+++ b/kded/engine/vault.cpp
|
|
-@@ -485,7 +485,7 @@ FutureResult<> Vault::close()
|
|
- } else {
|
|
- // We want to check whether there is an application
|
|
- // that is accessing the vault
|
|
-- AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this] {
|
|
-+ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast<QString>() | onError([this] {
|
|
- d->updateMessage(i18n("Unable to lock the vault because an application is using it"));
|
|
- }) | onSuccess([this](const QString &result) {
|
|
- // based on ksolidnotify.cpp
|
|
-@@ -538,7 +538,7 @@ FutureResult<> Vault::forceClose()
|
|
+@@ -490,7 +490,7 @@ FutureResult<> Vault::close()
|
|
+ } else {
|
|
+ // We want to check whether there is an application
|
|
+ // that is accessing the vault
|
|
+- AsynQt::Process::getOutput(QStringLiteral("lsof"), { QStringLiteral("-t"), mountPoint().data() })
|
|
++ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), { QStringLiteral("-t"), mountPoint().data() })
|
|
+ | cast<QString>()
|
|
+ | onError([this] {
|
|
+ d->updateMessage(i18n("Unable to close the vault because an application is using it"));
|
|
+@@ -546,7 +546,7 @@ FutureResult<> Vault::forceClose()
|
|
using namespace AsynQt::operators;
|
|
|
|
AsynQt::await(
|