From 5e28b57945a38830ff7e560056bf77215467a79cd767d77f17d85df323c18099 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 23 Mar 2021 16:40:12 +0000 Subject: [PATCH] Accepting request 880719 from home:cgiboudeaux:branches:KDE:Frameworks5 - Add patch to prevent file.so from remaining loaded (boo#1183880) * 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch OBS-URL: https://build.opensuse.org/request/show/880719 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=325 --- ...b-don-t-put-job-on-hold-for-local-fi.patch | 30 +++++++++++++++++++ kio.changes | 6 ++++ kio.spec | 5 ++-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch diff --git a/0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch b/0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch new file mode 100644 index 0000000..fe6bc82 --- /dev/null +++ b/0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch @@ -0,0 +1,30 @@ +From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001 +From: David Faure +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 + diff --git a/kio.changes b/kio.changes index 718310d..fe4f5d6 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 23 12:30:10 UTC 2021 - Christophe Giboudeaux + +- Add patch to prevent file.so from remaining loaded (boo#1183880) + * 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch + ------------------------------------------------------------------- Mon Mar 15 16:01:52 UTC 2021 - Christophe Giboudeaux diff --git a/kio.spec b/kio.spec index a2d61da..7d060ef 100644 --- a/kio.spec +++ b/kio.spec @@ -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