Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: kservice

kservice (5.73.0-0ubuntu1) groovy; urgency=medium * New upstream release (5.73.0) * Update install files. * Update install files. -- Rik Mills <rikmills@kde.org> Sat, 08 Aug 2020 11:00:00 +0100 kservice (5.72.0-0ubuntu1) groovy; urgency=medium * New upstream release (5.72.0) -- Rik Mills <rikmills@kde.org> Mon, 06 Jul 2020 20:34:35 +0100 kservice (5.71.0-0ubuntu1) groovy; urgency=medium * New upstream release (5.71.0) * Update symbols from build logs. -- Rik Mills <rikmills@kde.org> Sun, 14 Jun 2020 12:08:08 +0100 kservice (5.70.0-1ubuntu1) groovy; urgency=medium * Merge from debian unstable. Remaining changes: - Kubuntu Vcs fields. - debhelper-compat = 12 for backports. - Keep Kubuntu test setup. -- Rik Mills <rikmills@kde.org> Sun, 07 Jun 2020 19:51:53 +0100

Modifications :
  1. Download patch src/services/kservicetype.cpp

    --- 5.70.0-1/src/services/kservicetype.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservicetype.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -26,8 +26,8 @@ #include "kservicefactory_p.h" #include "kservicetypeprofile.h" #include <assert.h> -#include <kdesktopfile.h> -#include <kconfiggroup.h> +#include <KDesktopFile> +#include <KConfigGroup> #include "servicesdebug.h" extern int servicesDebugArea();
  2. Download patch src/services/kmimetypetrader.cpp

    --- 5.70.0-1/src/services/kmimetypetrader.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kmimetypetrader.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -28,7 +28,7 @@ #include "kservicefactory_p.h" #include "kmimetypefactory_p.h" #include "servicesdebug.h" -#include <qmimedatabase.h> +#include <QMimeDatabase> class KMimeTypeTraderPrivate { @@ -193,10 +193,14 @@ KService::Ptr KMimeTypeTrader::preferred 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(); }
  3. Download patch src/services/kservicetype.h

    --- 5.70.0-1/src/services/kservicetype.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservicetype.h 2020-08-01 19:54:44.000000000 +0000 @@ -28,7 +28,7 @@ #include <QMap> #include <QVariant> -#include <kconfig.h> +#include <KConfig> class KDesktopFile; class KServiceTypePrivate;
  4. Download patch src/sycoca/kmimeassociations.cpp

    --- 5.70.0-1/src/sycoca/kmimeassociations.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/kmimeassociations.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -21,12 +21,12 @@ #include "kmimeassociations_p.h" #include <kservice.h> #include <kservicefactory_p.h> -#include <kconfiggroup.h> -#include <kconfig.h> +#include <KConfigGroup> +#include <KConfig> #include <QDebug> #include <QFile> -#include <qstandardpaths.h> -#include <qmimedatabase.h> +#include <QStandardPaths> +#include <QMimeDatabase> #include "sycocadebug.h" KMimeAssociations::KMimeAssociations(KOfferHash &offerHash, KServiceFactory *serviceFactory) @@ -128,7 +128,11 @@ void KMimeAssociations::parseAddedAssoci 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; } }
  5. Download patch src/services/kservicefactory.cpp

    --- 5.70.0-1/src/services/kservicefactory.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservicefactory.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -269,7 +269,11 @@ QList<KServiceOffer> KServiceFactory::of 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);
  6. Download patch debian/tests/control

    --- 5.70.0-1/debian/tests/control 2020-04-13 19:39:12.000000000 +0000 +++ 5.73.0-0ubuntu1/debian/tests/control 2020-08-08 10:00:00.000000000 +0000 @@ -1,14 +1,14 @@ -Tests: testsuite -Depends: build-essential, - dbus (>= 1.8), - kded5, - libkf5service-bin, - openbox, - xauth, - xvfb, - @builddeps@, -Restrictions: build-needed, allow-stderr - +#Tests: testsuite +#Depends: build-essential, +# dbus (>= 1.8), +# kded5, +# libkf5service-bin, +# openbox, +# xauth, +# xvfb, +# @builddeps@, +#Restrictions: build-needed, allow-stderr +# Tests: acc Depends: dh-acc, exuberant-ctags, @ Restrictions: allow-stderr
  7. Download patch debian/libkf5service-data.install

    --- 5.70.0-1/debian/libkf5service-data.install 2020-04-13 19:39:12.000000000 +0000 +++ 5.73.0-0ubuntu1/debian/libkf5service-data.install 2020-08-08 10:00:00.000000000 +0000 @@ -1,4 +1,4 @@ etc/xdg/menus/kf5-applications.menu usr/share/kservicetypes5/ usr/share/locale/*/*/kservice5.mo -usr/share/qlogging-categories5/kservice.categories +usr/share/qlogging-categories5/
  8. Download patch autotests/kmimeassociationstest.cpp

    --- 5.70.0-1/autotests/kmimeassociationstest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/kmimeassociationstest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -20,13 +20,13 @@ #include <QDebug> #include <QDir> -#include <kconfiggroup.h> -#include <kdesktopfile.h> +#include <KConfigGroup> +#include <KDesktopFile> #include <kmimetypetrader.h> #include <kservicefactory_p.h> -#include <qtemporarydir.h> -#include <qtemporaryfile.h> -#include <qtest.h> +#include <QTemporaryDir> +#include <QTemporaryFile> +#include <QTest> #include "setupxdgdirs.h" #include "kmimeassociations_p.h" #include <kbuildsycoca_p.h>
  9. Download patch autotests/ksycoca_xdgdirstest.cpp

    --- 5.70.0-1/autotests/ksycoca_xdgdirstest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/ksycoca_xdgdirstest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -23,8 +23,8 @@ #include <QTest> #include <QDebug> #include <kservicetype.h> -#include <kdesktopfile.h> -#include <kconfiggroup.h> +#include <KDesktopFile> +#include <KConfigGroup> #include <QProcess> #include <kservice.h> #include <kservicefactory_p.h>
  10. Download patch src/kdeinit/ktoolinvocation.h

    --- 5.70.0-1/src/kdeinit/ktoolinvocation.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/kdeinit/ktoolinvocation.h 2020-08-01 19:54:44.000000000 +0000 @@ -159,6 +159,22 @@ public Q_SLOTS: * Invokes the standard terminal application. * * @param command the command to execute, can be empty. + * @param envs ENV variables for the invoked terminal command + * @param workdir the initial working directory, can be empty. + * @param startup_id for app startup notification, "0" for none, + * "" ( empty string ) is the default + * @since 5.73 + */ + static void invokeTerminal(const QString &command, + const QStringList &envs, + const QString &workdir = QString(), + const QByteArray &startup_id = ""); + + /** + * + * Invokes the standard terminal application. + * + * @param command the command to execute, can be empty. * @param workdir the initial working directory, can be empty. * @param startup_id for app startup notification, "0" for none, * "" ( empty string ) is the default @@ -391,6 +407,12 @@ private: QString *error, QString *serviceName, int *pid, const QByteArray &startup_id, bool noWait, const QString &workdir = QString()); + int startServiceInternal(const char *_function, + const QString &_name, const QStringList &URLs, + const QStringList &envs, QString *error, + QString *serviceName, int *pid, + const QByteArray &startup_id, bool noWait, + const QString &workdir = QString()); static bool isMainThreadActive(QString *error = nullptr); KToolInvocationPrivate *const d;
  11. Download patch po/sr@latin/kservice5.po

    --- 5.70.0-1/po/sr@latin/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/sr@latin/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kservice5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-02-18 02:58+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-03-30 03:00+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" @@ -31,43 +31,43 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "toptan@kde.org.yu,caslav.ilic@gmx.net" -#: kbuildsycoca/kbuildsycoca_main.cpp:56 +#: kbuildsycoca/kbuildsycoca_main.cpp:58 #, kde-format msgctxt "application name" msgid "KBuildSycoca" msgstr "K‑gradnja-Sycoce" -#: kbuildsycoca/kbuildsycoca_main.cpp:58 +#: kbuildsycoca/kbuildsycoca_main.cpp:60 #, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." msgstr "Ponovo gradi keš postave sistema." -#: kbuildsycoca/kbuildsycoca_main.cpp:60 +#: kbuildsycoca/kbuildsycoca_main.cpp:62 #, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" msgstr "© 1999–2014, programeri KDE‑a" -#: kbuildsycoca/kbuildsycoca_main.cpp:61 +#: kbuildsycoca/kbuildsycoca_main.cpp:63 #, kde-format msgctxt "@info:credit" msgid "David Faure" msgstr "David For" -#: kbuildsycoca/kbuildsycoca_main.cpp:62 kbuildsycoca/kbuildsycoca_main.cpp:65 +#: kbuildsycoca/kbuildsycoca_main.cpp:64 kbuildsycoca/kbuildsycoca_main.cpp:67 #, kde-format msgctxt "@info:credit" msgid "Author" msgstr "Autor" -#: kbuildsycoca/kbuildsycoca_main.cpp:64 +#: kbuildsycoca/kbuildsycoca_main.cpp:66 #, kde-format msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "Valdo Bastijan" -#: kbuildsycoca/kbuildsycoca_main.cpp:73 +#: kbuildsycoca/kbuildsycoca_main.cpp:75 #, kde-format msgctxt "@info:shell command-line option" msgid "" @@ -76,43 +76,37 @@ msgid "" msgstr "" "Ne šalji programima signal za ažuriranje (prevaziđeno, više nema dejstva)" -#: kbuildsycoca/kbuildsycoca_main.cpp:76 +#: kbuildsycoca/kbuildsycoca_main.cpp:78 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" msgstr "Isključi postepeno ažuriranje, iščitaj sve ponovo" -#: kbuildsycoca/kbuildsycoca_main.cpp:79 +#: kbuildsycoca/kbuildsycoca_main.cpp:81 #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "Proveri vremenske oznake fajlova (prevaziđeno, više nema dejstva)" -#: kbuildsycoca/kbuildsycoca_main.cpp:82 +#: kbuildsycoca/kbuildsycoca_main.cpp:84 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" msgstr "Isključi proveru fajlova (prevaziđeno, više nema dejstva)" -#: kbuildsycoca/kbuildsycoca_main.cpp:85 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Create global database" -msgstr "Napravi globalnu bazu" - -#: kbuildsycoca/kbuildsycoca_main.cpp:88 +#: kbuildsycoca/kbuildsycoca_main.cpp:87 #, kde-format msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" msgstr "Izvrši samo probni postupak stvaranja menija" -#: kbuildsycoca/kbuildsycoca_main.cpp:91 +#: kbuildsycoca/kbuildsycoca_main.cpp:90 #, kde-format msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" msgstr "Prati id. menija radi ispravljanja" -#: kbuildsycoca/kbuildsycoca_main.cpp:95 +#: kbuildsycoca/kbuildsycoca_main.cpp:94 #, kde-format msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" @@ -141,7 +135,7 @@ msgstr "" "KLauncher nije dostupan preko D‑Busa, greška pri pozivu %1:\n" "%2\n" -#: kdeinit/ktoolinvocation_x11.cpp:250 +#: kdeinit/ktoolinvocation_x11.cpp:240 #, kde-format msgid "" "Could not launch the mail client:\n" @@ -152,7 +146,7 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:251 +#: kdeinit/ktoolinvocation_x11.cpp:241 #, kde-format msgid "Could not launch Mail Client" msgstr "Ne mogu da pokrenem poštanski klijent" @@ -160,8 +154,8 @@ msgstr "Ne mogu da pokrenem poštanski k #. 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:300 kdeinit/ktoolinvocation_x11.cpp:325 -#: kdeinit/ktoolinvocation_x11.cpp:344 +#: kdeinit/ktoolinvocation_x11.cpp:291 kdeinit/ktoolinvocation_x11.cpp:316 +#: kdeinit/ktoolinvocation_x11.cpp:335 #, kde-format msgid "" "Could not launch the browser:\n" @@ -172,13 +166,13 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 -#: kdeinit/ktoolinvocation_x11.cpp:345 +#: kdeinit/ktoolinvocation_x11.cpp:292 kdeinit/ktoolinvocation_x11.cpp:317 +#: kdeinit/ktoolinvocation_x11.cpp:336 #, kde-format msgid "Could not launch Browser" msgstr "Ne mogu da pokrenem pregledač" -#: kdeinit/ktoolinvocation_x11.cpp:384 +#: kdeinit/ktoolinvocation_x11.cpp:376 #, kde-format msgid "" "Could not launch the terminal client:\n" @@ -189,22 +183,22 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:385 +#: kdeinit/ktoolinvocation_x11.cpp:377 #, kde-format msgid "Could not launch Terminal Client" msgstr "Ne mogu da pokrenem terminalski klijent" -#: plugin/kdbusservicestarter.cpp:77 +#: plugin/kdbusservicestarter.cpp:79 #, kde-format msgid "No service implementing %1" msgstr "Nijedan servis ne izvodi %1" -#: services/kservice.cpp:1019 +#: services/kservice.cpp:1050 #, kde-format msgid "The provided service is not valid" msgstr "Dati servis nije dobar." -#: services/kservice.cpp:1023 +#: services/kservice.cpp:1054 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "Servis „%1“ ne daje biblioteku ili nedostaje ključ „Library“."
  12. Download patch po/bn/kservice5.po

    --- 5.70.0-1/po/bn/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/bn/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -14,7 +14,7 @@ msgstr "" "PO-Revision-Date: 2012-07-16 14:27+0530\n" "Last-Translator: Deepayan Sarkar <deepayan.sarkar@gmail.com>\n" "Language-Team: American English <kde-translation@bengalinux.org>\n" -"Language: en_US\n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
  13. Download patch autotests/ksycocadicttest.cpp

    --- 5.70.0-1/autotests/ksycocadicttest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/ksycocadicttest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -22,8 +22,8 @@ #include <QSignalSpy> #include <QDebug> #include <kservicetype.h> -#include <kdesktopfile.h> -#include <kconfiggroup.h> +#include <KDesktopFile> +#include <KConfigGroup> #include <ksycocadict_p.h> #include <kbuildsycoca_p.h>
  14. Download patch src/services/kserviceoffer.h

    --- 5.70.0-1/src/services/kserviceoffer.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kserviceoffer.h 2020-08-01 19:54:44.000000000 +0000 @@ -50,6 +50,7 @@ public: */ 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 @@ public: * 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();
  15. Download patch src/services/kplugininfo.desktop

    --- 5.70.0-1/src/services/kplugininfo.desktop 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kplugininfo.desktop 2020-08-01 19:54:44.000000000 +0000 @@ -5,6 +5,7 @@ Name=KDE Plugin Information 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
  16. Download patch src/services/kautostart.cpp

    --- 5.70.0-1/src/services/kautostart.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kautostart.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -19,8 +19,8 @@ #include "kautostart.h" -#include "kdesktopfile.h" -#include "kconfiggroup.h" +#include <KDesktopFile> +#include <KConfigGroup> #include <QCoreApplication> #include <QDir>
  17. Download patch po/sr@ijekavian/kservice5.po

    --- 5.70.0-1/po/sr@ijekavian/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/sr@ijekavian/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kservice5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-02-18 02:58+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-03-30 03:00+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" @@ -31,43 +31,43 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "toptan@kde.org.yu,caslav.ilic@gmx.net" -#: kbuildsycoca/kbuildsycoca_main.cpp:56 +#: kbuildsycoca/kbuildsycoca_main.cpp:58 #, kde-format msgctxt "application name" msgid "KBuildSycoca" msgstr "К‑градња-Сикоке" -#: kbuildsycoca/kbuildsycoca_main.cpp:58 +#: kbuildsycoca/kbuildsycoca_main.cpp:60 #, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." msgstr "Поново гради кеш поставе система." -#: kbuildsycoca/kbuildsycoca_main.cpp:60 +#: kbuildsycoca/kbuildsycoca_main.cpp:62 #, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" msgstr "© 1999–2014, програмери КДЕ‑а" -#: kbuildsycoca/kbuildsycoca_main.cpp:61 +#: kbuildsycoca/kbuildsycoca_main.cpp:63 #, kde-format msgctxt "@info:credit" msgid "David Faure" msgstr "Давид Фор" -#: kbuildsycoca/kbuildsycoca_main.cpp:62 kbuildsycoca/kbuildsycoca_main.cpp:65 +#: kbuildsycoca/kbuildsycoca_main.cpp:64 kbuildsycoca/kbuildsycoca_main.cpp:67 #, kde-format msgctxt "@info:credit" msgid "Author" msgstr "Аутор" -#: kbuildsycoca/kbuildsycoca_main.cpp:64 +#: kbuildsycoca/kbuildsycoca_main.cpp:66 #, kde-format msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "Валдо Бастијан" -#: kbuildsycoca/kbuildsycoca_main.cpp:73 +#: kbuildsycoca/kbuildsycoca_main.cpp:75 #, kde-format msgctxt "@info:shell command-line option" msgid "" @@ -76,43 +76,37 @@ msgid "" msgstr "" "Не шаљи програмима сигнал за ажурирање (превазиђено, више нема дејства)" -#: kbuildsycoca/kbuildsycoca_main.cpp:76 +#: kbuildsycoca/kbuildsycoca_main.cpp:78 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" msgstr "Искључи постепено ажурирање, ишчитај све поново" -#: kbuildsycoca/kbuildsycoca_main.cpp:79 +#: kbuildsycoca/kbuildsycoca_main.cpp:81 #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "Провјери временске ознаке фајлова (превазиђено, више нема дејства)" -#: kbuildsycoca/kbuildsycoca_main.cpp:82 +#: kbuildsycoca/kbuildsycoca_main.cpp:84 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" msgstr "Искључи провјеру фајлова (превазиђено, више нема дејства)" -#: kbuildsycoca/kbuildsycoca_main.cpp:85 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Create global database" -msgstr "Направи глобалну базу" - -#: kbuildsycoca/kbuildsycoca_main.cpp:88 +#: kbuildsycoca/kbuildsycoca_main.cpp:87 #, kde-format msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" msgstr "Изврши само пробни поступак стварања менија" -#: kbuildsycoca/kbuildsycoca_main.cpp:91 +#: kbuildsycoca/kbuildsycoca_main.cpp:90 #, kde-format msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" msgstr "Прати ид. менија ради исправљања" -#: kbuildsycoca/kbuildsycoca_main.cpp:95 +#: kbuildsycoca/kbuildsycoca_main.cpp:94 #, kde-format msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" @@ -141,7 +135,7 @@ msgstr "" "К‑лансер није доступан преко д‑буса, грешка при позиву %1:\n" "%2\n" -#: kdeinit/ktoolinvocation_x11.cpp:250 +#: kdeinit/ktoolinvocation_x11.cpp:240 #, kde-format msgid "" "Could not launch the mail client:\n" @@ -152,7 +146,7 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:251 +#: kdeinit/ktoolinvocation_x11.cpp:241 #, kde-format msgid "Could not launch Mail Client" msgstr "Не могу да покренем поштански клијент" @@ -160,8 +154,8 @@ msgstr "Не могу да покрен #. 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:300 kdeinit/ktoolinvocation_x11.cpp:325 -#: kdeinit/ktoolinvocation_x11.cpp:344 +#: kdeinit/ktoolinvocation_x11.cpp:291 kdeinit/ktoolinvocation_x11.cpp:316 +#: kdeinit/ktoolinvocation_x11.cpp:335 #, kde-format msgid "" "Could not launch the browser:\n" @@ -172,13 +166,13 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 -#: kdeinit/ktoolinvocation_x11.cpp:345 +#: kdeinit/ktoolinvocation_x11.cpp:292 kdeinit/ktoolinvocation_x11.cpp:317 +#: kdeinit/ktoolinvocation_x11.cpp:336 #, kde-format msgid "Could not launch Browser" msgstr "Не могу да покренем прегледач" -#: kdeinit/ktoolinvocation_x11.cpp:384 +#: kdeinit/ktoolinvocation_x11.cpp:376 #, kde-format msgid "" "Could not launch the terminal client:\n" @@ -189,22 +183,22 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:385 +#: kdeinit/ktoolinvocation_x11.cpp:377 #, kde-format msgid "Could not launch Terminal Client" msgstr "Не могу да покренем терминалски клијент" -#: plugin/kdbusservicestarter.cpp:77 +#: plugin/kdbusservicestarter.cpp:79 #, kde-format msgid "No service implementing %1" msgstr "Ниједан сервис не изводи %1" -#: services/kservice.cpp:1019 +#: services/kservice.cpp:1050 #, kde-format msgid "The provided service is not valid" msgstr "Дати сервис није добар." -#: services/kservice.cpp:1023 +#: services/kservice.cpp:1054 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "Сервис „%1“ не даје библиотеку или недостаје кључ „Library“."
  18. Download patch autotests/nsaplugin.cpp

    --- 5.70.0-1/autotests/nsaplugin.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/nsaplugin.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -20,7 +20,7 @@ */ #include "nsaplugin.h" -#include <kexportplugin.h> +#include <KExportPlugin> #include <QDebug> NSAPlugin::NSAPlugin(QObject *parent, const QVariantList &args)
  19. Download patch src/services/kservicegroup.cpp

    --- 5.70.0-1/src/services/kservicegroup.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservicegroup.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -24,8 +24,8 @@ #include "ksycoca_p.h" #include "servicesdebug.h" #include <ksycoca.h> -#include <kdesktopfile.h> -#include <kconfiggroup.h> +#include <KDesktopFile> +#include <KConfigGroup> KServiceGroup::KServiceGroup(const QString &name) : KSycocaEntry(*new KServiceGroupPrivate(name))
  20. Download patch src/sycoca/kbuildservicetypefactory.cpp

    --- 5.70.0-1/src/sycoca/kbuildservicetypefactory.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/kbuildservicetypefactory.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -24,10 +24,10 @@ #include <QDebug> #include <assert.h> -#include <kdesktopfile.h> -#include <kconfiggroup.h> +#include <KDesktopFile> +#include <KConfigGroup> #include <QHash> -#include <qstandardpaths.h> +#include <QStandardPaths> KBuildServiceTypeFactory::KBuildServiceTypeFactory(KSycoca *db) : KServiceTypeFactory(db)
  21. Download patch po/zh_CN/kservice5.po

    --- 5.70.0-1/po/zh_CN/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/zh_CN/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -16,8 +16,8 @@ msgstr "" "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" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2020-07-31 15:01\n" +"Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -25,8 +25,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Project-ID: 269464\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-trunk/messages/frameworks/kservice5.pot\n" +"X-Crowdin-File: /kf5-trunk/messages/kservice/kservice5.pot\n" +"X-Crowdin-File-ID: 5560\n" #, kde-format msgctxt "NAME OF TRANSLATORS"
  22. Download patch debian/control

    --- 5.70.0-1/debian/control 2020-05-26 21:57:15.000000000 +0000 +++ 5.73.0-0ubuntu1/debian/control 2020-08-08 10:00:00.000000000 +0000 @@ -6,74 +6,35 @@ Uploaders: Maximiliano Curia <maxy@debia Build-Depends: bison (>= 2.4.1~), cmake (>= 3.5~), dbus-x11, - debhelper-compat (= 13), + debhelper-compat (= 12), docbook-xml, docbook-xsl, doxygen, - extra-cmake-modules (>= 5.70.0~), + extra-cmake-modules (>= 5.73.0~), flex, graphviz, - libkf5config-dev (>= 5.70.0~), - libkf5coreaddons-dev (>= 5.70.0~), - libkf5crash-dev (>= 5.70.0~), - libkf5dbusaddons-dev (>= 5.70.0~), - libkf5doctools-dev (>= 5.70.0~), - libkf5i18n-dev (>= 5.70.0~), + libkf5config-dev (>= 5.73.0~), + libkf5coreaddons-dev (>= 5.73.0~), + libkf5crash-dev (>= 5.73.0~), + libkf5dbusaddons-dev (>= 5.73.0~), + libkf5doctools-dev (>= 5.73.0~), + libkf5i18n-dev (>= 5.73.0~), libqt5sql5-sqlite, libxml2-utils, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.12.0~), qttools5-dev, - qttools5-dev-tools (>= 5.4) + qttools5-dev-tools (>= 5.4), Standards-Version: 4.5.0 Homepage: https://projects.kde.org/projects/frameworks/kservice -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kservice -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kservice.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kservice +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kservice Rules-Requires-Root: no Package: libkf5service-bin Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: baloo-kf5 (<< 5.42), - kded5 (<< 5.54), - kdesignerplugin (<< 5.42), - kinit (<< 5.54), - kio (<< 5.54), - kross (<< 5.42), - ktexteditor-katepart (<< 5.42), - libkf5declarative5 (<< 5.42), - libkf5emoticons-bin (<< 5.42), - libkf5emoticons5 (<< 5.54), - libkf5kcmutils5 (<< 5.54), - libkf5kdelibs4support5 (<< 5.54), - libkf5kdelibs4support5-bin (<< 5.42), - libkf5khtml-bin (<< 5.54), - libkf5khtml5 (<< 5.54), - libkf5kiocore5 (<< 5.54), - libkf5kiofilewidgets5 (<< 5.42), - libkf5kiogui5 (<< 5.42), - libkf5kiowidgets5 (<< 5.54), - libkf5krossui5 (<< 5.42), - libkf5mediaplayer5 (<< 5.42), - libkf5newstuff5 (<< 5.54), - libkf5notifyconfig5 (<< 5.42), - libkf5parts-plugins (<< 5.42), - libkf5parts5 (<< 5.54), - libkf5people5 (<< 5.54), - libkf5peoplewidgets5 (<< 5.54), - libkf5plasma5 (<< 5.54), - libkf5plasmaquick5 (<< 5.54), - libkf5runner5 (<< 5.54), - libkf5service5 (<= 5.15), - libkf5su5 (<< 5.54), - libkf5texteditor5 (<< 5.42), - libkf5textwidgets5 (<< 5.54), - libkf5wallet-bin (<< 5.54), - libkf5webkit5 (<< 5.54), - libkf5xmlrpcclient5 (<< 5.42), - plasma-framework (<< 5.54), - qml-module-org-kde-kio (<< 5.54), - qml-module-org-kde-runnermodel (<< 5.42) +Breaks: libkf5service5 (<= 5.15) Replaces: libkf5service5 (<= 5.15) Description: Advanced plugin and service introspection Application framework for file type association @@ -92,26 +53,20 @@ Description: Advanced plugin and service This package contains shared data files. Package: libkf5service-dev -Section: libdevel Architecture: any Multi-Arch: same -Depends: libkf5config-dev (>= 5.70.0~), - libkf5coreaddons-dev (>= 5.70.0~), - libkf5dbusaddons-dev (>= 5.70.0~), - libkf5i18n-dev (>= 5.70.0~), +Section: libdevel +Depends: libkf5config-dev (>= 5.73.0~), + libkf5coreaddons-dev (>= 5.73.0~), + libkf5dbusaddons-dev (>= 5.73.0~), + libkf5i18n-dev (>= 5.73.0~), libkf5service5 (= ${binary:Version}), ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Recommends: libkf5service-doc (= ${source:Version}) -Breaks: kded5-dev (<< 5.54), - kio-dev (<< 5.28), - libkf5emoticons-dev (<< 5.54), - libkf5kcmutils-dev (<< 5.54), - libkf5kio-dev (<< 5.54), - libkf5plasma-dev (<< 5.54), +Breaks: kio-dev (<< 5.28), libkf5service5 (<< 5.12.0~), - libkf5textwidgets-dev (<< 5.54), - plasma-framework-dev (<< 5.28) + plasma-framework-dev (<< 5.28), Replaces: libkf5service5 (<< 5.12.0~) Description: development files for kservice Application framework for file type association @@ -122,13 +77,13 @@ Description: development files for kserv Package: libkf5service-doc Architecture: all Multi-Arch: foreign +Section: doc Depends: ${misc:Depends} Description: Advanced plugin and service introspection (documentation) Application framework for file type association and plugin locating. . This package contains the qch documentation files. -Section: doc Package: libkf5service5 Architecture: any @@ -140,42 +95,3 @@ Recommends: libkf5service-bin (= ${binar Description: Advanced plugin and service introspection Application framework for file type association and plugin locating. -Breaks: baloo-kf5 (<< 5.42), - kded5 (<< 5.54), - kdesignerplugin (<< 5.42), - kinit (<< 5.54), - kio (<< 5.54), - kross (<< 5.42), - ktexteditor-katepart (<< 5.42), - libkf5declarative5 (<< 5.42), - libkf5emoticons-bin (<< 5.42), - libkf5emoticons5 (<< 5.54), - libkf5kcmutils5 (<< 5.54), - libkf5kdelibs4support5 (<< 5.54), - libkf5kdelibs4support5-bin (<< 5.42), - libkf5khtml-bin (<< 5.54), - libkf5khtml5 (<< 5.54), - libkf5kiocore5 (<< 5.54), - libkf5kiofilewidgets5 (<< 5.42), - libkf5kiogui5 (<< 5.42), - libkf5kiowidgets5 (<< 5.54), - libkf5krossui5 (<< 5.42), - libkf5mediaplayer5 (<< 5.42), - libkf5newstuff5 (<< 5.54), - libkf5notifyconfig5 (<< 5.42), - libkf5parts-plugins (<< 5.42), - libkf5parts5 (<< 5.54), - libkf5people5 (<< 5.54), - libkf5peoplewidgets5 (<< 5.54), - libkf5plasma5 (<< 5.54), - libkf5plasmaquick5 (<< 5.54), - libkf5runner5 (<< 5.54), - libkf5su5 (<< 5.54), - libkf5texteditor5 (<< 5.42), - libkf5textwidgets5 (<< 5.54), - libkf5wallet-bin (<< 5.54), - libkf5webkit5 (<< 5.54), - libkf5xmlrpcclient5 (<< 5.42), - plasma-framework (<< 5.54), - qml-module-org-kde-kio (<< 5.54), - qml-module-org-kde-runnermodel (<< 5.42)
  23. Download patch src/plugin/kdbusservicestarter.cpp

    --- 5.70.0-1/src/plugin/kdbusservicestarter.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/plugin/kdbusservicestarter.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -19,7 +19,7 @@ #include "kdbusservicestarter.h" #include "kservicetypetrader.h" #include "kservice.h" -#include <klocalizedstring.h> +#include <KLocalizedString> #include <ktoolinvocation.h> #include <QDBusConnection> #include <QDBusConnectionInterface>
  24. Download patch po/mai/kservice5.po

    --- 5.70.0-1/po/mai/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/mai/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "PO-Revision-Date: 2010-09-24 15:44+0530\n" "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n" "Language-Team: Hindi <fedora-trans-hi@redhat.com>\n" -"Language: hi\n" +"Language: mai\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
  25. Download patch src/kdeinit/ktoolinvocation.cpp

    --- 5.70.0-1/src/kdeinit/ktoolinvocation.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/kdeinit/ktoolinvocation.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -21,16 +21,16 @@ #include "ktoolinvocation.h" #ifdef QT_DBUS_LIB #include "klauncher_iface.h" -#include <kdeinitinterface.h> +#include <KDEInitInterface> #endif -#include <klocalizedstring.h> +#include <KLocalizedString> #include <QDebug> #include <QUrl> #include <QUrlQuery> #include <QCoreApplication> #include <QThread> -#include <qstandardpaths.h> +#include <QStandardPaths> #include <errno.h> // for EINVAL @@ -80,6 +80,21 @@ int KToolInvocation::startServiceInterna const QByteArray &startup_id, bool noWait, const QString &workdir) { + return startServiceInternal(_function, _name, URLs, QStringList(), error, + serviceName, pid, startup_id, noWait, workdir); +} + +int KToolInvocation::startServiceInternal(const char *_function, + const QString &_name, + const QStringList &URLs, + const QStringList &envs, + QString *error, + QString *serviceName, + int *pid, + const QByteArray &startup_id, + bool noWait, + const QString &workdir) +{ #ifdef QT_DBUS_LIB QString function = QLatin1String(_function); KToolInvocation::ensureKdeinitRunning(); @@ -92,10 +107,10 @@ int KToolInvocation::startServiceInterna msg << workdir; } // make sure there is id, so that user timestamp exists - QStringList envs; QByteArray s = startup_id; - emit kapplication_hook(envs, s); - msg << envs; + QStringList envCopy(envs); + emit kapplication_hook(envCopy, s); + msg << envCopy; msg << QString::fromLatin1(s); if (!function.startsWith(QLatin1String("kdeinit_exec"))) { msg << noWait;
  26. Download patch autotests/kservicetest.cpp

    --- 5.70.0-1/autotests/kservicetest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/kservicetest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -22,11 +22,11 @@ #include <locale.h> -#include <qtest.h> +#include <QTest> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <kdesktopfile.h> +#include <KConfig> +#include <KConfigGroup> +#include <KDesktopFile> #include <ksycoca.h> #include <kbuildsycoca_p.h> #include <../src/services/kserviceutil_p.h> // for KServiceUtilPrivate @@ -36,13 +36,13 @@ #include <kservicetypetrader.h> #include <kservicetype.h> #include <kservicetypeprofile.h> -#include <kpluginmetadata.h> +#include <KPluginMetaData> #include <kplugininfo.h> -#include <qfile.h> -#include <qstandardpaths.h> -#include <qthread.h> -#include <qsignalspy.h> +#include <QFile> +#include <QStandardPaths> +#include <QThread> +#include <QSignalSpy> #include <QDebug> #include <QLoggingCategory> @@ -521,16 +521,20 @@ void KServiceTest::testServiceTypeTrader // 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 @@ void KServiceTest::testHasServiceType2() QVERIFY(!faketextPlugin->hasServiceType(QStringLiteral("FakeBasePart"))); } +#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 66) void KServiceTest::testWriteServiceTypeProfile() { const QString serviceType = QStringLiteral("FakeBasePart"); @@ -692,6 +697,7 @@ void KServiceTest::testWriteServiceTypeP 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 @@ void KServiceTest::testDefaultOffers() 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 @@ void KServiceTest::testDeleteServiceType } QCOMPARE(offers[0]->entryPath(), m_firstOffer); } +#endif void KServiceTest::testActionsAndDataStream() { @@ -809,7 +817,7 @@ void KServiceTest::createFakeService(con #include <QThreadPool> #include <QFutureSynchronizer> -#include <qtconcurrentrun.h> +#include <QtConcurrentRun> // Testing for concurrent access to ksycoca from multiple threads // It's especially interesting to run this test as ./kservicetest testThreads @@ -903,7 +911,7 @@ void KServiceTest::testEntryPathToName() 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";
  27. Download patch po/uz@cyrillic/kservice5.po

    --- 5.70.0-1/po/uz@cyrillic/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/uz@cyrillic/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "PO-Revision-Date: 2009-10-17 00:34+0200\n" "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n" "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n" -"Language: uz\n" +"Language: uz@cyrillic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
  28. Download patch po/bs/kservice5.po

    --- 5.70.0-1/po/bs/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/bs/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -16,7 +16,7 @@ msgstr "" "PO-Revision-Date: 2013-12-21 17:26+0000\n" "Last-Translator: Ademovic Saudin <sademovic1@etf.unsa.ba>\n" "Language-Team: bosanski <bs@li.org>\n" -"Language: bosnian\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
  29. Download patch src/services/kservicetypeprofile.cpp

    --- 5.70.0-1/src/services/kservicetypeprofile.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservicetypeprofile.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -17,15 +17,17 @@ * Boston, MA 02110-1301, USA. */ + #include "kservicetypeprofile.h" #include "kservicetypeprofile_p.h" + #include "kservice.h" #include "kserviceoffer.h" #include "kservicetype.h" #include "ksycoca_p.h" -#include <kconfig.h> -#include <kconfiggroup.h> +#include <KConfig> +#include <KConfigGroup> #include <QMutex> #include <QHash> @@ -140,7 +142,11 @@ KServiceOfferList KServiceTypeProfile::s 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 @@ KServiceOfferList KServiceTypeProfile::s // 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 @@ KServiceOfferList KServiceTypeProfile::s 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 @@ void KServiceTypeProfile::writeServiceTy // 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);
  30. Download patch CMakeLists.txt

    --- 5.70.0-1/CMakeLists.txt 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/CMakeLists.txt 2020-08-01 19:54:44.000000000 +0000 @@ -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.73.0") # handled by release scripts +set(KF5_DEP_VERSION "5.73.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ endif() # ECM setup include(FeatureSummary) -find_package(ECM 5.70.0 NO_MODULE) +find_package(ECM 5.73.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 @@ set_package_properties(BISON PROPERTIES 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)
  31. Download patch po/sr@ijekavianlatin/kservice5.po

    --- 5.70.0-1/po/sr@ijekavianlatin/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/sr@ijekavianlatin/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kservice5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-02-18 02:58+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-03-30 03:00+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" @@ -31,43 +31,43 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "toptan@kde.org.yu,caslav.ilic@gmx.net" -#: kbuildsycoca/kbuildsycoca_main.cpp:56 +#: kbuildsycoca/kbuildsycoca_main.cpp:58 #, kde-format msgctxt "application name" msgid "KBuildSycoca" msgstr "K‑gradnja-Sycoce" -#: kbuildsycoca/kbuildsycoca_main.cpp:58 +#: kbuildsycoca/kbuildsycoca_main.cpp:60 #, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." msgstr "Ponovo gradi keš postave sistema." -#: kbuildsycoca/kbuildsycoca_main.cpp:60 +#: kbuildsycoca/kbuildsycoca_main.cpp:62 #, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" msgstr "© 1999–2014, programeri KDE‑a" -#: kbuildsycoca/kbuildsycoca_main.cpp:61 +#: kbuildsycoca/kbuildsycoca_main.cpp:63 #, kde-format msgctxt "@info:credit" msgid "David Faure" msgstr "David For" -#: kbuildsycoca/kbuildsycoca_main.cpp:62 kbuildsycoca/kbuildsycoca_main.cpp:65 +#: kbuildsycoca/kbuildsycoca_main.cpp:64 kbuildsycoca/kbuildsycoca_main.cpp:67 #, kde-format msgctxt "@info:credit" msgid "Author" msgstr "Autor" -#: kbuildsycoca/kbuildsycoca_main.cpp:64 +#: kbuildsycoca/kbuildsycoca_main.cpp:66 #, kde-format msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "Valdo Bastijan" -#: kbuildsycoca/kbuildsycoca_main.cpp:73 +#: kbuildsycoca/kbuildsycoca_main.cpp:75 #, kde-format msgctxt "@info:shell command-line option" msgid "" @@ -76,43 +76,37 @@ msgid "" msgstr "" "Ne šalji programima signal za ažuriranje (prevaziđeno, više nema dejstva)" -#: kbuildsycoca/kbuildsycoca_main.cpp:76 +#: kbuildsycoca/kbuildsycoca_main.cpp:78 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" msgstr "Isključi postepeno ažuriranje, iščitaj sve ponovo" -#: kbuildsycoca/kbuildsycoca_main.cpp:79 +#: kbuildsycoca/kbuildsycoca_main.cpp:81 #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "Provjeri vremenske oznake fajlova (prevaziđeno, više nema dejstva)" -#: kbuildsycoca/kbuildsycoca_main.cpp:82 +#: kbuildsycoca/kbuildsycoca_main.cpp:84 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" msgstr "Isključi provjeru fajlova (prevaziđeno, više nema dejstva)" -#: kbuildsycoca/kbuildsycoca_main.cpp:85 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Create global database" -msgstr "Napravi globalnu bazu" - -#: kbuildsycoca/kbuildsycoca_main.cpp:88 +#: kbuildsycoca/kbuildsycoca_main.cpp:87 #, kde-format msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" msgstr "Izvrši samo probni postupak stvaranja menija" -#: kbuildsycoca/kbuildsycoca_main.cpp:91 +#: kbuildsycoca/kbuildsycoca_main.cpp:90 #, kde-format msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" msgstr "Prati id. menija radi ispravljanja" -#: kbuildsycoca/kbuildsycoca_main.cpp:95 +#: kbuildsycoca/kbuildsycoca_main.cpp:94 #, kde-format msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" @@ -141,7 +135,7 @@ msgstr "" "KLauncher nije dostupan preko D‑Busa, greška pri pozivu %1:\n" "%2\n" -#: kdeinit/ktoolinvocation_x11.cpp:250 +#: kdeinit/ktoolinvocation_x11.cpp:240 #, kde-format msgid "" "Could not launch the mail client:\n" @@ -152,7 +146,7 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:251 +#: kdeinit/ktoolinvocation_x11.cpp:241 #, kde-format msgid "Could not launch Mail Client" msgstr "Ne mogu da pokrenem poštanski klijent" @@ -160,8 +154,8 @@ msgstr "Ne mogu da pokrenem poštanski k #. 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:300 kdeinit/ktoolinvocation_x11.cpp:325 -#: kdeinit/ktoolinvocation_x11.cpp:344 +#: kdeinit/ktoolinvocation_x11.cpp:291 kdeinit/ktoolinvocation_x11.cpp:316 +#: kdeinit/ktoolinvocation_x11.cpp:335 #, kde-format msgid "" "Could not launch the browser:\n" @@ -172,13 +166,13 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 -#: kdeinit/ktoolinvocation_x11.cpp:345 +#: kdeinit/ktoolinvocation_x11.cpp:292 kdeinit/ktoolinvocation_x11.cpp:317 +#: kdeinit/ktoolinvocation_x11.cpp:336 #, kde-format msgid "Could not launch Browser" msgstr "Ne mogu da pokrenem pregledač" -#: kdeinit/ktoolinvocation_x11.cpp:384 +#: kdeinit/ktoolinvocation_x11.cpp:376 #, kde-format msgid "" "Could not launch the terminal client:\n" @@ -189,22 +183,22 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:385 +#: kdeinit/ktoolinvocation_x11.cpp:377 #, kde-format msgid "Could not launch Terminal Client" msgstr "Ne mogu da pokrenem terminalski klijent" -#: plugin/kdbusservicestarter.cpp:77 +#: plugin/kdbusservicestarter.cpp:79 #, kde-format msgid "No service implementing %1" msgstr "Nijedan servis ne izvodi %1" -#: services/kservice.cpp:1019 +#: services/kservice.cpp:1050 #, kde-format msgid "The provided service is not valid" msgstr "Dati servis nije dobar." -#: services/kservice.cpp:1023 +#: services/kservice.cpp:1054 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "Servis „%1“ ne daje biblioteku ili nedostaje ključ „Library“."
  32. Download patch debian/libkf5service5.lintian-overrides

    --- 5.70.0-1/debian/libkf5service5.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 5.73.0-0ubuntu1/debian/libkf5service5.lintian-overrides 2020-08-08 10:00:00.000000000 +0000 @@ -0,0 +1 @@ +libkf5service5: symbols-declares-dependency-on-other-package libkf5service-bin
  33. Download patch autotests/ksycocathreadtest.cpp

    --- 5.70.0-1/autotests/ksycocathreadtest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/ksycocathreadtest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -30,9 +30,9 @@ #include <QFile> #include <kbuildsycoca_p.h> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <kdesktopfile.h> +#include <KConfig> +#include <KConfigGroup> +#include <KDesktopFile> #include <ksycoca.h> #include <kservicegroup.h> #include <kservicetype.h>
  34. Download patch src/services/kserviceaction.h

    --- 5.70.0-1/src/services/kserviceaction.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kserviceaction.h 2020-08-01 19:54:44.000000000 +0000 @@ -45,8 +45,9 @@ public: * 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);
  35. Download patch src/kbuildsycoca/kbuildsycoca_main.cpp

    --- 5.70.0-1/src/kbuildsycoca/kbuildsycoca_main.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/kbuildsycoca/kbuildsycoca_main.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -21,10 +21,10 @@ #include "../../kservice_version.h" -#include <klocalizedstring.h> -#include <kaboutdata.h> +#include <KLocalizedString> +#include <KAboutData> #ifndef __ANDROID__ -#include <kcrash.h> +#include <KCrash> #endif #include <QCommandLineOption>
  36. Download patch src/sycoca/ksycoca_p.h

    --- 5.70.0-1/src/sycoca/ksycoca_p.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/ksycoca_p.h 2020-08-01 19:54:44.000000000 +0000 @@ -25,7 +25,7 @@ #include <QStringList> #include <QElapsedTimer> #include <QDateTime> -#include <kdirwatch.h> +#include <KDirWatch> class QFile; class QDataStream; class KSycocaAbstractDevice;
  37. Download patch src/sycoca/ksycoca.cpp

    --- 5.70.0-1/src/sycoca/ksycoca.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/ksycoca.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -23,11 +23,11 @@ #include "ksycocautils_p.h" #include "ksycocatype.h" #include "ksycocafactory_p.h" -#include "kconfiggroup.h" -#include "ksharedconfig.h" +#include <KConfigGroup> +#include <KSharedConfig> #include "sycocadebug.h" -#include <qstandardpaths.h> +#include <QStandardPaths> #include <QDataStream> #include <QCoreApplication> #include <QFile>
  38. Download patch src/services/kserviceoffer.cpp

    --- 5.70.0-1/src/services/kserviceoffer.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kserviceoffer.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -26,14 +26,15 @@ public: 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 @@ KServiceOffer::KServiceOffer(const KServ *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 @@ KServiceOffer::KServiceOffer(const KServ 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 @@ bool KServiceOffer::operator< (const KSe 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 @@ bool KServiceOffer::operator< (const KSe 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
  39. Download patch debian/libkf5service5.symbols

    --- 5.70.0-1/debian/libkf5service5.symbols 2020-05-26 21:57:15.000000000 +0000 +++ 5.73.0-0ubuntu1/debian/libkf5service5.symbols 2020-08-08 10:00:00.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 5.69.0 amd64 +# SymbolsHelper-Confirmed: 5.73.0 amd64 arm64 armhf ppc64el riscv64 s390x libKF5Service.so.5 libkf5service5 #MINVER#, libkf5service-bin * Build-Depends-Package: libkf5service-dev _Z5qHashRK11KPluginInfo@Base 4.96.0 @@ -79,7 +79,7 @@ libKF5Service.so.5 libkf5service5 #MINVE _ZN12KBuildSycocaD0Ev@Base 5.15.0 _ZN12KBuildSycocaD1Ev@Base 5.15.0 _ZN12KBuildSycocaD2Ev@Base 5.15.0 - (optional=templinst)_ZN12KConfigGroup10writeEntryIiEEvPKcRKT_6QFlagsIN11KConfigBase15WriteConfigFlagEE@Base 4.100.0 + (optional=templinst|arch=!ppc64el)_ZN12KConfigGroup10writeEntryIiEEvPKcRKT_6QFlagsIN11KConfigBase15WriteConfigFlagEE@Base 4.100.0 _ZN12KServiceType10parentTypeEv@Base 4.96.0 _ZN12KServiceType11serviceTypeERK7QString@Base 4.96.0 _ZN12KServiceType15allServiceTypesEv@Base 4.96.0 @@ -132,9 +132,11 @@ libKF5Service.so.5 libkf5service5 #MINVE _ZN13KServiceGroupD2Ev@Base 4.96.0 _ZN13KServiceOffer13setPreferenceEi@Base 4.96.0 _ZN13KServiceOffer27setMimeTypeInheritanceLevelEi@Base 4.96.0 + _ZN13KServiceOfferC1ERK28QExplicitlySharedDataPointerI8KServiceEii@Base 5.71.0 _ZN13KServiceOfferC1ERK28QExplicitlySharedDataPointerI8KServiceEiib@Base 4.96.0 _ZN13KServiceOfferC1ERKS_@Base 4.96.0 _ZN13KServiceOfferC1Ev@Base 4.96.0 + _ZN13KServiceOfferC2ERK28QExplicitlySharedDataPointerI8KServiceEii@Base 5.71.0 _ZN13KServiceOfferC2ERK28QExplicitlySharedDataPointerI8KServiceEiib@Base 4.96.0 _ZN13KServiceOfferC2ERKS_@Base 4.96.0 _ZN13KServiceOfferC2Ev@Base 4.96.0 @@ -219,6 +221,7 @@ libKF5Service.so.5 libkf5service5 #MINVE _ZN15KToolInvocation12invokeMailerERK7QStringS2_RK10QByteArray@Base 4.96.0 _ZN15KToolInvocation12invokeMailerERK7QStringS2_S2_S2_S2_S2_RK11QStringListRK10QByteArray@Base 4.96.0 _ZN15KToolInvocation13invokeBrowserERK7QStringRK10QByteArray@Base 4.96.0 + _ZN15KToolInvocation14invokeTerminalERK7QStringRK11QStringListS2_RK10QByteArray@Base 5.73.0 _ZN15KToolInvocation14invokeTerminalERK7QStringS2_RK10QByteArray@Base 4.96.0 _ZN15KToolInvocation15kdeinitExecWaitERK7QStringRK11QStringListPS0_PiRK10QByteArray@Base 4.96.0 _ZN15KToolInvocation16staticMetaObjectE@Base 4.96.0 @@ -228,6 +231,7 @@ libKF5Service.so.5 libkf5service5 #MINVE _ZN15KToolInvocation18startServiceByNameERK7QStringS2_PS0_S3_PiRK10QByteArrayb@Base 4.96.0 _ZN15KToolInvocation20ensureKdeinitRunningEv@Base 4.96.0 _ZN15KToolInvocation20startServiceInternalEPKcRK7QStringRK11QStringListPS2_S8_PiRK10QByteArraybS4_@Base 4.96.0 + _ZN15KToolInvocation20startServiceInternalEPKcRK7QStringRK11QStringListS7_PS2_S8_PiRK10QByteArraybS4_@Base 5.73.0 _ZN15KToolInvocation25startServiceByDesktopNameERK7QStringRK11QStringListPS0_S6_PiRK10QByteArrayb@Base 4.96.0 _ZN15KToolInvocation25startServiceByDesktopNameERK7QStringS2_PS0_S3_PiRK10QByteArrayb@Base 4.96.0 _ZN15KToolInvocation25startServiceByDesktopPathERK7QStringRK11QStringListPS0_S6_PiRK10QByteArrayb@Base 4.96.0 @@ -369,9 +373,9 @@ libKF5Service.so.5 libkf5service5 #MINVE _ZNK11KSycocaDict15findMultiStringERK7QString@Base 4.96.0 _ZNK11KSycocaDict5countEv@Base 4.96.0 _ZNK12KBuildSycoca10metaObjectEv@Base 5.15.0 - (optional=templinst|arch=!amd64 !arm64 !x32)_ZNK12KConfigGroup9readEntryI10QByteArrayEET_PKcRKS2_@Base 4.100.0 - (optional=templinst)_ZNK12KConfigGroup9readEntryIbEET_PKcRKS1_@Base 4.100.0 - (optional=templinst)_ZNK12KConfigGroup9readEntryIiEET_PKcRKS1_@Base 4.100.0 + (optional=templinst|arch=!s390x !x32)_ZNK12KConfigGroup9readEntryI10QByteArrayEET_PKcRKS2_@Base 4.100.0 + (optional=templinst|arch=!ppc64el !s390x)_ZNK12KConfigGroup9readEntryIbEET_PKcRKS1_@Base 4.100.0 + (optional=templinst|arch=!ppc64el !s390x)_ZNK12KConfigGroup9readEntryIiEET_PKcRKS1_@Base 4.100.0 _ZNK12KServiceType11propertyDefERK7QString@Base 4.96.0 _ZNK12KServiceType12propertyDefsEv@Base 4.96.0 _ZNK12KServiceType16propertyDefNamesEv@Base 4.96.0
  40. Download patch tests/CMakeLists.txt

    --- 5.70.0-1/tests/CMakeLists.txt 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/tests/CMakeLists.txt 2020-08-01 19:54:44.000000000 +0000 @@ -28,7 +28,11 @@ if(NOT EXCLUDE_DEPRECATED_BEFORE_AND_AT endif() set(kmimeassociations_dumper_debug_SRCS) -ecm_qt_declare_logging_category(kmimeassociations_dumper_debug_SRCS HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf5.kservice.sycoca) +ecm_qt_declare_logging_category(kmimeassociations_dumper_debug_SRCS + HEADER sycocadebug.h + IDENTIFIER SYCOCA + CATEGORY_NAME kf.service.sycoca +) set(kmimeassociations_dumper_SRCS kmimeassociations_dumper.cpp ../src/sycoca/kmimeassociations.cpp ${kmimeassociations_dumper_debug_SRCS}) add_executable(kmimeassociations_dumper ${kmimeassociations_dumper_SRCS})
  41. Download patch tests/startserviceby.cpp

    --- 5.70.0-1/tests/startserviceby.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/tests/startserviceby.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <qcoreapplication.h> +#include <QCoreApplication> #include <ktoolinvocation.h> #include <QDebug>
  42. Download patch src/kdeinit/ktoolinvocation_x11.cpp

    --- 5.70.0-1/src/kdeinit/ktoolinvocation_x11.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/kdeinit/ktoolinvocation_x11.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -24,19 +24,19 @@ #include "ktoolinvocation.h" -#include <kconfiggroup.h> -#include <ksharedconfig.h> +#include <KConfigGroup> +#include <KSharedConfig> #include <kmimetypetrader.h> -#include "kconfig.h" -#include "kshell.h" -#include "kmacroexpander.h" -#include "klocalizedstring.h" -#include "kmessage.h" +#include <KConfig> +#include <KShell> +#include <KMacroExpander> +#include <KLocalizedString> +#include <KMessage> #include "kservice.h" #include <QDebug> -#include <qstandardpaths.h> +#include <QStandardPaths> #include <QHash> #include <QUrl> #include <QUrlQuery> @@ -339,6 +339,7 @@ void KToolInvocation::invokeBrowser(cons #endif void KToolInvocation::invokeTerminal(const QString &command, + const QStringList &envs, const QString &workdir, const QByteArray &startup_id) { @@ -371,9 +372,16 @@ void KToolInvocation::invokeTerminal(con QString error; if (self()->startServiceInternal("kdeinit_exec_with_workdir", - cmd, cmdTokens, &error, nullptr, nullptr, startup_id, false, workdir)) { + cmd, cmdTokens, envs, &error, nullptr, nullptr, startup_id, false, workdir)) { KMessage::message(KMessage::Error, i18n("Could not launch the terminal client:\n\n%1", error), i18n("Could not launch Terminal Client")); } } + +void KToolInvocation::invokeTerminal(const QString &command, + const QString &workdir, + const QByteArray &startup_id) +{ + invokeTerminal(command, {}, workdir, startup_id); +}
  43. Download patch po/hne/kservice5.po

    --- 5.70.0-1/po/hne/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/hne/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2009-02-10 20:44+0530\n" "Last-Translator: Ravishankar Shrivastava <raviratlami@aol.in>\n" "Language-Team: Hindi <kde-i18n-doc@lists.kde.org>\n" -"Language: hi\n" +"Language: hne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
  44. Download patch po/ca/kservice5.po

    --- 5.70.0-1/po/ca/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/ca/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -1,10 +1,10 @@ # Translation of kservice5.po to Catalan -# Copyright (C) 1998-2016 This_file_is_part_of_KDE +# Copyright (C) 1998-2020 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <sps@sastia.com>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. -# Antoni Bella Pérez <antonibella5@yahoo.com>, 2003, 2006, 2011, 2012, 2013, 2014, 2015. +# Antoni Bella Pérez <antonibella5@yahoo.com>, 2003, 2006, 2011, 2012, 2013, 2014, 2015, 2020. # Albert Astals Cid <aacid@kde.org>, 2004, 2005, 2007. # Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # Robert Millan <rmh@aybabtu.com>, 2009. @@ -14,14 +14,14 @@ msgstr "" "Project-Id-Version: kservice5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2020-03-30 03:00+0200\n" -"PO-Revision-Date: 2016-05-19 22:49+0200\n" -"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n" +"PO-Revision-Date: 2020-07-25 08:16+0200\n" +"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 20.04.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -51,7 +51,7 @@ msgstr "Refà el cau de configuració de #, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" -msgstr "Copyright 1999-2014 KDE Developers" +msgstr "Copyright 1999-2014, KDE developers" #: kbuildsycoca/kbuildsycoca_main.cpp:63 #, kde-format @@ -102,19 +102,20 @@ msgstr "Desactiva la verificació dels f #, kde-format msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" -msgstr "Executa només una prova de generació de menú" +msgstr "Executa només una prova de generació del menú" #: kbuildsycoca/kbuildsycoca_main.cpp:90 #, kde-format msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" -msgstr "Segueix l'identificador de menú per a la depuració" +msgstr "Segueix l'identificador del menú per a la depuració" #: kbuildsycoca/kbuildsycoca_main.cpp:94 #, kde-format msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" -msgstr "Commuta QStandardPaths al mode de prova, només per proves unitàries." +msgstr "" +"Commuta «QStandardPaths» al mode de prova, només per a les proves unitàries." #: kdeinit/ktoolinvocation.cpp:70 #, kde-format
  45. Download patch debian/tests/testsuite

    --- 5.70.0-1/debian/tests/testsuite 2020-04-13 19:39:12.000000000 +0000 +++ 5.73.0-0ubuntu1/debian/tests/testsuite 2020-08-08 10:00:00.000000000 +0000 @@ -1,4 +1,6 @@ #!/bin/sh +dpkg-architecture -e s390x && exit 0 + xvfb-run -a --server-args="-screen 0 1024x768x24+32" \ dbus-run-session -- debian/tests/testsuite.xsession
  46. Download patch src/services/application.desktop

    --- 5.70.0-1/src/services/application.desktop 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/application.desktop 2020-08-01 19:54:44.000000000 +0000 @@ -5,6 +5,7 @@ Name=Application Name[af]=Program Name[ar]=تطبيق Name[as]=অনুপ্ৰয়োগ +Name[az]=Tətbiq Name[be]=Праграма Name[be@latin]=Aplikacyja Name[bg]=Програма @@ -150,3 +151,6 @@ Type=QStringList [PropertyDef::X-KDE-Wayland-Interfaces] Type=QStringList + +[PropertyDef::X-KDE-DBUS-Restricted-Interfaces] +Type=QStringList
  47. Download patch autotests/kservicetest.h

    --- 5.70.0-1/autotests/kservicetest.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/kservicetest.h 2020-08-01 19:54:44.000000000 +0000 @@ -30,7 +30,7 @@ public: 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 @@ private Q_SLOTS: 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();
  48. Download patch tests/pluginlocator/main.cpp

    --- 5.70.0-1/tests/pluginlocator/main.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/tests/pluginlocator/main.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qcommandlineparser.h> -#include <qcommandlineoption.h> +#include <QCommandLineParser> +#include <QCommandLineOption> #include "plugintest.h"
  49. Download patch src/sycoca/kbuildservicefactory.cpp

    --- 5.70.0-1/src/sycoca/kbuildservicefactory.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/kbuildservicefactory.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -24,17 +24,17 @@ #include "ksycoca.h" #include "ksycocadict_p.h" #include "ksycocaresourcelist_p.h" -#include "kdesktopfile.h" +#include <KDesktopFile> #include "kservicetype.h" #include "sycocadebug.h" #include <QDebug> #include <QDir> -#include <qmimedatabase.h> +#include <QMimeDatabase> #include <assert.h> #include <kmimetypefactory_p.h> -#include <qstandardpaths.h> +#include <QStandardPaths> KBuildServiceFactory::KBuildServiceFactory(KServiceTypeFactory *serviceTypeFactory, KBuildMimeTypeFactory *mimeTypeFactory, @@ -284,9 +284,17 @@ void KBuildServiceFactory::populateServi } //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/"))) {
  50. Download patch src/sycoca/kbuildmimetypefactory.cpp

    --- 5.70.0-1/src/sycoca/kbuildmimetypefactory.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/kbuildmimetypefactory.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -25,7 +25,7 @@ #include <assert.h> #include <QDebug> #include <QHash> -#include <qstandardpaths.h> +#include <QStandardPaths> KBuildMimeTypeFactory::KBuildMimeTypeFactory(KSycoca *db) : KMimeTypeFactory(db)
  51. Download patch po/az/kservice5.po
  52. Download patch .arcconfig

    --- 5.70.0-1/.arcconfig 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/.arcconfig 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.kde.org/", - "project.name" : "KService" -} \ No newline at end of file
  53. Download patch src/services/kapplicationtrader.cpp

    --- 5.70.0-1/src/services/kapplicationtrader.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kapplicationtrader.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -27,7 +27,7 @@ #include "kmimetypefactory_p.h" #include "servicesdebug.h" -#include <qmimedatabase.h> +#include <QMimeDatabase> static KService::List mimeTypeSycocaServiceOffers(const QString &mimeType) {
  54. Download patch po/cs/kservice5.po

    --- 5.70.0-1/po/cs/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/cs/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2017-02-21 17:04+0100\n" "Last-Translator: Vít Pelčák <vit@pelcak.org>\n" "Language-Team: Czech <kde-i18n-doc@kde.org>\n" -"Language: en_US\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
  55. Download patch autotests/nsaplugin.h

    --- 5.70.0-1/autotests/nsaplugin.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/nsaplugin.h 2020-08-01 19:54:44.000000000 +0000 @@ -25,7 +25,7 @@ #include <QObject> #include <kplugininfo.h> -#include <kpluginfactory.h> +#include <KPluginFactory> class NSAPlugin : public QObject {
  56. Download patch autotests/kplugininfotest.cpp

    --- 5.70.0-1/autotests/kplugininfotest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/kplugininfotest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -168,10 +168,14 @@ private Q_SLOTS: 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"));
  57. Download patch src/sycoca/ksycocafactory_p.h

    --- 5.70.0-1/src/sycoca/ksycocafactory_p.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/ksycocafactory_p.h 2020-08-01 19:54:44.000000000 +0000 @@ -20,7 +20,7 @@ #define KSYCOCAFACTORY_H #include <ksycocaentry.h> -#include <qstandardpaths.h> +#include <QStandardPaths> #include <ksycoca.h> // for KSycoca::self()
  58. Download patch src/sycoca/kbuildsycoca.cpp

    --- 5.70.0-1/src/sycoca/kbuildsycoca.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/sycoca/kbuildsycoca.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -41,14 +41,14 @@ #include <QDebug> #include <QDirIterator> #include <QDateTime> -#include <qsavefile.h> +#include <QSaveFile> #include <kmemfile_p.h> #include <qplatformdefs.h> #include <time.h> #include <memory> // auto_ptr -#include <qstandardpaths.h> +#include <QStandardPaths> #include <QLockFile> static const char *s_cSycocaPath = nullptr;
  59. Download patch src/services/kservice.h

    --- 5.70.0-1/src/services/kservice.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservice.h 2020-08-01 19:54:44.000000000 +0000 @@ -24,8 +24,8 @@ #include "kserviceaction.h" #include <QStringList> #include <QVariant> -#include <kpluginfactory.h> -#include <kpluginloader.h> +#include <KPluginFactory> +#include <KPluginLoader> #include <ksycocaentry.h> #include <QCoreApplication>
  60. Download patch tests/pluginlocator/plugintest.cpp

    --- 5.70.0-1/tests/pluginlocator/plugintest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/tests/pluginlocator/plugintest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -25,7 +25,7 @@ #include <kplugininfo.h> #include <kplugintrader.h> -#include <qcommandlineparser.h> +#include <QCommandLineParser> #include <QElapsedTimer> #include <QStandardPaths>
  61. Download patch po/sr/kservice5.po

    --- 5.70.0-1/po/sr/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/sr/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kservice5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-02-18 02:58+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-03-30 03:00+0200\n" "PO-Revision-Date: 2017-09-28 17:58+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" @@ -32,43 +32,43 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "toptan@kde.org.yu,caslav.ilic@gmx.net" -#: kbuildsycoca/kbuildsycoca_main.cpp:56 +#: kbuildsycoca/kbuildsycoca_main.cpp:58 #, kde-format msgctxt "application name" msgid "KBuildSycoca" msgstr "К‑градња-Сикоке" -#: kbuildsycoca/kbuildsycoca_main.cpp:58 +#: kbuildsycoca/kbuildsycoca_main.cpp:60 #, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." msgstr "Поново гради кеш поставе система." -#: kbuildsycoca/kbuildsycoca_main.cpp:60 +#: kbuildsycoca/kbuildsycoca_main.cpp:62 #, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" msgstr "© 1999–2014, програмери КДЕ‑а" -#: kbuildsycoca/kbuildsycoca_main.cpp:61 +#: kbuildsycoca/kbuildsycoca_main.cpp:63 #, kde-format msgctxt "@info:credit" msgid "David Faure" msgstr "Давид Фор" -#: kbuildsycoca/kbuildsycoca_main.cpp:62 kbuildsycoca/kbuildsycoca_main.cpp:65 +#: kbuildsycoca/kbuildsycoca_main.cpp:64 kbuildsycoca/kbuildsycoca_main.cpp:67 #, kde-format msgctxt "@info:credit" msgid "Author" msgstr "Аутор" -#: kbuildsycoca/kbuildsycoca_main.cpp:64 +#: kbuildsycoca/kbuildsycoca_main.cpp:66 #, kde-format msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "Валдо Бастијан" -#: kbuildsycoca/kbuildsycoca_main.cpp:73 +#: kbuildsycoca/kbuildsycoca_main.cpp:75 #, kde-format msgctxt "@info:shell command-line option" msgid "" @@ -77,43 +77,37 @@ msgid "" msgstr "" "Не шаљи програмима сигнал за ажурирање (превазиђено, више нема дејства)" -#: kbuildsycoca/kbuildsycoca_main.cpp:76 +#: kbuildsycoca/kbuildsycoca_main.cpp:78 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" msgstr "Искључи постепено ажурирање, ишчитај све поново" -#: kbuildsycoca/kbuildsycoca_main.cpp:79 +#: kbuildsycoca/kbuildsycoca_main.cpp:81 #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "Провери временске ознаке фајлова (превазиђено, више нема дејства)" -#: kbuildsycoca/kbuildsycoca_main.cpp:82 +#: kbuildsycoca/kbuildsycoca_main.cpp:84 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" msgstr "Искључи проверу фајлова (превазиђено, више нема дејства)" -#: kbuildsycoca/kbuildsycoca_main.cpp:85 -#, kde-format -msgctxt "@info:shell command-line option" -msgid "Create global database" -msgstr "Направи глобалну базу" - -#: kbuildsycoca/kbuildsycoca_main.cpp:88 +#: kbuildsycoca/kbuildsycoca_main.cpp:87 #, kde-format msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" msgstr "Изврши само пробни поступак стварања менија" -#: kbuildsycoca/kbuildsycoca_main.cpp:91 +#: kbuildsycoca/kbuildsycoca_main.cpp:90 #, kde-format msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" msgstr "Прати ид. менија ради исправљања" -#: kbuildsycoca/kbuildsycoca_main.cpp:95 +#: kbuildsycoca/kbuildsycoca_main.cpp:94 #, kde-format msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" @@ -142,7 +136,7 @@ msgstr "" "К‑лансер није доступан преко д‑буса, грешка при позиву %1:\n" "%2\n" -#: kdeinit/ktoolinvocation_x11.cpp:250 +#: kdeinit/ktoolinvocation_x11.cpp:240 #, kde-format msgid "" "Could not launch the mail client:\n" @@ -153,7 +147,7 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:251 +#: kdeinit/ktoolinvocation_x11.cpp:241 #, kde-format msgid "Could not launch Mail Client" msgstr "Не могу да покренем поштански клијент" @@ -161,8 +155,8 @@ msgstr "Не могу да покрен #. 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:300 kdeinit/ktoolinvocation_x11.cpp:325 -#: kdeinit/ktoolinvocation_x11.cpp:344 +#: kdeinit/ktoolinvocation_x11.cpp:291 kdeinit/ktoolinvocation_x11.cpp:316 +#: kdeinit/ktoolinvocation_x11.cpp:335 #, kde-format msgid "" "Could not launch the browser:\n" @@ -173,13 +167,13 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 -#: kdeinit/ktoolinvocation_x11.cpp:345 +#: kdeinit/ktoolinvocation_x11.cpp:292 kdeinit/ktoolinvocation_x11.cpp:317 +#: kdeinit/ktoolinvocation_x11.cpp:336 #, kde-format msgid "Could not launch Browser" msgstr "Не могу да покренем прегледач" -#: kdeinit/ktoolinvocation_x11.cpp:384 +#: kdeinit/ktoolinvocation_x11.cpp:376 #, kde-format msgid "" "Could not launch the terminal client:\n" @@ -190,22 +184,22 @@ msgstr "" "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:385 +#: kdeinit/ktoolinvocation_x11.cpp:377 #, kde-format msgid "Could not launch Terminal Client" msgstr "Не могу да покренем терминалски клијент" -#: plugin/kdbusservicestarter.cpp:77 +#: plugin/kdbusservicestarter.cpp:79 #, kde-format msgid "No service implementing %1" msgstr "Ниједан сервис не изводи %1" -#: services/kservice.cpp:1019 +#: services/kservice.cpp:1050 #, kde-format msgid "The provided service is not valid" msgstr "Дати сервис није добар." -#: services/kservice.cpp:1023 +#: services/kservice.cpp:1054 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "Сервис „%1“ не даје библиотеку или недостаје кључ „Library“."
  62. Download patch autotests/kapplicationtradertest.cpp

    --- 5.70.0-1/autotests/kapplicationtradertest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/kapplicationtradertest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -21,11 +21,11 @@ #include <locale.h> -#include <qtest.h> +#include <QTest> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <kdesktopfile.h> +#include <KConfig> +#include <KConfigGroup> +#include <KDesktopFile> #include <ksycoca.h> #include <kbuildsycoca_p.h> #include <../src/services/ktraderparsetree_p.h> @@ -35,10 +35,10 @@ #include <kservicetype.h> #include <kservicetypeprofile.h> -#include <qfile.h> -#include <qstandardpaths.h> -#include <qthread.h> -#include <qsignalspy.h> +#include <QFile> +#include <QStandardPaths> +#include <QThread> +#include <QSignalSpy> #include <QDebug> #include <QLoggingCategory> @@ -295,7 +295,7 @@ QString KApplicationTraderTest::createFa #include <QThreadPool> #include <QFutureSynchronizer> -#include <qtconcurrentrun.h> +#include <QtConcurrentRun> // Testing for concurrent access to ksycoca from multiple threads // Use thread-sanitizer to see the data races
  63. Download patch src/services/kplugininfo.h

    --- 5.70.0-1/src/services/kplugininfo.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kplugininfo.h 2020-08-01 19:54:44.000000000 +0000 @@ -24,7 +24,7 @@ #include <QString> #include <QStringList> -#include <kconfiggroup.h> +#include <KConfigGroup> #include <kservice.h> #include <QList>
  64. Download patch src/services/kplugininfo.cpp

    --- 5.70.0-1/src/services/kplugininfo.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kplugininfo.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -29,10 +29,10 @@ #include "ksycoca.h" #include "ksycoca_p.h" -#include <kaboutdata.h> -#include <kconfiggroup.h> -#include <kdesktopfile.h> -#include <kpluginmetadata.h> +#include <KAboutData> +#include <KConfigGroup> +#include <KDesktopFile> +#include <KPluginMetaData> #include <kservice.h> #include <kservicetypetrader.h> #include <kservicetypefactory_p.h>
  65. Download patch po/vi/kservice5.po

    --- 5.70.0-1/po/vi/kservice5.po 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/po/vi/kservice5.po 2020-08-01 19:54:44.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "PO-Revision-Date: 2012-09-23 18:43+0800\n" "Last-Translator: Lê Hoàng Phương <herophuong93@gmail.com>\n" "Language-Team: American English <kde-i18n-vi@kde.org>\n" -"Language: en_US\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
  66. Download patch autotests/ksycocatest.cpp

    --- 5.70.0-1/autotests/ksycocatest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/ksycocatest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -24,8 +24,8 @@ #include <QTest> #include <QDebug> #include <kservicetype.h> -#include <kdesktopfile.h> -#include <kconfiggroup.h> +#include <KDesktopFile> +#include <KConfigGroup> #include <QSignalSpy> #include <QProcess> #include <kservice.h>
  67. Download patch docs/Doxyfile.local

    --- 5.70.0-1/docs/Doxyfile.local 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/docs/Doxyfile.local 2020-08-01 19:54:44.000000000 +0000 @@ -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)="
  68. Download patch src/kdeinit/ktoolinvocation_win.cpp

    --- 5.70.0-1/src/kdeinit/ktoolinvocation_win.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/kdeinit/ktoolinvocation_win.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -20,8 +20,8 @@ #include "ktoolinvocation.h" -#include "kmessage.h" -#include "klocalizedstring.h" +#include <KMessage> +#include <KLocalizedString> #include <QUrl> #include <QUrlQuery> @@ -83,7 +83,15 @@ void KToolInvocation::invokeMailer(const #endif } -void KToolInvocation::invokeTerminal(const QString &command, const QString &workdir, const QByteArray &startup_id) +void KToolInvocation::invokeTerminal(const QString &command, + const QStringList &envs, + const QString &workdir, + const QByteArray &startup_id) { //TODO } + +void KToolInvocation::invokeTerminal(const QString &command, const QString &workdir, const QByteArray &startup_id) +{ + invokeTerminal(command, QStringList(), workdir, startup_id); +}
  69. Download patch autotests/kautostarttest.cpp

    --- 5.70.0-1/autotests/kautostarttest.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/kautostarttest.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -18,7 +18,7 @@ #include "kautostarttest.h" -#include <qstandardpaths.h> +#include <QStandardPaths> #include <QTest> #include <QFile>
  70. Download patch src/CMakeLists.txt

    --- 5.70.0-1/src/CMakeLists.txt 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/CMakeLists.txt 2020-08-01 19:54:44.000000000 +0000 @@ -45,14 +45,16 @@ endif() ecm_qt_declare_logging_category(kservice_SRCS HEADER servicesdebug.h IDENTIFIER SERVICES - CATEGORY_NAME kf5.kservice.services + CATEGORY_NAME kf.service.services + OLD_CATEGORY_NAMES kf5.kservice.services EXPORT KSERVICE DESCRIPTION "service (kservice lib)" ) ecm_qt_declare_logging_category(kservice_SRCS HEADER sycocadebug.h IDENTIFIER SYCOCA - CATEGORY_NAME kf5.kservice.sycoca + CATEGORY_NAME kf.service.sycoca + OLD_CATEGORY_NAMES kf5.kservice.sycoca EXPORT KSERVICE DESCRIPTION "sycoca (kservice)" ) @@ -101,7 +103,7 @@ ecm_generate_export_header(KF5Service 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 +236,7 @@ if(BUILD_QCH) 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
  71. Download patch src/services/kservicetypetrader.cpp

    --- 5.70.0-1/src/services/kservicetypetrader.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservicetypetrader.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -179,10 +179,14 @@ KService::Ptr KServiceTypeTrader::prefer 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(); }
  72. Download patch src/services/kservicetypeprofile.h

    --- 5.70.0-1/src/services/kservicetypeprofile.h 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservicetypeprofile.h 2020-08-01 19:54:44.000000000 +0000 @@ -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_EXPORT void writeServiceTypePro 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 @@ KSERVICE_EXPORT bool hasProfile(const QS void clearCache(); } -#endif #endif
  73. Download patch autotests/CMakeLists.txt

    --- 5.70.0-1/autotests/CMakeLists.txt 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/autotests/CMakeLists.txt 2020-08-01 19:54:44.000000000 +0000 @@ -30,6 +30,8 @@ kservice_unit_tests( 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 @@ -52,7 +54,11 @@ kcoreaddons_desktop_to_json(fakeplugin $ ######### kmimeassociationstest ######## set(kmimeassociationstest_SRCS kmimeassociationstest.cpp ../src/sycoca/kmimeassociations.cpp) -ecm_qt_declare_logging_category(kmimeassociationstest_SRCS HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf5.kservice.sycoca) +ecm_qt_declare_logging_category(kmimeassociationstest_SRCS + HEADER sycocadebug.h + IDENTIFIER SYCOCA + CATEGORY_NAME kf.service.sycoca +) ecm_add_test(${kmimeassociationstest_SRCS} TEST_NAME kmimeassociationstest LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Xml)
  74. Download patch src/services/kservice.cpp

    --- 5.70.0-1/src/services/kservice.cpp 2020-05-02 22:22:35.000000000 +0000 +++ 5.73.0-0ubuntu1/src/services/kservice.cpp 2020-08-01 19:54:44.000000000 +0000 @@ -29,15 +29,15 @@ #include <QDir> #include <QMap> #include <QCoreApplication> -#include <qmimedatabase.h> +#include <QMimeDatabase> -#include <kauthorized.h> -#include <kdesktopfile.h> -#include <kconfiggroup.h> -#include <klocalizedstring.h> +#include <KAuthorized> +#include <KDesktopFile> +#include <KConfigGroup> +#include <KLocalizedString> -#include <qstandardpaths.h> -#include <qdebug.h> +#include <QStandardPaths> +#include <QDebug> #include "kservicefactory_p.h" #include "kservicetypefactory_p.h"
  1. kservice