Wolfgang Bauer 2021-02-04 12:48:37 +00:00 committed by Git OBS Bridge
parent 688787dbd4
commit 27339fecec
9 changed files with 35 additions and 71 deletions

View File

@ -1,23 +0,0 @@
From 21fe11c2d0be6d135d3ffe87e925ae7eeea7f653 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 30 Dec 2020 17:16:49 +0100
Subject: [PATCH 1/2] Initialize Transfer::m_runningSeconds
Valgrind complained about that.
---
core/transfer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: kget-20.12.0/core/transfer.cpp
===================================================================
--- kget-20.12.0.orig/core/transfer.cpp
+++ kget-20.12.0/core/transfer.cpp
@@ -49,7 +49,7 @@ Transfer::Transfer(TransferGroup * paren
m_percent(0), m_downloadSpeed(0), m_uploadSpeed(0),
m_uploadLimit(0), m_downloadLimit(0), m_isSelected(false),
m_capabilities(0), m_visibleUploadLimit(0), m_visibleDownloadLimit(0),
- m_ratio(0), m_handler(nullptr), m_factory(factory)
+ m_runningSeconds(0), m_ratio(0), m_handler(nullptr), m_factory(factory)
{
Q_UNUSED(e)
}

View File

@ -1,30 +0,0 @@
From 7cb5edab11bcf99788451b00994854d175386781 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 30 Dec 2020 17:17:25 +0100
Subject: [PATCH 2/2] Don't create dangling iterators in TransferMultiSegKio
m_dataSourceFactory->mirrors() returns a value, which is destroyed after the
assignment, but the iterators still point to it.
---
transfer-plugins/multisegmentkio/transfermultisegkio.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp
index 5b5d898b..87b74148 100644
--- a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp
+++ b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp
@@ -182,8 +182,9 @@ void TransferMultiSegKio::slotDataSourceFactoryChange(Transfer::ChangesFlags cha
}
if (change & Tc_Source) {
m_source = QUrl();
- QHash< QUrl, QPair<bool, int> >::const_iterator it = m_dataSourceFactory->mirrors().constBegin();
- QHash< QUrl, QPair<bool, int> >::const_iterator end = m_dataSourceFactory->mirrors().constEnd();
+ QHash< QUrl, QPair<bool, int> > mirrors = m_dataSourceFactory->mirrors();
+ QHash< QUrl, QPair<bool, int> >::const_iterator it = mirrors.constBegin();
+ QHash< QUrl, QPair<bool, int> >::const_iterator end = mirrors.constEnd();
for (; it != end; it++) {
if (it.value().first) {
m_source = it.key();
--
2.25.1

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ae245a6df334d3f397153af8eb265f029f89a5f75b9d5213772d09fdde5480f
size 5583860

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwfIACgkQ29LOiT4t
HIfN6ggAk6bo8PhwP47Q/818kEpbpeoJ09OAHwgaL222vej2CCrXVSTPnDmCE892
2bELqUZK4HzBQSYB+ATdt9+GzZmx07e+Vjqav4YLOVHQW1PzGNaeV1cAmIsVukdF
cKWS/6AdT5SgFpuc5Ko3ymmS0YFfGQaCMfRZap6tIj9a2A2Hxq7aPV50CbVzkasZ
E3m0DE+2Zqu4fo2BwGkxvZ5gB4Z8QcDXrGXruO4eovAYAZYi+mepGtcMBCjsPdoN
J1bZr034YvkqOfOwPcKoEc0bx+mNngDcQSpkGRr4noGrJHYf1+CAFjRD3rwLhphd
m5rAvLeHorV3J5t1Yri8J3k1kEI3GA==
=9E/6
-----END PGP SIGNATURE-----

3
kget-20.12.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7a021fa5b85348c84445893ec8052d37e796aae43bd39d6c758a6a85426caf7
size 5583764

16
kget-20.12.2.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmAYsOwACgkQu0YzUNbv
Me8Ryw//VRLXYQ/ewZd2Ixok0Y+pQknWblrZM5dtnVDec8IbCoSv1Q9PXEHGjYmd
gD9Mc4NjgKoY7+ZPJ8eAaMQwozquF/PtKjuvsAvGMj6ohw3+K0TfsCJSlmfsKPxm
0kVstpPYA2ePKKo5lVIWtH48nuA1RWHweNkZv+tqNX6FXUr5rSDUlSSv9HnWtD7E
YmXO0tlOFAN2obLFvOn1vkLqytDVoVoGJ8O/S8GZ+7EOd065Y1IWYYk4xjIWv7p2
97K1h6vYNPhq1TZMYPEyHRGYdhgaCtZQMCuvWzDziV51lYVWvpbBVIfL2ceN0ADR
LWAbiGux0qlI75RQ3XG5o4AbgFYX+F5fSlMZ2MCxPT6u5Ew2Jh0LwCB/0zbYy6rs
myjCwuNFprHwGeKzRkv5YyxtqxpEMdAQ2vdTYHtKn9mO7yUDgEh0mQZhjUqNgihT
AmYIlzs0/S4s2oV3U3oLMaH2ZobAiD13uu5mXCHwxTFaL8ZxOiCISuxBWY6EfqEy
0tVCU1rp4vmd2PFx68e7ZMZ2jdKsU0IA/iGiB3+oNjMSdeju4yyvq1+23av0zxmf
abQ+3yovvn9ke26VRgWEhY12im8+8my4frM9FXK/ZGyZJy5K5BGEdjjgbrnv7tVt
6E00pv9CgNl/ohIJnq/QefMybROZqKEKiUxXn2jT6ipBvUOKPSo=
=eUEv
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Feb 3 08:28:37 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 20.12.2
* New bugfix release
* For more details please see:
* https://kde.org/announcements/releases/2021-02-apps-update
- Changes since 20.12.1:
* The New Download button had an empty layout
* Don't create dangling iterators in TransferMultiSegKio
* Initialize Transfer::m_runningSeconds
- Drop upstream patches:
* 0001-Initialize-Transfer-m_runningSeconds.patch
* 0002-Don-t-create-dangling-iterators-in-TransferMultiSegK.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 5 12:25:37 UTC 2021 - Luca Beltrame <lbeltrame@kde.org> Tue Jan 5 12:25:37 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>

View File

@ -21,15 +21,12 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang %bcond_without lang
Name: kget Name: kget
Version: 20.12.1 Version: 20.12.2
Release: 0 Release: 0
Summary: Download Manager Summary: Download Manager
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch1: 0001-Initialize-Transfer-m_runningSeconds.patch
Patch2: 0002-Don-t-create-dangling-iterators-in-TransferMultiSegK.patch
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: gpgme-devel BuildRequires: gpgme-devel
BuildRequires: libboost_headers-devel BuildRequires: libboost_headers-devel