Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2020-06-16 13:43:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Tue Jun 16 13:43:52 2020 rev:77 rq:814386 version:5.71.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2020-05-11 13:31:58.507937979 +0200 +++ /work/SRC/openSUSE:Factory/.krunner.new.3606/krunner.changes 2020-06-16 13:44:03.497381051 +0200 @@ -1,0 +2,15 @@ +Sun Jun 7 08:07:00 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.71.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.71.0 +- Changes since 5.70.0: + * Fix and expand unit test + * Do not persist runner whitelist to config + * KRunner fix prepare/teardown signals (kde#420311) + * Improve docstring for Type::InformationalMatch + * Detect local files and folders starting with ~ + * Deprecate defunct functions + +------------------------------------------------------------------- Old: ---- krunner-5.70.0.tar.xz krunner-5.70.0.tar.xz.sig New: ---- krunner-5.71.0.tar.xz krunner-5.71.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.2ECpfG/_old 2020-06-16 13:44:04.333384099 +0200 +++ /var/tmp/diff_new_pack.2ECpfG/_new 2020-06-16 13:44:04.337384114 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Runner5 -%define _tar_path 5.70 +%define _tar_path 5.71 # 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.70.0 +Version: 5.71.0 Release: 0 Summary: Plugins responsible for better integration of Qt applications in KDE Workspace License: LGPL-2.1-or-later ++++++ krunner-5.70.0.tar.xz -> krunner-5.71.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/.arcconfig new/krunner-5.71.0/.arcconfig --- old/krunner-5.70.0/.arcconfig 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.kde.org/"; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/CMakeLists.txt new/krunner-5.71.0/CMakeLists.txt --- old/krunner-5.70.0/CMakeLists.txt 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/CMakeLists.txt 2020-06-06 21:35:43.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.70.0") # handled by release scripts -set(KF5_DEP_VERSION "5.70.0") # handled by release scripts +set(KF5_VERSION "5.71.0") # handled by release scripts +set(KF5_DEP_VERSION "5.71.0") # handled by release scripts project(KRunner VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.70.0 NO_MODULE) +find_package(ECM 5.71.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) @@ -58,7 +58,7 @@ ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054700) add_definitions(-DPLASMA_DISABLE_DEPRECATED_BEFORE_AND_AT=0x050500) # needed because we use Plasma::Package in the API add_definitions(-DQT_NO_FOREACH) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/autotests/runnercontexttest.cpp new/krunner-5.71.0/autotests/runnercontexttest.cpp --- old/krunner-5.70.0/autotests/runnercontexttest.cpp 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/autotests/runnercontexttest.cpp 2020-06-06 21:35:43.000000000 +0200 @@ -46,6 +46,8 @@ QTest::newRow("full path executable") << "ls -R" << Plasma::RunnerContext::ShellCommand; QTest::newRow("full path executable with params") << "/bin/ls -R" << Plasma::RunnerContext::ShellCommand; QTest::newRow("protocol-less path") << "/home" << Plasma::RunnerContext::Directory; + QTest::newRow("protocol-less tilded") << "~" << Plasma::RunnerContext::Directory; + QTest::newRow("protocol-less file starting with tilded") << "~/.bashrc" << Plasma::RunnerContext::File; QTest::newRow("invalid protocol-less path") << "/bad/path" << Plasma::RunnerContext::UnknownType; QTest::newRow("calculation") << "5*4" << Plasma::RunnerContext::UnknownType; QTest::newRow("calculation (float)") << "5.2*4" << Plasma::RunnerContext::UnknownType; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/docs/Doxyfile.local new/krunner-5.71.0/docs/Doxyfile.local --- old/krunner-5.70.0/docs/Doxyfile.local 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/docs/Doxyfile.local 2020-06-06 21:35:43.000000000 +0200 @@ -5,4 +5,5 @@ "PLASMA_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KRUNNER_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KRUNNER_BUILD_DEPRECATED_SINCE(x, y)=1" \ - "KRUNNER_DEPRECATED_VERSION(x, y, t)=" + "KRUNNER_DEPRECATED_VERSION(x, y, t)=" \ + "KRUNNER_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/CMakeLists.txt new/krunner-5.71.0/src/CMakeLists.txt --- old/krunner-5.70.0/src/CMakeLists.txt 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/CMakeLists.txt 2020-06-06 21:35:43.000000000 +0200 @@ -25,7 +25,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.28 + DEPRECATION_VERSIONS 5.28 5.71 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) @@ -122,6 +122,7 @@ KRUNNER_DEPRECATED KRUNNER_DEPRECATED_EXPORT "KRUNNER_DEPRECATED_VERSION(x, y, t)" + "KRUNNER_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" PREDEFINED_MACROS "PLASMA_ENABLE_DEPRECATED_SINCE(x, y)=1" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/abstractrunner.cpp new/krunner-5.71.0/src/abstractrunner.cpp --- old/krunner-5.70.0/src/abstractrunner.cpp 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/abstractrunner.cpp 2020-06-06 21:35:43.000000000 +0200 @@ -208,20 +208,26 @@ return result; } +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) bool AbstractRunner::hasRunOptions() { return d->hasRunOptions; } +#endif +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) void AbstractRunner::setHasRunOptions(bool hasRunOptions) { d->hasRunOptions = hasRunOptions; } +#endif +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) void AbstractRunner::createRunOptions(QWidget *parent) { - Q_UNUSED(parent); + Q_UNUSED(parent) } +#endif AbstractRunner::Speed AbstractRunner::speed() const { @@ -328,7 +334,11 @@ #if KRUNNER_BUILD_DEPRECATED_SINCE(5, 65) Package AbstractRunner::package() const { +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") return Package(); +QT_WARNING_POP } #endif @@ -375,7 +385,11 @@ void AbstractRunnerPrivate::init(const KService::Ptr service) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") runnerDescription = KPluginInfo(service); +QT_WARNING_POP } void AbstractRunnerPrivate::init(const QString &path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/abstractrunner.h new/krunner-5.71.0/src/abstractrunner.h --- old/krunner-5.70.0/src/abstractrunner.h 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/abstractrunner.h 2020-06-06 21:35:43.000000000 +0200 @@ -146,21 +146,29 @@ */ void performMatch(Plasma::RunnerContext &context); +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * If the runner has options that the user can interact with to modify * what happens when run or one of the actions created in match * is called, the runner should return true + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") bool hasRunOptions(); +#endif +#if KRUNNER_ENABLE_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 * the behaviour of what happens when a given match is selected. * * @param widget the parent of the options widgets. + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") virtual void createRunOptions(QWidget *widget); +#endif /** * Called whenever an exact or possible match associated with this @@ -330,10 +338,14 @@ */ KConfigGroup config() const; +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * Sets whether or not the runner has options for matches + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") void setHasRunOptions(bool hasRunOptions); +#endif /** * Sets the nominal speed of the runner. Only slow runners need diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/data/servicetypes/plasma-runner.desktop new/krunner-5.71.0/src/data/servicetypes/plasma-runner.desktop --- old/krunner-5.70.0/src/data/servicetypes/plasma-runner.desktop 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/data/servicetypes/plasma-runner.desktop 2020-06-06 21:35:43.000000000 +0200 @@ -4,6 +4,7 @@ Comment=KRunner plugin Comment[ar]=ملحقة «مشغّلك» +Comment[az]=KRunner uzantısı Comment[bs]=Priključak za KRunner Comment[ca]=Connector del KRunner Comment[ca@valencia]=Connector del KRunner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/declarative/runnermodel.cpp new/krunner-5.71.0/src/declarative/runnermodel.cpp --- old/krunner-5.70.0/src/declarative/runnermodel.cpp 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/declarative/runnermodel.cpp 2020-06-06 21:35:43.000000000 +0200 @@ -79,7 +79,12 @@ void RunnerModel::setRunners(const QStringList &allowedRunners) { //use sets to ensure comparison is order-independent +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + const auto runners = this->runners(); + if (QSet<QString>(allowedRunners.begin(), allowedRunners.end()) == QSet<QString>(runners.begin(), runners.end())) { +#else if (allowedRunners.toSet() == runners().toSet()) { +#endif return; } if (m_manager) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/querymatch.cpp new/krunner-5.71.0/src/querymatch.cpp --- old/krunner-5.70.0/src/querymatch.cpp 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/querymatch.cpp 2020-06-06 21:35:43.000000000 +0200 @@ -333,17 +333,19 @@ } } +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) bool QueryMatch::hasConfigurationInterface() const { - return d->runner && d->runner.data()->hasRunOptions(); + return false; } +#endif +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71) void QueryMatch::createConfigurationInterface(QWidget *parent) { - if (hasConfigurationInterface()) { - d->runner.data()->createRunOptions(parent); - } + Q_UNUSED(parent) } +#endif } // Plasma namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/querymatch.h new/krunner-5.71.0/src/querymatch.h --- old/krunner-5.70.0/src/querymatch.h 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/querymatch.h 2020-06-06 21:35:43.000000000 +0200 @@ -55,8 +55,10 @@ NoMatch = 0, /**< Null match */ CompletionMatch = 10, /**< Possible completion for the data of the query */ PossibleMatch = 30, /**< Something that may match the query */ - InformationalMatch = 50, /**< A purely informational, non-actionable match, - such as the answer to a question or calculation*/ + InformationalMatch = 50, /**< A purely informational, non-runnable match, + such as the answer to a question or calculation. + The data of the match will be converted to a string + and set in the search field */ HelperMatch = 70, /**< A match that represents an action not directly related to activating the given search term, such as a search in an external tool or a command learning trigger. Helper @@ -287,12 +289,17 @@ */ void setSelectedAction(QAction *action); +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * @return true if this match can be configured before being run * @since 4.3 + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") bool hasConfigurationInterface() const; +#endif +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71) /** * If hasConfigurationInterface() returns true, this method may be called to get * a widget displaying the options the user can interact with to modify @@ -300,8 +307,11 @@ * * @param widget the parent of the options widgets. * @since 4.3 + * @deprecated Since 5.0, this feature has been defunct */ + KRUNNER_DEPRECATED_VERSION_BELATED(5, 71, 5, 0, "No longer use, feature removed") void createConfigurationInterface(QWidget *parent); +#endif private: QSharedDataPointer<QueryMatchPrivate> d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/runnercontext.cpp new/krunner-5.71.0/src/runnercontext.cpp --- old/krunner-5.70.0/src/runnercontext.cpp 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/runnercontext.cpp 2020-06-06 21:35:43.000000000 +0200 @@ -199,6 +199,7 @@ RunnerContext::Executable; } else { QUrl url = QUrl::fromUserInput(term); + // QUrl::fromUserInput assigns http to everything if it cannot match it to // anything else. We do not want that. if (url.scheme() == QLatin1String("http")) { @@ -206,8 +207,9 @@ url.setScheme(QString()); } } + const bool hasProtocol = !url.scheme().isEmpty(); - const bool isLocalProtocol = hasProtocol && KProtocolInfo::protocolClass(url.scheme()) == QLatin1String(":local"); + const bool isLocalProtocol = !hasProtocol || KProtocolInfo::protocolClass(url.scheme()) == QLatin1String(":local"); if ((hasProtocol && ((!isLocalProtocol && !url.host().isEmpty()) || (isLocalProtocol && url.scheme() != QLatin1String("file")))) @@ -220,9 +222,9 @@ // at this point in the game, we assume we have a path, // but if a path doesn't have any slashes // it's too ambiguous to be sure we're in a filesystem context - path = QDir::cleanPath(url.toLocalFile()); + path = !url.scheme().isEmpty() ? QDir::cleanPath(url.toLocalFile()) : path; //qCDebug(KRUNNER)<< "slash check" << path; - if (hasProtocol || ((path.indexOf(QLatin1Char('/')) != -1 || path.indexOf(QLatin1Char('\\')) != -1))) { + if ((path.indexOf(QLatin1Char('/')) != -1 || path.indexOf(QLatin1Char('\\')) != -1)) { QString correctCasePath; if (correctPathCase(path, correctCasePath)) { path = correctCasePath; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/runnermanager.cpp new/krunner-5.71.0/src/runnermanager.cpp --- old/krunner-5.70.0/src/runnermanager.cpp 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/runnermanager.cpp 2020-06-06 21:35:43.000000000 +0200 @@ -167,7 +167,6 @@ KPluginInfo::List offers = RunnerManager::listRunnerInfo(); const bool loadAll = config.readEntry("loadAll", false); - const QStringList whiteList = config.readEntry("pluginWhiteList", QStringList()); const bool noWhiteList = whiteList.isEmpty(); KConfigGroup pluginConf; if (conf.isValid()) { @@ -206,7 +205,11 @@ if (selected) { AbstractRunner *runner = nullptr; if (!loaded) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") runner = loadInstalledRunner(description.service()); +QT_WARNING_POP } else { runner = runners.value(runnerName); runner->reloadConfiguration(); @@ -358,9 +361,6 @@ // ourselves here emit q->matchesChanged(context.matches()); } - - teardownRequested = true; - checkTearDown(); } void checkTearDown() @@ -460,6 +460,7 @@ bool teardownRequested : 1; bool singleMode : 1; bool singleRunnerWasLoaded : 1; + QStringList whiteList; }; /***************************************************** @@ -503,9 +504,7 @@ void RunnerManager::setAllowedRunners(const QStringList &runners) { - KConfigGroup config = d->configGroup(); - config.writeEntry("pluginWhiteList", runners); - + d->whiteList = runners; if (!d->runners.isEmpty()) { // this has been called with runners already created. so let's do an instant reload d->loadRunners(); @@ -546,7 +545,11 @@ void RunnerManager::loadRunner(const KService::Ptr service) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") KPluginInfo description(service); +QT_WARNING_POP const QString runnerName = description.pluginName(); if (!runnerName.isEmpty() && !d->runners.contains(runnerName)) { AbstractRunner *runner = d->loadInstalledRunner(service); @@ -715,7 +718,11 @@ } KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("Plasma/Runner"), constraint); +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") return KPluginInfo::fromServices(offers); +QT_WARNING_POP } void RunnerManager::setupMatchSession() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/src/runnermanager.h new/krunner-5.71.0/src/runnermanager.h --- old/krunner-5.70.0/src/runnermanager.h 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/src/runnermanager.h 2020-06-06 21:35:43.000000000 +0200 @@ -157,7 +157,7 @@ void reloadConfiguration(); /** - * Sets a whitelist for the plugins that can be loaded + * Sets a whitelist for the plugins that can be loaded by this manager. * * @param plugins the plugin names of allowed runners * @since 4.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.70.0/templates/runner/runner.kdevtemplate new/krunner-5.71.0/templates/runner/runner.kdevtemplate --- old/krunner-5.70.0/templates/runner/runner.kdevtemplate 2020-05-03 00:00:24.000000000 +0200 +++ new/krunner-5.71.0/templates/runner/runner.kdevtemplate 2020-06-06 21:35:43.000000000 +0200 @@ -2,6 +2,7 @@ [General] Name=C++ Name[ar]=سي++ +Name[az]=C++ Name[ca]=C++ Name[ca@valencia]=C++ Name[cs]=C++ @@ -43,6 +44,7 @@ Name[zh_TW]=C++ 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@valencia]=Plantilla de Runner del Plasma. Una plantilla de «Runner» pel Plasma Comment[da]=Skabelon til Plasma-runner. En skabelon til en Plasma-runner
