[neon/kf6/kf6-solid/Neon/stable] debian/patches: Revert "add patch recommended by Nate"

Jonathan Riddell null at kde.org
Fri Apr 19 11:47:36 BST 2024


Git commit 70774cc118da435a29b418ddb9d8e6c7f006003a by Jonathan Riddell.
Committed on 19/04/2024 at 10:47.
Pushed by jriddell into branch 'Neon/stable'.

Revert "add patch recommended by Nate"

This reverts commit 56edf10927a23b7ff3e6e9e7c80076350f8a4efd.

D  +0    -29   debian/patches/luks.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kf6/kf6-solid/-/commit/70774cc118da435a29b418ddb9d8e6c7f006003a

diff --git a/debian/patches/luks.diff b/debian/patches/luks.diff
deleted file mode 100644
index e4f1519..0000000
--- a/debian/patches/luks.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 9ecaf388ccd41d2831ab3833c26627f72ab78f40
-Author: Kai Uwe Broulik <kde at privat.broulik.de>
-Date:   Mon Apr 15 22:43:15 2024 +0200
-
-    udisks: Return empty string for "root" clearTextPath
-    
-    There cannot be an empty object path on DBus, so "/" is used to denote
-    no clear text device. Return empty string explicitly here to avoid
-    littering even more places with empty || "/" checks.
-    
-    BUG: 485507
-
-diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-index 04e78b1f..cfbedae0 100644
---- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-@@ -465,7 +465,11 @@ QString StorageAccess::generateReturnObjectPath()
- 
- QString StorageAccess::clearTextPath() const
- {
--    return m_device->prop("CleartextDevice").value<QDBusObjectPath>().path();
-+    const QString path = m_device->prop("CleartextDevice").value<QDBusObjectPath>().path();
-+    if (path != QLatin1String("/")) {
-+        return path;
-+    }
-+    return QString();
- }
- 
- QString StorageAccess::dbusPath() const
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 98738f3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-luks.diff


More information about the Neon-commits mailing list