commit xosview for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package xosview for openSUSE:Factory checked 
in at 2023-07-18 22:08:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xosview (Old)
 and      /work/SRC/openSUSE:Factory/.xosview.new.3193 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xosview"

Tue Jul 18 22:08:03 2023 rev:52 rq:1099191 version:1.24

Changes:
--------
--- /work/SRC/openSUSE:Factory/xosview/xosview.changes  2023-07-14 
15:36:15.906153853 +0200
+++ /work/SRC/openSUSE:Factory/.xosview.new.3193/xosview.changes        
2023-07-18 22:08:18.323049716 +0200
@@ -1,0 +2,6 @@
+Tue Jul 18 06:48:23 UTC 2023 - Dr. Werner Fink <wer...@suse.de>
+
+- Add patch xosview-1.24-coretemp-pkg.patch
+  * Avoid crash on disabled cores in a second CPU package 
+
+-------------------------------------------------------------------

New:
----
  xosview-1.24-coretemp-pkg.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xosview.spec ++++++
--- /var/tmp/diff_new_pack.yxvsZL/_old  2023-07-18 22:08:19.075053921 +0200
+++ /var/tmp/diff_new_pack.yxvsZL/_new  2023-07-18 22:08:19.083053965 +0200
@@ -37,6 +37,8 @@
 Patch12:        xosview-1.21-lmstemp.patch
 # PATCH-FIX-SUSE: The numbers seen in temp*_label might not continuously 
growing
 Patch13:        xosview-1.24-coretemp-labels.patch
+# PATCH-FIX-SUSE: Avoid crash on missing/disabled cores in CPU package
+Patch14:        xosview-1.24-coretemp-pkg.patch
 BuildRequires:  autoconf
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -64,6 +66,7 @@
 %patch11  -b .diskstat
 %patch12  -b .lmst
 %patch13  -b .coretemp
+%patch14  -b .cpupkg
 %patch0   -b .p0
 
 %build

++++++ xosview-1.24-coretemp-pkg.patch ++++++
>From 0af72a3cba4f55a7aa58ac2988cda6c3a1fe2a36 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <wer...@suse.de>
Date: Mon, 17 Jul 2023 14:01:26 +0200
Subject: [PATCH] Update MeterMaker.cc -- count always CPU cores

I've here an INTEL cpu which shows 12 cores on pkg 0 but have a pkg 1 without 
any enabled cores:

find /sys/devices/platform/coretemp.*/ -name 'temp*_label' -o -type d
/sys/devices/platform/coretemp.0/
/sys/devices/platform/coretemp.0/hwmon
/sys/devices/platform/coretemp.0/hwmon/hwmon3
/sys/devices/platform/coretemp.0/hwmon/hwmon3/power
/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp2_label
/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp3_label
/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp4_label
/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp5_label
/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp6_label
/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp7_label
/sys/devices/platform/coretemp.0/power
/sys/devices/platform/coretemp.1/
/sys/devices/platform/coretemp.1/power

this commit avoids a SIGSEGV if average or maximum is used as 
coretempDisplayType
---
 linux/MeterMaker.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git linux/MeterMaker.cc linux/MeterMaker.cc
index bd9f0e9..0238947 100644
--- linux/MeterMaker.cc
+++ linux/MeterMaker.cc
@@ -189,14 +189,18 @@ void MeterMaker::makeMeters(void){
       do {
         if (pkgCount > 1)
           snprintf(name, 8, "CPU%d", pkg);
-        push(new CoreTemp(_xos, name, caption, pkg, -1));
+       coreCount = CoreTemp::countCores(pkg);
+        if (coreCount > 0)
+         push(new CoreTemp(_xos, name, caption, pkg, -1));
       } while (++pkg < pkgCount);
     }
     else if ( strncmp(displayType, "maximum", 1) == 0 ) {
       do {
         if (pkgCount > 1)
           snprintf(name, 8, "CPU%d", pkg);
-        push(new CoreTemp(_xos, name, caption, pkg, -2));
+        coreCount = CoreTemp::countCores(pkg);
+       if (coreCount > 0)
+         push(new CoreTemp(_xos, name, caption, pkg, -2));
       } while (++pkg < pkgCount);
     }
     else {
-- 
2.41.0