Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2021-06-16 20:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Wed Jun 16 20:34:09 2021 rev:90 rq:899761 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2021-05-10 15:37:30.534010207 +0200 +++ /work/SRC/openSUSE:Factory/.krunner.new.32437/krunner.changes 2021-06-16 20:35:47.863218146 +0200 @@ -1,0 +2,12 @@ +Sat Jun 5 11:59:11 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.83.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.83.0 +- Changes since 5.82.0: + * runnermanager: Remove unneeded version check + * Bump required CMake version to 3.16 + * RunnerManager::runnerMetaDataList: Do not return duplicate plugin IDs + +------------------------------------------------------------------- Old: ---- krunner-5.82.0.tar.xz krunner-5.82.0.tar.xz.sig New: ---- krunner-5.83.0.tar.xz krunner-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.bpkh87/_old 2021-06-16 20:35:48.327218937 +0200 +++ /var/tmp/diff_new_pack.bpkh87/_new 2021-06-16 20:35:48.331218944 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Runner5 -%define _tar_path 5.82 +%define _tar_path 5.83 # 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.82.0 +Version: 5.83.0 Release: 0 Summary: KDE Framework for providing different actions given a string query License: LGPL-2.1-or-later ++++++ krunner-5.82.0.tar.xz -> krunner-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/CMakeLists.txt new/krunner-5.83.0/CMakeLists.txt --- old/krunner-5.82.0/CMakeLists.txt 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/CMakeLists.txt 2021-06-05 10:58:49.000000000 +0200 @@ -1,12 +1,12 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.82.0") # handled by release scripts -set(KF_DEP_VERSION "5.82.0") # handled by release scripts +set(KF_VERSION "5.83.0") # handled by release scripts +set(KF_DEP_VERSION "5.83.0") # handled by release scripts project(KRunner VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.82.0 NO_MODULE) +find_package(ECM 5.83.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) @@ -73,7 +73,6 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) # must port away from qmlRegisterInterface before upgrading this to 050f00 add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_definitions(-DPLASMA_DISABLE_DEPRECATED_BEFORE_AND_AT=0x050500) # needed because we use Plasma::Package in the API -add_definitions(-DQT_NO_FOREACH -DQT_NO_KEYWORDS) # Subdirectories add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/autotests/CMakeLists.txt new/krunner-5.83.0/autotests/CMakeLists.txt --- old/krunner-5.82.0/autotests/CMakeLists.txt 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/autotests/CMakeLists.txt 2021-06-05 10:58:49.000000000 +0200 @@ -33,9 +33,9 @@ LINK_LIBRARIES Qt5::Test KF5::KIOCore KF5Runner Qt5::Widgets Qt5::DBus ) -set(demoapp_SRCS testremoterunner.cpp) -qt5_add_dbus_adaptor(demoapp_SRCS "../src/data/org.kde.krunner1.xml" testremoterunner.h TestRemoteRunner) -add_executable(testremoterunner ${demoapp_SRCS}) +add_executable(testremoterunner) +qt_add_dbus_adaptor(demoapp_dbus_adaptor_SRCS "../src/data/org.kde.krunner1.xml" testremoterunner.h TestRemoteRunner) +target_sources(testremoterunner PRIVATE testremoterunner.cpp ${demoapp_dbus_adaptor_SRCS}) target_link_libraries(testremoterunner Qt5::DBus KF5::Runner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/src/CMakeLists.txt new/krunner-5.83.0/src/CMakeLists.txt --- old/krunner-5.82.0/src/CMakeLists.txt 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/src/CMakeLists.txt 2021-06-05 10:58:49.000000000 +0200 @@ -8,7 +8,10 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -set (KF5Runner_SRCS +add_library(KF5Runner SHARED) +add_library(KF5::Runner ALIAS KF5Runner) + +target_sources(KF5Runner PRIVATE abstractrunner.cpp dbusrunner.cpp runnerjobs.cpp @@ -16,8 +19,9 @@ runnercontext.cpp runnermanager.cpp runnersyntax.cpp - abstractrunnertest.h) -ecm_qt_declare_logging_category(KF5Runner_SRCS + abstractrunnertest.h +) +ecm_qt_declare_logging_category(KF5Runner HEADER krunner_debug.h IDENTIFIER KRUNNER CATEGORY_NAME kf.runner @@ -27,9 +31,6 @@ ) set_property(SOURCE "data/org.kde.krunner1.xml" PROPERTY INCLUDE dbusutils_p.h) -add_library(KF5Runner - ${KF5Runner_SRCS}) -add_library(KF5::Runner ALIAS KF5Runner) ecm_generate_export_header(KF5Runner BASE_NAME KRunner GROUP_BASE_NAME KF @@ -64,7 +65,7 @@ endif() set_target_properties(KF5Runner - PROPERTIES VERSION ${KRUNNER_VERSION_STRING} + PROPERTIES VERSION ${KRUNNER_VERSION} SOVERSION 5 EXPORT_NAME "Runner" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/src/abstractrunner.h new/krunner-5.83.0/src/abstractrunner.h --- old/krunner-5.82.0/src/abstractrunner.h 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/src/abstractrunner.h 2021-06-05 10:58:49.000000000 +0200 @@ -687,8 +687,7 @@ * @since 5.72 */ #define K_EXPORT_PLASMA_RUNNER_WITH_JSON(classname, jsonFile) \ - K_PLUGIN_FACTORY_WITH_JSON(classname ## Factory, jsonFile, registerPlugin<classname>();) \ - K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) + K_PLUGIN_FACTORY_WITH_JSON(classname ## Factory, jsonFile, registerPlugin<classname>();) #if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 75) /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/src/data/servicetypes/plasma-runner.desktop new/krunner-5.83.0/src/data/servicetypes/plasma-runner.desktop --- old/krunner-5.82.0/src/data/servicetypes/plasma-runner.desktop 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/src/data/servicetypes/plasma-runner.desktop 2021-06-05 10:58:49.000000000 +0200 @@ -53,6 +53,7 @@ Comment[zh_CN]=KRunner ?????? Comment[zh_TW]=KRunner ???????????? +# TODO KF6 remove [PropertyDef::X-Plasma-AdvertiseSingleRunnerQueryMode] Type=bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/src/declarative/CMakeLists.txt new/krunner-5.83.0/src/declarative/CMakeLists.txt --- old/krunner-5.82.0/src/declarative/CMakeLists.txt 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/src/declarative/CMakeLists.txt 2021-06-05 10:58:49.000000000 +0200 @@ -1,16 +1,18 @@ project(runnermodel) -set(runnermodel_SRCS +add_library(runnermodelplugin SHARED) + +target_sources(runnermodelplugin PRIVATE runnermodel.cpp runnermodelplugin.cpp - ) -ecm_qt_declare_logging_category(runnermodel_SRCS +) + +ecm_qt_declare_logging_category(runnermodelplugin HEADER krunner_debug.h IDENTIFIER KRUNNER CATEGORY_NAME kf.runner.quick ) -add_library(runnermodelplugin SHARED ${runnermodel_SRCS}) target_link_libraries(runnermodelplugin Qt5::Quick Qt5::Qml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/src/runnermanager.cpp new/krunner-5.83.0/src/runnermanager.cpp --- old/krunner-5.82.0/src/runnermanager.cpp 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/src/runnermanager.cpp 2021-06-05 10:58:49.000000000 +0200 @@ -41,22 +41,20 @@ namespace Plasma { -void forEachDBusPlugin(std::function<void(const KPluginMetaData &, bool *)> callback) +void forEachDBusPlugin(std::function<void(const KPluginMetaData &)> callback) { const QStringList dBusPlugindirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("krunner/dbusplugins"), QStandardPaths::LocateDirectory); const QStringList serviceTypeFiles(QStringLiteral("plasma-runner.desktop")); + QSet<QString> addedPluginIds; for (const QString &dir : dBusPlugindirs) { const QStringList desktopFiles = QDir(dir).entryList(QStringList(QStringLiteral("*.desktop"))); for (const QString &file : desktopFiles) { const QString desktopFilePath = dir + QLatin1Char('/') + file; KPluginMetaData pluginMetaData = KPluginMetaData::fromDesktopFile(desktopFilePath, serviceTypeFiles); - if (pluginMetaData.isValid()) { - bool cancel = false; - callback(pluginMetaData, &cancel); - if (cancel) { - return; - } + if (pluginMetaData.isValid() && !addedPluginIds.contains(pluginMetaData.pluginId())) { + callback(pluginMetaData); + addedPluginIds << pluginMetaData.pluginId(); } } } @@ -281,28 +279,20 @@ if (api.isEmpty()) { KPluginLoader pluginLoader(pluginMetaData.fileName()); - const quint64 pluginVersion = pluginLoader.pluginVersion(); - if (Plasma::isPluginVersionCompatible(pluginVersion)) { - if (KPluginFactory *factory = pluginLoader.factory()) { - const QVariantList args - { + if (KPluginFactory *factory = pluginLoader.factory()) { + const QVariantList args + { #if KRUNNER_BUILD_DEPRECATED_SINCE(5, 77) #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) - pluginMetaData.metaDataFileName(), + pluginMetaData.metaDataFileName(), #endif - QVariant::fromValue(pluginMetaData), + QVariant::fromValue(pluginMetaData), #endif - }; - runner = factory->create<AbstractRunner>(q, args); - } else { - qCWarning(KRUNNER).nospace() << "Could not load runner " << pluginMetaData.name() << ":" << pluginLoader.errorString() - << " (library path was:" << pluginMetaData.fileName() << ")"; - } + }; + runner = factory->create<AbstractRunner>(q, args); } else { - const QString runnerVersion = - QStringLiteral("%1.%2.%3").arg(pluginVersion >> 16).arg((pluginVersion >> 8) & 0x00ff).arg(pluginVersion & 0x0000ff); - qCWarning(KRUNNER) << "Cannot load runner" << pluginMetaData.name() << "- versions mismatch: KRunner" << Plasma::versionString() << "," - << pluginMetaData.name() << runnerVersion; + qCWarning(KRUNNER).nospace() << "Could not load runner " << pluginMetaData.name() << ":" << pluginLoader.errorString() + << " (library path was:" << pluginMetaData.fileName() << ")"; } } else if (api == QLatin1String("DBus")) { runner = new DBusRunner(pluginMetaData, q); @@ -795,7 +785,7 @@ } // get D-Bus plugins - forEachDBusPlugin([&](const KPluginMetaData &pluginMetaData, bool *) { + forEachDBusPlugin([&](const KPluginMetaData &pluginMetaData) { pluginMetaDatas.append(pluginMetaData); knownRunnerIds.insert(pluginMetaData.pluginId()); }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/templates/runner/CMakeLists.txt new/krunner-5.83.0/templates/runner/CMakeLists.txt --- old/krunner-5.82.0/templates/runner/CMakeLists.txt 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/templates/runner/CMakeLists.txt 2021-06-05 10:58:49.000000000 +0200 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.16) project(%{APPNAMELC}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.82.0/templates/runner/src/CMakeLists.txt new/krunner-5.83.0/templates/runner/src/CMakeLists.txt --- old/krunner-5.82.0/templates/runner/src/CMakeLists.txt 2021-05-01 11:45:28.000000000 +0200 +++ new/krunner-5.83.0/templates/runner/src/CMakeLists.txt 2021-06-05 10:58:49.000000000 +0200 @@ -1,8 +1,11 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_org.kde.%{APPNAMELC}\") -set(%{APPNAMELC}_SRCS %{APPNAMELC}.cpp) +add_library(%{APPNAMELC} MODULE) + +target_sources(%{APPNAMELC} PRIVATE + %{APPNAMELC}.cpp +) -add_library(%{APPNAMELC} MODULE ${%{APPNAMELC}_SRCS}) kcoreaddons_desktop_to_json(%{APPNAMELC} plasma-runner-%{APPNAMELC}.desktop) target_link_libraries(%{APPNAMELC} KF5::Runner KF5::I18n)
