Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package kio for openSUSE:Factory checked in 
at 2021-04-06 17:29:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kio (Old)
 and      /work/SRC/openSUSE:Factory/.kio.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kio"

Tue Apr  6 17:29:02 2021 rev:107 rq:880771 version:5.80.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/kio/kio.changes  2021-03-16 15:43:04.888910152 
+0100
+++ /work/SRC/openSUSE:Factory/.kio.new.2401/kio.changes        2021-04-06 
17:29:41.711117906 +0200
@@ -1,0 +2,6 @@
+Tue Mar 23 12:30:10 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- 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
+
+-------------------------------------------------------------------

New:
----
  0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kio.spec ++++++
--- /var/tmp/diff_new_pack.sOl3pf/_old  2021-04-06 17:29:42.299118571 +0200
+++ /var/tmp/diff_new_pack.sOl3pf/_new  2021-04-06 17:29:42.303118576 +0200
@@ -37,6 +37,8 @@
 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 @@
 %lang_package
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build

++++++ 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch ++++++
>From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001
From: David Faure <[email protected]>
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

Reply via email to