Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2021-03-16 15:40:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kded (Old) and /work/SRC/openSUSE:Factory/.kded.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded" Tue Mar 16 15:40:22 2021 rev:90 rq:878797 version:5.80.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kded/kded.changes 2021-02-17 18:11:48.713953950 +0100 +++ /work/SRC/openSUSE:Factory/.kded.new.2401/kded.changes 2021-03-16 15:41:38.532771949 +0100 @@ -1,0 +2,10 @@ +Sun Mar 7 09:26:44 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.80.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.80.0 +- Changes since 5.79.0: + * Make QByteArray -> char* conversion explicit + +------------------------------------------------------------------- Old: ---- kded-5.79.0.tar.xz kded-5.79.0.tar.xz.sig New: ---- kded-5.80.0.tar.xz kded-5.80.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.ZsarXk/_old 2021-03-16 15:41:39.128772903 +0100 +++ /var/tmp/diff_new_pack.ZsarXk/_new 2021-03-16 15:41:39.132772910 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.79 +%define _tar_path 5.80 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kded -Version: 5.79.0 +Version: 5.80.0 Release: 0 Summary: Central daemon of KDE workspaces License: LGPL-2.1-or-later ++++++ kded-5.79.0.tar.xz -> kded-5.80.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/.git-blame-ignore-revs new/kded-5.80.0/.git-blame-ignore-revs --- old/kded-5.79.0/.git-blame-ignore-revs 1970-01-01 01:00:00.000000000 +0100 +++ new/kded-5.80.0/.git-blame-ignore-revs 2021-03-06 17:21:46.000000000 +0100 @@ -0,0 +1,3 @@ +#clang-format +d88258e39caa2af3ac698629601adac1424a9bf4 +060fbd7d8d3c4fb8e27864e8cea4cffb6c8e9ef9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/.gitignore new/kded-5.80.0/.gitignore --- old/kded-5.79.0/.gitignore 2021-02-06 19:13:54.000000000 +0100 +++ new/kded-5.80.0/.gitignore 2021-03-06 17:21:46.000000000 +0100 @@ -21,3 +21,4 @@ *.unc-backup* .cmake/ /.clang-format +/compile_commands.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/CMakeLists.txt new/kded-5.80.0/CMakeLists.txt --- old/kded-5.79.0/CMakeLists.txt 2021-02-06 19:13:54.000000000 +0100 +++ new/kded-5.80.0/CMakeLists.txt 2021-03-06 17:21:46.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.79.0") # handled by release scripts -set(KF_DEP_VERSION "5.79.0") # handled by release scripts +set(KF_VERSION "5.80.0") # handled by release scripts +set(KF_DEP_VERSION "5.80.0") # handled by release scripts project(KDED VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.79.0 NO_MODULE) +find_package(ECM 5.80.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -17,6 +17,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(KDEGitCommitHooks) find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED) @@ -41,7 +42,7 @@ # We don't install kded_version.h, it's only useful internally # (given that this framework produces no library) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054B00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054F00) add_definitions(-DQT_NO_FOREACH) if (KF5DocTools_FOUND) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") @@ -72,3 +73,5 @@ install(FILES org.kde.kded5.desktop DESTINATION ${KDE_INSTALL_APPDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + +kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/org.kde.kded5.desktop new/kded-5.80.0/org.kde.kded5.desktop --- old/kded-5.79.0/org.kde.kded5.desktop 2021-02-06 19:13:54.000000000 +0100 +++ new/kded-5.80.0/org.kde.kded5.desktop 2021-03-06 17:21:46.000000000 +0100 @@ -23,6 +23,7 @@ Name[pt]=KDED Name[pt_BR]=KDED Name[ro]=KDED +Name[ru]=KDED Name[sk]=KDED Name[sl]=KDED Name[sv]=KDED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/src/kded.cpp new/kded-5.80.0/src/kded.cpp --- old/kded-5.79.0/src/kded.cpp 2021-02-06 19:13:54.000000000 +0100 +++ new/kded-5.80.0/src/kded.cpp 2021-03-06 17:21:46.000000000 +0100 @@ -7,30 +7,30 @@ */ #include "kded.h" -#include "kdedadaptor.h" #include "kded_version.h" +#include "kdedadaptor.h" #include <KCrash> #include <qplatformdefs.h> -#include <QLoggingCategory> -#include <QDir> -#include <QCommandLineParser> #include <QApplication> +#include <QCommandLineParser> +#include <QDir> +#include <QLoggingCategory> #include <QProcess> #include <QDBusConnection> #include <QDBusConnectionInterface> #include <QDBusServiceWatcher> -#include <KDBusService> #include <KConfigGroup> -#include <KSharedConfig> +#include <KDBusService> #include <KDirWatch> -#include <KServiceTypeTrader> #include <KPluginInfo> #include <KPluginMetaData> +#include <KServiceTypeTrader> +#include <KSharedConfig> #ifdef Q_OS_OSX #include <CoreFoundation/CoreFoundation.h> @@ -69,8 +69,7 @@ m_serviceWatcher = new QDBusServiceWatcher(this); m_serviceWatcher->setConnection(QDBusConnection::sessionBus()); m_serviceWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration); - QObject::connect(m_serviceWatcher, &QDBusServiceWatcher::serviceUnregistered, - this, &Kded::slotApplicationRemoved); + QObject::connect(m_serviceWatcher, &QDBusServiceWatcher::serviceUnregistered, this, &Kded::slotApplicationRemoved); new KBuildsycocaAdaptor(this); new KdedAdaptor(this); @@ -82,7 +81,7 @@ qDBusAddSpyHook(messageFilter); m_pTimer->setSingleShot(true); - connect(m_pTimer, &QTimer::timeout, this, static_cast<void(Kded::*)()>(&Kded::recreate)); + connect(m_pTimer, &QTimer::timeout, this, static_cast<void (Kded::*)()>(&Kded::recreate)); } Kded::~Kded() @@ -92,15 +91,12 @@ delete m_pTimer; delete m_pDirWatch; - for (QHash<QString, KDEDModule *>::const_iterator - it(m_modules.constBegin()), itEnd(m_modules.constEnd()); - it != itEnd; ++it) { + for (QHash<QString, KDEDModule *>::const_iterator it(m_modules.constBegin()), itEnd(m_modules.constEnd()); it != itEnd; ++it) { KDEDModule *module(it.value()); // first disconnect otherwise slotKDEDModuleRemoved() is called // and changes m_modules while we're iterating over it - disconnect(module, &KDEDModule::moduleDeleted, - this, &Kded::slotKDEDModuleRemoved); + disconnect(module, &KDEDModule::moduleDeleted, this, &Kded::slotKDEDModuleRemoved); delete module; } @@ -143,18 +139,20 @@ } #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) // also search for old .desktop based kded modules -QT_WARNING_PUSH -QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") -QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") + QT_WARNING_PUSH + QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") + QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") const KPluginInfo::List oldStylePlugins = KPluginInfo::fromServices(KServiceTypeTrader::self()->query(QStringLiteral("KDEDModule"))); -QT_WARNING_POP + QT_WARNING_POP for (const KPluginInfo &info : oldStylePlugins) { if (moduleIds.contains(info.pluginName())) { - qCWarning(KDED).nospace() << "kded module " << info.pluginName() << " has already been found using " - "JSON metadata, please don't install the now unneeded .desktop file (" << info.entryPath() << ")."; + qCWarning(KDED).nospace() << "kded module " << info.pluginName() + << " has already been found using " + "JSON metadata, please don't install the now unneeded .desktop file (" + << info.entryPath() << ")."; } else { - qCDebug(KDED).nospace() << "kded module " << info.pluginName() << " still uses .desktop files (" - << info.entryPath() << "). Please port it to JSON metadata."; + qCDebug(KDED).nospace() << "kded module " << info.pluginName() << " still uses .desktop files (" << info.entryPath() + << "). Please port it to JSON metadata."; plugins.append(info.toMetaData()); } } @@ -172,13 +170,13 @@ // TODO KF6: remove the .desktop fallback code KService::Ptr oldStyleModule = KService::serviceByDesktopPath(QStringLiteral("kded/") + id + QStringLiteral(".desktop")); if (oldStyleModule) { - qCDebug(KDED).nospace() << "kded module " << oldStyleModule->desktopEntryName() - << " still uses .desktop files (" << oldStyleModule->entryPath() << "). Please port it to JSON metadata."; -QT_WARNING_PUSH -QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") -QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") + qCDebug(KDED).nospace() << "kded module " << oldStyleModule->desktopEntryName() << " still uses .desktop files (" << oldStyleModule->entryPath() + << "). Please port it to JSON metadata."; + QT_WARNING_PUSH + QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") + QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") return KPluginInfo(oldStyleModule).toMetaData(); -QT_WARNING_POP + QT_WARNING_POP } #endif qCWarning(KDED) << "could not find kded module with id" << id; @@ -204,7 +202,7 @@ kde_running = false; } #endif - //TODO: Change 5 to KDED_VERSION_MAJOR the moment KF5 are stable + // TODO: Change 5 to KDED_VERSION_MAJOR the moment KF5 are stable // not the same kde version as the current desktop const QByteArray kdeSession = qgetenv("KDE_SESSION_VERSION"); if (kdeSession.toInt() != 5) { @@ -374,19 +372,18 @@ KPluginLoader loader2(QStringLiteral("kded_") + module.fileName()); factory = loader2.factory(); if (factory) { - qCWarning(KDED).nospace() << "found kded module " << moduleId - << " by prepending 'kded_' to the library path, please fix your metadata."; + qCWarning(KDED).nospace() << "found kded module " << moduleId << " by prepending 'kded_' to the library path, please fix your metadata."; kdedModule = factory->create<KDEDModule>(this); } else { - qCWarning(KDED).nospace() << "Could not load kded module " << moduleId << ":" - << loader.errorString() << " (library path was:" << module.fileName() << ")"; + qCWarning(KDED).nospace() << "Could not load kded module " << moduleId << ":" << loader.errorString() << " (library path was:" << module.fileName() + << ")"; } } if (kdedModule) { kdedModule->setModuleName(moduleId); m_modules.insert(moduleId, kdedModule); - //m_libs.insert(moduleId, lib); + // m_libs.insert(moduleId, lib); connect(kdedModule, &KDEDModule::moduleDeleted, this, &Kded::slotKDEDModuleRemoved); qCDebug(KDED) << "Successfully loaded module" << moduleId; return kdedModule; @@ -425,8 +422,7 @@ #endif m_serviceWatcher->removeWatchedService(name); const QList<qlonglong> windowIds = m_windowIdList.value(name); - for (QList<qlonglong>::ConstIterator it = windowIds.begin(); - it != windowIds.end(); ++it) { + for (QList<qlonglong>::ConstIterator it = windowIds.begin(); it != windowIds.end(); ++it) { qlonglong windowId = *it; m_globalWindowIdList.remove(windowId); for (KDEDModule *module : qAsConst(m_modules)) { @@ -445,17 +441,12 @@ delete m_pDirWatch; m_pDirWatch = new KDirWatch; - QObject::connect(m_pDirWatch, &KDirWatch::dirty, - this, &Kded::update); - QObject::connect(m_pDirWatch, &KDirWatch::created, - this, &Kded::update); - QObject::connect(m_pDirWatch, &KDirWatch::deleted, - this, &Kded::dirDeleted); + QObject::connect(m_pDirWatch, &KDirWatch::dirty, this, &Kded::update); + QObject::connect(m_pDirWatch, &KDirWatch::created, this, &Kded::update); + QObject::connect(m_pDirWatch, &KDirWatch::deleted, this, &Kded::dirDeleted); // For each resource - for (QStringList::ConstIterator it = m_allResourceDirs.constBegin(); - it != m_allResourceDirs.constEnd(); - ++it) { + for (QStringList::ConstIterator it = m_allResourceDirs.constBegin(); it != m_allResourceDirs.constEnd(); ++it) { readDirectory(*it); } } @@ -474,9 +465,7 @@ const QStringList dirs = KSycoca::self()->allResourceDirs(); // For each resource - for (QStringList::ConstIterator it = dirs.begin(); - it != dirs.end(); - ++it) { + for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { if (!m_allResourceDirs.contains(*it)) { m_allResourceDirs.append(*it); readDirectory(*it); @@ -508,7 +497,7 @@ recreateDone(); } else { if (!delayedCheck) { - updateDirWatch(); // this would search all the directories + updateDirWatch(); // this would search all the directories } if (bCheckSycoca) { KSycoca::self()->ensureCacheValid(); @@ -549,12 +538,12 @@ path += QLatin1Char('/'); } - if (m_pDirWatch->contains(path)) { // Already seen this one? + if (m_pDirWatch->contains(path)) { // Already seen this one? return; } Q_ASSERT(path != QDir::homePath()); - m_pDirWatch->addDir(path, KDirWatch::WatchFiles | KDirWatch::WatchSubDirs); // add watch on this dir + m_pDirWatch->addDir(path, KDirWatch::WatchFiles | KDirWatch::WatchSubDirs); // add watch on this dir } void Kded::registerWindowId(qlonglong windowId, const QString &sender) @@ -607,13 +596,10 @@ m_pTimer = new QTimer(this); m_pTimer->setSingleShot(true); connect(m_pTimer, &QTimer::timeout, this, &KUpdateD::runKonfUpdate); - QObject::connect(m_pDirWatch, &KDirWatch::dirty, - this, &KUpdateD::slotNewUpdateFile); + QObject::connect(m_pDirWatch, &KDirWatch::dirty, this, &KUpdateD::slotNewUpdateFile); const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory); - for (QStringList::ConstIterator it = dirs.begin(); - it != dirs.end(); - ++it) { + for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { QString path = *it; Q_ASSERT(path != QDir::homePath()); if (path[path.length() - 1] != QLatin1Char('/')) { @@ -678,10 +664,11 @@ return false; } for (int i = 0; i < argc; i++) { - if (qstrcmp(argv[i], "-platform") == 0 || - qstrcmp(argv[i], "--platform") == 0 || - QByteArray(argv[i]).startsWith("-platform=") || - QByteArray(argv[i]).startsWith("--platform=")) { + /* clang-format off */ + if (qstrcmp(argv[i], "-platform") == 0 + || qstrcmp(argv[i], "--platform") == 0 + || QByteArray(argv[i]).startsWith("-platform=") + || QByteArray(argv[i]).startsWith("--platform=")) { /* clang-format on */ return false; } } @@ -689,10 +676,10 @@ if (sessionType.isEmpty()) { return false; } - if (qstrcmp(sessionType, "wayland") == 0) { + if (qstrcmp(sessionType.data(), "wayland") == 0) { qputenv("QT_QPA_PLATFORM", "wayland"); return true; - } else if (qstrcmp(sessionType, "x11") == 0) { + } else if (qstrcmp(sessionType.data(), "x11") == 0) { qputenv("QT_QPA_PLATFORM", "xcb"); return true; } @@ -706,7 +693,7 @@ if (mainBundle) { // get the application's Info Dictionary. For app bundles this would live in the bundle's Info.plist, // for regular executables it is obtained in another way. - CFMutableDictionaryRef infoDict = (CFMutableDictionaryRef) CFBundleGetInfoDictionary(mainBundle); + CFMutableDictionaryRef infoDict = (CFMutableDictionaryRef)CFBundleGetInfoDictionary(mainBundle); if (infoDict) { // Add or set the "LSUIElement" key with/to value "1". This can simply be a CFString. CFDictionarySetValue(infoDict, CFSTR("LSUIElement"), CFSTR("1")); @@ -715,7 +702,7 @@ } } #endif - //options.add("check", qi18n("Check Sycoca database only once")); + // options.add("check", qi18n("Check Sycoca database only once")); // WABA: Make sure not to enable session management. qunsetenv("SESSION_MANAGER"); @@ -726,7 +713,7 @@ // testing for --check, in which case, only a QCoreApplication was created. // Since that option is no longer used at startup, we removed that speed // optimization for code clarity and easier support of standard parameters. - + // Fixes blurry icons with Fractional scaling QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); @@ -787,7 +774,7 @@ kded->recreate(true); // initial if (bCheckUpdates) { - (void) new KUpdateD; // Watch for updates + (void)new KUpdateD; // Watch for updates } runKonfUpdate(); // Run it once. @@ -798,4 +785,3 @@ return result; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/src/kded.h new/kded-5.80.0/src/kded.h --- old/kded-5.79.0/src/kded.h 2021-02-06 19:13:54.000000000 +0100 +++ new/kded-5.80.0/src/kded.h 2021-03-06 17:21:46.000000000 +0100 @@ -9,16 +9,16 @@ #ifndef KDED_H #define KDED_H +#include <QHash> #include <QObject> +#include <QSet> #include <QString> #include <QTimer> -#include <QHash> -#include <QSet> #include <QDBusAbstractAdaptor> -#include <ksycoca.h> #include <KDEDModule> +#include <ksycoca.h> class QDBusMessage; class QDBusServiceWatcher; @@ -42,7 +42,7 @@ QStringList loadedModules(); bool unloadModule(const QString &obj); - //bool isWindowRegistered(qlonglong windowId) const; + // bool isWindowRegistered(qlonglong windowId) const; /** * Applications can register/unregister their windows with kded modules. * This allows kpasswdserver and kcookiejar to delete authentication @@ -195,12 +195,12 @@ QTimer *m_pTimer; QHash<QString, KDEDModule *> m_modules; - //QHash<QString,KLibrary *> m_libs; + // QHash<QString,KLibrary *> m_libs; QHash<QString, QObject *> m_dontLoad; - //window id tracking, with a QDBusServiceWatcher to remove them as needed + // window id tracking, with a QDBusServiceWatcher to remove them as needed QDBusServiceWatcher *m_serviceWatcher; - QHash<QString, QList<qlonglong> > m_windowIdList; + QHash<QString, QList<qlonglong>> m_windowIdList; QSet<long> m_globalWindowIdList; QStringList m_allResourceDirs; @@ -209,7 +209,7 @@ static Kded *_self; }; -class KBuildsycocaAdaptor: public QDBusAbstractAdaptor +class KBuildsycocaAdaptor : public QDBusAbstractAdaptor { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kbuildsycoca") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/src/kdedadaptor.cpp new/kded-5.80.0/src/kdedadaptor.cpp --- old/kded-5.79.0/src/kdedadaptor.cpp 2021-02-06 19:13:54.000000000 +0100 +++ new/kded-5.80.0/src/kdedadaptor.cpp 2021-03-06 17:21:46.000000000 +0100 @@ -72,4 +72,3 @@ { QCoreApplication::instance()->quit(); } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.79.0/src/kdedadaptor.h new/kded-5.80.0/src/kdedadaptor.h --- old/kded-5.79.0/src/kdedadaptor.h 2021-02-06 19:13:54.000000000 +0100 +++ new/kded-5.80.0/src/kdedadaptor.h 2021-03-06 17:21:46.000000000 +0100 @@ -12,7 +12,7 @@ #include <QDBusAbstractAdaptor> class QDBusMessage; -class KdedAdaptor: public QDBusAbstractAdaptor +class KdedAdaptor : public QDBusAbstractAdaptor { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kded5") @@ -23,7 +23,7 @@ bool loadModule(const QString &obj); QStringList loadedModules(); bool unloadModule(const QString &obj); - //bool isWindowRegistered(qlonglong windowId) const; + // bool isWindowRegistered(qlonglong windowId) const; void registerWindowId(qlonglong windowId, const QDBusMessage &); void unregisterWindowId(qlonglong windowId, const QDBusMessage &); void reconfigure();
