pool/kio
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 880771 from KDE:Frameworks5

Browse Source 
- Add patch to prevent file.so from remaining loaded (kde#434455, boo#1183880)
  * 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch

OBS-URL: https://build.opensuse.org/request/show/880771
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=107
This commit is contained in:
Richard Brown 2021-04-06 15:29:02 +00:00 committed by Git OBS Bridge
commit e85dea172f
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch Normal file
View File

@ -0,0 +1,30 @@
From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Tue, 23 Mar 2021 00:29:31 +0100
Subject: [PATCH] MimeTypeFinderJob: don't put job on hold for local files
Fixes: 434455
---
src/core/mimetypefinderjob.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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();
});
}
--
2.30.2

6
kio.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 23 12:30:10 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Add patch to prevent file.so from remaining loaded (kde#434455, boo#1183880)
* 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch
-------------------------------------------------------------------
Mon Mar 15 16:01:52 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

5
kio.spec
View File

@ -37,6 +37,8 @@ Source2: frameworks.keyring
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
Patch0: kio_help-fallback-to-kde4-docs.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@ -132,8 +134,7 @@ Development files.
%lang_package
%prep
%setup -q
%autopatch -p1
%autosetup -p1
%build
%cmake_kf5 -d build