Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libsysstat-qt5 for openSUSE:Factory checked in at 2021-04-17 00:01:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsysstat-qt5 (Old) and /work/SRC/openSUSE:Factory/.libsysstat-qt5.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsysstat-qt5" Sat Apr 17 00:01:50 2021 rev:11 rq:885937 version:0.4.5 Changes: -------- --- /work/SRC/openSUSE:Factory/libsysstat-qt5/libsysstat-qt5.changes 2020-11-04 18:32:36.072119919 +0100 +++ /work/SRC/openSUSE:Factory/.libsysstat-qt5.new.12324/libsysstat-qt5.changes 2021-04-17 00:02:04.717623730 +0200 @@ -1,0 +2,8 @@ +Fri Apr 16 07:03:51 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 0.4.5: + * Initialized some variables. + * Used "= default" to define trivial destructors. + * Handled Qt5.15's deprecations. + +------------------------------------------------------------------- Old: ---- libsysstat-0.4.4.tar.xz libsysstat-0.4.4.tar.xz.asc New: ---- libsysstat-0.4.5.tar.xz libsysstat-0.4.5.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsysstat-qt5.spec ++++++ --- /var/tmp/diff_new_pack.8U6CgE/_old 2021-04-17 00:02:05.297624645 +0200 +++ /var/tmp/diff_new_pack.8U6CgE/_new 2021-04-17 00:02:05.301624651 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsysstat-qt5 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _name libsysstat Name: libsysstat-qt5 -Version: 0.4.4 +Version: 0.4.5 Release: 0 Summary: Library used to query system info and statistics License: LGPL-2.1-or-later @@ -29,7 +29,7 @@ Source2: libsysstat-qt5.keyring BuildRequires: cmake >= 3.1.0 BuildRequires: gcc-c++ -BuildRequires: lxqt-build-tools-devel >= 0.8.0 +BuildRequires: lxqt-build-tools-devel >= 0.9.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) >= 5.12.0 ++++++ libsysstat-0.4.4.tar.xz -> libsysstat-0.4.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.4/CHANGELOG new/libsysstat-0.4.5/CHANGELOG --- old/libsysstat-0.4.4/CHANGELOG 2020-11-03 15:45:02.000000000 +0100 +++ new/libsysstat-0.4.5/CHANGELOG 2021-04-07 08:58:34.000000000 +0200 @@ -1,3 +1,9 @@ +libsysstat-0.4.5 / 2021-04-15 +============================= + * Initialized some variables. + * Used "= default" to define trivial destructors. + * Handled Qt5.15's deprecations. + libsysstat-0.4.4 / 2020-11-01 ============================= * Bumped version to 0.4.4. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.4/CMakeLists.txt new/libsysstat-0.4.5/CMakeLists.txt --- old/libsysstat-0.4.4/CMakeLists.txt 2020-11-03 15:45:02.000000000 +0100 +++ new/libsysstat-0.4.5/CMakeLists.txt 2021-04-07 08:58:34.000000000 +0200 @@ -8,10 +8,10 @@ set(MAJOR_VERSION 0) set(MINOR_VERSION 4) -set(PATCH_VERSION 4) +set(PATCH_VERSION 5) set(SYSSTAT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") -set(LXQTBT_MINIMUM_VERSION "0.8.0") +set(LXQTBT_MINIMUM_VERSION "0.9.0") set(QT_MINIMUM_VERSION "5.12.0") # additional cmake files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.4/basestat.cpp new/libsysstat-0.4.5/basestat.cpp --- old/libsysstat-0.4.4/basestat.cpp 2020-11-03 15:45:02.000000000 +0100 +++ new/libsysstat-0.4.5/basestat.cpp 2021-04-07 08:58:34.000000000 +0200 @@ -46,9 +46,7 @@ connect(mSynchroTimer, SIGNAL(timeout()), SLOT(synchroTimeout())); } -BaseStatPrivate::~BaseStatPrivate() -{ -} +BaseStatPrivate::~BaseStatPrivate() = default; bool BaseStatPrivate::timerIsActive() const { @@ -143,9 +141,7 @@ { } -BaseStat::~BaseStat() -{ -} +BaseStat::~BaseStat() = default; QStringList BaseStat::sources() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.4/cpustat.cpp new/libsysstat-0.4.5/cpustat.cpp --- old/libsysstat-0.4.4/cpustat.cpp 2020-11-03 15:45:02.000000000 +0100 +++ new/libsysstat-0.4.5/cpustat.cpp 2021-04-07 08:58:34.000000000 +0200 @@ -47,7 +47,7 @@ void CpuStatPrivate::addSource(const QString &source) { - bool ok; + bool ok = false; uint min = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_min_freq").arg(source))).toUInt(&ok); if (ok) @@ -61,11 +61,18 @@ void CpuStatPrivate::updateSources() { mSources.clear(); - +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + const QStringList rows = readAllFile("/proc/stat").split(QLatin1Char('\n'), Qt::SkipEmptyParts); +#else const QStringList rows = readAllFile("/proc/stat").split(QLatin1Char('\n'), QString::SkipEmptyParts); +#endif for (const QString &row : rows) { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList tokens = row.split(QLatin1Char(' '), Qt::SkipEmptyParts); +#else QStringList tokens = row.split(QLatin1Char(' '), QString::SkipEmptyParts); +#endif if( (tokens.size() < 5) || (!tokens[0].startsWith(QLatin1String("cpu"))) ) continue; @@ -75,9 +82,13 @@ mBounds.clear(); - bool ok; + bool ok = false; +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + const QStringList ranges = readAllFile("/sys/devices/system/cpu/online").split(QLatin1Char(','), Qt::SkipEmptyParts); +#else const QStringList ranges = readAllFile("/sys/devices/system/cpu/online").split(QLatin1Char(','), QString::SkipEmptyParts); +#endif for (const QString &range : ranges) { int dash = range.indexOf(QLatin1Char('-')); @@ -101,9 +112,7 @@ } } -CpuStatPrivate::~CpuStatPrivate() -{ -} +CpuStatPrivate::~CpuStatPrivate() = default; void CpuStatPrivate::intervalChanged() { @@ -130,7 +139,11 @@ if ( (mMonitoring == CpuStat::LoadOnly) || (mMonitoring == CpuStat::LoadAndFrequency) ) { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + const QStringList rows = readAllFile("/proc/stat").split(QLatin1Char('\n'), Qt::SkipEmptyParts); +#else const QStringList rows = readAllFile("/proc/stat").split(QLatin1Char('\n'), QString::SkipEmptyParts); +#endif for (const QString &row : rows) { if (!row.startsWith(QLatin1String("cpu"))) @@ -138,7 +151,11 @@ if (row.startsWith(mSource + QLatin1Char(' '))) { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList tokens = row.split(QLatin1Char(' '), Qt::SkipEmptyParts); +#else QStringList tokens = row.split(QLatin1Char(' '), QString::SkipEmptyParts); +#endif if (tokens.size() < 5) continue; @@ -171,7 +188,7 @@ float freqRate = 1.0; uint freq = 0; - bool ok; + bool ok = false; if (mSource == QLatin1String("cpu")) { @@ -233,7 +250,7 @@ } else { - bool ok; + bool ok = false; uint freq = 0; if (mSource == QLatin1String("cpu")) @@ -310,9 +327,7 @@ connect(impl, SIGNAL(update(uint)), this, SIGNAL(update(uint))); } -CpuStat::~CpuStat() -{ -} +CpuStat::~CpuStat() = default; void CpuStat::updateSources() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.4/memstat.cpp new/libsysstat-0.4.5/memstat.cpp --- old/libsysstat-0.4.4/memstat.cpp 2020-11-03 15:45:02.000000000 +0100 +++ new/libsysstat-0.4.5/memstat.cpp 2021-04-07 08:58:34.000000000 +0200 @@ -40,9 +40,7 @@ mSources << QLatin1String("memory") << QLatin1String("swap"); } -MemStatPrivate::~MemStatPrivate() -{ -} +MemStatPrivate::~MemStatPrivate() = default; void MemStatPrivate::timeout() { @@ -53,10 +51,18 @@ qulonglong swapTotal = 0; qulonglong swapFree = 0; +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + const QStringList rows = readAllFile("/proc/meminfo").split(QLatin1Char('\n'), Qt::SkipEmptyParts); +#else const QStringList rows = readAllFile("/proc/meminfo").split(QLatin1Char('\n'), QString::SkipEmptyParts); +#endif for (const QString &row : rows) { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList tokens = row.split(QLatin1Char(' '), Qt::SkipEmptyParts); +#else QStringList tokens = row.split(QLatin1Char(' '), QString::SkipEmptyParts); +#endif if (tokens.size() != 3) continue; @@ -112,8 +118,6 @@ connect(impl, SIGNAL(swapUpdate(float)), this, SIGNAL(swapUpdate(float))); } -MemStat::~MemStat() -{ -} +MemStat::~MemStat() = default; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.4/netstat.cpp new/libsysstat-0.4.5/netstat.cpp --- old/libsysstat-0.4.4/netstat.cpp 2020-11-03 15:45:02.000000000 +0100 +++ new/libsysstat-0.4.5/netstat.cpp 2021-04-07 08:58:34.000000000 +0200 @@ -38,13 +38,21 @@ connect(mTimer, SIGNAL(timeout()), SLOT(timeout())); +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList rows(readAllFile("/proc/net/dev").split(QLatin1Char('\n'), Qt::SkipEmptyParts)); +#else QStringList rows(readAllFile("/proc/net/dev").split(QLatin1Char('\n'), QString::SkipEmptyParts)); +#endif rows.erase(rows.begin(), rows.begin() + 2); for (const QString &row : qAsConst(rows)) { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList tokens = row.split(QLatin1Char(':'), Qt::SkipEmptyParts); +#else QStringList tokens = row.split(QLatin1Char(':'), QString::SkipEmptyParts); +#endif if (tokens.size() != 2) continue; @@ -52,13 +60,15 @@ } } -NetStatPrivate::~NetStatPrivate() -{ -} +NetStatPrivate::~NetStatPrivate() = default; void NetStatPrivate::timeout() { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList rows(readAllFile("/proc/net/dev").split(QLatin1Char('\n'), Qt::SkipEmptyParts)); +#else QStringList rows(readAllFile("/proc/net/dev").split(QLatin1Char('\n'), QString::SkipEmptyParts)); +#endif if (rows.size() < 2) @@ -67,8 +77,13 @@ QStringList names = rows[1].split(QLatin1Char('|')); if (names.size() != 3) return; +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList namesR = names[1].split(QLatin1Char(' '), Qt::SkipEmptyParts); + QStringList namesT = names[2].split(QLatin1Char(' '), Qt::SkipEmptyParts); +#else QStringList namesR = names[1].split(QLatin1Char(' '), QString::SkipEmptyParts); QStringList namesT = names[2].split(QLatin1Char(' '), QString::SkipEmptyParts); +#endif int receivedIndex = namesR.indexOf(QLatin1String("bytes")); int transmittedIndex = namesR.size() + namesT.indexOf(QLatin1String("bytes")); @@ -76,13 +91,21 @@ for (const QString &row : qAsConst(rows)) { +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList tokens = row.split(QLatin1Char(':'), Qt::SkipEmptyParts); +#else QStringList tokens = row.split(QLatin1Char(':'), QString::SkipEmptyParts); +#endif if (tokens.size() != 2) continue; QString interfaceName = tokens[0].trimmed(); +#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) + QStringList data = tokens[1].split(QLatin1Char(' '), Qt::SkipEmptyParts); +#else QStringList data = tokens[1].split(QLatin1Char(' '), QString::SkipEmptyParts); +#endif if (data.size() < transmittedIndex) continue; @@ -121,8 +144,6 @@ connect(impl, SIGNAL(update(unsigned,unsigned)), this, SIGNAL(update(unsigned,unsigned))); } -NetStat::~NetStat() -{ -} +NetStat::~NetStat() = default; }
