[neon/kde/solid/Neon/unstable] debian/patches: update patch

[Jonathan Riddell]

Git commit b9bb03bbc8017d211a4f22d3b64ad7e595796b5d by Jonathan Riddell.
Committed on 01/04/2021 at 13:43.
Pushed by jriddell into branch 'Neon/unstable'.

update patch

M  +6    -6    debian/patches/use_shortest_filepath.diff

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

diff --git a/debian/patches/use_shortest_filepath.diff b/debian/patches/use_shortest_filepath.diff
index 5750adc..4a0cca3 100644
--- a/debian/patches/use_shortest_filepath.diff
+++ b/debian/patches/use_shortest_filepath.diff
@@ -10,8 +10,8 @@ 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
-@@ -78,6 +78,24 @@ bool StorageAccess::isAccessible() const
-     return m_device->isMounted();
+@@ -70,6 +70,24 @@ bool StorageAccess::isEncrypted() const
+     return isLuksDevice() || m_device->isEncryptedCleartext();
  }
  
 +static inline QString get_shortest(QByteArrayList& mntPoints)
@@ -35,12 +35,12 @@ Index: solid/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
  QString StorageAccess::filePath() const
  {
      QByteArrayList mntPoints;
-@@ -89,20 +107,13 @@ QString StorageAccess::filePath() const
+@@ -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
+-            return QFile::decodeName(mntPoints.first()); // FIXME Solid doesn't support multiple mount points
 -        } else {
 -            return QString();
 -        }
@@ -49,9 +49,9 @@ Index: solid/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
      }
  
      mntPoints = qdbus_cast<QByteArrayList>(m_device->prop("MountPoints"));
--
+ 
 -    if (!mntPoints.isEmpty()) {
--        return QFile::decodeName(mntPoints.first());    // FIXME Solid doesn't support multiple mount points
+-        return QFile::decodeName(mntPoints.first()); // FIXME Solid doesn't support multiple mount points
 -    } else {
 -        return QString();
 -    }