[neon/kde/kio/Neon/stable] debian/patches: Revert "add patch from branch advised by kevin"

Jonathan Esk-Riddell null at kde.org
Mon Oct 2 16:58:11 BST 2023


Git commit 32f82a68088f05252eb69f518691c455715925f4 by Jonathan Esk-Riddell.
Committed on 02/10/2023 at 17:58.
Pushed by jriddell into branch 'Neon/stable'.

Revert "add patch from branch advised by kevin"

This reverts commit 057dabc1ef4c0dccede49ba2cd037ddfe65eaaed.

D  +0    -22   debian/patches/cifs-crash.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/kio/-/commit/32f82a68088f05252eb69f518691c455715925f4

diff --git a/debian/patches/cifs-crash.diff b/debian/patches/cifs-crash.diff
deleted file mode 100644
index fd19fc4..0000000
--- a/debian/patches/cifs-crash.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 48322f44323a1fc09305d66d9093fe6c3780709e
-Author: Kevin Ottens <kevin.ottens at enioka.com>
-Date:   Fri Sep 15 09:45:58 2023 +0200
-
-    Don't crash if KMountPoint gives nothing back while checking for CIFS
-    
-    BUG: 474451
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index 87c47e7e7..c0bc64354 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -328,6 +328,9 @@ inline static time_t stat_mtime(const QT_STATBUF &buf)
- static bool isOnCifsMount(const QString &filePath)
- {
-     const auto mount = KMountPoint::currentMountPoints().findByPath(filePath);
-+    if (!mount) {
-+        return false;
-+    }
-     return mount->mountType() == QStringLiteral("cifs") || mount->mountType() == QStringLiteral("smb3");
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index faf086d..0e4fb57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ wait_for_a_bit_longer
 Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
-cifs-crash.diff


More information about the Neon-commits mailing list