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

Accepting request 665989 from home:wolfi323:test

Browse Source 
Fix build by removing 0001-Revert-Fix-elapsed-time-check.patch.
The change that this is supposed to revert is not in 5.54.0 yet, only in master.

OBS-URL: https://build.opensuse.org/request/show/665989
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=244
This commit is contained in:
Luca Beltrame 2019-01-14 15:58:01 +00:00 committed by Git OBS Bridge
parent 9a8b2f55a9
commit 8951f2eb88
3 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Revert-Fix-elapsed-time-check.patch
View File

@ -1,29 +0,0 @@
From 0362f77d51b2fc9c784ab8fa751ee6ffac33eb00 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 14 Jan 2019 13:31:39 +0100
Subject: [PATCH 1/2] Revert "Fix elapsed time check"
This reverts commit cd2f67c39b25de026390bfe2bc1c7aa269f78ccb.
In preparation for reverting the calcSpeed rewrite.
---
src/core/slaveinterface.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/core/slaveinterface.cpp b/src/core/slaveinterface.cpp
index d79b498d..6eb2b08d 100644
--- a/src/core/slaveinterface.cpp
+++ b/src/core/slaveinterface.cpp
@@ -103,9 +103,7 @@ void SlaveInterface::calcSpeed()
// using first and last item from the list.
const qint64 elapsed_time = d->elapsed_timer.elapsed();
- const qint64 last_time = d->transfer_details.isEmpty() ? 0 : d->transfer_details.last().time;
-
- if (elapsed_time - last_time >= 900) {
+ if (elapsed_time >= 900) {
if (d->transfer_details.count() == max_count) {
d->transfer_details.removeFirst();
}
--
2.20.1

3
kio.changes
View File

@ -7,8 +7,7 @@ Mon Jan 14 06:08:48 UTC 2019 - lbeltrame@kde.org
* https://www.kde.org/announcements/kde-frameworks-5.54.0.php
- Changes since 5.53.0:
* Too many changes to list here
- Add upstream patches to prevent crashes in KIO (kde#402665)
* 0001-Revert-Fix-elapsed-time-check.patch
- Add upstream patch to prevent crashes in KIO (kde#402665)
* 0002-Revert-Refactor-SlaveInterface-calcSpeed.patch
-------------------------------------------------------------------

4
kio.spec
View File

@ -34,9 +34,7 @@ Source1: 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-Revert-Fix-elapsed-time-check.patch
# PATCH-FIX-UPSTREAM
Patch2: 0002-Revert-Refactor-SlaveInterface-calcSpeed.patch
Patch1: 0002-Revert-Refactor-SlaveInterface-calcSpeed.patch
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes