Hello community, here is the log from the commit of package libsysstat-qt5 for openSUSE:Factory checked in at 2019-02-25 17:50:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsysstat-qt5 (Old) and /work/SRC/openSUSE:Factory/.libsysstat-qt5.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsysstat-qt5" Mon Feb 25 17:50:34 2019 rev:8 rq:672093 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libsysstat-qt5/libsysstat-qt5.changes 2018-06-29 22:31:37.726245182 +0200 +++ /work/SRC/openSUSE:Factory/.libsysstat-qt5.new.28833/libsysstat-qt5.changes 2019-02-25 17:50:36.774777452 +0100 @@ -1,0 +2,13 @@ +Tue Feb 5 14:30:25 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Use noun phrase in summary. + +------------------------------------------------------------------- +Thu Jan 31 09:46:57 UTC 2019 - Michael Vetter <mvet...@suse.com> + +- Update to 0.4.2: + * Improved cmake scripting and set cmake_minimum_required to 3.1.0 + * Don't use automatic string conversions + * Removes local compile definition + +------------------------------------------------------------------- @@ -107 +119,0 @@ - Old: ---- libsysstat-0.4.1.tar.xz libsysstat-0.4.1.tar.xz.asc New: ---- libsysstat-0.4.2.tar.xz libsysstat-0.4.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsysstat-qt5.spec ++++++ --- /var/tmp/diff_new_pack.EXA8T8/_old 2019-02-25 17:50:38.278776633 +0100 +++ /var/tmp/diff_new_pack.EXA8T8/_new 2019-02-25 17:50:38.278776633 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsysstat-qt5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,38 +12,38 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define _name libsysstat Name: libsysstat-qt5 -Version: 0.4.1 +Version: 0.4.2 Release: 0 -Summary: Query system info and statistics +Summary: Library used to query system info and statistics License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ URL: http://www.lxqt.org Source: https://github.com/lxde/%{_name}/releases/download/%{version}/%{_name}-%{version}.tar.xz Source1: https://github.com/lxde/%{_name}/releases/download/%{version}/%{_name}-%{version}.tar.xz.asc Source2: libsysstat-qt5.keyring -BuildRequires: cmake >= 3.0.2 +BuildRequires: cmake >= 3.1.0 BuildRequires: gcc-c++ -BuildRequires: lxqt-build-tools-devel >= 0.5.0 +BuildRequires: lxqt-build-tools-devel >= 0.6.0 BuildRequires: pkgconfig BuildRequires: cmake(Qt5LinguistTools) BuildRequires: pkgconfig(Qt5Core) >= 5.7.1 %description -Library used to query system info and statistics +Library used to query system info and statistics. %package -n libsysstat-qt5-0 -Summary: Libraries for lxqt +Summary: Library used to query system info and statistics Group: System/Libraries Provides: libsysstat %description -n libsysstat-qt5-0 -Development libraries for libsysstat +Development libraries for libsysstat. %package devel Summary: Devel files for libsysstat @@ -52,7 +52,7 @@ Requires: pkgconfig %description devel -sysstat libraries for development +sysstat libraries for development. %prep %setup -q -n %{_name}-%{version} ++++++ libsysstat-0.4.1.tar.xz -> libsysstat-0.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.1/CHANGELOG new/libsysstat-0.4.2/CHANGELOG --- old/libsysstat-0.4.1/CHANGELOG 2018-05-21 19:16:59.000000000 +0200 +++ new/libsysstat-0.4.2/CHANGELOG 2019-01-24 22:43:32.000000000 +0100 @@ -1,3 +1,10 @@ +libsysstat-0.4.2 / 2019-01-25 +============================= + + * Bumped version to 0.4.2 + * Improved cmake scripting and set cmake_minimum_required to 3.1.0 + * Don't use automatic string conversions + * Removes local compile definition libsysstat-0.4.1 / 2018-05-21 ============================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.1/CMakeLists.txt new/libsysstat-0.4.2/CMakeLists.txt --- old/libsysstat-0.4.1/CMakeLists.txt 2018-05-21 19:16:59.000000000 +0200 +++ new/libsysstat-0.4.2/CMakeLists.txt 2019-01-24 22:43:32.000000000 +0100 @@ -1,13 +1,17 @@ -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) - +cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) +# CMP0000: Call the cmake_minimum_required() command at the beginning of the top-level +# CMakeLists.txt file even before calling the project() command. +# The cmake_minimum_required(VERSION) command implicitly invokes the cmake_policy(VERSION) +# command to specify that the current project code is written for the given range of CMake +# versions. project(libsysstat) set(MAJOR_VERSION 0) set(MINOR_VERSION 4) -set(PATCH_VERSION 1) +set(PATCH_VERSION 2) set(SYSSTAT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") -set(LXQTBT_MINIMUM_VERSION "0.5.0") +set(LXQTBT_MINIMUM_VERSION "0.6.0") set(QT_MINIMUM_VERSION "5.7.1") # additional cmake files @@ -66,11 +70,6 @@ set(SYSSTAT_QM_FILES "") -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() - - set(APP_SHARE_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${SYSSTAT_LIBRARY_NAME}") add_library(${SYSSTAT_LIBRARY_NAME} @@ -94,7 +93,11 @@ "MINOR_VERSION=${MINOR_VERSION}" "PATCH_VERSION=${PATCH_VERSION}" "SYSSTAT_LIBRARY" - "QT_NO_FOREACH" + "QT_USE_QSTRINGBUILDER" + "QT_NO_CAST_FROM_ASCII" + "QT_NO_CAST_TO_ASCII" + "QT_NO_URL_CAST_FROM_STRING" + "QT_NO_CAST_FROM_BYTEARRAY" ) target_include_directories(${SYSSTAT_LIBRARY_NAME} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.1/cpustat.cpp new/libsysstat-0.4.2/cpustat.cpp --- old/libsysstat-0.4.1/cpustat.cpp 2018-05-21 19:16:59.000000000 +0200 +++ new/libsysstat-0.4.2/cpustat.cpp 2019-01-24 22:43:32.000000000 +0100 @@ -49,10 +49,10 @@ { bool ok; - uint min = readAllFile(qPrintable(QString("/sys/devices/system/cpu/%1/cpufreq/scaling_min_freq").arg(source))).toUInt(&ok); + uint min = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_min_freq").arg(source))).toUInt(&ok); if (ok) { - uint max = readAllFile(qPrintable(QString("/sys/devices/system/cpu/%1/cpufreq/scaling_max_freq").arg(source))).toUInt(&ok); + uint max = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_max_freq").arg(source))).toUInt(&ok); if (ok) mBounds[source] = qMakePair(min, max); } @@ -62,12 +62,12 @@ { mSources.clear(); - const QStringList rows = readAllFile("/proc/stat").split(QChar('\n'), QString::SkipEmptyParts); + const QStringList rows = readAllFile("/proc/stat").split(QLatin1Char('\n'), QString::SkipEmptyParts); for (const QString &row : rows) { - QStringList tokens = row.split(QChar(' '), QString::SkipEmptyParts); + QStringList tokens = row.split(QLatin1Char(' '), QString::SkipEmptyParts); if( (tokens.size() < 5) - || (!tokens[0].startsWith("cpu")) ) + || (!tokens[0].startsWith(QLatin1String("cpu"))) ) continue; mSources.append(tokens[0]); @@ -77,10 +77,10 @@ bool ok; - const QStringList ranges = readAllFile("/sys/devices/system/cpu/online").split(QChar(','), QString::SkipEmptyParts); + const QStringList ranges = readAllFile("/sys/devices/system/cpu/online").split(QLatin1Char(','), QString::SkipEmptyParts); for (const QString &range : ranges) { - int dash = range.indexOf('-'); + int dash = range.indexOf(QLatin1Char('-')); if (dash != -1) { uint min = range.leftRef(dash).toUInt(&ok); @@ -89,14 +89,14 @@ uint max = range.midRef(dash + 1).toUInt(&ok); if (ok) for (uint number = min; number <= max; ++number) - addSource(QString("cpu%1").arg(number)); + addSource(QString::fromLatin1("cpu%1").arg(number)); } } else { uint number = range.toUInt(&ok); if (ok) - addSource(QString("cpu%1").arg(number)); + addSource(QString::fromLatin1("cpu%1").arg(number)); } } } @@ -118,7 +118,7 @@ void CpuStatPrivate::recalculateMinMax() { int cores = 1; - if (mSource == "cpu") + if (mSource == QLatin1String("cpu")) cores = mSources.size() - 1; mIntervalMin = static_cast<float>(mTimer->interval()) / 1000 * static_cast<float>(mUserHz) * static_cast<float>(cores) / 1.25; // -25% @@ -130,15 +130,15 @@ if ( (mMonitoring == CpuStat::LoadOnly) || (mMonitoring == CpuStat::LoadAndFrequency) ) { - const QStringList rows = readAllFile("/proc/stat").split(QChar('\n'), QString::SkipEmptyParts); + const QStringList rows = readAllFile("/proc/stat").split(QLatin1Char('\n'), QString::SkipEmptyParts); for (const QString &row : rows) { - if (!row.startsWith("cpu")) + if (!row.startsWith(QLatin1String("cpu"))) continue; - if (row.startsWith(mSource + " ")) + if (row.startsWith(mSource + QLatin1Char(' '))) { - QStringList tokens = row.split(QChar(' '), QString::SkipEmptyParts); + QStringList tokens = row.split(QLatin1Char(' '), QString::SkipEmptyParts); if (tokens.size() < 5) continue; @@ -173,14 +173,14 @@ bool ok; - if (mSource == "cpu") + if (mSource == QLatin1String("cpu")) { uint count = 0; freqRate = 0.0; for (Bounds::ConstIterator I = mBounds.constBegin(); I != mBounds.constEnd(); ++I) { - uint thisFreq = readAllFile(qPrintable(QString("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(I.key()))).toUInt(&ok); + uint thisFreq = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(I.key()))).toUInt(&ok); if (ok) { @@ -199,7 +199,7 @@ } else { - freq = readAllFile(qPrintable(QString("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(mSource))).toUInt(&ok); + freq = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(mSource))).toUInt(&ok); if (ok) { @@ -236,13 +236,13 @@ bool ok; uint freq = 0; - if (mSource == "cpu") + if (mSource == QLatin1String("cpu")) { uint count = 0; for (Bounds::ConstIterator I = mBounds.constBegin(); I != mBounds.constEnd(); ++I) { - uint thisFreq = readAllFile(qPrintable(QString("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(I.key()))).toUInt(&ok); + uint thisFreq = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(I.key()))).toUInt(&ok); if (ok) { @@ -257,7 +257,7 @@ } else { - freq = readAllFile(qPrintable(QString("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(mSource))).toUInt(&ok); + freq = readAllFile(qPrintable(QString::fromLatin1("/sys/devices/system/cpu/%1/cpufreq/scaling_cur_freq").arg(mSource))).toUInt(&ok); } emit update(freq); } @@ -265,7 +265,7 @@ QString CpuStatPrivate::defaultSource() { - return "cpu"; + return QLatin1String("cpu"); } CpuStatPrivate::Values::Values() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.1/memstat.cpp new/libsysstat-0.4.2/memstat.cpp --- old/libsysstat-0.4.1/memstat.cpp 2018-05-21 19:16:59.000000000 +0200 +++ new/libsysstat-0.4.2/memstat.cpp 2019-01-24 22:43:32.000000000 +0100 @@ -37,7 +37,7 @@ connect(mTimer, SIGNAL(timeout()), SLOT(timeout())); - mSources << "memory" << "swap"; + mSources << QLatin1String("memory") << QLatin1String("swap"); } MemStatPrivate::~MemStatPrivate() @@ -53,28 +53,28 @@ qulonglong swapTotal = 0; qulonglong swapFree = 0; - const QStringList rows = readAllFile("/proc/meminfo").split(QChar('\n'), QString::SkipEmptyParts); + const QStringList rows = readAllFile("/proc/meminfo").split(QLatin1Char('\n'), QString::SkipEmptyParts); for (const QString &row : rows) { - QStringList tokens = row.split(QChar(' '), QString::SkipEmptyParts); + QStringList tokens = row.split(QLatin1Char(' '), QString::SkipEmptyParts); if (tokens.size() != 3) continue; - if (tokens[0] == "MemTotal:") + if (tokens[0] == QLatin1String("MemTotal:")) memTotal = tokens[1].toULong(); - else if(tokens[0] == "MemFree:") + else if(tokens[0] == QLatin1String("MemFree:")) memFree = tokens[1].toULong(); - else if(tokens[0] == "Buffers:") + else if(tokens[0] == QLatin1String("Buffers:")) memBuffers = tokens[1].toULong(); - else if(tokens[0] == "Cached:") + else if(tokens[0] == QLatin1String("Cached:")) memCached = tokens[1].toULong(); - else if(tokens[0] == "SwapTotal:") + else if(tokens[0] == QLatin1String("SwapTotal:")) swapTotal = tokens[1].toULong(); - else if(tokens[0] == "SwapFree:") + else if(tokens[0] == QLatin1String("SwapFree:")) swapFree = tokens[1].toULong(); } - if (mSource == "memory") + if (mSource == QLatin1String("memory")) { if (memTotal) { @@ -86,7 +86,7 @@ emit memoryUpdate(applications_d, buffers_d, cached_d); } } - else if (mSource == "swap") + else if (mSource == QLatin1String("swap")) { if (swapTotal) { @@ -99,7 +99,7 @@ QString MemStatPrivate::defaultSource() { - return "memory"; + return QLatin1String("memory"); } MemStat::MemStat(QObject *parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.1/netstat.cpp new/libsysstat-0.4.2/netstat.cpp --- old/libsysstat-0.4.1/netstat.cpp 2018-05-21 19:16:59.000000000 +0200 +++ new/libsysstat-0.4.2/netstat.cpp 2019-01-24 22:43:32.000000000 +0100 @@ -38,13 +38,13 @@ connect(mTimer, SIGNAL(timeout()), SLOT(timeout())); - QStringList rows(readAllFile("/proc/net/dev").split(QChar('\n'), QString::SkipEmptyParts)); + QStringList rows(readAllFile("/proc/net/dev").split(QLatin1Char('\n'), QString::SkipEmptyParts)); rows.erase(rows.begin(), rows.begin() + 2); for (const QString &row : qAsConst(rows)) { - QStringList tokens = row.split(QChar(':'), QString::SkipEmptyParts); + QStringList tokens = row.split(QLatin1Char(':'), QString::SkipEmptyParts); if (tokens.size() != 2) continue; @@ -58,31 +58,31 @@ void NetStatPrivate::timeout() { - QStringList rows(readAllFile("/proc/net/dev").split(QChar('\n'), QString::SkipEmptyParts)); + QStringList rows(readAllFile("/proc/net/dev").split(QLatin1Char('\n'), QString::SkipEmptyParts)); if (rows.size() < 2) return; - QStringList names = rows[1].split(QChar('|')); + QStringList names = rows[1].split(QLatin1Char('|')); if (names.size() != 3) return; - QStringList namesR = names[1].split(QChar(' '), QString::SkipEmptyParts); - QStringList namesT = names[2].split(QChar(' '), QString::SkipEmptyParts); - int receivedIndex = namesR.indexOf("bytes"); - int transmittedIndex = namesR.size() + namesT.indexOf("bytes"); + QStringList namesR = names[1].split(QLatin1Char(' '), QString::SkipEmptyParts); + QStringList namesT = names[2].split(QLatin1Char(' '), QString::SkipEmptyParts); + int receivedIndex = namesR.indexOf(QLatin1String("bytes")); + int transmittedIndex = namesR.size() + namesT.indexOf(QLatin1String("bytes")); rows.erase(rows.begin(), rows.begin() + 2); for (const QString &row : qAsConst(rows)) { - QStringList tokens = row.split(QChar(':'), QString::SkipEmptyParts); + QStringList tokens = row.split(QLatin1Char(':'), QString::SkipEmptyParts); if (tokens.size() != 2) continue; QString interfaceName = tokens[0].trimmed(); - QStringList data = tokens[1].split(QChar(' '), QString::SkipEmptyParts); + QStringList data = tokens[1].split(QLatin1Char(' '), QString::SkipEmptyParts); if (data.size() < transmittedIndex) continue; @@ -103,7 +103,7 @@ QString NetStatPrivate::defaultSource() { - return "lo"; + return QLatin1String("lo"); } NetStatPrivate::Values::Values() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.1/version.cpp new/libsysstat-0.4.2/version.cpp --- old/libsysstat-0.4.1/version.cpp 2018-05-21 19:16:59.000000000 +0200 +++ new/libsysstat-0.4.2/version.cpp 2019-01-24 22:43:32.000000000 +0100 @@ -34,7 +34,7 @@ QString verbose() { - return QString("%1.%2.%3").arg(MAJOR_VERSION_STR).arg(MINOR_VERSION_STR).arg(PATCH_VERSION_STR); + return QString::fromLatin1("%1.%2.%3").arg(QLatin1String(MAJOR_VERSION_STR)).arg(QLatin1String(MINOR_VERSION_STR)).arg(QLatin1String(PATCH_VERSION_STR)); } int majorNumber()
