Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2021-05-10 15:35:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Mon May 10 15:35:48 2021 rev:95 rq:891779 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2021-04-12 12:36:49.745331916 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new.2988/kservice.changes 2021-05-10 15:37:31.502006459 +0200 @@ -1,0 +2,14 @@ +Sat May 1 16:41:13 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Deprecate KMimeTypeTrader + * [ktoolinvokation] Port away from KMimeTypeTrader + * Deprecate KPluginTrader + * Properly deprecate some KToolInvokation methods + * Include X-KDE-Wayland-VirtualKeyboard + +------------------------------------------------------------------- Old: ---- kservice-5.81.0.tar.xz kservice-5.81.0.tar.xz.sig New: ---- kservice-5.82.0.tar.xz kservice-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.GBLHXd/_old 2021-05-10 15:37:32.030004414 +0200 +++ /var/tmp/diff_new_pack.GBLHXd/_new 2021-05-10 15:37:32.034004398 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.81 +%define _tar_path 5.82 # 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: kservice -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later @@ -50,10 +50,10 @@ BuildRequires: cmake(KF5DBusAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5DocTools) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5I18n) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Concurrent) >= 5.14.0 -BuildRequires: cmake(Qt5DBus) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 -BuildRequires: cmake(Qt5Xml) >= 5.14.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.15.0 +BuildRequires: cmake(Qt5DBus) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 +BuildRequires: cmake(Qt5Xml) >= 5.15.0 Recommends: kded >= %{_kf5_bugfix_version} Obsoletes: libKF5Service4 %if %{with lang} @@ -81,17 +81,15 @@ %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 %build - %cmake_kf5 -d build -- -DAPPLICATIONS_MENU_NAME="kf5-applications.menu" - %cmake_build +%cmake_kf5 -d build -- -DAPPLICATIONS_MENU_NAME="kf5-applications.menu" +%cmake_build %install - %kf5_makeinstall -C build - %fdupes %{buildroot} +%kf5_makeinstall -C build +%fdupes %{buildroot} %if %{with lang} %find_lang %{name} --with-man --all-name ++++++ kservice-5.81.0.tar.xz -> kservice-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/.gitignore new/kservice-5.82.0/.gitignore --- old/kservice-5.81.0/.gitignore 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/.gitignore 2021-05-01 14:39:32.000000000 +0200 @@ -22,3 +22,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/CMakeLists.txt new/kservice-5.82.0/CMakeLists.txt --- old/kservice-5.81.0/CMakeLists.txt 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/CMakeLists.txt 2021-05-01 14:39:32.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.81.0") # handled by release scripts -set(KF_DEP_VERSION "5.81.0") # handled by release scripts +set(KF_VERSION "5.82.0") # handled by release scripts +set(KF_DEP_VERSION "5.82.0") # handled by release scripts project(KService VERSION ${KF_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.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) @@ -42,7 +42,7 @@ CACHE STRING "Name to install the applications.menu file as.") # Dependencies -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) if (NOT ANDROID) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) @@ -74,8 +74,8 @@ ) add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_definitions(-DKCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054E00) # for KPluginInfo::dependencies add_definitions(-DQT_NO_FOREACH) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/autotests/CMakeLists.txt new/kservice-5.82.0/autotests/CMakeLists.txt --- old/kservice-5.81.0/autotests/CMakeLists.txt 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/autotests/CMakeLists.txt 2021-05-01 14:39:32.000000000 +0200 @@ -19,7 +19,6 @@ ksycocadicttest ksycocathreadtest kservicetest - kplugintradertest kplugininfotest kapplicationtradertest ) @@ -28,6 +27,11 @@ kservice_unit_tests(ktoolinvocation_x11test) endif() +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.82.0) + kservice_unit_tests(kplugintradertest) +endif() + # the test plays with the timestamp of ~/.qttest/share/kservicetypes5, and with the ksycoca file, other tests can collide set_tests_properties(ksycocatest PROPERTIES RUN_SERIAL TRUE) # KServiceTest::testAllServices can fail if any service is deleted while the test runs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/po/zh_CN/kservice5.po new/kservice-5.82.0/po/zh_CN/kservice5.po --- old/kservice-5.81.0/po/zh_CN/kservice5.po 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/po/zh_CN/kservice5.po 2021-05-01 14:39:32.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-03-07 02:21+0100\n" -"PO-Revision-Date: 2021-03-27 17:29\n" +"PO-Revision-Date: 2021-04-24 15:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/CMakeLists.txt new/kservice-5.82.0/src/CMakeLists.txt --- old/kservice-5.81.0/src/CMakeLists.txt 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/CMakeLists.txt 2021-05-01 14:39:32.000000000 +0200 @@ -105,7 +105,7 @@ GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 5.70 5.71 5.79 5.80 5.81 + DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 5.70 5.71 5.79 5.80 5.81 5.82 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) set(kservice_includes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/kdeinit/ktoolinvocation.cpp new/kservice-5.82.0/src/kdeinit/ktoolinvocation.cpp --- old/kservice-5.81.0/src/kdeinit/ktoolinvocation.cpp 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/kdeinit/ktoolinvocation.cpp 2021-05-01 14:39:32.000000000 +0200 @@ -165,6 +165,7 @@ } #endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 82) int KToolInvocation::startServiceByDesktopPath(const QString &_name, const QString &URL, QString *error, @@ -183,7 +184,9 @@ } return self()->startServiceInternal("start_service_by_desktop_path", _name, URLs, error, serviceName, pid, startup_id, noWait); } +#endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 82) int KToolInvocation::startServiceByDesktopPath(const QString &_name, const QStringList &URLs, QString *error, @@ -198,7 +201,9 @@ return self()->startServiceInternal("start_service_by_desktop_path", _name, URLs, error, serviceName, pid, startup_id, noWait); } +#endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 82) int KToolInvocation::startServiceByDesktopName(const QString &_name, const QString &URL, QString *error, @@ -217,7 +222,9 @@ } return self()->startServiceInternal("start_service_by_desktop_name", _name, URLs, error, serviceName, pid, startup_id, noWait); } +#endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 82) int KToolInvocation::startServiceByDesktopName(const QString &_name, const QStringList &URLs, QString *error, @@ -232,6 +239,7 @@ return self()->startServiceInternal("start_service_by_desktop_name", _name, URLs, error, serviceName, pid, startup_id, noWait); } +#endif int KToolInvocation::kdeinitExec(const QString &name, const QStringList &args, QString *error, int *pid, const QByteArray &startup_id) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/kdeinit/ktoolinvocation.h new/kservice-5.82.0/src/kdeinit/ktoolinvocation.h --- old/kservice-5.81.0/src/kdeinit/ktoolinvocation.h 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/kdeinit/ktoolinvocation.h 2021-05-01 14:39:32.000000000 +0200 @@ -255,6 +255,7 @@ bool noWait = false); #endif +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 82) /** * Starts a service based on the desktop path of the service. * E.g. "Applications/konqueror.desktop" or "/home/user/bla/myfile.desktop" @@ -277,8 +278,10 @@ * * @deprecated since 5.0 use QDBusConnectionInterface::startService("org.kde.serviceName"), * to start a unique application in order to make D-Bus calls to it (after ensuring that - * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. + * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess, + * KIO::CommandLauncherJob or KIO::ApplicationLauncherJob. */ + KSERVICE_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "See API documentation") static int startServiceByDesktopPath(const QString &_name, const QString &URL, QString *error = nullptr, @@ -286,7 +289,9 @@ int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); +#endif +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 82) /** * Starts a service based on the desktop path of the service. * E.g. "Applications/konqueror.desktop" or "/home/user/bla/myfile.desktop" @@ -307,8 +312,10 @@ * @return an error code indicating success (== 0) or failure (> 0). * @deprecated since 5.0 use QDBusConnectionInterface::startService("org.kde.serviceName"), * to start a unique application in order to make D-Bus calls to it (after ensuring that - * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. + * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess, + * KIO::CommandLauncherJob or KIO::ApplicationLauncherJob. */ + KSERVICE_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "See API documentation") static int startServiceByDesktopPath(const QString &_name, const QStringList &URLs = QStringList(), QString *error = nullptr, @@ -316,7 +323,9 @@ int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); +#endif +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 82) /** * Starts a service based on the desktop name of the service. * E.g. "konqueror" @@ -338,8 +347,10 @@ * @return an error code indicating success (== 0) or failure (> 0). * @deprecated since 5.0 use QDBusConnectionInterface::startService("org.kde.serviceName"), * to start a unique application in order to make D-Bus calls to it (after ensuring that - * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. + * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess, + * KIO::CommandLauncherJob or KIO::ApplicationLauncherJob. */ + KSERVICE_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "See API documentation") static int startServiceByDesktopName(const QString &_name, const QString &URL, QString *error = nullptr, @@ -347,7 +358,9 @@ int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); +#endif +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 82) /** * Starts a service based on the desktop name of the service. * E.g. "konqueror" @@ -369,8 +382,10 @@ * @return an error code indicating success (== 0) or failure (> 0). * @deprecated since 5.0 use QDBusConnectionInterface::startService("org.kde.serviceName"), * to start a unique application in order to make D-Bus calls to it (after ensuring that - * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess or KRun. + * it installs a D-Bus org.kde.serviceName.service file). Otherwise just use QProcess, + * KIO::CommandLauncherJob or KIO::ApplicationLauncherJob. */ + KSERVICE_DEPRECATED_VERSION_BELATED(5, 82, 5, 0, "See API documentation") static int startServiceByDesktopName(const QString &_name, const QStringList &URLs = QStringList(), QString *error = nullptr, @@ -378,6 +393,7 @@ int *pid = nullptr, const QByteArray &startup_id = QByteArray(), bool noWait = false); +#endif /** * Starts a program via kdeinit. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/kdeinit/ktoolinvocation_x11.cpp new/kservice-5.82.0/src/kdeinit/ktoolinvocation_x11.cpp --- old/kservice-5.81.0/src/kdeinit/ktoolinvocation_x11.cpp 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/kdeinit/ktoolinvocation_x11.cpp 2021-05-01 14:39:32.000000000 +0200 @@ -12,9 +12,9 @@ #include "ktoolinvocation.h" +#include <KApplicationTrader> #include <KConfigGroup> #include <KSharedConfig> -#include <kmimetypetrader.h> #include "kservice.h" #include <KConfig> @@ -117,7 +117,7 @@ if (!isMainThreadActive()) { return; } - KService::Ptr emailClient = KMimeTypeTrader::self()->preferredService(QStringLiteral("x-scheme-handler/mailto")); + KService::Ptr emailClient = KApplicationTrader::preferredService(QStringLiteral("x-scheme-handler/mailto")); auto command = emailClient->exec(); QString to, cc, bcc; @@ -286,7 +286,7 @@ } } } else { - const KService::Ptr htmlApp = KMimeTypeTrader::self()->preferredService(QStringLiteral("text/html")); + const KService::Ptr htmlApp = KApplicationTrader::preferredService(QStringLiteral("text/html")); if (htmlApp) { // WORKAROUND: For bugs 264562 and 265474: // In order to correctly handle non-HTML urls we change the service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/plugin/kplugintrader.cpp new/kservice-5.82.0/src/plugin/kplugintrader.cpp --- old/kservice-5.81.0/src/plugin/kplugintrader.cpp 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/plugin/kplugintrader.cpp 2021-05-01 14:39:32.000000000 +0200 @@ -14,6 +14,8 @@ #include <KPluginMetaData> #include <QVector> +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 82) + using namespace KTraderParse; KPluginTrader *KPluginTrader::self() @@ -75,3 +77,5 @@ applyConstraints(lst, constraint); return lst; } + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/plugin/kplugintrader.h new/kservice-5.82.0/src/plugin/kplugintrader.h --- old/kservice-5.81.0/src/plugin/kplugintrader.h 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/plugin/kplugintrader.h 2021-05-01 14:39:32.000000000 +0200 @@ -11,6 +11,9 @@ #define __kplugintrader_h__ #include "kplugininfo.h" + +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 82) + class KPluginTraderPrivate; /** * \class KPluginTrader kplugintrader.h <KPluginTrader> @@ -141,7 +144,9 @@ * * @return A list of services that satisfy the query * @see http://techbase.kde.org/Development/Tutorials/Services/Traders#The_KTrader_Query_Language + * @deprecated since 5.82, use KPluginLoader::findPlugins. */ + KSERVICE_DEPRECATED_VERSION(5, 82, "Use KPluginLoader::findPlugins") KPluginInfo::List query(const QString &subDirectory, const QString &serviceType = QString(), const QString &constraint = QString()); /** @@ -150,8 +155,11 @@ * You will need to use this to access the KPluginTrader functionality since the * constructors are protected. * + * @deprecated since 5.82, use KPluginLoader + * * @return Static KPluginTrader instance */ + KSERVICE_DEPRECATED_VERSION(5, 82, "Use KPluginLoader") static KPluginTrader *self(); /** @@ -173,8 +181,10 @@ * @param error The string passed here will contain an error description. * @return A pointer to the newly created object or a null pointer if the * factory was unable to create an object of the given type. + * @deprecated since 5.82, use KPluginLoader API. */ template<class T> + KSERVICE_DEPRECATED_VERSION(5, 82, "Use KPluginLoader API") static T *createInstanceFromQuery(const QString &subDirectory, const QString &serviceType = QString(), const QString &constraint = QString(), @@ -202,8 +212,10 @@ * @param error The string passed here will contain an error description. * @return A pointer to the newly created object or a null pointer if the * factory was unable to create an object of the given type. + * @deprecated since 5.82, use KPluginLoader API. */ template<class T> + KSERVICE_DEPRECATED_VERSION(5, 82, "Use KPluginLoader API") static T *createInstanceFromQuery(const QString &subDirectory, const QString &serviceType, const QString &constraint, @@ -236,6 +248,7 @@ return nullptr; } + KSERVICE_DEPRECATED_VERSION(5, 82, "No users.") static void applyConstraints(KPluginInfo::List &lst, const QString &constraint); private: @@ -250,5 +263,6 @@ KPluginTraderPrivate *const d; }; +#endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/services/application.desktop new/kservice-5.82.0/src/services/application.desktop --- old/kservice-5.81.0/src/services/application.desktop 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/services/application.desktop 2021-05-01 14:39:32.000000000 +0200 @@ -83,7 +83,7 @@ Name[sr@ijekavianlatin]=Program Name[sr@latin]=Program Name[sv]=Program -Name[ta]=???????????????????????? +Name[ta]=??????????????? Name[te]=?????????????????????????????? Name[tg]=?????????????? Name[th]=????????????????????? @@ -152,5 +152,8 @@ [PropertyDef::X-KDE-Wayland-Interfaces] Type=QStringList +[PropertyDef::X-KDE-Wayland-VirtualKeyboard] +Type=bool + [PropertyDef::X-KDE-DBUS-Restricted-Interfaces] Type=QStringList diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/services/kmimetypetrader.cpp new/kservice-5.82.0/src/services/kmimetypetrader.cpp --- old/kservice-5.81.0/src/services/kmimetypetrader.cpp 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/services/kmimetypetrader.cpp 2021-05-01 14:39:32.000000000 +0200 @@ -18,6 +18,8 @@ #include "servicesdebug.h" #include <QMimeDatabase> +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 82) + class KMimeTypeTraderPrivate { public: @@ -195,3 +197,5 @@ // qCDebug(SERVICES) << "No offers, or none allowed as default"; return KService::Ptr(); } + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/src/services/kmimetypetrader.h new/kservice-5.82.0/src/services/kmimetypetrader.h --- old/kservice-5.81.0/src/services/kmimetypetrader.h 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/src/services/kmimetypetrader.h 2021-05-01 14:39:32.000000000 +0200 @@ -14,6 +14,7 @@ class KServiceOffer; typedef QList<KServiceOffer> KServiceOfferList; +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 82) /** * @class KMimeTypeTrader kmimetypetrader.h <KMimeTypeTrader> * @@ -34,6 +35,10 @@ * Although if this is about loading that component you would use createPartInstanceFromQuery() directly. * * @see KServiceTypeTrader, KService + * + * @deprecated since 5.82. For querying applications use KApplicationTrader. + * For querying KParts use KParts::PartLoader. + * For querying plugins use KPluginLoader. */ class KSERVICE_EXPORT KMimeTypeTrader { @@ -73,7 +78,11 @@ * @return A list of services that satisfy the query, sorted by preference * (preferred service first) * @see http://techbase.kde.org/Development/Tutorials/Services/Traders#The_KTrader_Query_Language + * @deprecated since 5.82. For querying applications use KApplicationTrader::query(). + * For querying KParts use KParts::PartLoader::partsForMimeType(). + * For querying plugins use KPluginLoader. */ + KSERVICE_DEPRECATED_VERSION(5, 82, "See API docs.") KService::List query(const QString &mimeType, const QString &genericServiceType = QStringLiteral("Application"), const QString &constraint = QString()) const; @@ -85,8 +94,11 @@ * * @param mimeType the MIME type (see query()) * @param genericServiceType the service type (see query()) - * @return the preferred service, or @c nullptr if no service is available + * @return the preferred service, or @c nullptr if no service is available. + * @deprecated since 5.82. For querying applications use KApplicationTrader::preferredService(). For querying KParts use + * KParts::PartLoader::partsForMimeType().first(). */ + KSERVICE_DEPRECATED_VERSION(5, 82, "See API docs.") KService::Ptr preferredService(const QString &mimeType, const QString &genericServiceType = QStringLiteral("Application")); /** @@ -109,8 +121,11 @@ * @param error The string passed here will contain an error description. * @return A pointer to the newly created object or a null pointer if the * factory was unable to create an object of the given type. + * @deprecated since 5.82. For KParts use KParts::PartLoader::createPartInstanceForMimeType(). + * Otherwise use KPluginLoader. */ template<class T> + KSERVICE_DEPRECATED_VERSION(5, 82, "See API docs.") static T *createPartInstanceFromQuery(const QString &mimeType, QWidget *parentWidget = nullptr, QObject *parent = nullptr, @@ -146,8 +161,11 @@ * @param error The string passed here will contain an error description. * @return A pointer to the newly created object or a null pointer if the * factory was unable to create an object of the given type. + * @deprecated since 5.82. For KParts use KParts::PartLoader::createPartInstanceForMimeType(). + * Otherwise use KPluginLoader. */ template<class T> + KSERVICE_DEPRECATED_VERSION(5, 82, "See API docs.") static T *createInstanceFromQuery(const QString &mimeType, const QString &serviceType, QObject *parent = nullptr, @@ -196,4 +214,6 @@ friend class KMimeTypeTraderSingleton; }; +#endif + #endif /* KMIMETYPETRADER_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.81.0/tests/CMakeLists.txt new/kservice-5.82.0/tests/CMakeLists.txt --- old/kservice-5.81.0/tests/CMakeLists.txt 2021-04-04 13:47:30.000000000 +0200 +++ new/kservice-5.82.0/tests/CMakeLists.txt 2021-05-01 14:39:32.000000000 +0200 @@ -1,4 +1,7 @@ -add_subdirectory(pluginlocator) +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.82.0) + add_subdirectory(pluginlocator) +endif() include(ECMMarkAsTest) @@ -13,7 +16,6 @@ endmacro() kservice_executable_tests( - startserviceby kservicegroup_dumper findservice ) @@ -24,6 +26,13 @@ ) endif() +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.82.0) + kservice_executable_tests( + startserviceby + ) +endif() + set(kmimeassociations_dumper_debug_SRCS) ecm_qt_declare_logging_category(kmimeassociations_dumper_debug_SRCS HEADER sycocadebug.h
