Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ksystemstats5 for openSUSE:Factory checked in at 2022-02-17 23:39:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksystemstats5 (Old) and /work/SRC/openSUSE:Factory/.ksystemstats5.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksystemstats5" Thu Feb 17 23:39:36 2022 rev:14 rq:955233 version:5.24.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ksystemstats5/ksystemstats5.changes 2022-02-07 23:37:14.222790285 +0100 +++ /work/SRC/openSUSE:Factory/.ksystemstats5.new.1958/ksystemstats5.changes 2022-02-17 23:39:48.279701274 +0100 @@ -1,0 +2,10 @@ +Tue Feb 15 19:18:16 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.24.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.24.1 +- Changes since 5.24.0: + * CPU Plugin: Prevent integer overflow of total usage (kde#448626) + +------------------------------------------------------------------- Old: ---- ksystemstats-5.24.0.tar.xz ksystemstats-5.24.0.tar.xz.sig New: ---- ksystemstats-5.24.1.tar.xz ksystemstats-5.24.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksystemstats5.spec ++++++ --- /var/tmp/diff_new_pack.wuvDzV/_old 2022-02-17 23:39:48.879701269 +0100 +++ /var/tmp/diff_new_pack.wuvDzV/_new 2022-02-17 23:39:48.887701269 +0100 @@ -19,7 +19,7 @@ %bcond_without released Name: ksystemstats5 -Version: 5.24.0 +Version: 5.24.1 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -30,9 +30,9 @@ License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org -Source: ksystemstats-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/%{version}/ksystemstats-%{version}.tar.xz %if %{with released} -Source1: ksystemstats-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/plasma/%{version}/ksystemstats-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: cmake >= 3.16 ++++++ ksystemstats-5.24.0.tar.xz -> ksystemstats-5.24.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemstats-5.24.0/CMakeLists.txt new/ksystemstats-5.24.1/CMakeLists.txt --- old/ksystemstats-5.24.0/CMakeLists.txt 2022-02-03 15:33:15.000000000 +0100 +++ new/ksystemstats-5.24.1/CMakeLists.txt 2022-02-15 13:29:22.000000000 +0100 @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) project(ksystemstats) -set(PROJECT_VERSION "5.24.0") +set(PROJECT_VERSION "5.24.1") set(QT_MIN_VERSION "5.15.0") set(KF5_MIN_VERSION "5.86") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemstats-5.24.0/plugins/cpu/usagecomputer.cpp new/ksystemstats-5.24.1/plugins/cpu/usagecomputer.cpp --- old/ksystemstats-5.24.0/plugins/cpu/usagecomputer.cpp 2022-02-03 15:32:55.000000000 +0100 +++ new/ksystemstats-5.24.1/plugins/cpu/usagecomputer.cpp 2022-02-15 13:29:03.000000000 +0100 @@ -6,20 +6,29 @@ #include "usagecomputer.h" +#include <algorithm> + void UsageComputer::setTicks(unsigned long long system, unsigned long long user, unsigned long long wait, unsigned long long idle) { + // according to the documentation some counters can go backwards in some circumstances + auto systemDiff = std::max(system - m_systemTicks, 0ull); + auto userDiff = std::max(user - m_userTicks, 0ull); + auto waitDiff = std::max(wait - m_waitTicks, 0ull); + unsigned long long totalTicks = system + user + wait + idle; - unsigned long long totalDiff = totalTicks - m_totalTicks; + auto totalDiff = std::max(totalTicks - m_totalTicks, 0ull); auto percentage = [totalDiff] (unsigned long long tickDiff) { - // according to the documentation some counters can go backwards in some circumstances - return tickDiff > 0 ? 100.0 * tickDiff / totalDiff : 0; + if (tickDiff > 0 && totalDiff > 0) { + return 100.0 * tickDiff / totalDiff; + } + return 0.0; }; - systemUsage = percentage(system - m_systemTicks); - userUsage = percentage(user - m_userTicks); - waitUsage = percentage(wait - m_waitTicks); - totalUsage = percentage((system + user + wait) - (m_systemTicks + m_userTicks + m_waitTicks)); + systemUsage = percentage(systemDiff); + userUsage = percentage(userDiff); + waitUsage = percentage(waitDiff); + totalUsage = percentage(systemDiff + userDiff + waitDiff); m_totalTicks = totalTicks; m_systemTicks = system; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemstats-5.24.0/po/zh_CN/ksystemstats_plugins.po new/ksystemstats-5.24.1/po/zh_CN/ksystemstats_plugins.po --- old/ksystemstats-5.24.0/po/zh_CN/ksystemstats_plugins.po 2022-02-03 15:33:15.000000000 +0100 +++ new/ksystemstats-5.24.1/po/zh_CN/ksystemstats_plugins.po 2022-02-15 13:29:22.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-05 00:47+0000\n" -"PO-Revision-Date: 2022-01-08 15:24\n" +"PO-Revision-Date: 2022-02-11 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -14,8 +14,8 @@ "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Project-ID: 269464\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-trunk/messages/ksystemstats/ksystemstats_plugins.pot\n" -"X-Crowdin-File-ID: 25392\n" +"X-Crowdin-File: /kf5-stable/messages/ksystemstats/ksystemstats_plugins.pot\n" +"X-Crowdin-File-ID: 25440\n" #: cpu/cpu.cpp:22 disks/disks.cpp:68 disks/disks.cpp:69 gpu/GpuDevice.cpp:20 #: power/power.cpp:39
