[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     9a23deced58f2f084a8979f4ebf522ae1c72f47b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 13:27:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 14:35:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a23dece

kde-frameworks/kio: Tarball respun, add kio core crashfix

1) See also:
https://mail.kde.org/pipermail/release-team/2019-January/011202.html
https://bugs.kde.org/show_bug.cgi?id=403100

2) See also:
https://bugs.kde.org/show_bug.cgi?id=402665

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/kio/Manifest                        |  2 +-
 .../kio/files/kio-5.54.0-elapsedtime.patch         | 38 ++++++++++++++++++++++
 kde-frameworks/kio/kio-5.54.0.ebuild               |  2 ++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 77df753c9f1..b6ccab1d596 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,3 @@
 DIST kio-5.52.0.tar.xz 3159632 BLAKE2B 4be5993157b6ee08be4cb2f40b5669353079fe2174e6204fbe2e375cfa71fb6121b4a2ca0783f3e4f45205cd3ae4bde36823e9543005a1124ac43fe7ecb189bc SHA512 b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36
 DIST kio-5.53.0.tar.xz 3143732 BLAKE2B 89be51cf5270b978fe4e8f28a590b1ad2b39fcb50843d51b99ced22dc5d3b91958975a48110b38a9138ef77f7b618deb6f9f769f403dbee2d31dec1d89717b3c SHA512 121e87c1a0fe17c4b3f1102af34ef65e867efba5e352549da830f874420e8f2b4ee30f27281cbd844617f3d9bf15fa6dfc3548ae86366c70b8ea4e083bee103d
-DIST kio-5.54.0.tar.xz 3150608 BLAKE2B cdf34296a8c05a9e9e1e9ff34407f4a995104fd87b4dd1c290033621447c9620024f59997e97c7f5891f6719abfc62b18966df4c29dfda839ea35a94921f3d31 SHA512 d957b48ee7fe8490cb9bf854016ad5fe8ce922207036cdc3b3a97c9b8f68487cf87f6215cf18f91e911577d4a26e24c87f9f7c4ed3933f820cdb7ca309f82060
+DIST kio-5.54.0.tar.xz 3150624 BLAKE2B 0dbca930cfd82e079f5f7d138d9342f701a23d9f7de99847e2371cd9c137b198c55f6dc61c8b9f78e30b7ecfaee3ff3ed52c88d01e4369434045cc0e02979476 SHA512 163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d

diff --git a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
new file mode 100644
index 00000000000..d18347fb63d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
@@ -0,0 +1,38 @@
+From cd2f67c39b25de026390bfe2bc1c7aa269f78ccb Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 10 Jan 2019 16:03:06 +0000
+Subject: Fix elapsed time check
+
+Summary:
+To match the code it was refactored from it should be checking the code
+since the last time we checked calcSpeed, not since the job started.
+
+CCBUG: 402665
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D18158
+---
+ src/core/slaveinterface.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/slaveinterface.cpp b/src/core/slaveinterface.cpp
+index 6eb2b08..d79b498 100644
+--- a/src/core/slaveinterface.cpp
++++ b/src/core/slaveinterface.cpp
+@@ -103,7 +103,9 @@ void SlaveInterface::calcSpeed()
+     // using first and last item from the list.
+ 
+     const qint64 elapsed_time = d->elapsed_timer.elapsed();
+-    if (elapsed_time >= 900) {
++    const qint64 last_time = d->transfer_details.isEmpty() ? 0 : d->transfer_details.last().time;
++
++    if (elapsed_time - last_time >= 900) {
+         if (d->transfer_details.count() == max_count) {
+             d->transfer_details.removeFirst();
+         }
+-- 
+cgit v1.1
+

diff --git a/kde-frameworks/kio/kio-5.54.0.ebuild b/kde-frameworks/kio/kio-5.54.0.ebuild
index e10f37ff9d3..3256957d5aa 100644
--- a/kde-frameworks/kio/kio-5.54.0.ebuild
+++ b/kde-frameworks/kio/kio-5.54.0.ebuild
@@ -68,6 +68,8 @@ PDEPEND="
 # tests hang
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-elapsedtime.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package acl ACL)