Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2023-05-14 16:31:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Sun May 14 16:31:02 2023 rev:112 rq:1086953 version:5.106.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2023-04-09 18:42:16.170176604 +0200 +++ /work/SRC/openSUSE:Factory/.krunner.new.1533/krunner.changes 2023-05-14 16:33:19.187660814 +0200 @@ -1,0 +2,11 @@ +Sat May 6 14:01:47 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 5.106.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.106.0 +- Changes since 5.105.0: + * Backport new API for RunnerSyntax, deprecated old API + * Repair binary compatibility for RunnerSyntax + +------------------------------------------------------------------- Old: ---- krunner-5.105.0.tar.xz krunner-5.105.0.tar.xz.sig New: ---- krunner-5.106.0.tar.xz krunner-5.106.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.Sva7Rw/_old 2023-05-14 16:33:19.811663831 +0200 +++ /var/tmp/diff_new_pack.Sva7Rw/_new 2023-05-14 16:33:19.815663850 +0200 @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without released Name: krunner -Version: 5.105.0 +Version: 5.106.0 Release: 0 Summary: KDE Framework for providing different actions given a string query License: LGPL-2.1-or-later ++++++ krunner-5.105.0.tar.xz -> krunner-5.106.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.105.0/CMakeLists.txt new/krunner-5.106.0/CMakeLists.txt --- old/krunner-5.105.0/CMakeLists.txt 2023-03-31 11:14:07.000000000 +0200 +++ new/krunner-5.106.0/CMakeLists.txt 2023-05-07 22:39:23.000000000 +0200 @@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.105.0") # handled by release scripts -set(KF_DEP_VERSION "5.105.0") # handled by release scripts +set(KF_VERSION "5.106.0") # handled by release scripts +set(KF_DEP_VERSION "5.106.0") # handled by release scripts project(KRunner VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.105.0 NO_MODULE) +find_package(ECM 5.106.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.105.0/src/CMakeLists.txt new/krunner-5.106.0/src/CMakeLists.txt --- old/krunner-5.105.0/src/CMakeLists.txt 2023-03-31 11:14:07.000000000 +0200 +++ new/krunner-5.106.0/src/CMakeLists.txt 2023-05-07 22:39:23.000000000 +0200 @@ -49,7 +49,7 @@ GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.28 5.71 5.72 5.73 5.76 5.77 5.79 5.81 5.82 5.85 5.86 5.88 5.99 + DEPRECATION_VERSIONS 5.28 5.71 5.72 5.73 5.76 5.77 5.79 5.81 5.82 5.85 5.86 5.88 5.99 5.106 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.105.0/src/abstractrunner.h new/krunner-5.106.0/src/abstractrunner.h --- old/krunner-5.105.0/src/abstractrunner.h 2023-03-31 11:14:07.000000000 +0200 +++ new/krunner-5.106.0/src/abstractrunner.h 2023-05-07 22:39:23.000000000 +0200 @@ -79,7 +79,7 @@ public: #if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 81) /** Specifies a nominal speed for the runner */ - enum Speed { + enum Speed{ SlowSpeed, NormalSpeed, }; @@ -642,6 +642,22 @@ #endif /** + * Utility overload for creating a syntax based on the given parameters + * @see RunnerSyntax + * @since 5.106 + */ + inline void addSyntax(const QString &exampleQuery, const QString &description) + { + addSyntax(QStringList(exampleQuery), description); + } + + /// @copydoc addSyntax(const QString &exampleQuery, const QString &description) + inline void addSyntax(const QStringList &exampleQueries, const QString &description) + { + addSyntax(RunnerSyntax(exampleQueries, description)); + } + + /** * Sets the list of syntaxes; passing in an empty list effectively clears * the syntaxes. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.105.0/src/dbusrunner.cpp new/krunner-5.106.0/src/dbusrunner.cpp --- old/krunner-5.105.0/src/dbusrunner.cpp 2023-03-31 11:14:07.000000000 +0200 +++ new/krunner-5.106.0/src/dbusrunner.cpp 2023-05-07 22:39:23.000000000 +0200 @@ -93,7 +93,7 @@ for (int i = 0; i < syntaxes.count(); ++i) { const QString &query = syntaxes.at(i); const QString description = i < descriptionCount ? syntaxDescriptions.at(i) : QString(); - addSyntax(Plasma::RunnerSyntax(query, description)); + addSyntax(query, description); } } @@ -212,8 +212,7 @@ m_actionsOnceRequested = true; m_actionsForSessionRequested = true; auto actions = requestActions(); - const auto actionsArg = QArgument<QMap<QString, RemoteActions>>("QMap<QString, RemoteActions>", actions); - QMetaObject::invokeMethod(this, "createQActionsFromRemoteActions", actionsArg); + QMetaObject::invokeMethod(this, "createQActionsFromRemoteActions", QArgument("QMap<QString, RemoteActions>", actions)); } } // we scope watchers to make sure the lambda that captures context by reference definitely gets disconnected when this function ends diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.105.0/src/runnersyntax.cpp new/krunner-5.106.0/src/runnersyntax.cpp --- old/krunner-5.105.0/src/runnersyntax.cpp 2023-03-31 11:14:07.000000000 +0200 +++ new/krunner-5.106.0/src/runnersyntax.cpp 2023-05-07 22:39:23.000000000 +0200 @@ -13,29 +13,37 @@ class RunnerSyntaxPrivate { public: - RunnerSyntaxPrivate(const QString &s, const QString &d) - : description(d) - , termDescription(i18n("search term")) + RunnerSyntaxPrivate(const QStringList &_exampleQueries, const QString &_description) + : description(_description) { - addExampleQuery(s); + for (const QString &query : _exampleQueries) { + addExampleQuery(query); + } } void addExampleQuery(const QString &s) { + Q_ASSERT_X(!s.isEmpty(), "KRunner::RunnerSyntax", "Example queries must not be empty!"); const QString termDesc(QLatin1Char('<') + termDescription + QLatin1Char('>')); exampleQueries.append(QString(s).replace(QStringLiteral(":q:"), termDesc)); } QStringList exampleQueries; QString description; - QString termDescription; + QString termDescription = i18n("search term"); }; RunnerSyntax::RunnerSyntax(const QString &exampleQuery, const QString &description) - : d(new RunnerSyntaxPrivate(exampleQuery, description)) + : d(new RunnerSyntaxPrivate({exampleQuery}, description)) { } +RunnerSyntax::RunnerSyntax(const QStringList &exampleQueries, const QString &description) + : d(new RunnerSyntaxPrivate(exampleQueries, description)) +{ + Q_ASSERT_X(!exampleQueries.isEmpty(), "KRunner::RunnerSyntax", "Example queries must not be empty"); +} + RunnerSyntax::RunnerSyntax(const RunnerSyntax &other) : d(new RunnerSyntaxPrivate(*other.d)) { @@ -49,10 +57,12 @@ return *this; } +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 106) void RunnerSyntax::addExampleQuery(const QString &exampleQuery) { d->addExampleQuery(exampleQuery); } +#endif QStringList RunnerSyntax::exampleQueries() const { @@ -72,7 +82,7 @@ } #endif -#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 76) +#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 106) void RunnerSyntax::setDescription(const QString &description) { d->description = description; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.105.0/src/runnersyntax.h new/krunner-5.106.0/src/runnersyntax.h --- old/krunner-5.105.0/src/runnersyntax.h 2023-03-31 11:14:07.000000000 +0200 +++ new/krunner-5.106.0/src/runnersyntax.h 2023-05-07 22:39:23.000000000 +0200 @@ -51,6 +51,16 @@ RunnerSyntax(const QString &exampleQuery, const QString &description); /** + * Constructs a syntax object + * + * @param exampleQuery See the class description for examples and placeholder conventions. + * @param description A description of what the described syntax does from the user's point of view. + * + * @since 5.106 + */ + explicit RunnerSyntax(const QStringList &exampleQueries, const QString &description); + + /** * Copy constructor */ RunnerSyntax(const RunnerSyntax &other); @@ -62,6 +72,7 @@ */ RunnerSyntax &operator=(const RunnerSyntax &rhs); +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 106) /** * Adds a synonymous example query to this Syntax. Some runners may * accept multiple formulations of keywords to trigger the same behaviour. @@ -69,8 +80,11 @@ * example queries into one Syntax object * * @param exampleQuery See the class description for examples and placeholder conventions. + * @deprecated Since 5.106, use constructor taking example query QStringList */ + KRUNNER_DEPRECATED_VERSION(5, 106, "Use constructor taking example query QStringList") void addExampleQuery(const QString &exampleQuery); +#endif /** * @return the example queries associated with this Syntax object @@ -89,11 +103,15 @@ QStringList exampleQueriesWithTermDescription() const; #endif +#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 106) /** * Sets the description for the syntax, describing what it does from * the user's point of view. + * @deprecated Since 5.106, this should only be set when constructing the syntax */ + KRUNNER_DEPRECATED_VERSION(5, 106, "This should only be set when constructing the syntax") void setDescription(const QString &description); +#endif /** * @return the description of what the syntax does from the user's
