From 3288c200da661ac45a1d9baea82ea7385a5f91d0acfd8acfd4d356e1466f3c45 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 28 Oct 2020 12:05:31 +0000 Subject: [PATCH 1/2] Plasma 5.20.2 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/libksysguard5?expand=0&rev=278 --- libksysguard-5.20.1.tar.xz | 3 --- libksysguard-5.20.1.tar.xz.sig | 11 ----------- libksysguard-5.20.2.tar.xz | 3 +++ libksysguard-5.20.2.tar.xz.sig | 11 +++++++++++ libksysguard5.changes | 10 ++++++++++ libksysguard5.spec | 6 +++--- 6 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 libksysguard-5.20.1.tar.xz delete mode 100644 libksysguard-5.20.1.tar.xz.sig create mode 100644 libksysguard-5.20.2.tar.xz create mode 100644 libksysguard-5.20.2.tar.xz.sig diff --git a/libksysguard-5.20.1.tar.xz b/libksysguard-5.20.1.tar.xz deleted file mode 100644 index d2a6e48..0000000 --- a/libksysguard-5.20.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cd4b9a05aba2843628205c0006147910f8b243e9da6dc8e429ca8681ce5993e -size 686188 diff --git a/libksysguard-5.20.1.tar.xz.sig b/libksysguard-5.20.1.tar.xz.sig deleted file mode 100644 index e40c818..0000000 --- a/libksysguard-5.20.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl+O0dcACgkQ7JTRj38F -mX5U7Qf/WT6RCCxaD9Aw85Izdz+uszqT9VjJr5+Jys/x3vcJ4LOt8DbXNcK0BgZ/ -7R9viSy+mY3818XWD2YBAknAn0uJiu5gbyXwm45PTGDx4omPiXyIlyDyKRzhjPP9 -RumuHWzfzAh4yBDt5/WzpbMKTpSc+aPd+owIj6oL4IWcylffpCzny418uu4xNcsz -YxAvByMG48wmTXMO4e1FrNlgE7dVVpLgt+SMPNfhKCI8jsLN/SHmTgqHSEOZO8vg -3qCTdCyYsUcb5w6Aumt7Vj2tA1CM2Rqmij5PVft3VMP6i4K99vZm5pRuV1aTZOD3 -PCMj/E77R9IU1T2OdZPFEEzDcEnfOQ== -=8acR ------END PGP SIGNATURE----- diff --git a/libksysguard-5.20.2.tar.xz b/libksysguard-5.20.2.tar.xz new file mode 100644 index 0000000..9c2a821 --- /dev/null +++ b/libksysguard-5.20.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f57a3719d665df6d6b3c494a62bb7d60c79b06f30c0e9c75eb03568d2046d71 +size 685860 diff --git a/libksysguard-5.20.2.tar.xz.sig b/libksysguard-5.20.2.tar.xz.sig new file mode 100644 index 0000000..4ab3a1a --- /dev/null +++ b/libksysguard-5.20.2.tar.xz.sig @@ -0,0 +1,11 @@ +-----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----- diff --git a/libksysguard5.changes b/libksysguard5.changes index ac6b374..5034130 100644 --- a/libksysguard5.changes +++ b/libksysguard5.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 27 20:43:50 UTC 2020 - Fabian Vogt + +- Update to 5.20.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma-5.20.2 +- Changes since 5.20.1: + * Handle smap read result in the correct thread (kde#428160) + ------------------------------------------------------------------- Tue Oct 20 14:30:34 UTC 2020 - Fabian Vogt diff --git a/libksysguard5.spec b/libksysguard5.spec index fc15c21..2124704 100644 --- a/libksysguard5.spec +++ b/libksysguard5.spec @@ -18,15 +18,15 @@ %bcond_without lang Name: libksysguard5 -Version: 5.20.1 +Version: 5.20.2 Release: 0 Summary: Task management and system monitoring library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: http://www.kde.org -Source: libksysguard-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/%{version}/libksysguard-%{version}.tar.xz %if %{with lang} -Source1: libksysguard-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/%{version}/libksysguard-%{version}.tar.xz.sig Source2: plasma.keyring %endif Source3: baselibs.conf From 9001270f73dac2e895c80a133fd9ba8795ef503ec8814831dc4157fd3b9d0a5b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 29 Oct 2020 16:24:31 +0000 Subject: [PATCH 2/2] Accepting request 844891 from home:Vogtinator:plasma5.20 - Add patch to fix memory leak (kde#428048): * 0001-Autodelete-smapsRunnable.patch OBS-URL: https://build.opensuse.org/request/show/844891 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/libksysguard5?expand=0&rev=279 --- 0001-Autodelete-smapsRunnable.patch | 46 +++++++++++++++++++++++++++++ libksysguard5.changes | 6 ++++ libksysguard5.spec | 2 ++ 3 files changed, 54 insertions(+) create mode 100644 0001-Autodelete-smapsRunnable.patch diff --git a/0001-Autodelete-smapsRunnable.patch b/0001-Autodelete-smapsRunnable.patch new file mode 100644 index 0000000..a2efb00 --- /dev/null +++ b/0001-Autodelete-smapsRunnable.patch @@ -0,0 +1,46 @@ +From ebcf87527c32db0b6685c63a450489d2c6727069 Mon Sep 17 00:00:00 2001 +From: David Edmundson +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 + diff --git a/libksysguard5.changes b/libksysguard5.changes index 5034130..acec8ac 100644 --- a/libksysguard5.changes +++ b/libksysguard5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 29 15:03:03 UTC 2020 - Fabian Vogt + +- Add patch to fix memory leak (kde#428048): + * 0001-Autodelete-smapsRunnable.patch + ------------------------------------------------------------------- Tue Oct 27 20:43:50 UTC 2020 - Fabian Vogt diff --git a/libksysguard5.spec b/libksysguard5.spec index 2124704..0733058 100644 --- a/libksysguard5.spec +++ b/libksysguard5.spec @@ -30,6 +30,8 @@ Source1: https://download.kde.org/stable/plasma/%{version}/libksysguard-% Source2: plasma.keyring %endif Source3: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch1: 0001-Autodelete-smapsRunnable.patch BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kf5-filesystem BuildRequires: xz