File ksysguard.patch of Package kdebase4-workspace
diff -Pdpru kde-workspace-4.11.22.orig/ksysguard/gui/ksysguard.cpp kde-workspace-4.11.22/ksysguard/gui/ksysguard.cpp
--- kde-workspace-4.11.22.orig/ksysguard/gui/ksysguard.cpp 2015-08-12 10:03:15.000000000 +0300
+++ kde-workspace-4.11.22/ksysguard/gui/ksysguard.cpp 2025-03-09 08:53:45.001377378 +0300
@@ -344,7 +344,7 @@ void TopLevel::timerEvent( QTimerEvent*
if ( statusBar()->isVisibleTo( this ) ) {
/* Request some info about the memory status. The requested
* information will be received by answerReceived(). */
- KSGRD::SensorMgr->sendRequest( "localhost", "cpu/idle",
+ KSGRD::SensorMgr->sendRequest( "localhost", "cpu/system/idle",
(KSGRD::SensorClient*)this, 1 );
KSGRD::SensorMgr->sendRequest( "localhost", "mem/physical/free",
(KSGRD::SensorClient*)this, 2 );
diff -Pdpru kde-workspace-4.11.22.orig/ksysguard/gui/ProcessTable.sgrd kde-workspace-4.11.22/ksysguard/gui/ProcessTable.sgrd
--- kde-workspace-4.11.22.orig/ksysguard/gui/ProcessTable.sgrd 2015-08-12 10:03:15.000000000 +0300
+++ kde-workspace-4.11.22/ksysguard/gui/ProcessTable.sgrd 2025-03-09 08:49:31.179449027 +0300
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE KSysGuardWorkSheet>
-<WorkSheet rows="1" interval="2" columns="1" title="Process Table" locked="1">
- <host port="-1" shell="" name="localhost" command="ksysguardd" />
- <display title="Process Table" class="ProcessController" row="0" column="0" sensorName="ps" unit="" showUnit="0" hostName="localhost" sensorType="table" showTotals="1" units="1" filterState="0" version="1" />
+<WorkSheet title="Process Table" interval="1" locked="1" rows="1" columns="1">
+ <host port="-1" command="ksysguardd" shell="" name="localhost"/>
+ <display title="Process Table" columnSpan="1" treeViewHeader="AAAA/wAAAAAAAAABAAAAAAAAAAoBAAAADwAAAAIAAAABAAAAAAAAAAMAAAAEAAAABQAAAAYAAAAIAAAACQAAAAoAAAAHAAAACwAAAAwAAAANAAAADgAAAA8AAAACAAAAAQAAAAAAAAADAAAABAAAAAUAAAAGAAAACgAAAAcAAAAIAAAACQAAAAsAAAAMAAAADQAAAA4AAAAPWGwAAAAHAAAADgAAATUAAAANAAAAZAAAAAsAAAGOAAAACQAAAGQAAAAGAAAAZAAAAAQAAABkAAAAAwAAAGQAAAMZAAAADwEBAAEAAAAAAAAAAAAAAABk/////wAAAIEAAAAAAAAADAAAADoAAAABAAAAAAAAAGQAAAABAAAAAAAAAK0AAAABAAAAAAAAAAAAAAACAAAAAAAAADAAAAABAAAAAAAAAAAAAAABAAAAAAAAAEsAAAABAAAAAAAAAEUAAAABAAAAAAAAAEMAAAABAAAAAAAAAAAAAAACAAAAAAAAAMsAAAABAAAAAAAAAAAAAAACAAAAAA==" filterState="0" ioUnits="0" hostName="localhost" ioInformation="5" version="5" showTotals="1" sensorType="table" normalizeCPUUsage="1" units="0" rowSpan="1" sensorName="ps" showTooltips="1" column="0" unit="" showCommandLineOptions="1" showUnit="0" class="ProcessController" row="0"/>
</WorkSheet>
diff -Pdpru kde-workspace-4.11.22.orig/ksysguard/gui/SystemLoad2.sgrd kde-workspace-4.11.22/ksysguard/gui/SystemLoad2.sgrd
--- kde-workspace-4.11.22.orig/ksysguard/gui/SystemLoad2.sgrd 2015-08-12 10:03:15.000000000 +0300
+++ kde-workspace-4.11.22/ksysguard/gui/SystemLoad2.sgrd 2025-03-09 08:49:31.182515069 +0300
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE KSysGuardWorkSheet>
-<WorkSheet title="System Load" interval="0.5" locked="1" rows="3" columns="1" >
- <host port="-1" command="ksysguardd" shell="" name="localhost" />
- <display title="CPU History" svgBackground="widgets/plot-background" autoRange="0" class="FancyPlotter" column="0" row="0" version="1">
- <beam sensorType="float" hostName="localhost" regexpSensorName="cpu/cpu.*/TotalLoad" color="0xffff8000,0xffe20800" />
+<WorkSheet title="System Load" interval="1" locked="1" rows="4" columns="1">
+ <host port="-1" command="ksysguardd" shell="" name="localhost"/>
+ <display title="CPU History" columnSpan="1" hScale="6" svgBackground="widgets/plot-background" version="1" vLines="0" labels="1" manualRange="0" autoRange="0" rowSpan="1" stacked="0" vDistance="30" fontSize="8" vScroll="0" column="0" unit="" hLines="1" showUnit="0" class="FancyPlotter" row="0">
+ <beam sensorType="float" hostName="localhost" regexpSensorName="^cpu/cpu\d+/TotalLoad$" color="0xffff8000,0xffe20800,0xfff3c300,0xffff0000,0xff00a900,0xff0028a9,0xffa92928,0xff28a929,0xff297da9,0xffa9bd7d,0xff7dbdbd,0xffbdfdbd,0xffbde7fd,0xfffd87e7,0xffe78787,0xff87a787"/>
</display>
- <display title="Memory and Swap History" svgBackground="widgets/plot-background" autoRange="0" class="FancyPlotter" column="0" row="1" version="1" >
- <beam summationName="Memory" sensorName="mem/physical/application" sensorType="integer" hostName="localhost" color="0xffc000c0" />
- <beam summationName="Swap" sensorName="mem/swap/used" sensorType="integer" hostName="localhost" color="0xff00c000" />
+ <display title="Memory and Swap History" columnSpan="1" hScale="6" svgBackground="widgets/plot-background" version="1" vLines="0" labels="1" manualRange="0" autoRange="0" rowSpan="1" stacked="0" vDistance="30" fontSize="8" vScroll="0" column="0" unit="" hLines="1" showUnit="0" class="FancyPlotter" row="1">
+ <beam sensorName="mem/physical/application" sensorType="integer" hostName="localhost" summationName="Memory" color="0xff00cc00"/>
+ <beam sensorName="mem/swap/used" sensorType="integer" hostName="localhost" summationName="Swap" color="0xff00cccc"/>
</display>
- <display title="Network History" svgBackground="widgets/plot-background" autoRange="1" class="FancyPlotter" column="0" row="2" version="1" min="0" max="20" manualRange="1">
- <beam sensorType="float" hostName="localhost" summationName="Receiving" regexpSensorName="network/interfaces/(?!lo|bridge|usbus|bond).*/receiver/data" color="0xB3A52D" />
- <beam sensorType="float" hostName="localhost" summationName="Sending" regexpSensorName="network/interfaces/(?!lo|bridge|usbus|bond).*/transmitter/data" color="0x844798" />
+ <display title="Disk Activity" columnSpan="1" hScale="6" svgBackground="widgets/plot-background" version="1" max="20" vLines="0" labels="1" manualRange="1" autoRange="1" rowSpan="1" min="0" stacked="0" vDistance="30" vScroll="0" fontSize="8" column="0" unit="" hLines="1" showUnit="0" class="FancyPlotter" row="2">
+ <beam sensorType="float" hostName="localhost" regexpSensorName="^disk/(?:md|sd|hd|nvme)[^_]+_[^/]+/Rate/rblk$" summationName="Reading" color="0xff0000cc"/>
+ <beam sensorType="float" hostName="localhost" regexpSensorName="^disk/(?:md|sd|hd|nvme)[^_]+_[^/]+/Rate/wblk$" summationName="Writing" color="0xffcc0000"/>
+ </display>
+ <display title="Network History" columnSpan="1" hScale="6" svgBackground="widgets/plot-background" version="1" max="20" vLines="0" labels="1" manualRange="1" autoRange="1" rowSpan="1" min="0" stacked="0" vDistance="30" vScroll="0" fontSize="8" column="0" unit="" hLines="1" showUnit="0" class="FancyPlotter" row="3">
+ <beam sensorType="float" hostName="localhost" regexpSensorName="^network/interfaces/(?!lo|bridge|usbus|bond)[^/]+/receiver/data$" summationName="Receiving" color="0xff0000cc"/>
+ <beam sensorType="float" hostName="localhost" regexpSensorName="^network/interfaces/(?!lo|bridge|usbus|bond)[^/]+/transmitter/data$" summationName="Sending" color="0xff00cc00"/>
</display>
</WorkSheet>
diff -Pdpru kde-workspace-4.11.22.orig/ksysguard/ksysguardd/CMakeLists.txt kde-workspace-4.11.22/ksysguard/ksysguardd/CMakeLists.txt
--- kde-workspace-4.11.22.orig/ksysguard/ksysguardd/CMakeLists.txt 2015-08-12 10:03:15.000000000 +0300
+++ kde-workspace-4.11.22/ksysguard/ksysguardd/CMakeLists.txt 2025-03-09 08:53:45.005806994 +0300
@@ -2,13 +2,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_
cmake_minimum_required(VERSION 2.6.2)
endif()
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/CContLib/ )
-
-# Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc
-# otherwise it's necessary to change it.
-# into kde 3.x it was installed into /etc/
-add_definitions( -DKSYSGUARDDRCFILE="\\"${SYSCONF_INSTALL_DIR}/ksysguarddrc\\"" )
-
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/CContLib/)
+add_definitions(-DKSYSGUARDDRCFILE="${SYSCONF_INSTALL_DIR}/ksysguarddrc")
add_definitions(-DOSTYPE_${CMAKE_SYSTEM_NAME})
macro_optional_find_package(Sensors)
diff -Pdpru kde-workspace-4.11.22.orig/ksysguard/ksysguardd/Linux/lmsensors.c kde-workspace-4.11.22/ksysguard/ksysguardd/Linux/lmsensors.c
--- kde-workspace-4.11.22.orig/ksysguard/ksysguardd/Linux/lmsensors.c 2015-08-12 10:03:15.000000000 +0300
+++ kde-workspace-4.11.22/ksysguard/ksysguardd/Linux/lmsensors.c 2025-03-09 08:53:45.006785531 +0300
@@ -149,11 +149,10 @@ void initLmSensors( struct SensorModul*
label = sensors_get_label( scn, sf );
sensors_snprintf_chip_name(scnbuf, BUFFER_SIZE_LMSEN, scn);
- p = (LMSENSOR*)malloc( sizeof( LMSENSOR ) );
- p->fullName = (char*)malloc( strlen( "lmsensors/" ) +
- strlen( scnbuf ) + 1 +
- strlen( label ) + 1 );
- snprintf( p->fullName, BUFFER_SIZE_LMSEN, "lmsensors/%s/%s", scnbuf, label );
+ size_t allocated_size = strlen("lmsensors/") + strlen(scnbuf) + strlen(label) + 2;
+ p = (LMSENSOR*)malloc(sizeof(LMSENSOR));
+ p->fullName = (char*)malloc(allocated_size);
+ snprintf(p->fullName, allocated_size, "lmsensors/%s/%s", scnbuf, label);
/* Make sure that name contains only proper characters. */
for ( s = p->fullName; *s; s++ )
