[neon/kde/solid/Neon/release] debian/patches: remove patch use_shortest_filepath.diff from debian which needs updated and if it is not important enough to upstream then its not important enough to rewrite

[Jonathan Riddell]

Git commit a23d95cd9144329ece53d874995b85b17c63a3a0 by Jonathan Riddell.
Committed on 12/07/2021 at 15:02.
Pushed by jriddell into branch 'Neon/release'.

remove patch use_shortest_filepath.diff from debian which needs updated and if it is not important enough to upstream then its not important enough to rewrite

D  +0    -1    debian/patches/series
D  +0    -62   debian/patches/use_shortest_filepath.diff

https://invent.kde.org/neon/kde/solid/commit/a23d95cd9144329ece53d874995b85b17c63a3a0

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 32c8131..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use_shortest_filepath.diff
diff --git a/debian/patches/use_shortest_filepath.diff b/debian/patches/use_shortest_filepath.diff
deleted file mode 100644
index 4a0cca3..0000000
--- a/debian/patches/use_shortest_filepath.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Sun, 12 Jun 2016 21:57:24 +0200
-Subject: use_shortest_filepath
-
----
- .../backends/udisks2/udisksstorageaccess.cpp       | 33 ++++++++++++++--------
- 1 file changed, 22 insertions(+), 11 deletions(-)
-
-Index: solid/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-===================================================================
---- solid.orig/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-+++ solid/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-@@ -70,6 +70,24 @@ bool StorageAccess::isEncrypted() const
-     return isLuksDevice() || m_device->isEncryptedCleartext();
- }
- 
-+static inline QString get_shortest(QByteArrayList& mntPoints)
-+{
-+    // We return the shortest filePath to avoid errors like:
-+    // https://bugs.debian.org/762950
-+
-+    if (mntPoints.isEmpty()) {
-+        return QString();
-+    }
-+    QString shortest = QFile::decodeName(mntPoints.first());
-+    for (int i = 1; i < mntPoints.count(); i++) {
-+        QString current = QFile::decodeName(mntPoints.at(i));
-+        if (shortest.length() > current.length()) {
-+            shortest = current;
-+        }
-+    }
-+    return shortest;
-+}
-+
- QString StorageAccess::filePath() const
- {
-     QByteArrayList mntPoints;
-@@ -81,20 +99,14 @@ QString StorageAccess::filePath() const
-         }
-         Device holderDevice(path);
-         mntPoints = qdbus_cast<QByteArrayList>(holderDevice.prop("MountPoints"));
--        if (!mntPoints.isEmpty()) {
--            return QFile::decodeName(mntPoints.first()); // FIXME Solid doesn't support multiple mount points
--        } else {
--            return QString();
--        }
-+        // FIXME Solid doesn't support multiple mount points
-+        return get_shortest(mntPoints);
-     }
- 
-     mntPoints = qdbus_cast<QByteArrayList>(m_device->prop("MountPoints"));
- 
--    if (!mntPoints.isEmpty()) {
--        return QFile::decodeName(mntPoints.first()); // FIXME Solid doesn't support multiple mount points
--    } else {
--        return QString();
--    }
-+    // FIXME Solid doesn't support multiple mount points
-+    return get_shortest(mntPoints);
- }
- 
- bool StorageAccess::isIgnored() const