[neon/kde/kio/Neon/unstable] debian/patches: Revert "add patch from master"

Jonathan Riddell null at kde.org
Tue Mar 23 12:00:39 GMT 2021


Git commit 4125e7d6a308c6704d1a14c9360b2b16e1d961eb by Jonathan Riddell.
Committed on 23/03/2021 at 12:00.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "add patch from master"

This reverts commit f34bc0e9bcded6f36b38f63115962b933b65bc9f.

D  +0    -25   debian/patches/mimetypefinderjob.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/kio/commit/4125e7d6a308c6704d1a14c9360b2b16e1d961eb

diff --git a/debian/patches/mimetypefinderjob.diff b/debian/patches/mimetypefinderjob.diff
deleted file mode 100644
index 4cc0d77..0000000
--- a/debian/patches/mimetypefinderjob.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 05e1090603ca81eb54a23febe41a8823a0e7d572
-Author: David Faure <faure at kde.org>
-Date:   Tue Mar 23 00:29:31 2021 +0100
-
-    MimeTypeFinderJob: don't put job on hold for local files
-    
-    Fixes: 434455
-
-diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
-index 147f3aa9..f5e50cdc 100644
---- a/src/core/mimetypefinderjob.cpp
-+++ b/src/core/mimetypefinderjob.cpp
-@@ -241,8 +241,10 @@ void KIO::MimeTypeFinderJobPrivate::scanFileWithGet()
-             m_suggestedFileName = job->queryMetaData(QStringLiteral("content-disposition-filename"));
-         }
- 
--        job->putOnHold();
--        KIO::Scheduler::publishSlaveOnHold();
-+        if (!m_url.isLocalFile()) { // #434455
-+            job->putOnHold();
-+            KIO::Scheduler::publishSlaveOnHold();
-+        }
-         q->emitResult();
-     });
- }
diff --git a/debian/patches/series b/debian/patches/series
index dd91327..f49df91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
 libexec_from_env.patch
-mimetypefinderjob.diff


More information about the Neon-commits mailing list