Accepting request 848054 from KDE:Frameworks5
Plasma 5.20.3 OBS-URL: https://build.opensuse.org/request/show/848054 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libksysguard5?expand=0&rev=114
This commit is contained in:
@@ -1,46 +0,0 @@
|
|||||||
From ebcf87527c32db0b6685c63a450489d2c6727069 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Edmundson <kde@davidedmundson.co.uk>
|
|
||||||
Date: Thu, 29 Oct 2020 11:07:36 +0000
|
|
||||||
Subject: [PATCH] Autodelete smapsRunnable
|
|
||||||
|
|
||||||
The runnable has an early return on error conditions. This means
|
|
||||||
finished() might never be called.
|
|
||||||
|
|
||||||
Now we've removed the accessor and provide the return value in the
|
|
||||||
signal we can just set autoDelete.
|
|
||||||
|
|
||||||
BUG: 428048
|
|
||||||
---
|
|
||||||
processcore/processes_linux_p.cpp | 2 --
|
|
||||||
processcore/read_procsmaps_runnable.cpp | 2 +-
|
|
||||||
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/processcore/processes_linux_p.cpp b/processcore/processes_linux_p.cpp
|
|
||||||
index 6882f82..ee5559c 100644
|
|
||||||
--- a/processcore/processes_linux_p.cpp
|
|
||||||
+++ b/processcore/processes_linux_p.cpp
|
|
||||||
@@ -558,8 +558,6 @@ bool ProcessesLocal::updateProcessInfo( long pid, Process *process)
|
|
||||||
Q_EMIT processUpdated(pid, { { Process::VmPSS, pss } });
|
|
||||||
});
|
|
||||||
|
|
||||||
- connect(runnable, &ReadProcSmapsRunnable::finished, runnable, &QObject::deleteLater);
|
|
||||||
-
|
|
||||||
QThreadPool::globalInstance()->start(runnable);
|
|
||||||
|
|
||||||
if(!d->readProcStat(dir, process)) success = false;
|
|
||||||
diff --git a/processcore/read_procsmaps_runnable.cpp b/processcore/read_procsmaps_runnable.cpp
|
|
||||||
index ecace51..b91466b 100644
|
|
||||||
--- a/processcore/read_procsmaps_runnable.cpp
|
|
||||||
+++ b/processcore/read_procsmaps_runnable.cpp
|
|
||||||
@@ -14,7 +14,7 @@ ReadProcSmapsRunnable::ReadProcSmapsRunnable(const QString &dir)
|
|
||||||
: QObject()
|
|
||||||
, m_dir(dir)
|
|
||||||
{
|
|
||||||
- setAutoDelete(false);
|
|
||||||
+ setAutoDelete(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ReadProcSmapsRunnable::run()
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9f57a3719d665df6d6b3c494a62bb7d60c79b06f30c0e9c75eb03568d2046d71
|
|
||||||
size 685860
|
|
@@ -1,11 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl+YEPgACgkQ7JTRj38F
|
|
||||||
mX7wlQf+LnbJsXJcQ0ixuHzLh6pFXYu/B/u22LIbNO/8+FELhispdRVr3ogDOzEy
|
|
||||||
jIXE3KuQU+fGTkICdOZX3GRLWv5olxEnPve+HW8WDl6eQAPsxir/F9P6jd7QImND
|
|
||||||
OznviGyurjSKfPH/5O+QJl2wyWtLUwlX/PJ9vEkorpOHPkkgEm53w8R62/bZfIsw
|
|
||||||
voFycdqVyP3lysGDIJwgCBWFP9K0EdjRgsp1XBHcVVC3wZdnKaqDTz/mHLrTcGAG
|
|
||||||
ojie0TalOzhxN3enX4IhTG/EvZEcGK4p5xofE98Tt+6V7FYvDoLrO9of3aA4fNrF
|
|
||||||
PGZqzvCI8N4EjiE4ewBzUAQ4HXl6WA==
|
|
||||||
=6PJi
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libksysguard-5.20.3.tar.xz
Normal file
3
libksysguard-5.20.3.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:98d85bc9db01f77586701386e1612194df0b4fab8d650833aa4f0f13956fc830
|
||||||
|
size 694116
|
11
libksysguard-5.20.3.tar.xz.sig
Normal file
11
libksysguard-5.20.3.tar.xz.sig
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl+q8O8ACgkQ7JTRj38F
|
||||||
|
mX71Qwf/aTSRlgXOXyYMLS7eSNuIkJ/zXn1TN64aAMX9NmSS6cN4iGfYN/yOedMo
|
||||||
|
KOgmNgMD0BEcAP4/aMXdr90i0JKTI+xKoog6RZuVAYiXnrgZv2kCGpenUAWg/QqI
|
||||||
|
NVRqsIhM5oAmlQGNUzKt5W9lMGuQCHwrsd9G2jwZJGxbPLBpn8vwmrNkPf/2ktcm
|
||||||
|
+0BqiH7CH7S7vKFsI7MWrv1gtWCU8gSCy3w11pJI7hS4MdcOGt1GdRKDJvsISmZi
|
||||||
|
f9w5og4KTQ6QNmkILRtUG89HmHOPYadabwVSDXdwhhrc32oC6t/bBaZNm03xh/PP
|
||||||
|
Kb+i56uN/sVxIrLjpRgE61ce/W0ltg==
|
||||||
|
=wEzj
|
||||||
|
-----END PGP SIGNATURE-----
|
@@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 11 11:08:03 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 5.20.3
|
||||||
|
* New bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
* https://kde.org/announcements/plasma-5.20.3
|
||||||
|
- Changes since 5.20.2:
|
||||||
|
* Autodelete smapsRunnable (kde#428048)
|
||||||
|
- Drop patches, now upstream:
|
||||||
|
* 0001-Autodelete-smapsRunnable.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Oct 29 15:03:03 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
Thu Oct 29 15:03:03 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: libksysguard5
|
Name: libksysguard5
|
||||||
Version: 5.20.2
|
Version: 5.20.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Task management and system monitoring library
|
Summary: Task management and system monitoring library
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
@@ -30,8 +30,6 @@ Source1: https://download.kde.org/stable/plasma/%{version}/libksysguard-%
|
|||||||
Source2: plasma.keyring
|
Source2: plasma.keyring
|
||||||
%endif
|
%endif
|
||||||
Source3: baselibs.conf
|
Source3: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch1: 0001-Autodelete-smapsRunnable.patch
|
|
||||||
BuildRequires: extra-cmake-modules >= 1.2.0
|
BuildRequires: extra-cmake-modules >= 1.2.0
|
||||||
BuildRequires: kf5-filesystem
|
BuildRequires: kf5-filesystem
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
|
Reference in New Issue
Block a user