Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ksystemstats6 for openSUSE:Factory checked in at 2024-03-28 13:53:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksystemstats6 (Old) and /work/SRC/openSUSE:Factory/.ksystemstats6.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksystemstats6" Thu Mar 28 13:53:44 2024 rev:3 rq:1162426 version:6.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ksystemstats6/ksystemstats6.changes 2024-03-14 17:43:48.562627177 +0100 +++ /work/SRC/openSUSE:Factory/.ksystemstats6.new.1905/ksystemstats6.changes 2024-03-28 14:14:24.181694736 +0100 @@ -1,0 +2,10 @@ +Tue Mar 26 18:05:45 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de> + +- Update to 6.0.3: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.3 +- Changes since 6.0.2: + * update version for new release + * cpu: Store physical ID with core ID when looking up coretemp sensors (kde#474766) + +------------------------------------------------------------------- Old: ---- ksystemstats-6.0.2.tar.xz ksystemstats-6.0.2.tar.xz.sig New: ---- ksystemstats-6.0.3.tar.xz ksystemstats-6.0.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksystemstats6.spec ++++++ --- /var/tmp/diff_new_pack.W6463m/_old 2024-03-28 14:14:32.125986808 +0100 +++ /var/tmp/diff_new_pack.W6463m/_new 2024-03-28 14:14:32.137987250 +0100 @@ -23,7 +23,7 @@ %define rname ksystemstats %bcond_without released Name: ksystemstats6 -Version: 6.0.2 +Version: 6.0.3 Release: 0 # Full Plasma 6 version (e.g. 6.0.0) %{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}} ++++++ ksystemstats-6.0.2.tar.xz -> ksystemstats-6.0.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemstats-6.0.2/CMakeLists.txt new/ksystemstats-6.0.3/CMakeLists.txt --- old/ksystemstats-6.0.2/CMakeLists.txt 2024-03-12 13:44:09.000000000 +0100 +++ new/ksystemstats-6.0.3/CMakeLists.txt 2024-03-26 16:02:35.000000000 +0100 @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.16) project(ksystemstats) -set(PROJECT_VERSION "6.0.2") +set(PROJECT_VERSION "6.0.3") -set(PROJECT_DEP_VERSION "6.0.2") +set(PROJECT_DEP_VERSION "6.0.3") set(QT_MIN_VERSION "6.6.0") set(KF6_MIN_VERSION "6.0.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksystemstats-6.0.2/plugins/cpu/linuxcpuplugin.cpp new/ksystemstats-6.0.3/plugins/cpu/linuxcpuplugin.cpp --- old/ksystemstats-6.0.2/plugins/cpu/linuxcpuplugin.cpp 2024-03-12 13:44:09.000000000 +0100 +++ new/ksystemstats-6.0.3/plugins/cpu/linuxcpuplugin.cpp 2024-03-26 16:02:35.000000000 +0100 @@ -177,8 +177,8 @@ void LinuxCpuPluginPrivate::addSensorsIntel(const sensors_chip_name * const chipName) { int featureNumber = 0; - QHash<unsigned int, sensors_feature const *> coreFeatures; - int physicalId = -1; + QHash<std::pair<unsigned int, unsigned int>, sensors_feature const *> coreFeatures; + int physicalId = 0; while (sensors_feature const * feature = sensors_get_features(chipName, &featureNumber)) { if (feature->type != SENSORS_FEATURE_TEMP) { continue; @@ -187,20 +187,18 @@ unsigned int coreId; // First try to see if it's a core temperature because we should have more of those if (std::sscanf(sensorLabel, "Core %d", &coreId) != 0) { - coreFeatures.insert(coreId, feature); + coreFeatures.insert(std::make_pair(physicalId, coreId), feature); } else { std::sscanf(sensorLabel, "Package id %d", &physicalId); } free(sensorLabel); } - if (physicalId == -1) { - return; - } + for (auto feature = coreFeatures.cbegin(); feature != coreFeatures.cend(); ++feature) { - if (m_cpusBySystemIds.contains({physicalId, int(feature.key())})) { + if (m_cpusBySystemIds.contains(feature.key())) { // When the cpu has hyperthreading we display multiple cores for each physical core. // Naturally they share the same temperature sensor and have the same coreId. - auto cpu_range = m_cpusBySystemIds.equal_range({physicalId, int(feature.key())}); + auto cpu_range = m_cpusBySystemIds.equal_range(feature.key()); for (auto cpu_it = cpu_range.first; cpu_it != cpu_range.second; ++cpu_it) { (*cpu_it)->makeTemperatureSensor(chipName, feature.value()); }