Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2022-01-11 21:16:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Tue Jan 11 21:16:43 2022 rev:103 rq:945083 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2021-12-13 20:44:44.464487612 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new.1892/kservice.changes 2022-01-11 21:19:29.684968329 +0100 @@ -1,0 +2,18 @@ +Mon Jan 3 12:47:54 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Wrap KServiceTypeTrader methods to create instances also in KCOREADDONS + visibility guard + * Not use toLower on DesktopEntryName + * QVariant(QVariant::Type) constructor is explicit in Qt6 + * Change the build system to enable building with Qt 6 + * Expand deprecation docs for KServiceTypeTrader + * Deprecate KServiceTypeTrader class + * Emit deprecation warning for KServiceType class + * Deprecate KPluginInfo in favor of KPluginMetaData + +------------------------------------------------------------------- Old: ---- kservice-5.89.0.tar.xz kservice-5.89.0.tar.xz.sig New: ---- kservice-5.90.0.tar.xz kservice-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.7LH1tk/_old 2022-01-11 21:19:30.340968790 +0100 +++ /var/tmp/diff_new_pack.7LH1tk/_new 2022-01-11 21:19:30.340968790 +0100 @@ -16,21 +16,21 @@ # -%define _tar_path 5.89 +%define _tar_path 5.90 # 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 +%bcond_without released Name: kservice -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif @@ -55,9 +55,6 @@ BuildRequires: cmake(Qt5Xml) >= 5.15.0 Recommends: kded >= %{_kf5_bugfix_version} Obsoletes: libKF5Service4 -%if %{with lang} -Recommends: %{name}-lang = %{version} -%endif %description Provides a plugin framework for handling desktop services. Services can @@ -90,14 +87,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name} --with-man --all-name %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files lang -f %{name}.lang %endif ++++++ kservice-5.89.0.tar.xz -> kservice-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/CMakeLists.txt new/kservice-5.90.0/CMakeLists.txt --- old/kservice-5.89.0/CMakeLists.txt 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/CMakeLists.txt 2022-01-01 13:35:53.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.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.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -43,9 +43,9 @@ # Dependencies set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) if (NOT ANDROID) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) endif() find_package(KF5Config ${KF_DEP_VERSION} CONFIG REQUIRED) @@ -74,7 +74,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_definitions(-DKCOREADDONS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054E00) # for KPluginInfo::dependencies ki18n_install(po) @@ -122,7 +122,7 @@ ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kservice_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/autotests/CMakeLists.txt new/kservice-5.90.0/autotests/CMakeLists.txt --- old/kservice-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:35:53.000000000 +0100 @@ -2,12 +2,12 @@ ########### unittests ############### -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Concurrent Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Concurrent Test) macro(KSERVICE_UNIT_TESTS) foreach(_testname ${ARGN}) ecm_add_test(${_testname}.cpp TEST_NAME ${_testname} - LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Concurrent Qt5::Xml) + LINK_LIBRARIES KF5::Service Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Concurrent Qt${QT_MAJOR_VERSION}::Xml) target_compile_definitions(${_testname} PRIVATE -DKBUILDSYCOCAEXE=\"$<TARGET_FILE:kbuildsycoca5>\") endforeach() endmacro(KSERVICE_UNIT_TESTS) @@ -18,7 +18,6 @@ ksycocadicttest ksycocathreadtest kservicetest - kplugininfotest kapplicationtradertest ) @@ -48,19 +47,24 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../src/services/ktraderparsetree.cpp ) -add_library(fakeplugin MODULE nsaplugin.cpp) -ecm_mark_as_test(fakeplugin) -target_link_libraries(fakeplugin KF5::Service) - +if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT" AND + EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.90.0) + kservice_unit_tests(kplugininfotest) -# generate new-style and old-style JSON from the .desktop file -file(COPY fakeplugin.desktop DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin.desktop ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_old.desktop) -kcoreaddons_desktop_to_json(fakeplugin ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_old.desktop COMPAT_MODE) - -file(COPY fakeplugin.desktop DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin.desktop ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_new.desktop) -kcoreaddons_desktop_to_json(fakeplugin ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_new.desktop) + add_library(fakeplugin MODULE nsaplugin.cpp) + ecm_mark_as_test(fakeplugin) + target_link_libraries(fakeplugin KF5::Service) + + + # generate new-style and old-style JSON from the .desktop file + file(COPY fakeplugin.desktop DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin.desktop ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_old.desktop) + kcoreaddons_desktop_to_json(fakeplugin ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_old.desktop COMPAT_MODE) + + file(COPY fakeplugin.desktop DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin.desktop ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_new.desktop) + kcoreaddons_desktop_to_json(fakeplugin ${CMAKE_CURRENT_BINARY_DIR}/fakeplugin_json_new.desktop) +endif() ######### kmimeassociationstest ######## @@ -72,5 +76,5 @@ ) ecm_add_test(${kmimeassociationstest_SRCS} TEST_NAME kmimeassociationstest - LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Xml) + LINK_LIBRARIES KF5::Service Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/autotests/kapplicationtradertest.cpp new/kservice-5.90.0/autotests/kapplicationtradertest.cpp --- old/kservice-5.89.0/autotests/kapplicationtradertest.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/autotests/kapplicationtradertest.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -323,8 +323,13 @@ QThreadPool::globalInstance()->setMaxThreadCount(10); QFutureSynchronizer<void> sync; // Can't use data-driven tests here, QTestLib isn't threadsafe. +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + sync.addFuture(QtConcurrent::run(&KApplicationTraderTest::testQueryByMimeType, this)); + sync.addFuture(QtConcurrent::run(&KApplicationTraderTest::testQueryByMimeType, this)); +#else sync.addFuture(QtConcurrent::run(this, &KApplicationTraderTest::testQueryByMimeType)); sync.addFuture(QtConcurrent::run(this, &KApplicationTraderTest::testQueryByMimeType)); +#endif sync.waitForFinished(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/autotests/kservicetest.cpp new/kservice-5.90.0/autotests/kservicetest.cpp --- old/kservice-5.89.0/autotests/kservicetest.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/autotests/kservicetest.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -490,6 +490,7 @@ QCOMPARE(KService::serviceByDesktopName(QStringLiteral("org.kde.faketestapp"))->menuId(), QStringLiteral("org.kde.faketestapp.desktop")); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void KServiceTest::testServiceTypeTraderForReadOnlyPart() { if (!KSycoca::isAvailable()) { @@ -537,10 +538,12 @@ lastPreference = preference; } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) // Now look for any FakePluginType offers = KServiceTypeTrader::self()->query(QStringLiteral("FakePluginType")); QVERIFY(offerListHasService(offers, QStringLiteral("fakeservice.desktop"))); QVERIFY(offerListHasService(offers, QStringLiteral("faketextplugin.desktop"))); +#endif } void KServiceTest::testTraderConstraints() @@ -600,6 +603,7 @@ offers = KServiceTypeTrader::self()->query(QStringLiteral("FakePluginType"), QStringLiteral("A == B OR C == D AND OR Foo == 'Parse Error'")); QVERIFY(offers.isEmpty()); } +#endif void KServiceTest::testSubseqConstraints() { @@ -693,6 +697,7 @@ } #endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void KServiceTest::testDefaultOffers() { // Now that we have a user-profile, let's see if defaultOffers indeed gives us the default ordering. @@ -706,6 +711,7 @@ } QCOMPARE(offers[0]->entryPath(), m_firstOffer); } +#endif #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void KServiceTest::testDeleteServiceTypeProfile() @@ -822,12 +828,21 @@ { QThreadPool::globalInstance()->setMaxThreadCount(10); QFutureSynchronizer<void> sync; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + sync.addFuture(QtConcurrent::run(&KServiceTest::testAllServices, this)); + sync.addFuture(QtConcurrent::run(&KServiceTest::testAllServices, this)); + sync.addFuture(QtConcurrent::run(&KServiceTest::testAllServices, this)); + sync.addFuture(QtConcurrent::run(&KServiceTest::testHasServiceType1, this)); + sync.addFuture(QtConcurrent::run(&KServiceTest::testAllServices, this)); + sync.addFuture(QtConcurrent::run(&KServiceTest::testAllServices, this)); +#else sync.addFuture(QtConcurrent::run(this, &KServiceTest::testAllServices)); sync.addFuture(QtConcurrent::run(this, &KServiceTest::testAllServices)); sync.addFuture(QtConcurrent::run(this, &KServiceTest::testAllServices)); sync.addFuture(QtConcurrent::run(this, &KServiceTest::testHasServiceType1)); sync.addFuture(QtConcurrent::run(this, &KServiceTest::testAllServices)); sync.addFuture(QtConcurrent::run(this, &KServiceTest::testAllServices)); +#endif sync.waitForFinished(); QThreadPool::globalInstance()->setMaxThreadCount(1); // delete those threads } @@ -836,10 +851,20 @@ { QThreadPool::globalInstance()->setMaxThreadCount(10); QFutureSynchronizer<void> sync; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + sync.addFuture(QtConcurrent::run(&KServiceTest::testAllServices, this)); + sync.addFuture(QtConcurrent::run(&KServiceTest::testHasServiceType1, this)); + sync.addFuture(QtConcurrent::run(&KServiceTest::testDeletingService, this)); +#else sync.addFuture(QtConcurrent::run(this, &KServiceTest::testAllServices)); sync.addFuture(QtConcurrent::run(this, &KServiceTest::testHasServiceType1)); sync.addFuture(QtConcurrent::run(this, &KServiceTest::testDeletingService)); + +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) sync.addFuture(QtConcurrent::run(this, &KServiceTest::testTraderConstraints)); +#endif +#endif // QT_VERSION + // process events (DBus, inotify...), until we get all expected signals QTRY_COMPARE_WITH_TIMEOUT(m_sycocaUpdateDone.loadRelaxed(), 1, 15000); // not using a bool, just to silence helgrind qDebug() << "Joining all threads"; @@ -882,12 +907,14 @@ } #endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void KServiceTest::testKPluginInfoQuery() { KPluginInfo info(KPluginMetaData(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String{"/kservices5/fakepart2.desktop"})); QCOMPARE(info.property(QStringLiteral("X-KDE-TestList")).toStringList().size(), 2); } +#endif void KServiceTest::testCompleteBaseName() { @@ -916,6 +943,7 @@ } #endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void KServiceTest::testTraderQueryMustRebuildSycoca() { QVERIFY(!KServiceTypeProfile::hasProfile(QStringLiteral("FakeBasePart"))); @@ -924,3 +952,4 @@ KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("FakeBasePart")); QVERIFY(offers.count() > 0); } +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/autotests/kservicetest.h new/kservice-5.90.0/autotests/kservicetest.h --- old/kservice-5.89.0/autotests/kservicetest.h 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/autotests/kservicetest.h 2022-01-01 13:35:53.000000000 +0100 @@ -34,15 +34,19 @@ void testProperty(); void testAllServiceTypes(); void testAllServices(); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void testServiceTypeTraderForReadOnlyPart(); void testTraderConstraints(); +#endif void testSubseqConstraints(); void testHasServiceType1(); void testHasServiceType2(); #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void testWriteServiceTypeProfile(); #endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void testDefaultOffers(); +#endif #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void testDeleteServiceTypeProfile(); #endif @@ -56,10 +60,15 @@ #if KSERVICE_BUILD_DEPRECATED_SINCE(5, 86) void testOperatorKPluginName(); #endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void testKPluginInfoQuery(); +#endif void testCompleteBaseName(); void testEntryPathToName(); + +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) void testTraderQueryMustRebuildSycoca(); +#endif private: void createFakeService(const QString &filenameSuffix, const QString &serviceType); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/autotests/ksycocathreadtest.cpp new/kservice-5.90.0/autotests/ksycocathreadtest.cpp --- old/kservice-5.89.0/autotests/ksycocathreadtest.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/autotests/ksycocathreadtest.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -124,12 +124,14 @@ } } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("KPluginInfo")); Q_ASSERT(offerListHasService(offers, QStringLiteral("threadtextplugin.desktop"))); offers = KServiceTypeTrader::self()->query(QStringLiteral("KPluginInfo"), QStringLiteral("Library == 'threadtextplugin'")); Q_ASSERT(offers.count() == 1); QVERIFY(offerListHasService(offers, QStringLiteral("threadtextplugin.desktop"))); +#endif KServiceGroup::Ptr root = KServiceGroup::root(); Q_ASSERT(root); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/po/ca@valencia/kservice5.po new/kservice-5.90.0/po/ca@valencia/kservice5.po --- old/kservice-5.89.0/po/ca@valencia/kservice5.po 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/po/ca@valencia/kservice5.po 2022-01-01 13:35:53.000000000 +0100 @@ -6,17 +6,17 @@ # Sebasti?? Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella P??rez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. +# Josep M. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. -# Empar <[email protected]>, 2019. +# Empar Montoro Mart??n <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: kservice\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-09-19 00:15+0000\n" "PO-Revision-Date: 2019-06-18 13:49+0200\n" -"Last-Translator: Empar <[email protected]>\n" +"Last-Translator: Empar Montoro Mart??n <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Sebasti?? Pla,Antoni Bella,Albert Astals,Josep Ma. Ferrer" +msgstr "Sebasti?? Pla,Antoni Bella,Albert Astals,Josep M. Ferrer" #, kde-format msgctxt "EMAIL OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/po/zh_CN/kservice5.po new/kservice-5.90.0/po/zh_CN/kservice5.po --- old/kservice-5.89.0/po/zh_CN/kservice5.po 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/po/zh_CN/kservice5.po 2022-01-01 13:35:53.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-09-19 00:15+0000\n" -"PO-Revision-Date: 2021-11-30 15:21\n" +"PO-Revision-Date: 2021-12-22 14:06\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.89.0/src/CMakeLists.txt new/kservice-5.90.0/src/CMakeLists.txt --- old/kservice-5.89.0/src/CMakeLists.txt 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/CMakeLists.txt 2022-01-01 13:35:53.000000000 +0100 @@ -61,7 +61,7 @@ endif() endif() -if (TARGET Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) target_sources(KF5Service PRIVATE plugin/kdbusservicestarter.cpp ) @@ -105,7 +105,7 @@ # kservice cannot depend on kinit (because kinit->kio->kservice), so we need a copy of org.kde.KLauncher.xml here. # And I don't want to have it here as a source file (who wants to edit dbus xml by hand), so it can be # generated from klauncher's implementation header. -if (TARGET Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) set(kservice_dbus_SRCS) qt_add_dbus_interface(kservice_dbus_SRCS kdeinit/org.kde.KLauncher.xml klauncher_iface) target_sources(KF5Service PRIVATE ${kservice_dbus_SRCS}) @@ -120,7 +120,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 5.82 5.83 5.86 5.87 5.88 5.89 + 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 5.83 5.86 5.87 5.88 5.89 5.90 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) set(kservice_includes @@ -134,7 +134,7 @@ PUBLIC "$<BUILD_INTERFACE:${kservice_includes}>" INTERFACE - "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KService>" + "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KService>" ) target_link_libraries(KF5Service @@ -143,7 +143,7 @@ KF5::CoreAddons # KShell KPluginLoader PRIVATE KF5::I18n - Qt5::Xml # (for vfolder menu) QDomDocument + Qt${QT_MAJOR_VERSION}::Xml # (for vfolder menu) QDomDocument ) if (TARGET KF5::DBusAddons) target_link_libraries(KF5Service PRIVATE KF5::DBusAddons) # KDEInitInterface @@ -189,7 +189,7 @@ install(FILES services/kplugininfo.desktop # TODO move to qrc too, like application.desktop? services/application.desktop # KF6: TODO: stop installing this file, it's now bundled into the qrc - DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} + DESTINATION ${KDE_INSTALL_KSERVICETYPESDIR} ) # Local copy for the unittests @@ -197,7 +197,7 @@ add_custom_command(TARGET KF5Service PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/services/kplugininfo.desktop - ${CMAKE_BINARY_DIR}/bin/data/kservicetypes5) # not using KDE_INSTALL_KSERVICETYPES5DIR because QStandardPaths wants "data" on Windows + ${CMAKE_BINARY_DIR}/bin/data/kservicetypes5) # not using KDE_INSTALL_KSERVICETYPESDIR because QStandardPaths wants "data" on Windows if (WIN32) install( FILES applications.menu DESTINATION ${KDE_INSTALL_DATAROOTDIR}/xdg/menus RENAME ${APPLICATIONS_MENU_NAME} ) @@ -217,7 +217,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kservice_export.h" ${KService_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KService COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KService COMPONENT Devel ) ecm_qt_install_logging_categories( @@ -257,5 +257,5 @@ add_subdirectory(kbuildsycoca) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KService LIB_NAME KF5Service DEPS "KConfigCore" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KService) +ecm_generate_pri_file(BASE_NAME KService LIB_NAME KF5Service DEPS "KConfigCore" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KService) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/kbuildsycoca/CMakeLists.txt new/kservice-5.90.0/src/kbuildsycoca/CMakeLists.txt --- old/kservice-5.89.0/src/kbuildsycoca/CMakeLists.txt 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/kbuildsycoca/CMakeLists.txt 2022-01-01 13:35:53.000000000 +0100 @@ -14,6 +14,6 @@ KF5::Service KF5::CoreAddons # KAboutData KF5::I18n - Qt5::Xml + Qt${QT_MAJOR_VERSION}::Xml ) install(TARGETS kbuildsycoca5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/kplugininfo.cpp new/kservice-5.90.0/src/services/kplugininfo.cpp --- old/kservice-5.89.0/src/services/kplugininfo.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/kplugininfo.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -8,6 +8,7 @@ #include "kplugininfo.h" +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) #include "servicesdebug.h" #include <QDirIterator> #include <QJsonArray> @@ -785,3 +786,4 @@ } #undef KPLUGININFO_ISVALID_ASSERTION +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/kplugininfo.h new/kservice-5.90.0/src/services/kplugininfo.h --- old/kservice-5.89.0/src/services/kplugininfo.h 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/kplugininfo.h 2022-01-01 13:35:53.000000000 +0100 @@ -19,6 +19,7 @@ class KPluginMetaData; class KPluginInfoPrivate; +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 90) /** * @class KPluginInfo kplugininfo.h <KPluginInfo> * @@ -28,6 +29,15 @@ * user to decide whether he wants to use this plugin or not. * * @author Matthias Kretz <[email protected]> + * @deprecated since 5.88, use QPluginLoader or the KPluginFactory::loadFactory/KPluginFactory::instantiatePlugins + * methods instead to create objects from the plugins. + * For accessing the metadata, use KPluginMetaData instead. + * To embed json metadata in your plugin, use K_PLUGIN_CLASS_WITH_JSON(MyClass, "mypluginmetadata.json") + * + * The reading of the enabled state can be done using the KPluginMetaData::isEnabled method. + * Writing the config should be done manually. Consider using KPluginWidget for the configuration + * of plugins in the UI. + * */ class KSERVICE_EXPORT KPluginInfo { @@ -71,10 +81,11 @@ * @param resource If filename is relative, you need to specify a resource type * (e.g. "service", "apps"... KStandardDirs). Otherwise, * resource isn't used. + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") explicit KPluginInfo(const QString &filename /*, QStandardPaths::StandardLocation resource = ...? GenericDataLocation + services ? Is this used? */); -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 88) /** * Read plugin info from a KService object. * @@ -99,14 +110,10 @@ Comment=Description of what the plugin does \endverbatim * In the first three entries the Icon entry is optional. - * @deprecated since 5.0, use (Q|K)PluginLoader instead and build the - * metadata into the plugin using K_PLUGIN_CLASS_WITH_JSON( ..., "mypluginmetadata.json") - * @deprecated since 5.88, use QPluginLoader/KPluginMetaData instead and build the - * metadata into the plugins using K_PLUGIN_CLASS_WITH_JSON( ..., "mypluginmetadata.json") + * @deprecated Since 5.90, see class API docs */ - KSERVICE_DEPRECATED_VERSION(5, 88, "see API docs") + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") explicit KPluginInfo(const KService::Ptr service); -#endif /** * Read plugin info from arguments passed to the plugin. These arguments should contain @@ -153,7 +160,9 @@ * \see K_PLUGIN_CLASS_WITH_JSON() * \see KPluginFactory::factory() * @since 5.0 + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") explicit KPluginInfo(const QVariantList &args, const QString &libraryPath = QString()); /** @@ -163,7 +172,9 @@ * @see K_PLUGIN_CLASS_WITH_JSON() * @see KPluginLoader * @since 5.5 + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") explicit KPluginInfo(const KPluginMetaData &md); /** @@ -175,7 +186,6 @@ ~KPluginInfo(); -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 88) /** * @return A list of KPluginInfo objects constructed from a list of * KService objects. If you get a trader offer of the plugins you want @@ -183,12 +193,10 @@ * * @param services The list of services to construct the list of KPluginInfo objects from * @param config The config group where to save/load whether the plugin is enabled/disabled - * @deprecated since 5.88, use QPluginLoader/KPluginMetaData instead and build the - * metadata into the plugins using K_PLUGIN_CLASS_WITH_JSON( ..., "mypluginmetadata.json") + * @deprecated Since 5.90, see class API docs */ - KSERVICE_DEPRECATED_VERSION(5, 88, "see API docs") + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") static KPluginInfo::List fromServices(const KService::List &services, const KConfigGroup &config = KConfigGroup()); -#endif /** * @return A list of KPluginInfo objects constructed from a list of @@ -451,28 +459,36 @@ * @param info the KPluginInfo object to convert * @return a KPluginMetaData object with equivalent meta data. * @since 5.3 + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") static KPluginMetaData toMetaData(const KPluginInfo &info); /** * @param meta the KPluginMetaData to convert * @return a KPluginInfo object with equivalent meta data. * @since 5.3 + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") static KPluginInfo fromMetaData(const KPluginMetaData &meta); /** * @param list the list of KPluginInfo objects to convert * @return a list of KPluginMetaData objects with equivalent meta data. * @since 5.3 + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") static QVector<KPluginMetaData> toMetaData(const KPluginInfo::List &list); /** * @param list the list of KPluginMetaData objects to convert * @return a list of KPluginInfo objects with equivalent meta data. * @since 5.3 + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "see class API docs") static KPluginInfo::List fromMetaData(const QVector<KPluginMetaData> &list); private: @@ -482,4 +498,5 @@ KSERVICE_EXPORT uint qHash(const KPluginInfo &); +#endif #endif // KPLUGININFO_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/kservice.cpp new/kservice-5.90.0/src/services/kservice.cpp --- old/kservice-5.89.0/src/services/kservice.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/kservice.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -113,18 +113,18 @@ return; } - const QStandardPaths::StandardLocation resource = config->resource(); + const QStandardPaths::StandardLocation locationType = config->locationType(); - if ((m_strType == QLatin1String("Application")) && (resource != QStandardPaths::ApplicationsLocation) && !absPath) { + if ((m_strType == QLatin1String("Application")) && (locationType != QStandardPaths::ApplicationsLocation) && !absPath) { qCWarning(SERVICES) << "The desktop entry file" << entryPath << "has Type=" << m_strType << "but is located under \"" - << QStandardPaths::displayName(resource) << "\" instead of \"Applications\""; + << QStandardPaths::displayName(locationType) << "\" instead of \"Applications\""; m_bValid = false; return; } - if ((m_strType == QLatin1String("Service")) && (resource != QStandardPaths::GenericDataLocation) && !absPath) { + if ((m_strType == QLatin1String("Service")) && (locationType != QStandardPaths::GenericDataLocation) && !absPath) { qCWarning(SERVICES) << "The desktop entry file" << entryPath << "has Type=" << m_strType << "but is located under \"" - << QStandardPaths::displayName(resource) << "\" instead of \"Shared Data\"/kservices5"; + << QStandardPaths::displayName(locationType) << "\" instead of \"Shared Data\"/kservices5"; m_bValid = false; return; } @@ -224,7 +224,7 @@ m_DBUSStartusType = KService::DBusNone; } - m_strDesktopEntryName = _name.toLower(); + m_strDesktopEntryName = _name; // Exec lines from the KCMs always have the pattern "<program> m_strDesktopEntryName", see https://phabricator.kde.org/T13729 const static bool hasSystemsettings = !QStandardPaths::findExecutable(QStringLiteral("systemsettings5")).isEmpty(); @@ -564,7 +564,7 @@ // All others // For instance properties defined as StringList, like MimeTypes. // XXX This API is accessible only through a friend declaration. - return KConfigGroup::convertToQVariant(_name.toUtf8().constData(), it->toString().toUtf8(), t); + return KConfigGroup::convertToQVariant(_name.toUtf8().constData(), it->toString().toUtf8(), QVariant(t)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/kservicegroupfactory.cpp new/kservice-5.90.0/src/services/kservicegroupfactory.cpp --- old/kservice-5.89.0/src/services/kservicegroupfactory.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/kservicegroupfactory.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -13,6 +13,8 @@ #include "servicesdebug.h" +#include <QIODevice> + KServiceGroupFactory::KServiceGroupFactory(KSycoca *db) : KSycocaFactory(KST_KServiceGroupFactory, db) , m_baseGroupDict(nullptr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/kservicetype.h new/kservice-5.90.0/src/services/kservicetype.h --- old/kservice-5.89.0/src/services/kservicetype.h 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/kservicetype.h 2022-01-01 13:35:53.000000000 +0100 @@ -29,6 +29,8 @@ * In order to discover services of a given type, using KServiceTypeTrader. * Service types are stored as desktop files in $KDEDIR/share/servicetypes. * @see KService, KServiceTypeTrader + * @deprecated Since 5.90, this class is an implementation detail of KService. + * Use @ref KService or @ref KApplicationTrader instead. */ class KSERVICE_EXPORT KServiceType : public KSycocaEntry // TODO KDE5: inherit kshared, but move KSycocaEntry to KServiceTypePrivate { @@ -45,7 +47,9 @@ /** * Construct a service type and take all information from a desktop file. * @param config the configuration file + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "See class API docs") explicit KServiceType(KDesktopFile *config); ~KServiceType() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/kservicetypetrader.cpp new/kservice-5.90.0/src/services/kservicetypetrader.cpp --- old/kservice-5.89.0/src/services/kservicetypetrader.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/kservicetypetrader.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -8,6 +8,8 @@ #include "kservicetypetrader.h" +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) + #include "kservicefactory_p.h" #include "kservicetype.h" #include "kservicetypefactory_p.h" @@ -159,3 +161,5 @@ // qDebug() << "No offers, or none allowed as default"; return KService::Ptr(); } + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/kservicetypetrader.h new/kservice-5.90.0/src/services/kservicetypetrader.h --- old/kservice-5.89.0/src/services/kservicetypetrader.h 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/kservicetypetrader.h 2022-01-01 13:35:53.000000000 +0100 @@ -10,6 +10,9 @@ #define __kservicetypetrader_h__ #include "kservice.h" + +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 90) + class KServiceOffer; typedef QList<KServiceOffer> KServiceOfferList; class KServiceTypeTraderPrivate; @@ -60,6 +63,11 @@ * greater than 4. * * @see KMimeTypeTrader, KService + * @deprecated Since 5.90. + * For querying plugins use @p KPluginMetaData::findPlugins. + * For querying applications use @p KApplicationTrader. + * For querying KParts use @p KParts::PartLoader. + * For querying desktop files use @p KFileUtils::findAllUniqueFiles and @p KDesktopFile. */ class KSERVICE_EXPORT KServiceTypeTrader { @@ -119,10 +127,13 @@ * constructors are protected. * * @return Static KServiceTypeTrader instance + * @deprecated Since 5.90, see class API docs */ + KSERVICE_DEPRECATED_VERSION(5, 90, "See class API docs") static KServiceTypeTrader *self(); #if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 86) +#if KCOREADDONS_ENABLE_DEPRECATED_SINCE(5, 86) /** * Get a plugin from a trader query * @@ -156,8 +167,10 @@ return createInstanceFromQuery<T>(serviceType, nullptr, parent, constraint, args, error); } #endif +#endif #if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 86) +#if KCOREADDONS_ENABLE_DEPRECATED_SINCE(5, 86) /** * Get a plugin from a trader query * @@ -203,6 +216,7 @@ return nullptr; } #endif +#endif /** * @internal (public for KMimeTypeTrader) @@ -227,3 +241,4 @@ }; #endif +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/ktraderparsetree.cpp new/kservice-5.90.0/src/services/ktraderparsetree.cpp --- old/kservice-5.89.0/src/services/ktraderparsetree.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/ktraderparsetree.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -14,9 +14,12 @@ { if (service) { return service->property(_key); - } else if (info.isValid()) { + } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) + if (info.isValid()) { return info.property(_key); } +#endif return QVariant(); } @@ -622,6 +625,7 @@ return (c.b ? 1 : 0); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) int matchConstraintPlugin(const ParseTreeBase *_tree, const KPluginInfo &_info, const KPluginInfo::List &_list) { // Empty tree matches always @@ -644,6 +648,7 @@ return (c.b ? 1 : 0); } +#endif bool ParseContext::initMaxima(const QString &_prop) { @@ -680,12 +685,15 @@ for (; oit != offers.cend(); ++oit) { offerValues << (*oit)->property(_prop); } - } else if (info.isValid()) { + } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) + else if (info.isValid()) { KPluginInfo::List::ConstIterator oit = pluginOffers.cbegin(); for (; oit != pluginOffers.cend(); ++oit) { offerValues << (*oit).property(_prop); } } +#endif for (const QVariant &p : std::as_const(offerValues)) { if (p.isValid()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/services/ktraderparsetree_p.h new/kservice-5.90.0/src/services/ktraderparsetree_p.h --- old/kservice-5.89.0/src/services/ktraderparsetree_p.h 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/services/ktraderparsetree_p.h 2022-01-01 13:35:53.000000000 +0100 @@ -26,7 +26,9 @@ * <0 => Error */ int matchConstraint(const ParseTreeBase *_tree, const KService::Ptr &, const KService::List &); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) int matchConstraintPlugin(const ParseTreeBase *_tree, const KPluginInfo &_info, const KPluginInfo::List &_list); +#endif /** * @internal @@ -60,28 +62,34 @@ */ explicit ParseContext(const ParseContext *_ctx) : service(_ctx->service) - , info(_ctx->info) , maxima(_ctx->maxima) , offers(_ctx->offers) +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) + , info(_ctx->info) , pluginOffers(_ctx->pluginOffers) +#endif { } ParseContext(const KService::Ptr &_service, const KService::List &_offers, QMap<QString, PreferencesMaxima> &_m) : service(_service) - , info(KPluginInfo()) , maxima(_m) , offers(_offers) +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) + , info(KPluginInfo()) , pluginOffers(KPluginInfo::List()) +#endif { } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) ParseContext(const KPluginInfo &_info, const KPluginInfo::List &_offers, QMap<QString, PreferencesMaxima> &_m) : service(nullptr) - , info(_info) , maxima(_m) , offers(KService::List()) + , info(_info) , pluginOffers(_offers) { } +#endif bool initMaxima(const QString &_prop); @@ -105,11 +113,13 @@ Type type; KService::Ptr service; - KPluginInfo info; QMap<QString, PreferencesMaxima> &maxima; KService::List offers; +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 90) + KPluginInfo info; KPluginInfo::List pluginOffers; +#endif }; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/sycoca/ksycocadict.cpp new/kservice-5.90.0/src/sycoca/ksycocadict.cpp --- old/kservice-5.89.0/src/sycoca/ksycocadict.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/sycoca/ksycocadict.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -12,6 +12,7 @@ #include <kservice.h> #include <QBitArray> +#include <QIODevice> #include <QVector> namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/src/sycoca/ksycocafactory.cpp new/kservice-5.90.0/src/sycoca/ksycocafactory.cpp --- old/kservice-5.89.0/src/sycoca/ksycocafactory.cpp 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/src/sycoca/ksycocafactory.cpp 2022-01-01 13:35:53.000000000 +0100 @@ -14,8 +14,8 @@ #include "sycocadebug.h" #include <QDebug> - #include <QHash> +#include <QIODevice> #include <QThread> class KSycocaFactoryPrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/tests/CMakeLists.txt new/kservice-5.90.0/tests/CMakeLists.txt --- old/kservice-5.89.0/tests/CMakeLists.txt 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/tests/CMakeLists.txt 2022-01-01 13:35:53.000000000 +0100 @@ -5,7 +5,7 @@ include(ECMMarkAsTest) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) macro(kservice_executable_tests) foreach(_testname ${ARGN}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.89.0/tests/pluginlocator/CMakeLists.txt new/kservice-5.90.0/tests/pluginlocator/CMakeLists.txt --- old/kservice-5.89.0/tests/pluginlocator/CMakeLists.txt 2021-12-04 19:42:21.000000000 +0100 +++ new/kservice-5.90.0/tests/pluginlocator/CMakeLists.txt 2022-01-01 13:35:53.000000000 +0100 @@ -4,4 +4,4 @@ ecm_add_test(plugintest.cpp main.cpp TEST_NAME kservice-pluginloadertest - LINK_LIBRARIES Qt5::Core KF5::Service) + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Core KF5::Service)
