Hello community, here is the log from the commit of package kservice for openSUSE:Leap:15.2 checked in at 2020-06-17 11:36:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kservice (Old) and /work/SRC/openSUSE:Leap:15.2/.kservice.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Wed Jun 17 11:36:57 2020 rev:64 rq:814468 version:5.71.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kservice/kservice.changes 2020-05-12 11:39:31.268641883 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.kservice.new.3606/kservice.changes 2020-06-17 11:37:29.576056697 +0200 @@ -1,0 +2,13 @@ +Sun Jun 7 08:07:00 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- 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: + * Add X-KDE-DBUS-Restricted-Interfaces to Application desktop entry fields + * Use KSERVICE_DEPRECATED_VERSION_BELATED + * Build with EXCLUDE_DEPRECATED_BEFORE_AND_AT=CURRENT + * Add missing compiler deprecation tag for 5-args KServiceAction constructor + +------------------------------------------------------------------- Old: ---- kservice-5.70.0.tar.xz kservice-5.70.0.tar.xz.sig New: ---- kservice-5.71.0.tar.xz kservice-5.71.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.ey7FLI/_old 2020-06-17 11:37:29.964057849 +0200 +++ /var/tmp/diff_new_pack.ey7FLI/_new 2020-06-17 11:37:29.964057849 +0200 @@ -16,14 +16,14 @@ # -%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) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kservice -Version: 5.70.0 +Version: 5.71.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-5.70.0.tar.xz -> kservice-5.71.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/.arcconfig new/kservice-5.71.0/.arcconfig --- old/kservice-5.70.0/.arcconfig 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.kde.org/";, - "project.name" : "KService" -} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/CMakeLists.txt new/kservice-5.71.0/CMakeLists.txt --- old/kservice-5.70.0/CMakeLists.txt 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/CMakeLists.txt 2020-06-07 20:31:39.000000000 +0200 @@ -1,7 +1,7 @@ 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(KService VERSION ${KF5_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ # 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) @@ -74,7 +74,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kservice5\") 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(-DQT_NO_FOREACH) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/autotests/CMakeLists.txt new/kservice-5.71.0/autotests/CMakeLists.txt --- old/kservice-5.70.0/autotests/CMakeLists.txt 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/autotests/CMakeLists.txt 2020-06-07 20:31:39.000000000 +0200 @@ -30,6 +30,8 @@ set_tests_properties(ksycocatest PROPERTIES RUN_SERIAL TRUE) # KServiceTest::testAllServices can fail if any service is deleted while the test runs set_tests_properties(kservicetest PROPERTIES RUN_SERIAL TRUE) +# This test deletes ~/.qttest/share/applications +set_tests_properties(kapplicationtradertest PROPERTIES RUN_SERIAL TRUE) target_sources(kapplicationtradertest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../src/services/ktraderparsetree.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/autotests/kplugininfotest.cpp new/kservice-5.71.0/autotests/kplugininfotest.cpp --- old/kservice-5.70.0/autotests/kplugininfotest.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/autotests/kplugininfotest.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -168,10 +168,14 @@ QCOMPARE(info.pluginName(), pluginName); // KService/KPluginInfo merges X-KDE-ServiceTypes and MimeTypes QCOMPARE(info.serviceTypes(), QStringList() << QStringLiteral("KService/NSA") << QStringLiteral("text/plain") << QStringLiteral("image/png")); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 70) if (!info.service()) { +#endif // KService does not include X-My-Custom-Property since there is no service type installed that defines it QCOMPARE(info.property(QStringLiteral("X-My-Custom-Property")), QVariant("foo")); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 70) } +#endif // Now check that converting to KPluginMetaData has the separation KPluginMetaData asMetaData = info.toMetaData(); QCOMPARE(asMetaData.serviceTypes(), QStringList() << QStringLiteral("KService/NSA")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/autotests/kservicetest.cpp new/kservice-5.71.0/autotests/kservicetest.cpp --- old/kservice-5.70.0/autotests/kservicetest.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/autotests/kservicetest.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -521,16 +521,20 @@ // Check ordering according to InitialPreference int lastPreference = -1; +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 67) bool lastAllowedAsDefault = true; +#endif for (KService::Ptr service : qAsConst(offers)) { const QString path = service->entryPath(); const int preference = service->initialPreference(); // ## might be wrong if we use per-servicetype preferences... //qDebug( "%s has preference %d, allowAsDefault=%d", qPrintable( path ), preference, service->allowAsDefault() ); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 67) if (lastAllowedAsDefault && !service->allowAsDefault()) { // first "not allowed as default" offer lastAllowedAsDefault = false; lastPreference = -1; // restart } +#endif if (lastPreference != -1) { QVERIFY(preference <= lastPreference); } @@ -658,6 +662,7 @@ QVERIFY(!faketextPlugin->hasServiceType(QStringLiteral("FakeBasePart"))); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void KServiceTest::testWriteServiceTypeProfile() { const QString serviceType = QStringLiteral("FakeBasePart"); @@ -692,6 +697,7 @@ QVERIFY(offerListHasService(offers, QStringLiteral("otherpart.desktop"))); // should still be somewhere in there QVERIFY(!offerListHasService(offers, QStringLiteral("fakepart2.desktop"))); // it got disabled above } +#endif void KServiceTest::testDefaultOffers() { @@ -707,6 +713,7 @@ QCOMPARE(offers[0]->entryPath(), m_firstOffer); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void KServiceTest::testDeleteServiceTypeProfile() { const QString serviceType = QStringLiteral("FakeBasePart"); @@ -721,6 +728,7 @@ } QCOMPARE(offers[0]->entryPath(), m_firstOffer); } +#endif void KServiceTest::testActionsAndDataStream() { @@ -903,7 +911,7 @@ QCOMPARE(KService(QStringLiteral("/hallo/a.b.c.desktop")).name(), QStringLiteral("a.b.c")); } -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 0) +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) void KServiceTest::testKPluginMetaData() { const QString fakePart = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/kservices5/") + "fakepart.desktop"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/autotests/kservicetest.h new/kservice-5.71.0/autotests/kservicetest.h --- old/kservice-5.70.0/autotests/kservicetest.h 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/autotests/kservicetest.h 2020-06-07 20:31:39.000000000 +0200 @@ -30,7 +30,7 @@ KServiceTest() : m_sycocaUpdateDone(0) {} private Q_SLOTS: void initTestCase(); -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 0) +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 0) void testKPluginMetaData(); #endif void cleanupTestCase(); @@ -48,9 +48,13 @@ void testSubseqConstraints(); void testHasServiceType1(); void testHasServiceType2(); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void testWriteServiceTypeProfile(); +#endif void testDefaultOffers(); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void testDeleteServiceTypeProfile(); +#endif void testDBUSStartupType(); void testByStorageId(); void testActionsAndDataStream(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/docs/Doxyfile.local new/kservice-5.71.0/docs/Doxyfile.local --- old/kservice-5.70.0/docs/Doxyfile.local 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/docs/Doxyfile.local 2020-06-07 20:31:39.000000000 +0200 @@ -4,4 +4,5 @@ PREDEFINED += \ "KSERVICE_ENABLE_DEPRECATED_SINCE(x, y)=1" \ "KSERVICE_BUILD_DEPRECATED_SINCE(x, y)=1" \ - "KSERVICE_DEPRECATED_VERSION(x, y, t)=" + "KSERVICE_DEPRECATED_VERSION(x, y, t)=" \ + "KSERVICE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/po/az/kservice5.po new/kservice-5.71.0/po/az/kservice5.po --- old/kservice-5.70.0/po/az/kservice5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kservice-5.71.0/po/az/kservice5.po 2020-06-07 20:31:39.000000000 +0200 @@ -0,0 +1,206 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the kservice package. +# +# Xəyyam <[email protected]>, 2020. +msgid "" +msgstr "" +"Project-Id-Version: kservice\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2020-03-30 03:00+0200\n" +"PO-Revision-Date: 2020-04-23 18:40+0400\n" +"Last-Translator: Xəyyam <[email protected]>\n" +"Language-Team: Azerbaijani <[email protected]>\n" +"Language: az\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 19.12.3\n" + +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Xəyyam" + +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "[email protected]" + +#: kbuildsycoca/kbuildsycoca_main.cpp:58 +#, kde-format +msgctxt "application name" +msgid "KBuildSycoca" +msgstr "KBuildSycoca" + +#: kbuildsycoca/kbuildsycoca_main.cpp:60 +#, kde-format +msgctxt "application description" +msgid "Rebuilds the system configuration cache." +msgstr "Sistem konfiqurasiya keşini yenidən qurun." + +#: kbuildsycoca/kbuildsycoca_main.cpp:62 +#, kde-format +msgctxt "@info:credit" +msgid "Copyright 1999-2014 KDE Developers" +msgstr "Copyright 1999-2014 KDE Developers" + +#: kbuildsycoca/kbuildsycoca_main.cpp:63 +#, kde-format +msgctxt "@info:credit" +msgid "David Faure" +msgstr "David Faure" + +#: kbuildsycoca/kbuildsycoca_main.cpp:64 kbuildsycoca/kbuildsycoca_main.cpp:67 +#, kde-format +msgctxt "@info:credit" +msgid "Author" +msgstr "Müəllif" + +#: kbuildsycoca/kbuildsycoca_main.cpp:66 +#, kde-format +msgctxt "@info:credit" +msgid "Waldo Bastian" +msgstr "Waldo Bastian" + +#: kbuildsycoca/kbuildsycoca_main.cpp:75 +#, kde-format +msgctxt "@info:shell command-line option" +msgid "" +"Do not signal applications to update (deprecated, no longer having any " +"effect)" +msgstr "" +"Tətbiqlərə yenilənmək üçün siqnal göndərməyin ( bu açar köhnəlib və artıq " +"fəaliyyət göstərmir)" + +#: kbuildsycoca/kbuildsycoca_main.cpp:78 +#, kde-format +msgctxt "@info:shell command-line option" +msgid "Disable incremental update, re-read everything" +msgstr "Artan yeniləməni deaktiv edin, hər şeyi yenidən oxuyun" + +#: kbuildsycoca/kbuildsycoca_main.cpp:81 +#, kde-format +msgctxt "@info:shell command-line option" +msgid "Check file timestamps (deprecated, no longer having any effect)" +msgstr "" +"Faylların dəyişmə vaxtını yoxlayın ( bu açar köhnəlib və artıq fəaliyyət " +"göstərmir)" + +#: kbuildsycoca/kbuildsycoca_main.cpp:84 +#, kde-format +msgctxt "@info:shell command-line option" +msgid "Disable checking files (deprecated, no longer having any effect)" +msgstr "" +"Faylların yoxlanmasını söndürün ( bu açar köhnəlib və artıq fəaliyyət " +"göstərmir)" + +#: kbuildsycoca/kbuildsycoca_main.cpp:87 +#, kde-format +msgctxt "@info:shell command-line option" +msgid "Perform menu generation test run only" +msgstr "Yalnız menyu generasiya testini həyata keçirin" + +#: kbuildsycoca/kbuildsycoca_main.cpp:90 +#, kde-format +msgctxt "@info:shell command-line option" +msgid "Track menu id for debug purposes" +msgstr "Debug məqsədləri üçün menyunun nömrəsini izləyin" + +#: kbuildsycoca/kbuildsycoca_main.cpp:94 +#, kde-format +msgctxt "@info:shell command-line option" +msgid "Switch QStandardPaths to test mode, for unit tests only" +msgstr "QStandardPaths'ı yalnız vahid testləri üçün test rejiminə keçirin" + +#: kdeinit/ktoolinvocation.cpp:70 +#, kde-format +msgid "Function must be called from the main thread." +msgstr "Funksiya əsas prosesdən çağırılmalıdır." + +#: kdeinit/ktoolinvocation.cpp:108 +#, kde-format +msgid "" +"Error launching %1. Either KLauncher is not running anymore, or it failed to " +"start the application." +msgstr "" +"%1 başlatmaq mümkün olmadı. KLauncher ya KLauncher ya artıq işləmir ya da " +"tətbiq başladıla bilmədi." + +#: kdeinit/ktoolinvocation.cpp:111 +#, kde-format +msgid "" +"KLauncher could not be reached via D-Bus. Error when calling %1:\n" +"%2\n" +msgstr "" +"KLauncher D-Bus vasitəsilə əldə edilə bilmədi. %1 çağırılmasında səhv:\n" +"%2\n" + +#: kdeinit/ktoolinvocation_x11.cpp:240 +#, kde-format +msgid "" +"Could not launch the mail client:\n" +"\n" +"%1" +msgstr "" +"E-poçt xidmətçisi işə salına bilmədi:\n" +"\n" +"%1" + +#: kdeinit/ktoolinvocation_x11.cpp:241 +#, kde-format +msgid "Could not launch Mail Client" +msgstr "E-poçt xidmətçisi başladıla bilmədi" + +#. i18n("Could not launch %1:\n\n%2", exe, error), +#. i18n("Could not launch %1:\n\n%2", htmlApp->exec(), error), +#. i18n("Could not launch %1:\n\n%2", exe, error), +#: kdeinit/ktoolinvocation_x11.cpp:291 kdeinit/ktoolinvocation_x11.cpp:316 +#: kdeinit/ktoolinvocation_x11.cpp:335 +#, kde-format +msgid "" +"Could not launch the browser:\n" +"\n" +"%1" +msgstr "" +"Brauzer başladıla bilmədi:\n" +"\n" +"%1" + +#: kdeinit/ktoolinvocation_x11.cpp:292 kdeinit/ktoolinvocation_x11.cpp:317 +#: kdeinit/ktoolinvocation_x11.cpp:336 +#, kde-format +msgid "Could not launch Browser" +msgstr "Brauzer başladıla bilmədi" + +#: kdeinit/ktoolinvocation_x11.cpp:376 +#, kde-format +msgid "" +"Could not launch the terminal client:\n" +"\n" +"%1" +msgstr "" +"Terminal xidmətçisi başladıla bilmədi:\n" +"\n" +"%1" + +#: kdeinit/ktoolinvocation_x11.cpp:377 +#, kde-format +msgid "Could not launch Terminal Client" +msgstr "Terminal xidmətçisi başladıla bilmədi" + +#: plugin/kdbusservicestarter.cpp:79 +#, kde-format +msgid "No service implementing %1" +msgstr "%1 -i həyata keçirən xidmət yoxdur" + +#: services/kservice.cpp:1050 +#, kde-format +msgid "The provided service is not valid" +msgstr "Təqdim olunan xidmət etibarlı deyil" + +#: services/kservice.cpp:1054 +#, kde-format +msgid "The service '%1' provides no library or the Library key is missing" +msgstr "" +"'%1' xidməti heç bir kitabxana təmin etmir və ya Kitabxana açarı yoxdur" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/po/zh_CN/kservice5.po new/kservice-5.71.0/po/zh_CN/kservice5.po --- old/kservice-5.70.0/po/zh_CN/kservice5.po 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/po/zh_CN/kservice5.po 2020-06-07 20:31:39.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-03-30 03:00+0200\n" -"PO-Revision-Date: 2020-03-25 19:51\n" +"PO-Revision-Date: 2020-05-09 13:50\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/CMakeLists.txt new/kservice-5.71.0/src/CMakeLists.txt --- old/kservice-5.70.0/src/CMakeLists.txt 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/CMakeLists.txt 2020-06-07 20:31:39.000000000 +0200 @@ -101,7 +101,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 5.70 + DEPRECATION_VERSIONS 5.0 5.15 5.61 5.63 5.66 5.67 5.70 5.71 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) set(kservice_includes @@ -234,6 +234,7 @@ KSERVICE_DEPRECATED KSERVICE_DEPRECATED_EXPORT "KSERVICE_DEPRECATED_VERSION(x, y, t)" + "KSERVICE_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/application.desktop new/kservice-5.71.0/src/services/application.desktop --- old/kservice-5.70.0/src/services/application.desktop 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/application.desktop 2020-06-07 20:31:39.000000000 +0200 @@ -5,6 +5,7 @@ Name[af]=Program Name[ar]=تطبيق Name[as]=অনুপ্ৰয়োগ +Name[az]=Tətbiq Name[be]=Праграма Name[be@latin]=Aplikacyja Name[bg]=Програма @@ -150,3 +151,6 @@ [PropertyDef::X-KDE-Wayland-Interfaces] Type=QStringList + +[PropertyDef::X-KDE-DBUS-Restricted-Interfaces] +Type=QStringList diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kmimetypetrader.cpp new/kservice-5.71.0/src/services/kmimetypetrader.cpp --- old/kservice-5.70.0/src/services/kmimetypetrader.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kmimetypetrader.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -193,10 +193,14 @@ filterMimeTypeOffers(offers, genericServiceType); KServiceOfferList::const_iterator itOff = offers.constBegin(); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 67) // Look for the first one that is allowed as default. // Since the allowed-as-default are first anyway, we only have // to look at the first one to know. if (itOff != offers.constEnd() && (*itOff).allowAsDefault()) { +#else + if (itOff != offers.constEnd()) { +#endif return (*itOff).service(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kplugininfo.desktop new/kservice-5.71.0/src/services/kplugininfo.desktop --- old/kservice-5.70.0/src/services/kplugininfo.desktop 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kplugininfo.desktop 2020-06-07 20:31:39.000000000 +0200 @@ -5,6 +5,7 @@ Name[af]=KDE inpropmodule Informasie Name[ar]=معلومات ملحقة «كدي» Name[as]=KDE প্লাগ-ইনৰ তথ্য +Name[az]=KDE Uzantısı Məlumatı Name[be]=Звесткі пра ўтулкі KDE Name[be@latin]=Źviestki pra plugin dla KDE Name[bg]=Информация за приставките в KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kserviceaction.h new/kservice-5.71.0/src/services/kserviceaction.h --- old/kservice-5.70.0/src/services/kserviceaction.h 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kserviceaction.h 2020-06-07 20:31:39.000000000 +0200 @@ -45,8 +45,9 @@ * Creates a KServiceAction. * Normally you don't have to do this, KService creates the actions * when parsing the .desktop file. - * @deprecated use the 6-args constructor + * @deprecated Since 5.69, use the 6-args constructor */ + KSERVICE_DEPRECATED_VERSION_BELATED(5, 71, 5, 69, "Use the 6-args constructor") KServiceAction(const QString &name, const QString &text, const QString &icon, const QString &exec, bool noDisplay = false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kservicefactory.cpp new/kservice-5.71.0/src/services/kservicefactory.cpp --- old/kservice-5.70.0/src/services/kservicefactory.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kservicefactory.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -269,7 +269,11 @@ KService *serv = createEntry(aServiceOffset); if (serv) { KService::Ptr servPtr(serv); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 69) list.append(KServiceOffer(servPtr, initialPreference, mimeTypeInheritanceLevel, servPtr->allowAsDefault())); +#else + list.append(KServiceOffer(servPtr, initialPreference, mimeTypeInheritanceLevel)); +#endif } // Restore position str->device()->seek(savedPos); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kserviceoffer.cpp new/kservice-5.71.0/src/services/kserviceoffer.cpp --- old/kservice-5.70.0/src/services/kserviceoffer.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kserviceoffer.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -26,14 +26,15 @@ KServiceOfferPrivate() : preference(-1), mimeTypeInheritanceLevel(0), - bAllowAsDefault(false), pService(nullptr) { } int preference; int mimeTypeInheritanceLevel; - bool bAllowAsDefault; +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 71) + bool bAllowAsDefault = false; +#endif KService::Ptr pService; }; @@ -48,6 +49,7 @@ *d = *_o.d; } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 71) KServiceOffer::KServiceOffer(const KService::Ptr &_service, int _pref, int mimeTypeInheritanceLevel, bool _default) : d(new KServiceOfferPrivate) { @@ -56,6 +58,18 @@ d->mimeTypeInheritanceLevel = mimeTypeInheritanceLevel; d->bAllowAsDefault = _default; } +#endif + +KServiceOffer::KServiceOffer(const KService::Ptr &_service, int _pref, int mimeTypeInheritanceLevel) + : d(new KServiceOfferPrivate) +{ + d->pService = _service; + d->preference = _pref; + d->mimeTypeInheritanceLevel = mimeTypeInheritanceLevel; +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 71) + d->bAllowAsDefault = true; +#endif +} KServiceOffer::~KServiceOffer() { @@ -81,6 +95,7 @@ return d->mimeTypeInheritanceLevel < _o.d->mimeTypeInheritanceLevel; } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 71) // Put offers allowed as default FIRST. if (_o.d->bAllowAsDefault && !d->bAllowAsDefault) { return false; // _o is default and not 'this'. @@ -89,6 +104,7 @@ return true; // 'this' is default but not _o. } // Both offers are allowed or not allowed as default +#endif // Finally, use preference to sort them // The bigger the better, but we want the better FIRST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kserviceoffer.h new/kservice-5.71.0/src/services/kserviceoffer.h --- old/kservice-5.70.0/src/services/kserviceoffer.h 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kserviceoffer.h 2020-06-07 20:31:39.000000000 +0200 @@ -50,6 +50,7 @@ */ KServiceOffer(const KServiceOffer &); +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 71) /** * Creates a new KServiceOffer. * @param service a pointer to the KService @@ -60,9 +61,24 @@ * 0 if no inheritance involved, 1 for parent mimetype, etc. * @param allowedAsDefault true if the service should be used as * default + * @deprecated Since 5.71, use constructor without @p allowedAsDefault argument */ + KSERVICE_DEPRECATED_VERSION(5, 71, "Use constructor without allowedAsDefault argument") KServiceOffer(const KService::Ptr &service, int pref, int mimeTypeInheritanceLevel, bool allowedAsDefault); +#endif + + /** + * Creates a new KServiceOffer. + * @param service a pointer to the KService + * @param pref the user's preference value, must be positive, + * bigger is better + * @param mimeTypeInheritanceLevel level of mimetype inheritance + * which allows this service to handling the mimetype. + * 0 if no inheritance involved, 1 for parent mimetype, etc. + * @since 5.71 + */ + KServiceOffer(const KService::Ptr &service, int pref, int mimeTypeInheritanceLevel); ~KServiceOffer(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kservicetypeprofile.cpp new/kservice-5.71.0/src/services/kservicetypeprofile.cpp --- old/kservice-5.70.0/src/services/kservicetypeprofile.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kservicetypeprofile.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -17,8 +17,10 @@ * Boston, MA 02110-1301, USA. */ + #include "kservicetypeprofile.h" #include "kservicetypeprofile_p.h" + #include "kservice.h" #include "kserviceoffer.h" #include "kservicetype.h" @@ -140,7 +142,11 @@ const int pref = it2.value(); //qDebug() << "found in mapServices pref=" << pref; if (pref > 0) { // 0 disables the service +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 69) offers.append(KServiceOffer(servPtr, pref, 0, servPtr->allowAsDefault())); +#else + offers.append(KServiceOffer(servPtr, pref, 0)); +#endif } foundInProfile = true; } @@ -155,8 +161,12 @@ // If there's a profile, we use 0 as the preference to ensure new apps don't take over existing apps (which default to 1) offers.append(KServiceOffer(servPtr, profile ? 0 : (*it).preference(), +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 69) 0, servPtr->allowAsDefault())); +#else + 0)); +#endif } } @@ -166,12 +176,12 @@ return offers; } -#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) bool KServiceTypeProfile::hasProfile(const QString &serviceType) { return s_serviceTypeProfiles()->hasProfile(serviceType); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void KServiceTypeProfile::writeServiceTypeProfile(const QString &serviceType, const KService::List &services, const KService::List &disabledServices) @@ -215,7 +225,9 @@ // Drop the whole cache... clearCache(); } +#endif +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void KServiceTypeProfile::deleteServiceTypeProfile(const QString &serviceType) { KConfig config(QStringLiteral("servicetype_profilerc"), KConfig::SimpleConfig); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kservicetypeprofile.h new/kservice-5.71.0/src/services/kservicetypeprofile.h --- old/kservice-5.70.0/src/services/kservicetypeprofile.h 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kservicetypeprofile.h 2020-06-07 20:31:39.000000000 +0200 @@ -25,6 +25,7 @@ #include <kservicetypetrader.h> +#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 66) /** * KServiceTypeProfile represents the user's preferences for services * of a service type. @@ -38,7 +39,6 @@ * @see KServiceTypeTrader * @short Represents the user's preferences for services of a service type */ -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 66) namespace KServiceTypeProfile { /** @@ -65,10 +65,14 @@ KSERVICE_DEPRECATED_VERSION(5, 66, "Unused") KSERVICE_EXPORT void deleteServiceTypeProfile(const QString &serviceType); +} +#endif + +namespace KServiceTypeProfile +{ /** - * @internal, for KServiceTypeTrader + * @internal, for KServiceTypeTrader & unit test */ -KSERVICE_DEPRECATED_VERSION(5, 66, "Unused") KSERVICE_EXPORT bool hasProfile(const QString &serviceType); /** @@ -78,6 +82,5 @@ void clearCache(); } -#endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/services/kservicetypetrader.cpp new/kservice-5.71.0/src/services/kservicetypetrader.cpp --- old/kservice-5.70.0/src/services/kservicetypetrader.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/services/kservicetypetrader.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -179,10 +179,14 @@ const KServiceOfferList offers = weightedOffers(serviceType); KServiceOfferList::const_iterator itOff = offers.begin(); +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 67) // Look for the first one that is allowed as default. // Since the allowed-as-default are first anyway, we only have // to look at the first one to know. if (itOff != offers.end() && (*itOff).allowAsDefault()) { +#else + if (itOff != offers.end()) { +#endif return (*itOff).service(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/sycoca/kbuildservicefactory.cpp new/kservice-5.71.0/src/sycoca/kbuildservicefactory.cpp --- old/kservice-5.70.0/src/sycoca/kbuildservicefactory.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/sycoca/kbuildservicefactory.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -284,9 +284,17 @@ } //qCDebug(SYCOCA) << "Adding service" << service->entryPath() << "to" << serviceType->name() << "pref=" << preference; +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 69) m_offerHash.addServiceOffer(stName, KServiceOffer(service, preference, 0, service->allowAsDefault())); +#else + m_offerHash.addServiceOffer(stName, KServiceOffer(service, preference, 0)); +#endif } else { +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 69) KServiceOffer offer(service, serviceTypeList[i].preference, 0, service->allowAsDefault()); +#else + KServiceOffer offer(service, serviceTypeList[i].preference, 0); +#endif QMimeType mime = db.mimeTypeForName(stName); if (!mime.isValid()) { if (stName.startsWith(QLatin1String("x-scheme-handler/"))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.70.0/src/sycoca/kmimeassociations.cpp new/kservice-5.71.0/src/sycoca/kmimeassociations.cpp --- old/kservice-5.70.0/src/sycoca/kmimeassociations.cpp 2020-05-03 00:22:35.000000000 +0200 +++ new/kservice-5.71.0/src/sycoca/kmimeassociations.cpp 2020-06-07 20:31:39.000000000 +0200 @@ -128,7 +128,11 @@ qCDebug(SYCOCA) << file << "specifies unknown service" << service << "in" << group.name(); } else { //qDebug() << "adding mime" << resolvedMimeName << "to service" << pService->entryPath() << "pref=" << pref; +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 69) m_offerHash.addServiceOffer(resolvedMimeName, KServiceOffer(pService, pref, 0, pService->allowAsDefault())); +#else + m_offerHash.addServiceOffer(resolvedMimeName, KServiceOffer(pService, pref, 0)); +#endif --pref; } }
