Hello community, here is the log from the commit of package ksysguard5 for openSUSE:Factory checked in at 2017-10-23 16:23:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksysguard5 (Old) and /work/SRC/openSUSE:Factory/.ksysguard5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksysguard5" Mon Oct 23 16:23:22 2017 rev:53 rq:534562 version:5.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ksysguard5/ksysguard5.changes 2017-10-09 19:39:54.425508808 +0200 +++ /work/SRC/openSUSE:Factory/.ksysguard5.new/ksysguard5.changes 2017-10-23 16:23:23.568655310 +0200 @@ -1,0 +2,12 @@ +Tue Oct 17 17:18:38 CEST 2017 - [email protected] + +- Update to 5.11.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.11.1.php +- Changes since 5.11.0: + * Try to read CPU clock from cpufreq/scaling_cur_freq instead of /proc/cpuinfo (kde#382561) +- Remove patches, now upstream: + * 0001-Try-to-read-CPU-clock-from-cpufreq-scaling_cur_freq-.patch + +------------------------------------------------------------------- Old: ---- 0001-Try-to-read-CPU-clock-from-cpufreq-scaling_cur_freq-.patch ksysguard-5.11.0.tar.xz New: ---- ksysguard-5.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksysguard5.spec ++++++ --- /var/tmp/diff_new_pack.EgrFIQ/_old 2017-10-23 16:23:24.104630217 +0200 +++ /var/tmp/diff_new_pack.EgrFIQ/_new 2017-10-23 16:23:24.108630030 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: ksysguard5 -Version: 5.11.0 +Version: 5.11.1 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -28,12 +28,10 @@ License: GPL-2.0 Group: System/GUI/KDE Url: http://www.kde.org -Source: ksysguard-%{version}.tar.xz +Source: http://download.kde.org/stable/plasma/%{version}/ksysguard-%{version}.tar.xz Source1: ksysguardd.service -# PATCH-FIX-OPENSUSE 0001-Use-run-for-ksysguardd-s-pid-file.patch -Patch0: 0001-Use-run-for-ksysguardd-s-pid-file.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-Try-to-read-CPU-clock-from-cpufreq-scaling_cur_freq-.patch +# PATCH-FIX-OPENSUSE +Patch1: 0001-Use-run-for-ksysguardd-s-pid-file.patch BuildRequires: extra-cmake-modules >= 1.5.0 BuildRequires: kf5-filesystem BuildRequires: libsensors4-devel @@ -73,7 +71,6 @@ %lang_package %prep %setup -q -n ksysguard-%{version} -%patch0 -p1 %patch1 -p1 %build ++++++ ksysguard-5.11.0.tar.xz -> ksysguard-5.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksysguard-5.11.0/CMakeLists.txt new/ksysguard-5.11.1/CMakeLists.txt --- old/ksysguard-5.11.0/CMakeLists.txt 2017-10-05 14:42:02.000000000 +0200 +++ new/ksysguard-5.11.1/CMakeLists.txt 2017-10-17 12:34:40.000000000 +0200 @@ -1,5 +1,5 @@ project(ksysguard) -set(PROJECT_VERSION "5.11.0") +set(PROJECT_VERSION "5.11.1") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.4.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksysguard-5.11.0/ksysguardd/Linux/cpuinfo.c new/ksysguard-5.11.1/ksysguardd/Linux/cpuinfo.c --- old/ksysguard-5.11.0/ksysguardd/Linux/cpuinfo.c 2017-10-05 14:41:39.000000000 +0200 +++ new/ksysguard-5.11.1/ksysguardd/Linux/cpuinfo.c 2017-10-17 12:32:56.000000000 +0200 @@ -56,6 +56,10 @@ * by the parse thus far */ int coreUniqueId = 0; + /* Indicates whether the "cpu MHz" value of the processor in /proc/cpuinfo should be used. + * This is not done if parsing the frequency from cpufreq worked. */ + int useCpuInfoFreq = 1; + /* Reset global variables */ numCores = 0; numProcessors = 0; @@ -94,8 +98,24 @@ registerMonitor( cmdName, "float", printCPUxClock, printCPUxClockInfo, CpuInfoSM ); } + + useCpuInfoFreq = 1; + + const char freqTemplate[] = "/sys/bus/cpu/devices/cpu%d/cpufreq/scaling_cur_freq"; + char freqName[sizeof(freqTemplate) + 3]; + snprintf(freqName, sizeof(freqName) - 1, freqTemplate, coreUniqueId); + FILE *freqFd = fopen(freqName, "r"); + if (freqFd) { + unsigned long khz; + if(fscanf(freqFd, "%lu\n", &khz) == 1) { + Clocks[coreUniqueId] = khz / 1000.0f; + useCpuInfoFreq = 0; + } + + fclose(freqFd); + } } - } else if ( strcmp( tag, "cpu MHz" ) == 0 ) { + } else if ( useCpuInfoFreq && strcmp( tag, "cpu MHz" ) == 0 ) { if (HighNumCores > coreUniqueId) { /* The if statement above *should* always be true, but there's no harm in being safe. */ sscanf( value, "%f", &Clocks[ coreUniqueId ] ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksysguard-5.11.0/po/gl/ksysguard.po new/ksysguard-5.11.1/po/gl/ksysguard.po --- old/ksysguard-5.11.0/po/gl/ksysguard.po 2017-10-05 14:41:48.000000000 +0200 +++ new/ksysguard-5.11.1/po/gl/ksysguard.po 2017-10-17 12:33:34.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: ksysguard\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-01-09 04:00+0100\n" -"PO-Revision-Date: 2017-10-03 21:01+0100\n" +"PO-Revision-Date: 2017-10-15 07:30+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" @@ -66,7 +66,8 @@ #: HostConnector.cpp:82 #, kde-format msgid "Select this to use the secure shell to login to the remote host." -msgstr "Escolla isto para empregar ssh para acceder no servidor remoto." +msgstr "" +"Escolla isto para empregar a shell segura para acceder no servidor remoto." #: HostConnector.cpp:85 #, kde-format @@ -82,7 +83,7 @@ #: HostConnector.cpp:89 #, kde-format msgid "Daemon" -msgstr "Daemon" +msgstr "Servizo" #: HostConnector.cpp:90 #, kde-format @@ -141,7 +142,7 @@ #: HostConnector.cpp:123 #, kde-format msgid "e.g. ssh -l root remote.host.org ksysguardd" -msgstr "por ex. ssh -l root servidor.remoto.org ksysguardd" +msgstr "p.ex. ssh -l root servidor.remoto.org ksysguardd" #: ksysguard.cpp:74 #, kde-format @@ -886,7 +887,7 @@ #: SensorDisplayLib/ListView.cpp:173 #, kde-format msgid "Gigabytes" -msgstr "Gigabytes" +msgstr "Xigabytes" #: SensorDisplayLib/ListView.cpp:179 #, kde-format
