Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2018-01-22 16:03:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Mon Jan 22 16:03:04 2018 rev:54 rq:566706 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2018-01-09 14:44:23.460564686 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2018-01-22 16:03:08.281108466 +0100 @@ -1,0 +2,13 @@ +Tue Jan 16 22:50:20 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * Install categories file + use debug categories when necessary + * Fix cmake warning + * autogenerate debug file + +------------------------------------------------------------------- Old: ---- kservice-5.41.0.tar.xz New: ---- kservice-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.4cvUdI/_old 2018-01-22 16:03:08.961076647 +0100 +++ /var/tmp/diff_new_pack.4cvUdI/_new 2018-01-22 16:03:08.965076459 +0100 @@ -1,7 +1,7 @@ # # spec file for package kservice # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,13 +17,13 @@ %bcond_without lang -%define _tar_path 5.41 +%define _tar_path 5.42 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kservice -Version: 5.41.0 +Version: 5.42.0 Release: 0 %define kf5_version %{version} BuildRequires: bison @@ -115,6 +115,7 @@ %{_kf5_sysconfdir}/xdg/menus/kf5-applications.menu %doc %lang(en) %{_kf5_mandir}/*/kbuildsycoca5.* %doc %lang(en) %{_kf5_mandir}/*/desktoptojson.* +%{_kf5_debugdir}/*.categories %files devel %defattr(-,root,root) ++++++ kservice-5.41.0.tar.xz -> kservice-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/.reviewboardrc new/kservice-5.42.0/.reviewboardrc --- old/kservice-5.41.0/.reviewboardrc 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kservice' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/CMakeLists.txt new/kservice-5.42.0/CMakeLists.txt --- old/kservice-5.41.0/CMakeLists.txt 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/CMakeLists.txt 2018-01-07 17:20:51.000000000 +0100 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts -set(KF5_DEP_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts +set(KF5_DEP_VERSION "5.42.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -19,7 +19,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) - +include(ECMQtDeclareLoggingCategory) include(GenerateExportHeader) option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) @@ -112,4 +112,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kservice_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +# contains list of debug categories, for kdebugsettings +install(FILES kservice.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/autotests/CMakeLists.txt new/kservice-5.42.0/autotests/CMakeLists.txt --- old/kservice-5.41.0/autotests/CMakeLists.txt 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/autotests/CMakeLists.txt 2018-01-07 17:20:51.000000000 +0100 @@ -50,7 +50,8 @@ ######### kmimeassociationstest ######## -set(kmimeassociationstest_SRCS kmimeassociationstest.cpp ../src/sycoca/kmimeassociations.cpp ../src/sycoca/sycocadebug.cpp) +set(kmimeassociationstest_SRCS kmimeassociationstest.cpp ../src/sycoca/kmimeassociations.cpp) +ecm_qt_declare_logging_category(kmimeassociationstest_SRCS HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf5.kservice.sycoca) ecm_add_test(${kmimeassociationstest_SRCS} TEST_NAME kmimeassociationstest LINK_LIBRARIES KF5::Service Qt5::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/kservice.categories new/kservice-5.42.0/kservice.categories --- old/kservice-5.41.0/kservice.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-5.42.0/kservice.categories 2018-01-07 17:20:51.000000000 +0100 @@ -0,0 +1,4 @@ +kf5.kservice.services service (kservice lib) +kf5.kservice.sycoca sycoca (kservice) + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook new/kservice-5.42.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook --- old/kservice-5.41.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/po/ca/docs/desktoptojson/man-desktoptojson.8.docbook 2018-01-07 17:20:51.000000000 +0100 @@ -8,7 +8,7 @@ <refentryinfo> <title ->&kde; Frameworks: KService</title> +>Frameworks del &kde;: KService</title> <author ><firstname >Scarlett</firstname @@ -43,7 +43,7 @@ <releaseinfo >Frameworks 5.0</releaseinfo> <productname ->KDE Frameworks</productname> +>Frameworks del KDE</productname> </refentryinfo> @@ -109,7 +109,7 @@ <para >L'entorn de treball KService utilitza la informació continguda als fitxers ><filename class="extension" >.desktop</filename -> per a localitzar els serveis, incloent els connectors per a les aplicacions i biblioteques basades en les Qt 5. De tota manera, el sistema de connectors de les Qt 5, utilitza les dades JSON incrustades en el propi connector. <command +> per a localitzar els serveis, inclosos els connectors per a les aplicacions i biblioteques basades en les Qt 5. De tota manera, el sistema de connectors de les Qt 5, utilitza les dades JSON incrustades en el propi connector. <command >desktoptojson</command > permet que la informació continguda en un fitxer <filename class="extension" >.desktop</filename diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook new/kservice-5.42.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook --- old/kservice-5.41.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/po/ca/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook 2018-01-07 17:20:51.000000000 +0100 @@ -8,7 +8,7 @@ <refentryinfo> <title ->&kde; Frameworks: KService</title> +>Frameworks del &kde;: KService</title> <author ><firstname >Darian</firstname @@ -43,7 +43,7 @@ <releaseinfo >Frameworks 5.15</releaseinfo> <productname ->KDE Frameworks</productname> +>Frameworks del KDE</productname> </refentryinfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/po/gl/kservice5.po new/kservice-5.42.0/po/gl/kservice5.po --- old/kservice-5.41.0/po/gl/kservice5.po 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/po/gl/kservice5.po 2018-01-07 17:20:51.000000000 +0100 @@ -147,8 +147,8 @@ "KLauncher could not be reached via D-Bus. Error when calling %1:\n" "%2\n" msgstr "" -"Non foi posíbel acadar KLauncher mediante D-Bus. Aconteceu un erro ao chamar " -"a %1:\n" +"Non se puido acadar KLauncher mediante D-Bus. Aconteceu un erro ao chamar a " +"%1:\n" "%2\n" #: kdeinit/ktoolinvocation_x11.cpp:251 @@ -158,14 +158,14 @@ "\n" "%1" msgstr "" -"Non foi posíbel iniciar o cliente de correo:\n" +"Non se puido iniciar o cliente de correo:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:252 #, kde-format msgid "Could not launch Mail Client" -msgstr "Non foi posíbel iniciar o cliente de correo" +msgstr "Non se puido iniciar o cliente de correo" #. i18n("Could not launch %1:\n\n%2", exe, error), #. i18n("Could not launch %1:\n\n%2", htmlApp->exec(), error), @@ -178,7 +178,7 @@ "\n" "%1" msgstr "" -"Non foi posíbel iniciar o navegador:\n" +"Non se puido iniciar o navegador:\n" "\n" "%1" @@ -186,7 +186,7 @@ #: kdeinit/ktoolinvocation_x11.cpp:346 #, kde-format msgid "Could not launch Browser" -msgstr "Non foi posíbel iniciar o navegador" +msgstr "Non se puido iniciar o navegador" #: kdeinit/ktoolinvocation_x11.cpp:385 #, kde-format @@ -195,14 +195,14 @@ "\n" "%1" msgstr "" -"Non foi posíbel iniciar o cliente de terminal:\n" +"Non se puido iniciar o cliente de terminal:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:386 #, kde-format msgid "Could not launch Terminal Client" -msgstr "Non foi posíbel iniciar o cliente de terminal" +msgstr "Non se puido iniciar o cliente de terminal" #: plugin/kdbusservicestarter.cpp:77 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/po/id/kservice5.po new/kservice-5.42.0/po/id/kservice5.po --- old/kservice-5.41.0/po/id/kservice5.po 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/po/id/kservice5.po 2018-01-07 17:20:51.000000000 +0100 @@ -2,6 +2,7 @@ # Copyright (C) 2010 This_file_is_part_of_KDE # This file is distributed under the same license as the kdelibs4 package. # Andhika Padmawan <[email protected]>, 2010-2014. +# Wantoyo <[email protected]>, 2017. # msgid "" msgstr "" @@ -16,6 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 2.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/po/ko/kservice5.po new/kservice-5.42.0/po/ko/kservice5.po --- old/kservice-5.41.0/po/ko/kservice5.po 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/po/ko/kservice5.po 2018-01-07 17:20:51.000000000 +0100 @@ -135,10 +135,10 @@ "KLauncher could not be reached via D-Bus. Error when calling %1:\n" "%2\n" msgstr "" -"KLauncher를 D-Bus를 통해 실행할 수 없어서, %1(을)를 호출하였을 때 오류가 발생" -"했습니다:\n" +"KLauncher를 D-Bus를 통해 실행할 수 없어서, %1(을)를 호출했을 때 오류가 발생했" +"습니다:\n" "%2\n" -"|/|KLauncher를 D-Bus를 통해 실행할 수 없어서, %1$[을를 %1] 호출하였을 때 오류" +"|/|KLauncher를 D-Bus를 통해 실행할 수 없어서, %1$[을를 %1] 호출했을 때 오류" "가 발생했습니다:\n" "%2\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/po/zh_CN/kservice5.po new/kservice-5.42.0/po/zh_CN/kservice5.po --- old/kservice-5.41.0/po/zh_CN/kservice5.po 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/po/zh_CN/kservice5.po 2018-01-07 17:20:51.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-07 08:40+0100\n" -"PO-Revision-Date: 2017-11-09 08:33-0500\n" +"PO-Revision-Date: 2018-01-05 06:38-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/CMakeLists.txt new/kservice-5.42.0/src/CMakeLists.txt --- old/kservice-5.41.0/src/CMakeLists.txt 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/CMakeLists.txt 2018-01-07 17:20:51.000000000 +0100 @@ -22,14 +22,12 @@ services/ktraderparse.cpp services/ktraderparsetree.cpp services/kplugininfo.cpp - services/servicesdebug.cpp sycoca/ksycoca.cpp sycoca/ksycocadevices.cpp sycoca/ksycocadict.cpp sycoca/ksycocaentry.cpp sycoca/ksycocafactory.cpp sycoca/kmemfile.cpp - sycoca/sycocadebug.cpp sycoca/kbuildmimetypefactory.cpp sycoca/kbuildservicetypefactory.cpp sycoca/kbuildservicefactory.cpp @@ -41,6 +39,9 @@ plugin/kplugintrader.cpp plugin/kdbusservicestarter.cpp ) +ecm_qt_declare_logging_category(kservice_SRCS HEADER servicesdebug.h IDENTIFIER SERVICES CATEGORY_NAME kf5.kservice.services) +ecm_qt_declare_logging_category(kservice_SRCS HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf5.kservice.sycoca) + if (WIN32) LIST(APPEND kservice_SRCS kdeinit/ktoolinvocation_win.cpp @@ -64,6 +65,7 @@ ) add_flex_bison_dependency(TraderLexer TraderParser) list(APPEND kservice_SRCS ${BISON_TraderParser_OUTPUTS} ${FLEX_TraderLexer_OUTPUTS}) +set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/yacc.h PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file # kservice cannot depend on kinit (because kinit->kio->kservice), so we need a copy of org.kde.KLauncher.xml here. # And I don't want to have it here as a source file (who wants to edit dbus xml by hand), so it can be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kmimetypefactory.cpp new/kservice-5.42.0/src/services/kmimetypefactory.cpp --- old/kservice-5.41.0/src/services/kmimetypefactory.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kmimetypefactory.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -18,9 +18,9 @@ */ #include "kmimetypefactory_p.h" +#include "servicesdebug.h" #include <ksycoca.h> #include <ksycocadict_p.h> -#include <QDebug> extern int servicesDebugArea(); @@ -71,12 +71,12 @@ } if (type != KST_KMimeTypeEntry) { - qWarning() << "KMimeTypeFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; + qCWarning(SERVICES) << "KMimeTypeFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; return nullptr; } MimeTypeEntry *newEntry = new MimeTypeEntry(*str, offset); if (newEntry && !newEntry->isValid()) { - qWarning() << "KMimeTypeFactory: corrupt object in KSycoca database!\n"; + qCWarning(SERVICES) << "KMimeTypeFactory: corrupt object in KSycoca database!\n"; delete newEntry; newEntry = nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kmimetypetrader.cpp new/kservice-5.42.0/src/services/kmimetypetrader.cpp --- old/kservice-5.41.0/src/services/kmimetypetrader.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kmimetypetrader.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -28,7 +28,7 @@ #include "kmimetypefactory_p.h" #include "servicesdebug.h" #include <qmimedatabase.h> -#include <QDebug> +#include "servicesdebug.h" class KMimeTypeTraderPrivate { @@ -67,7 +67,7 @@ QString mime = db.mimeTypeForName(mimeType).name(); if (mime.isEmpty()) { if (!mimeType.startsWith(QLatin1String("x-scheme-handler/"))) { // don't warn for unknown scheme handler mimetypes - qWarning() << "KMimeTypeTrader: mimeType" << mimeType << "not found"; + qCWarning(SERVICES) << "KMimeTypeTrader: mimeType" << mimeType << "not found"; return lst; // empty } mime = mimeType; @@ -96,7 +96,7 @@ QString mime = db.mimeTypeForName(mimeType).name(); if (mime.isEmpty()) { if (!mimeType.startsWith(QLatin1String("x-scheme-handler/"))) { // don't warn for unknown scheme handler mimetypes - qWarning() << "KMimeTypeTrader: mimeType" << mimeType << "not found"; + qCWarning(SERVICES) << "KMimeTypeTrader: mimeType" << mimeType << "not found"; return lst; // empty } mime = mimeType; @@ -105,7 +105,7 @@ KMimeTypeFactory *factory = KSycocaPrivate::self()->mimeTypeFactory(); const int offset = factory->entryOffset(mime); if (!offset) { - qWarning() << "KMimeTypeTrader: mimeType" << mimeType << "not found"; + qCWarning(SERVICES) << "KMimeTypeTrader: mimeType" << mimeType << "not found"; return lst; // empty } const int serviceOffersOffset = factory->serviceOffersOffset(mime); @@ -117,7 +117,7 @@ #define CHECK_SERVICETYPE(genericServiceTypePtr) \ if (!genericServiceTypePtr) { \ - qWarning() << "KMimeTypeTrader: couldn't find service type" << genericServiceType << \ + qCWarning(SERVICES) << "KMimeTypeTrader: couldn't find service type" << genericServiceType << \ "\nPlease ensure that the .desktop file for it is installed; then run kbuildsycoca5."; \ return; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kplugininfo.cpp new/kservice-5.42.0/src/services/kplugininfo.cpp --- old/kservice-5.41.0/src/services/kplugininfo.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kplugininfo.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -21,7 +21,7 @@ #include "kplugininfo.h" #include <QList> -#include <QDebug> +#include "servicesdebug.h" #include <QDirIterator> #include <QJsonArray> #include <QMimeDatabase> @@ -258,7 +258,7 @@ KConfigGroup cg = file.desktopGroup(); if (!cg.exists()) { - qWarning() << filename << "has no desktop group, cannot construct a KPluginInfo object from it."; + qCWarning(SERVICES) << filename << "has no desktop group, cannot construct a KPluginInfo object from it."; d.reset(); return; } @@ -269,7 +269,7 @@ d->setMetaData(KPluginMetaData(file.fileName()), true); if (!d->metaData.isValid()) { - qWarning() << "Failed to read metadata from .desktop file" << file.fileName(); + qCWarning(SERVICES) << "Failed to read metadata from .desktop file" << file.fileName(); d.reset(); } } @@ -635,7 +635,7 @@ } result = newResult; } else - qWarning() << "Cannot interpret" << result << "into a string list"; + qCWarning(SERVICES) << "Cannot interpret" << result << "into a string list"; } return result; } @@ -696,7 +696,7 @@ config.writeEntry(pluginName() + s_enabledKey(), isPluginEnabled()); } else { if (!d->config.isValid()) { - qWarning() << "no KConfigGroup, cannot save"; + qCWarning(SERVICES) << "no KConfigGroup, cannot save"; return; } d->config.writeEntry(pluginName() + s_enabledKey(), isPluginEnabled()); @@ -711,7 +711,7 @@ setPluginEnabled(config.readEntry(pluginName() + s_enabledKey(), isPluginEnabledByDefault())); } else { if (!d->config.isValid()) { - qWarning() << "no KConfigGroup, cannot load"; + qCWarning(SERVICES) << "no KConfigGroup, cannot load"; return; } setPluginEnabled(d->config.readEntry(pluginName() + s_enabledKey(), isPluginEnabledByDefault())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kservice.cpp new/kservice-5.42.0/src/services/kservice.cpp --- old/kservice-5.41.0/src/services/kservice.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kservice.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -98,7 +98,7 @@ return;*/ m_strType = QStringLiteral("Application"); } else if (m_strType != QLatin1String("Application") && m_strType != QLatin1String("Service")) { - qWarning() << "The desktop entry file " << entryPath + qCWarning(SERVICES) << "The desktop entry file " << entryPath << " has Type=" << m_strType << " instead of \"Application\" or \"Service\""; m_bValid = false; @@ -115,7 +115,7 @@ if (m_strType == QLatin1String("Application")) { // It's an application? Should have an Exec line then, otherwise we can't run it if (m_strExec.isEmpty()) { - qWarning() << "The desktop entry file" << entryPath << "has Type=" << m_strType << "but no Exec line"; + qCWarning(SERVICES) << "The desktop entry file" << entryPath << "has Type=" << m_strType << "but no Exec line"; m_bValid = false; return; } @@ -133,7 +133,7 @@ if ((m_strType == QLatin1String("Application")) && (resource != QStandardPaths::ApplicationsLocation) && !absPath) { - qWarning() << "The desktop entry file" << entryPath + qCWarning(SERVICES) << "The desktop entry file" << entryPath << "has Type=" << m_strType << "but is located under \"" << QStandardPaths::displayName(resource) << "\" instead of \"Applications\""; m_bValid = false; @@ -143,7 +143,7 @@ if ((m_strType == QLatin1String("Service")) && (resource != QStandardPaths::GenericDataLocation) && !absPath) { - qWarning() << "The desktop entry file" << entryPath + qCWarning(SERVICES) << "The desktop entry file" << entryPath << "has Type=" << m_strType << "but is located under \"" << QStandardPaths::displayName(resource) << "\" instead of \"Shared Data\"/kservices5"; m_bValid = false; @@ -186,7 +186,7 @@ m_strLibrary = desktopGroup.readEntry("X-KDE-Library"); entryMap.remove(QStringLiteral("X-KDE-Library")); if (!m_strLibrary.isEmpty() && m_strType == QLatin1String("Application")) { - qWarning() << "The desktop entry file" << entryPath << "has Type=" << m_strType + qCWarning(SERVICES) << "The desktop entry file" << entryPath << "has Type=" << m_strType << "but also has a X-KDE-Library key. This works for now," " but makes user-preference handling difficult, so support for this might" " be removed at some point. Consider splitting it into two desktop files."; @@ -215,7 +215,7 @@ while (st_it.hasNext()) { const QString st = st_it.next(); if (st.isEmpty()) { - qWarning() << "The desktop entry file" << entryPath << "has an empty mimetype!"; + qCWarning(SERVICES) << "The desktop entry file" << entryPath << "has an empty mimetype!"; continue; } int initialPreference = m_initialPreference; @@ -293,7 +293,7 @@ if (config->hasActionGroup(group)) { const KConfigGroup cg = config->actionGroup(group); if (!cg.hasKey("Name") || !cg.hasKey("Exec")) { - qWarning() << "The action" << group << "in the desktop file" << q->entryPath() << "has no Name or no Exec key"; + qCWarning(SERVICES) << "The action" << group << "in the desktop file" << q->entryPath() << "has no Name or no Exec key"; } else { m_actions.append(KServiceAction(group, cg.readEntry("Name"), @@ -302,7 +302,7 @@ cg.readEntry("NoDisplay", false))); } } else { - qWarning() << "The desktop file" << q->entryPath() << "references the action" << group << "but doesn't define it"; + qCWarning(SERVICES) << "The desktop file" << q->entryPath() << "references the action" << group << "but doesn't define it"; } } } @@ -863,7 +863,7 @@ { Q_D(const KService); if (d->m_strType == QLatin1String("Application") && d->m_strExec.isEmpty()) { - qWarning() << "The desktop entry file " << entryPath() + qCWarning(SERVICES) << "The desktop entry file " << entryPath() << " has Type=" << d->m_strType << " but has no Exec field."; } return d->m_strExec; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kservicefactory.cpp new/kservice-5.42.0/src/services/kservicefactory.cpp --- old/kservice-5.41.0/src/services/kservicefactory.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kservicefactory.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -22,7 +22,7 @@ #include "ksycocadict_p.h" #include "kservice.h" #include "servicesdebug.h" -#include <QDebug> +#include "servicesdebug.h" #include <QDir> #include <QFile> @@ -212,12 +212,12 @@ KSycocaType type; QDataStream *str = sycoca()->findEntry(offset, type); if (type != KST_KService) { - qWarning() << "KServiceFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; + qCWarning(SERVICES) << "KServiceFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; return nullptr; } KService *newEntry = new KService(*str, offset); if (!newEntry->isValid()) { - qWarning() << "KServiceFactory: corrupt object in KSycoca database!"; + qCWarning(SERVICES) << "KServiceFactory: corrupt object in KSycoca database!"; delete newEntry; newEntry = nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kservicegroup.cpp new/kservice-5.42.0/src/services/kservicegroup.cpp --- old/kservice-5.41.0/src/services/kservicegroup.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kservicegroup.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -26,7 +26,7 @@ #include <ksycoca.h> #include <kdesktopfile.h> #include <kconfiggroup.h> -#include <QDebug> +#include "servicesdebug.h" KServiceGroup::KServiceGroup(const QString &name) : KSycocaEntry(*new KServiceGroupPrivate(name)) @@ -61,7 +61,6 @@ m_bNoDisplay = desktopFile.noDisplay(); m_strBaseGroupName = config.readEntry("X-KDE-BaseGroup"); suppressGenericNames = config.readEntry("X-KDE-SuppressGenericNames", QStringList()); -// d->sortOrder = config.readEntry("SortOrder", QStringList()); // Fill in defaults. if (m_strCaption.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kservicegroupfactory.cpp new/kservice-5.42.0/src/services/kservicegroupfactory.cpp --- old/kservice-5.41.0/src/services/kservicegroupfactory.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kservicegroupfactory.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -22,7 +22,7 @@ #include "ksycocadict_p.h" #include "kservice.h" -#include <QDebug> +#include "servicesdebug.h" KServiceGroupFactory::KServiceGroupFactory(KSycoca *db) : KSycocaFactory(KST_KServiceGroupFactory, db) @@ -101,13 +101,13 @@ KSycocaType type; QDataStream *str = sycoca()->findEntry(offset, type); if (type != KST_KServiceGroup) { - qWarning() << "KServiceGroupFactory: unexpected object entry in KSycoca database (type = " << int(type) << ")"; + qCWarning(SERVICES) << "KServiceGroupFactory: unexpected object entry in KSycoca database (type = " << int(type) << ")"; return nullptr; } KServiceGroup *newEntry = new KServiceGroup(*str, offset, deep); if (!newEntry->isValid()) { - qWarning() << "KServiceGroupFactory: corrupt object in KSycoca database!"; + qCWarning(SERVICES) << "KServiceGroupFactory: corrupt object in KSycoca database!"; delete newEntry; newEntry = nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kservicetype.cpp new/kservice-5.42.0/src/services/kservicetype.cpp --- old/kservice-5.41.0/src/services/kservicetype.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kservicetype.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -28,7 +28,7 @@ #include <assert.h> #include <kdesktopfile.h> #include <kconfiggroup.h> -#include <QDebug> +#include "servicesdebug.h" extern int servicesDebugArea(); @@ -210,7 +210,7 @@ KSycoca::self()->ensureCacheValid(); d->parentType = KSycocaPrivate::self()->serviceTypeFactory()->findServiceTypeByName(parentSt); if (!d->parentType) { - qWarning() << entryPath() << "specifies undefined mimetype/servicetype" << parentSt; + qCWarning(SERVICES) << entryPath() << "specifies undefined mimetype/servicetype" << parentSt; } return d->parentType; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kservicetypefactory.cpp new/kservice-5.42.0/src/services/kservicetypefactory.cpp --- old/kservice-5.41.0/src/services/kservicetypefactory.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kservicetypefactory.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -22,7 +22,7 @@ #include "ksycocatype.h" #include "ksycocadict_p.h" #include "kservicetypeprofile.h" -#include <QDebug> +#include "servicesdebug.h" #include <assert.h> @@ -118,13 +118,13 @@ } if (type != KST_KServiceType) { - qWarning() << "KServiceTypeFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; + qCWarning(SERVICES) << "KServiceTypeFactory: unexpected object entry in KSycoca database (type=" << int(type) << ")"; return nullptr; } KServiceType *newEntry = new KServiceType(*str, offset); if (newEntry && !newEntry->isValid()) { - qWarning() << "KServiceTypeFactory: corrupt object in KSycoca database!"; + qCWarning(SERVICES) << "KServiceTypeFactory: corrupt object in KSycoca database!"; delete newEntry; newEntry = nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/kservicetypetrader.cpp new/kservice-5.42.0/src/services/kservicetypetrader.cpp --- old/kservice-5.41.0/src/services/kservicetypetrader.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/kservicetypetrader.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -27,7 +27,7 @@ #include "kservicetypefactory_p.h" #include "kservicefactory_p.h" -#include <QDebug> +#include "servicesdebug.h" using namespace KTraderParse; @@ -104,7 +104,7 @@ KSycoca::self()->ensureCacheValid(); KServiceType::Ptr servTypePtr = KSycocaPrivate::self()->serviceTypeFactory()->findServiceTypeByName(serviceType); if (!servTypePtr) { - qWarning() << "KServiceTypeTrader: serviceType" << serviceType << "not found"; + qCWarning(SERVICES) << "KServiceTypeTrader: serviceType" << serviceType << "not found"; return KServiceOfferList(); } if (servTypePtr->serviceOffersOffset() == -1) { // no offers in ksycoca @@ -130,7 +130,7 @@ KSycoca::self()->ensureCacheValid(); KServiceType::Ptr servTypePtr = KSycocaPrivate::self()->serviceTypeFactory()->findServiceTypeByName(serviceType); if (!servTypePtr) { - qWarning() << "KServiceTypeTrader: serviceType" << serviceType << "not found"; + qCWarning(SERVICES) << "KServiceTypeTrader: serviceType" << serviceType << "not found"; return KService::List(); } if (servTypePtr->serviceOffersOffset() == -1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/ktraderparse.cpp new/kservice-5.42.0/src/services/ktraderparse.cpp --- old/kservice-5.41.0/src/services/ktraderparse.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/ktraderparse.cpp 2018-01-07 17:20:51.000000000 +0100 @@ -32,7 +32,7 @@ #include <stdlib.h> #include <QThreadStorage> -#include <QDebug> +#include "servicesdebug.h" namespace KTraderParse { @@ -67,7 +67,7 @@ void KTraderParse_error(const char *err) { - qWarning() << "Parsing" << s_parsingData()->localData()->buffer << "gave:" << err; + qCWarning(SERVICES) << "Parsing" << s_parsingData()->localData()->buffer << "gave:" << err; } void *KTraderParse_newOR(void *_ptr1, void *_ptr2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/servicesdebug.cpp new/kservice-5.42.0/src/services/servicesdebug.cpp --- old/kservice-5.41.0/src/services/servicesdebug.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/servicesdebug.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "servicesdebug.h" - -#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) -// logging category for this framework, default: log stuff >= warning -Q_LOGGING_CATEGORY(SERVICES, "kf5.kservice.services", QtWarningMsg) -#else -Q_LOGGING_CATEGORY(SERVICES, "kf5.kservice.services") -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/services/servicesdebug.h new/kservice-5.42.0/src/services/servicesdebug.h --- old/kservice-5.41.0/src/services/servicesdebug.h 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/services/servicesdebug.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef KSERVICE_SERVICES_DEBUG_H -#define KSERVICE_SERVICES_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(SERVICES) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/sycoca/sycocadebug.cpp new/kservice-5.42.0/src/sycoca/sycocadebug.cpp --- old/kservice-5.41.0/src/sycoca/sycocadebug.cpp 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/sycoca/sycocadebug.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "sycocadebug.h" - -#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) -// logging category for this framework, default: log stuff >= warning -Q_LOGGING_CATEGORY(SYCOCA, "kf5.kservice.sycoca", QtWarningMsg) -#else -Q_LOGGING_CATEGORY(SYCOCA, "kf5.kservice.sycoca") -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/src/sycoca/sycocadebug.h new/kservice-5.42.0/src/sycoca/sycocadebug.h --- old/kservice-5.41.0/src/sycoca/sycocadebug.h 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/src/sycoca/sycocadebug.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef KSERVICE_SYCOCA_DEBUG_H -#define KSERVICE_SYCOCA_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(SYCOCA) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.41.0/tests/CMakeLists.txt new/kservice-5.42.0/tests/CMakeLists.txt --- old/kservice-5.41.0/tests/CMakeLists.txt 2017-12-02 21:08:04.000000000 +0100 +++ new/kservice-5.42.0/tests/CMakeLists.txt 2018-01-07 17:20:51.000000000 +0100 @@ -21,7 +21,11 @@ kservicegroup_dumper findservice ) +set(kmimeassociations_dumper_debug_SRCS) +ecm_qt_declare_logging_category(kmimeassociations_dumper_debug_SRCS HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf5.kservice.sycoca) +set(kmimeassociations_dumper_SRCS kmimeassociations_dumper.cpp ../src/sycoca/kmimeassociations.cpp ${kmimeassociations_dumper_debug_SRCS}) + +add_executable(kmimeassociations_dumper ${kmimeassociations_dumper_SRCS}) -add_executable(kmimeassociations_dumper kmimeassociations_dumper.cpp ../src/sycoca/kmimeassociations.cpp ../src/sycoca/sycocadebug.cpp) target_link_libraries(kmimeassociations_dumper KF5::Service) ecm_mark_as_test(kmimeassociations_dumper)
