Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2020-08-12 12:25:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Wed Aug 12 12:25:08 2020 rev:80 rq:825104 version:5.73.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2020-07-16 12:09:02.338393648 +0200 +++ /work/SRC/openSUSE:Factory/.krunner.new.3399/krunner.changes 2020-08-12 12:29:12.092176379 +0200 @@ -1,0 +2,18 @@ +Sun Aug 2 07:13:45 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.73.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.73.0 +- Changes since 5.72.0: + * Remove unused forward declaration + * Implement KConfig watcher for enabled plugins and runner KCMs + * Do not remove virtual method from build (kde#423003) + * Deprecate AbstractRunner::dataEngine(...) + * Fix disabled runners and runner config for plasmoid + * Use KF-standardized Qt logging categories + * Delay emitting metadata porting warnings until KF 5.75 +- Drop krunner/0001-Do-not-remove-virtual-method-from-build.patch + * Merged upstream. + +------------------------------------------------------------------- Old: ---- 0001-Do-not-remove-virtual-method-from-build.patch krunner-5.72.0.tar.xz krunner-5.72.0.tar.xz.sig New: ---- krunner-5.73.0.tar.xz krunner-5.73.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.lxdPmJ/_old 2020-08-12 12:29:12.652176362 +0200 +++ /var/tmp/diff_new_pack.lxdPmJ/_new 2020-08-12 12:29:12.652176362 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Runner5 -%define _tar_path 5.72 +%define _tar_path 5.73 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: krunner -Version: 5.72.0 +Version: 5.73.0 Release: 0 Summary: KDE Framework for providing different actions given a string query License: LGPL-2.1-or-later @@ -37,8 +37,6 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch1: 0001-Do-not-remove-virtual-method-from-build.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -78,7 +76,7 @@ Files needed for developing custom runners or frontends. %prep -%autosetup -p1 +%setup -q %build %cmake_kf5 -d build @@ -98,6 +96,7 @@ %{_kf5_qmldir}/ %{_kf5_servicetypesdir}/plasma-runner.desktop %{_kf5_debugdir}/*.categories +%{_kf5_debugdir}/*.renamecategories %files devel #doc COPYING* README* ++++++ krunner-5.72.0.tar.xz -> krunner-5.73.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/CMakeLists.txt new/krunner-5.73.0/CMakeLists.txt --- old/krunner-5.72.0/CMakeLists.txt 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/CMakeLists.txt 2020-08-01 19:11:06.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.72.0") # handled by release scripts -set(KF5_DEP_VERSION "5.72.0") # handled by release scripts +set(KF5_VERSION "5.73.0") # handled by release scripts +set(KF5_DEP_VERSION "5.73.0") # handled by release scripts project(KRunner VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.72.0 NO_MODULE) +find_package(ECM 5.73.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/autotests/runnercontexttest.cpp new/krunner-5.73.0/autotests/runnercontexttest.cpp --- old/krunner-5.72.0/autotests/runnercontexttest.cpp 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/autotests/runnercontexttest.cpp 2020-08-01 19:11:06.000000000 +0200 @@ -19,9 +19,10 @@ #include "runnercontexttest.h" -#include <kprotocolinfo.h> #include "runnercontext.h" +#include <KProtocolInfo> + #include <QDir> Q_DECLARE_METATYPE(Plasma::RunnerContext::Type) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/CMakeLists.txt new/krunner-5.73.0/src/CMakeLists.txt --- old/krunner-5.72.0/src/CMakeLists.txt 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/CMakeLists.txt 2020-08-01 19:11:06.000000000 +0200 @@ -17,7 +17,8 @@ ecm_qt_declare_logging_category(KF5Runner_SRCS HEADER krunner_debug.h IDENTIFIER KRUNNER - CATEGORY_NAME org.kde.krunner + CATEGORY_NAME kf.runner + OLD_CATEGORY_NAMES org.kde.krunner DESCRIPTION "KRunner" EXPORT KRUNNER ) @@ -31,7 +32,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.28 5.71 5.72 + DEPRECATION_VERSIONS 5.28 5.71 5.72 5.73 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/abstractrunner.cpp new/krunner-5.73.0/src/abstractrunner.cpp --- old/krunner-5.72.0/src/abstractrunner.cpp 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/abstractrunner.cpp 2020-08-01 19:11:06.000000000 +0200 @@ -26,14 +26,13 @@ #include <QMimeData> #include <QMutex> -#include "krunner_debug.h" -#include <ksharedconfig.h> -#include <klocalizedstring.h> +#include <KSharedConfig> +#include <KLocalizedString> #if KRUNNER_BUILD_DEPRECATED_SINCE(5, 65) #include <Plasma/Package> #endif -#include <qstandardpaths.h> +#include "krunner_debug.h" #include "querymatch.h" #include "runnercontext.h" @@ -103,7 +102,7 @@ group = QStringLiteral("UnnamedRunner"); } - KConfigGroup runners(KSharedConfig::openConfig(), "Runners"); + KConfigGroup runners(KSharedConfig::openConfig(QStringLiteral("krunnerrc")), "Runners"); return KConfigGroup(&runners, group); } @@ -377,10 +376,12 @@ reloadConfiguration(); } +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 73) DataEngine *AbstractRunner::dataEngine(const QString &name) const { return d->dataEngine(name); } +#endif bool AbstractRunner::isMatchingSuspended() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/abstractrunner.h new/krunner-5.73.0/src/abstractrunner.h --- old/krunner-5.72.0/src/abstractrunner.h 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/abstractrunner.h 2020-08-01 19:11:06.000000000 +0200 @@ -24,17 +24,18 @@ #include <QStringList> #include <QIcon> -#include <kconfiggroup.h> -#include <kservice.h> -#include <kplugininfo.h> -#include <kpluginmetadata.h> +#include <KConfigGroup> +#include <KService> +#include <KPluginInfo> +#include <KPluginMetaData> + +#include <plasma_version.h> +#include <plasma/plasma_export.h> // for PLASMA_ENABLE_DEPRECATED_SINCE #include "krunner_export.h" #include "querymatch.h" #include "runnercontext.h" #include "runnersyntax.h" -#include <plasma_version.h> -#include <plasma/plasma_export.h> // for PLASMA_ENABLE_DEPRECATED_SINCE class QAction; class QMimeData; @@ -160,7 +161,7 @@ bool hasRunOptions(); #endif -#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) /** * If hasRunOptions() returns true, this method may be called to get * a widget displaying the options the user can interact with to modify @@ -488,6 +489,7 @@ */ void setSyntaxes(const QList<RunnerSyntax> &syns); +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 73) /** * Loads the given DataEngine * @@ -506,8 +508,11 @@ * could not be loaded * * @since 4.4 + * @deprecated Since 5.73, DataEngines are deprecated, use e.g. a shared library to provide the data instead. */ + KRUNNER_DEPRECATED_VERSION(5, 73, "DataEngines are deprecated, use e.g. a shared library to provide the data instead.") Q_INVOKABLE DataEngine *dataEngine(const QString &name) const; +#endif /** * Reimplement this slot to run any initialization routines on first load. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/abstractrunner_p.h new/krunner-5.73.0/src/abstractrunner_p.h --- old/krunner-5.72.0/src/abstractrunner_p.h 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/abstractrunner_p.h 2020-08-01 19:11:06.000000000 +0200 @@ -24,14 +24,19 @@ #include <KPluginMetaData> -#include "plasma/dataengineconsumer.h" +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 73) +#include <Plasma/DataEngineConsumer> +#endif namespace Plasma { class AbstractRunner; -class AbstractRunnerPrivate : public DataEngineConsumer +class AbstractRunnerPrivate +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 73) + : public DataEngineConsumer +#endif { public: AbstractRunnerPrivate(AbstractRunner *r); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/dbusrunner_p.h new/krunner-5.73.0/src/dbusrunner_p.h --- old/krunner-5.72.0/src/dbusrunner_p.h 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/dbusrunner_p.h 2020-08-01 19:11:06.000000000 +0200 @@ -21,7 +21,6 @@ #include <KRunner/AbstractRunner> #include "dbusutils_p.h" -class OrgKdeKrunner1Interface; #include <QHash> #include <QList> #include <QSet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/declarative/CMakeLists.txt new/krunner-5.73.0/src/declarative/CMakeLists.txt --- old/krunner-5.72.0/src/declarative/CMakeLists.txt 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/declarative/CMakeLists.txt 2020-08-01 19:11:06.000000000 +0200 @@ -4,7 +4,11 @@ runnermodel.cpp runnermodelplugin.cpp ) -ecm_qt_declare_logging_category(runnermodel_SRCS HEADER krunner_debug.h IDENTIFIER KRUNNER CATEGORY_NAME org.kde.krunner) +ecm_qt_declare_logging_category(runnermodel_SRCS + HEADER krunner_debug.h + IDENTIFIER KRUNNER + CATEGORY_NAME kf.runner.quick +) add_library(runnermodelplugin SHARED ${runnermodel_SRCS}) target_link_libraries(runnermodelplugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/runnercontext.cpp new/krunner-5.73.0/src/runnercontext.cpp --- old/krunner-5.72.0/src/runnercontext.cpp 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/runnercontext.cpp 2020-08-01 19:11:06.000000000 +0200 @@ -22,21 +22,20 @@ #include <cmath> #include <QReadWriteLock> - #include <QDir> #include <QFile> #include <QFileInfo> #include <QRegularExpression> #include <QSharedData> +#include <QMimeDatabase> +#include <QStandardPaths> +#include <QUrl> -#include <kconfiggroup.h> -#include "krunner_debug.h" -#include <qmimedatabase.h> -#include <kshell.h> -#include <qstandardpaths.h> -#include <qurl.h> -#include <kprotocolinfo.h> +#include <KConfigGroup> +#include <KShell> +#include <KProtocolInfo> +#include "krunner_debug.h" #include "abstractrunner.h" #include "querymatch.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/runnerjobs.cpp new/krunner-5.73.0/src/runnerjobs.cpp --- old/krunner-5.72.0/src/runnerjobs.cpp 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/runnerjobs.cpp 2020-08-01 19:11:06.000000000 +0200 @@ -21,8 +21,8 @@ #include <QTimer> #include <QMutexLocker> -#include "krunner_debug.h" +#include "krunner_debug.h" #include "runnermanager.h" #include "querymatch.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/runnermanager.cpp new/krunner-5.73.0/src/runnermanager.cpp --- old/krunner-5.72.0/src/runnermanager.cpp 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/runnermanager.cpp 2020-08-01 19:11:06.000000000 +0200 @@ -26,22 +26,24 @@ #include <QCoreApplication> #include <QStandardPaths> #include <QDir> -#include "krunner_debug.h" -#include <ksharedconfig.h> -#include <kplugininfo.h> -#include <kservicetypetrader.h> +#include <KSharedConfig> +#include <KPluginInfo> +#include <KServiceTypeTrader> #include <KPluginMetaData> +#include <KConfigWatcher> #include <ThreadWeaver/DebuggingAids> #include <ThreadWeaver/Queue> #include <ThreadWeaver/Thread> +#include <plasma/version.h> + #include "dbusrunner_p.h" #include "runnerjobs_p.h" -#include "plasma/pluginloader.h" -#include <plasma/version.h> #include "querymatch.h" +#include "krunner_debug.h" +#include <../krunner_version.h> using ThreadWeaver::Queue; using ThreadWeaver::Job; @@ -74,6 +76,12 @@ #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) void warnAboutDeprecatedMetaData(const KPluginInfo &pluginInfo) { + // only start to emit runtime warnings at the time Plasma 5.20 is to be released + // because the majority of runner plugins comes from Plasma + // and for 5.19 they cannot be ported (have been ported for what will be 5.20 already) + // so there would be lots of useless noise in the logs +#if KRUNNER_VERSION >= QT_VERSION_CHECK(5, 75, 0) +#pragma message("Remove this build condition and the krunner_version.h include, now that we are becoming KF 5.75") if (!pluginInfo.libraryPath().isEmpty()) { qCWarning(KRUNNER).nospace() << "KRunner plugin " << pluginInfo.pluginName() << " still uses a .desktop file (" << pluginInfo.entryPath() << "). Please port it to JSON metadata."; @@ -81,6 +89,9 @@ qCWarning(KRUNNER).nospace() << "KRunner D-Bus plugin " << pluginInfo.pluginName() << " installs the .desktop file (" << pluginInfo.entryPath() << ") still in the kservices5 folder. Please install it to ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins."; } +#else + Q_UNUSED(pluginInfo); +#endif } #endif @@ -150,7 +161,7 @@ KConfigGroup configGroup() { - return conf.isValid() ? conf : KConfigGroup(KSharedConfig::openConfig(), "PlasmaRunnerManager"); + return conf.isValid() ? conf : KConfigGroup(KSharedConfig::openConfig(configFile), "PlasmaRunnerManager"); } void clearSingleRunner() @@ -235,7 +246,7 @@ if (conf.isValid()) { pluginConf = KConfigGroup(&conf, "Plugins"); } else { - pluginConf = KConfigGroup(KSharedConfig::openConfig(), "Plugins"); + pluginConf = KConfigGroup(KSharedConfig::openConfig(configFile), "Plugins"); } advertiseSingleRunnerIds.clear(); @@ -530,6 +541,8 @@ bool singleMode : 1; bool singleRunnerWasLoaded : 1; QStringList whiteList; + QString configFile; + KConfigWatcher::Ptr watcher; }; /***************************************************** @@ -537,9 +550,15 @@ * *****************************************************/ RunnerManager::RunnerManager(QObject *parent) + : RunnerManager(QString(), parent) +{ +} + +RunnerManager::RunnerManager(const QString &configFile, QObject *parent) : QObject(parent), d(new RunnerManagerPrivate(this)) { + d->configFile = configFile; d->loadConfiguration(); //ThreadWeaver::setDebugLevel(true, 4); } @@ -970,6 +989,33 @@ emit queryFinished(); } +void RunnerManager::enableKNotifyPluginWatcher() +{ + if (!d->watcher) { + d->watcher = KConfigWatcher::create(KSharedConfig::openConfig(d->configGroup().config()->name())); + connect(d->watcher.data(), &KConfigWatcher::configChanged, this, [this](const KConfigGroup &group, const QByteArrayList &changedNames) { + const QString groupName = group.name(); + if (groupName == QLatin1String("Plugins")) { + reloadConfiguration(); + } else if (groupName == QLatin1String("Runners")) { + for (auto *runner : qAsConst(d->runners)) { + // Signals from the KCM contain the component name, which is the X-KDE-PluginInfo-Name property + if (changedNames.contains(runner->metadata(RunnerReturnPluginMetaData).pluginId().toUtf8())) { + runner->reloadConfiguration(); + } + } + } else if (group.parent().isValid() && group.parent().name() == QLatin1String("Runners")){ + for (auto *runner : qAsConst(d->runners)) { + // If the same config group has been modified which gets created in AbstractRunner::config() + if (groupName == runner->id()) { + runner->reloadConfiguration(); + } + } + } + }); + } +} + } // Plasma namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/runnermanager.h new/krunner-5.73.0/src/runnermanager.h --- old/krunner-5.72.0/src/runnermanager.h 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/runnermanager.h 2020-08-01 19:11:06.000000000 +0200 @@ -25,8 +25,8 @@ #include <QList> #include <QObject> -#include <kplugininfo.h> -#include <kpluginmetadata.h> +#include <KPluginInfo> +#include <KPluginMetaData> #include "krunner_export.h" #include "abstractrunner.h" @@ -53,6 +53,7 @@ public: explicit RunnerManager(QObject *parent=nullptr); + explicit RunnerManager(const QString &configFile, QObject *parent=nullptr); explicit RunnerManager(KConfigGroup &config, QObject *parent=nullptr); ~RunnerManager(); @@ -266,6 +267,14 @@ static KPluginInfo::List listRunnerInfo(const QString &parentApp = QString()); #endif + /** + * If you call this method the manager will create a KConfigWatcher + * which reload its runners or the runner configuration when the settings in the KCM are edited. + * @since 5.73 + * @see reloadConfiguration + */ + void enableKNotifyPluginWatcher(); + public Q_SLOTS: /** * Call this method when the runners should be prepared for a query session. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/src/runnersyntax.cpp new/krunner-5.73.0/src/runnersyntax.cpp --- old/krunner-5.72.0/src/runnersyntax.cpp 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/src/runnersyntax.cpp 2020-08-01 19:11:06.000000000 +0200 @@ -19,7 +19,7 @@ #include "runnersyntax.h" -#include <klocalizedstring.h> +#include <KLocalizedString> namespace Plasma { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.72.0/templates/runner/runner.kdevtemplate new/krunner-5.73.0/templates/runner/runner.kdevtemplate --- old/krunner-5.72.0/templates/runner/runner.kdevtemplate 2020-07-04 11:56:08.000000000 +0200 +++ new/krunner-5.73.0/templates/runner/runner.kdevtemplate 2020-08-01 19:11:06.000000000 +0200 @@ -45,7 +45,7 @@ Comment=Plasma Runner Template. A plasma runner template Comment[ar]=قالب «مشغّل بلازما». قالب لِ«مشغّل بلازما» Comment[az]=Plasma başlatma sətri üçün uzantıların şablonu -Comment[ca]=Plantilla de Runner del Plasma. Una plantilla de «Runner» pel Plasma +Comment[ca]=Plantilla de Runner del Plasma. Una plantilla de «Runner» per al Plasma Comment[ca@valencia]=Plantilla de Runner del Plasma. Una plantilla de «Runner» pel Plasma Comment[da]=Skabelon til Plasma-runner. En skabelon til en Plasma-runner Comment[de]=Eine Vorlage für einen Plasma-Runner
