Accepting request 884266 from KDE:Frameworks5
KDE Frameworks 5.81.0 OBS-URL: https://build.opensuse.org/request/show/884266 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=108
This commit is contained in:
commit
2d086a5b4c
@ -1,30 +0,0 @@
|
||||
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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d971ce61a022f9e4d2d6be9c66917be271d0fb212795a151150e208e64cd5a28
|
||||
size 3318204
|
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmBPbqoACgkQWNDuZIpI
|
||||
s7vLywf/X1dKXuO6ByeFNRcKCG4KPMkgkguDjb5Fm+NBw4DGRqPncVd2iItkfY2X
|
||||
+23klVXqbAgKQ6XfenyrCa7b2nFEq1Ago9+2JA3eQYUBqxSbSQCVCiCsxd4nsBn9
|
||||
fKj8XJt8X/jJA+2JQnI5OLy1aloHh3fR+f9Br8Zd/1zOVFppDMIY1EPaIuQ0aeWh
|
||||
AbCZZXmEmVhYQE4OChIzlJLT5aXSRKNv65OHMiNpDLA/e2LT3fIidcdjePjQic6f
|
||||
jLf2S6MwQ320T28e83hfLSy05/Ex17XMb/ow0olSZVRWilaLcAujjebf5cQKRVws
|
||||
mUatAmgCQhVvQJxbTu/j1bmKnlDrEA==
|
||||
=IjbK
|
||||
-----END PGP SIGNATURE-----
|
3
kio-5.81.0.tar.xz
Normal file
3
kio-5.81.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c62bae911978d163bbb86648344708d5b963823244941de0904c2a7800ecc07e
|
||||
size 3319696
|
11
kio-5.81.0.tar.xz.sig
Normal file
11
kio-5.81.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmBprWoACgkQWNDuZIpI
|
||||
s7vfDAf/WQQlC4vXkwI+8yVgzRcbW0Qpy489rEZB7CEpwyTKK/cnHOQ1AjO9Fgjg
|
||||
SdmLQcVpOF4M2/vd3iXmI1cptIF36hHMjBwq9sXZGKfSxERXjU6xsCgDWJzB/bXA
|
||||
/HALa2sTyUQyFMsrZIzhm/eWy3KWMd/L13xGBaEadZI67jR1Ogoeu5sYJbrlV1Fh
|
||||
aCLFbDwYlLqZi8NuTjawU4DgWBRd2mI6t40rsFqHbqrRHoAGIUwuDQrqItKiQnIr
|
||||
kRH3goxqC6A9hXFdMv4h74nSz0rKPhAUEHmEDAAmfGPplq6ZEOdDKOvI0ASDbLRv
|
||||
WZzBh6fZrbLr+HcDi/y5b/VufN2L1A==
|
||||
=GuIF
|
||||
-----END PGP SIGNATURE-----
|
15
kio.changes
15
kio.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 5 07:12:32 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 5.81.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/frameworks/5/5.81.0
|
||||
- Too many changes since 5.80.0, only listing bugfixes:
|
||||
* Handle .theme files correctly (kde#435176)
|
||||
* PreviewJob: Initialize cachesSize with 0, only pass size > 0
|
||||
to shmget, improve createThumbnail (kde#430862)
|
||||
* KNewFileMenu: use destination side to stat destination (kde#429541)
|
||||
- Drop patch:
|
||||
* 0001-MimeTypeFinderJob-don-t-put-job-on-hold-for-local-fi.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 23 12:30:10 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
6
kio.spec
6
kio.spec
@ -16,14 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
%define _tar_path 5.80
|
||||
%define _tar_path 5.81
|
||||
# Full KF5 version (e.g. 5.33.0)
|
||||
%{!?_kf5_version: %global _kf5_version %{version}}
|
||||
# Last major and minor KF5 version (e.g. 5.33)
|
||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
%bcond_without lang
|
||||
Name: kio
|
||||
Version: 5.80.1
|
||||
Version: 5.81.0
|
||||
Release: 0
|
||||
Summary: Network transparent access to files and data
|
||||
License: LGPL-2.1-or-later
|
||||
@ -37,8 +37,6 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user