diff options
Diffstat (limited to 'kde-frameworks/kio')
| -rw-r--r-- | kde-frameworks/kio/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch | 38 | ||||
| -rw-r--r-- | kde-frameworks/kio/kio-5.54.0.ebuild | 83 |
3 files changed, 124 insertions, 0 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 428b90e1cb53..77ba86b49587 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,6 +1,9 @@ AUX kio-5.52.0-sendfile.patch 3571 BLAKE2B ef2ce58c2e0c00a6982c52462f0124bfa3396d5f75174ee646fa99023d1d580cf6bf4f5fbee051b2358406e2dd6da863c1b757dcabdfa5e919c1bc0130598023 SHA512 694dc4f737b52a5b1f014a824aea7c97e0f50886db9e53152e3d42359f974ae1a2abada6cc1ab41816149b410e548e705fd46f1fd11e148e8ecf027c8ec7e990 +AUX kio-5.54.0-elapsedtime.patch 1202 BLAKE2B 0074dfb3c504288f58109756d3dc540e1cca7e79520122115b73095dbed342e9dd78a5a2ec41aa6b0d6695c31869f2850bed3cd2bda7efe540fb281a3cd60391 SHA512 36e03672af0fd8703be89a3e1b3dc5cc88c47b0cc63e75fcdce1e0f5126537a216da4f7ce103ddb423224e3ef51d5a136eced1d2239f85bdda46905932e374cd 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 3150624 BLAKE2B 0dbca930cfd82e079f5f7d138d9342f701a23d9f7de99847e2371cd9c137b198c55f6dc61c8b9f78e30b7ecfaee3ff3ed52c88d01e4369434045cc0e02979476 SHA512 163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d EBUILD kio-5.52.0-r1.ebuild 2000 BLAKE2B ab775c026509590e2459340293666fba63d963d391217e344fee45f283327874f326aea670280bf25670d617ac1a3f8eaa0130e134487f1ac03193fead1b2e71 SHA512 59fa067468a6048af3e0151a4b4522afd6ea5afbcd155b3c20e18c1926fa9f9cfd027b2b41ecb5b3433bec6b2f13466ae7e67124c1c93a894b5092ba5b6b0af4 EBUILD kio-5.53.0.ebuild 1955 BLAKE2B f1d5fdf44f0a9b845d24f8e49a6817ea34c6328242481900f1ccb3578b3f3cf75e2527cc36d4823b93c9cb043d7e153eaa8dee301130bd0f4f966a2a2619ac90 SHA512 13ca85fe2e6a7e98537ff7c5d781762b96eeb8411e3460b62c48d12fe31ca743012675635ca9319c6eaa5a51ef341fbe6f201eb93e6507ef239af6726b843b7e +EBUILD kio-5.54.0.ebuild 2073 BLAKE2B 804e180f11b84d7e58af5570f02cf712f250cda50ad5766ec531719a1733c98094e4d1780b02ec4cd8c74ac60609b5994a6c99250ac38f8ca645885362083ba6 SHA512 034184d34c18909ac61a2f7058dfc90a66bfb306143644073c7c14a3e445ef1a47deccccf60253e1c1ce6e49dcc7baa574e969f9f5b5fa7c92db0652ca95cca7 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820 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 000000000000..d18347fb63d4 --- /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 new file mode 100644 index 000000000000..3256957d5aad --- /dev/null +++ b/kde-frameworks/kio/kio-5.54.0.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing transparent file and data management" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="acl +handbook kerberos +kwallet X" + +# drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0 +RDEPEND=" + $(add_frameworks_dep kauth) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork 'ssl' '' '5=') + $(add_qt_dep qtscript) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-libs/libxml2 + dev-libs/libxslt + acl? ( + sys-apps/attr + virtual/acl + ) + handbook? ( $(add_frameworks_dep kdoctools) ) + kerberos? ( virtual/krb5 ) + kwallet? ( $(add_frameworks_dep kwallet) ) + X? ( $(add_qt_dep qtx11extras) ) +" +DEPEND="${RDEPEND} + $(add_qt_dep qtconcurrent) + test? ( sys-libs/zlib ) + X? ( + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + ) +" +PDEPEND=" + $(add_frameworks_dep kded) +" + +# tests hang +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-elapsedtime.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package acl ACL) + $(cmake-utils_use_find_package handbook KF5DocTools) + $(cmake-utils_use_find_package kerberos GSSAPI) + $(cmake-utils_use_find_package kwallet KF5Wallet) + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} |