Hello community, here is the log from the commit of package kdebugsettings for openSUSE:Factory checked in at 2017-01-18 21:48:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebugsettings (Old) and /work/SRC/openSUSE:Factory/.kdebugsettings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebugsettings" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebugsettings/kdebugsettings.changes 2016-12-17 10:37:01.951592920 +0100 +++ /work/SRC/openSUSE:Factory/.kdebugsettings.new/kdebugsettings.changes 2017-01-18 21:48:08.610804251 +0100 @@ -1,0 +2,7 @@ +Sat Jan 14 08:53:58 UTC 2017 - [email protected] + +- - Update to KDE Applications 16.12.1 + * KDE Applications 16.12.1 + * https://www.kde.org/announcements/announce-applications-16.12.1.php + +------------------------------------------------------------------- Old: ---- kdebugsettings-16.12.0.tar.xz New: ---- kdebugsettings-16.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebugsettings.spec ++++++ --- /var/tmp/diff_new_pack.SaA1a4/_old 2017-01-18 21:48:09.134730142 +0100 +++ /var/tmp/diff_new_pack.SaA1a4/_new 2017-01-18 21:48:09.138729576 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebugsettings # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,10 +17,10 @@ Name: kdebugsettings -Version: 16.12.0 +Version: 16.12.1 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: A KDebug settings module for KDE License: LGPL-2.0+ ++++++ kdebugsettings-16.12.0.tar.xz -> kdebugsettings-16.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebugsettings-16.12.0/CMakeLists.txt new/kdebugsettings-16.12.1/CMakeLists.txt --- old/kdebugsettings-16.12.0/CMakeLists.txt 2016-12-06 20:59:09.000000000 +0100 +++ new/kdebugsettings-16.12.1/CMakeLists.txt 2017-01-07 19:57:38.000000000 +0100 @@ -34,7 +34,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebugsettings-16.12.0/src/kdebugsettingsutil.cpp new/kdebugsettings-16.12.1/src/kdebugsettingsutil.cpp --- old/kdebugsettings-16.12.0/src/kdebugsettingsutil.cpp 2016-12-06 20:59:09.000000000 +0100 +++ new/kdebugsettings-16.12.1/src/kdebugsettingsutil.cpp 2017-01-07 19:57:38.000000000 +0100 @@ -21,6 +21,7 @@ #include "kdebugsettingsutil.h" #include "kdebugsettings_debug.h" #include <QFile> +#include <QFileInfo> RenameCategory KDebugSettingsUtil::parseRenameCategory(QString line) { @@ -206,12 +207,13 @@ QList<KDebugSettingsUtil::LoadLoggingCategory> KDebugSettingsUtil::readLoggingQtCategories(const QString &filename) { + if (filename.isEmpty()) { + return {}; + } //Code based on src/corelib/io/qloggingregistry.cpp QFile file(filename); QMap<QString, KDebugSettingsUtil::LoadLoggingCategory> hashLoadLoggingCategories; - if (!file.open(QIODevice::ReadOnly)) { - qCWarning(KDEBUGSETTINGS_LOG) << "Couldn't open" << filename; - } else { + if (file.open(QIODevice::ReadOnly)) { QTextStream ts(&file); QString _section; bool rulesSections = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebugsettings-16.12.0/src/loadcategoriesjob.cpp new/kdebugsettings-16.12.1/src/loadcategoriesjob.cpp --- old/kdebugsettings-16.12.0/src/loadcategoriesjob.cpp 2016-12-06 20:59:09.000000000 +0100 +++ new/kdebugsettings-16.12.1/src/loadcategoriesjob.cpp 2017-01-07 19:57:38.000000000 +0100 @@ -97,9 +97,6 @@ void LoadCategoriesJob::start() { - if (mFileName.isEmpty()) { - return; - } mCustomCategories.clear(); mQtKdeCategories.clear(); mFoundOverrideRule = false;
