[neon/kde/solid/Neon/release] debian/patches: lintian happiness with new package

[Jonathan Riddell]

Git commit e9c064870b34ea370928f992a597777935aab943 by Jonathan Riddell.
Committed on 08/05/2024 at 10:35.
Pushed by jriddell into branch 'Neon/release'.

lintian happiness with new package

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

https://invent.kde.org/neon/kde/solid/-/commit/e9c064870b34ea370928f992a597777935aab943

diff --git a/debian/patches/luks.diff b/debian/patches/luks.diff
new file mode 100644
index 0000000..e4f1519
--- /dev/null
+++ b/debian/patches/luks.diff
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..98738f3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+luks.diff