Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2020-08-12 12:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Wed Aug 12 12:25:10 2020 rev:86 rq:825105 version:5.73.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2020-07-14 07:55:40.377087010 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new.3399/kservice.changes 2020-08-12 12:29:12.964176352 +0200 @@ -1,0 +2,12 @@ +Sun Aug 2 07:13:46 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.73.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.73.0 +- Changes since 5.72.0: + * Add overload to invoke terminal with ENV variables + * Use KF-standardized Qt logging categories + * Use camelcase include. (scripted) + +------------------------------------------------------------------- Old: ---- kservice-5.72.0.tar.xz kservice-5.72.0.tar.xz.sig New: ---- kservice-5.73.0.tar.xz kservice-5.73.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.PNvQe2/_old 2020-08-12 12:29:13.612176333 +0200 +++ /var/tmp/diff_new_pack.PNvQe2/_new 2020-08-12 12:29:13.616176332 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.72 +%define _tar_path 5.73 # 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.72.0 +Version: 5.73.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later @@ -116,6 +116,7 @@ %doc %lang(en) %{_kf5_mandir}/*/kbuildsycoca5.* %doc %lang(en) %{_kf5_mandir}/*/desktoptojson.* %{_kf5_debugdir}/*.categories +%{_kf5_debugdir}/*.renamecategories %files devel %{_kf5_libdir}/libKF5Service.so ++++++ kservice-5.72.0.tar.xz -> kservice-5.73.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/CMakeLists.txt new/kservice-5.73.0/CMakeLists.txt --- old/kservice-5.72.0/CMakeLists.txt 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/CMakeLists.txt 2020-08-01 21:54:44.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.72.0") # handled by release scripts -set(KF5_DEP_VERSION "5.72.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 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.72.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/CMakeLists.txt new/kservice-5.73.0/autotests/CMakeLists.txt --- old/kservice-5.72.0/autotests/CMakeLists.txt 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/CMakeLists.txt 2020-08-01 21:54:44.000000000 +0200 @@ -54,7 +54,11 @@ ######### 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/kapplicationtradertest.cpp new/kservice-5.73.0/autotests/kapplicationtradertest.cpp --- old/kservice-5.72.0/autotests/kapplicationtradertest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/kapplicationtradertest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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 @@ #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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/kautostarttest.cpp new/kservice-5.73.0/autotests/kautostarttest.cpp --- old/kservice-5.72.0/autotests/kautostarttest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/kautostarttest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -18,7 +18,7 @@ #include "kautostarttest.h" -#include <qstandardpaths.h> +#include <QStandardPaths> #include <QTest> #include <QFile> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/kmimeassociationstest.cpp new/kservice-5.73.0/autotests/kmimeassociationstest.cpp --- old/kservice-5.72.0/autotests/kmimeassociationstest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/kmimeassociationstest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/kservicetest.cpp new/kservice-5.73.0/autotests/kservicetest.cpp --- old/kservice-5.72.0/autotests/kservicetest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/kservicetest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> @@ -817,7 +817,7 @@ #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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/ksycoca_xdgdirstest.cpp new/kservice-5.73.0/autotests/ksycoca_xdgdirstest.cpp --- old/kservice-5.72.0/autotests/ksycoca_xdgdirstest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/ksycoca_xdgdirstest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/ksycocadicttest.cpp new/kservice-5.73.0/autotests/ksycocadicttest.cpp --- old/kservice-5.72.0/autotests/ksycocadicttest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/ksycocadicttest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/ksycocatest.cpp new/kservice-5.73.0/autotests/ksycocatest.cpp --- old/kservice-5.72.0/autotests/ksycocatest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/ksycocatest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/ksycocathreadtest.cpp new/kservice-5.73.0/autotests/ksycocathreadtest.cpp --- old/kservice-5.72.0/autotests/ksycocathreadtest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/ksycocathreadtest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/nsaplugin.cpp new/kservice-5.73.0/autotests/nsaplugin.cpp --- old/kservice-5.72.0/autotests/nsaplugin.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/nsaplugin.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -20,7 +20,7 @@ */ #include "nsaplugin.h" -#include <kexportplugin.h> +#include <KExportPlugin> #include <QDebug> NSAPlugin::NSAPlugin(QObject *parent, const QVariantList &args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/autotests/nsaplugin.h new/kservice-5.73.0/autotests/nsaplugin.h --- old/kservice-5.72.0/autotests/nsaplugin.h 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/autotests/nsaplugin.h 2020-08-01 21:54:44.000000000 +0200 @@ -25,7 +25,7 @@ #include <QObject> #include <kplugininfo.h> -#include <kpluginfactory.h> +#include <KPluginFactory> class NSAPlugin : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/po/ca/kservice5.po new/kservice-5.73.0/po/ca/kservice5.po --- old/kservice-5.72.0/po/ca/kservice5.po 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/po/ca/kservice5.po 2020-08-01 21:54:44.000000000 +0200 @@ -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 <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. -# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015, 2020. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # Robert Millan <[email protected]>, 2009. @@ -14,14 +14,14 @@ "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 <[email protected]>\n" +"PO-Revision-Date: 2020-07-25 08:16+0200\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\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 @@ #, 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 @@ #, 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/po/zh_CN/kservice5.po new/kservice-5.73.0/po/zh_CN/kservice5.po --- old/kservice-5.72.0/po/zh_CN/kservice5.po 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/po/zh_CN/kservice5.po 2020-08-01 21:54:44.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-06-24 08:00\n" +"PO-Revision-Date: 2020-07-31 15:01\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/CMakeLists.txt new/kservice-5.73.0/src/CMakeLists.txt --- old/kservice-5.72.0/src/CMakeLists.txt 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/CMakeLists.txt 2020-08-01 21:54:44.000000000 +0200 @@ -45,14 +45,16 @@ 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)" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/kbuildsycoca/kbuildsycoca_main.cpp new/kservice-5.73.0/src/kbuildsycoca/kbuildsycoca_main.cpp --- old/kservice-5.72.0/src/kbuildsycoca/kbuildsycoca_main.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/kbuildsycoca/kbuildsycoca_main.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/kdeinit/ktoolinvocation.cpp new/kservice-5.73.0/src/kdeinit/ktoolinvocation.cpp --- old/kservice-5.72.0/src/kdeinit/ktoolinvocation.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/kdeinit/ktoolinvocation.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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 @@ 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 @@ 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/kdeinit/ktoolinvocation.h new/kservice-5.73.0/src/kdeinit/ktoolinvocation.h --- old/kservice-5.72.0/src/kdeinit/ktoolinvocation.h 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/kdeinit/ktoolinvocation.h 2020-08-01 21:54:44.000000000 +0200 @@ -159,6 +159,22 @@ * 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 @@ 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/kdeinit/ktoolinvocation_win.cpp new/kservice-5.73.0/src/kdeinit/ktoolinvocation_win.cpp --- old/kservice-5.72.0/src/kdeinit/ktoolinvocation_win.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/kdeinit/ktoolinvocation_win.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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 @@ #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); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/kdeinit/ktoolinvocation_x11.cpp new/kservice-5.73.0/src/kdeinit/ktoolinvocation_x11.cpp --- old/kservice-5.72.0/src/kdeinit/ktoolinvocation_x11.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/kdeinit/ktoolinvocation_x11.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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 @@ #endif void KToolInvocation::invokeTerminal(const QString &command, + const QStringList &envs, const QString &workdir, const QByteArray &startup_id) { @@ -371,9 +372,16 @@ 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); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/plugin/kdbusservicestarter.cpp new/kservice-5.73.0/src/plugin/kdbusservicestarter.cpp --- old/kservice-5.72.0/src/plugin/kdbusservicestarter.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/plugin/kdbusservicestarter.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kapplicationtrader.cpp new/kservice-5.73.0/src/services/kapplicationtrader.cpp --- old/kservice-5.72.0/src/services/kapplicationtrader.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kapplicationtrader.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -27,7 +27,7 @@ #include "kmimetypefactory_p.h" #include "servicesdebug.h" -#include <qmimedatabase.h> +#include <QMimeDatabase> static KService::List mimeTypeSycocaServiceOffers(const QString &mimeType) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kautostart.cpp new/kservice-5.73.0/src/services/kautostart.cpp --- old/kservice-5.72.0/src/services/kautostart.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kautostart.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -19,8 +19,8 @@ #include "kautostart.h" -#include "kdesktopfile.h" -#include "kconfiggroup.h" +#include <KDesktopFile> +#include <KConfigGroup> #include <QCoreApplication> #include <QDir> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kmimetypetrader.cpp new/kservice-5.73.0/src/services/kmimetypetrader.cpp --- old/kservice-5.72.0/src/services/kmimetypetrader.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kmimetypetrader.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -28,7 +28,7 @@ #include "kservicefactory_p.h" #include "kmimetypefactory_p.h" #include "servicesdebug.h" -#include <qmimedatabase.h> +#include <QMimeDatabase> class KMimeTypeTraderPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kplugininfo.cpp new/kservice-5.73.0/src/services/kplugininfo.cpp --- old/kservice-5.72.0/src/services/kplugininfo.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kplugininfo.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kplugininfo.h new/kservice-5.73.0/src/services/kplugininfo.h --- old/kservice-5.72.0/src/services/kplugininfo.h 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kplugininfo.h 2020-08-01 21:54:44.000000000 +0200 @@ -24,7 +24,7 @@ #include <QString> #include <QStringList> -#include <kconfiggroup.h> +#include <KConfigGroup> #include <kservice.h> #include <QList> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kservice.cpp new/kservice-5.73.0/src/services/kservice.cpp --- old/kservice-5.72.0/src/services/kservice.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kservice.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kservice.h new/kservice-5.73.0/src/services/kservice.h --- old/kservice-5.72.0/src/services/kservice.h 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kservice.h 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kservicegroup.cpp new/kservice-5.73.0/src/services/kservicegroup.cpp --- old/kservice-5.72.0/src/services/kservicegroup.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kservicegroup.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kservicetype.cpp new/kservice-5.73.0/src/services/kservicetype.cpp --- old/kservice-5.72.0/src/services/kservicetype.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kservicetype.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kservicetype.h new/kservice-5.73.0/src/services/kservicetype.h --- old/kservice-5.72.0/src/services/kservicetype.h 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kservicetype.h 2020-08-01 21:54:44.000000000 +0200 @@ -28,7 +28,7 @@ #include <QMap> #include <QVariant> -#include <kconfig.h> +#include <KConfig> class KDesktopFile; class KServiceTypePrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/services/kservicetypeprofile.cpp new/kservice-5.73.0/src/services/kservicetypeprofile.cpp --- old/kservice-5.72.0/src/services/kservicetypeprofile.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/services/kservicetypeprofile.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -26,8 +26,8 @@ #include "kservicetype.h" #include "ksycoca_p.h" -#include <kconfig.h> -#include <kconfiggroup.h> +#include <KConfig> +#include <KConfigGroup> #include <QMutex> #include <QHash> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/kbuildmimetypefactory.cpp new/kservice-5.73.0/src/sycoca/kbuildmimetypefactory.cpp --- old/kservice-5.72.0/src/sycoca/kbuildmimetypefactory.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/kbuildmimetypefactory.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -25,7 +25,7 @@ #include <assert.h> #include <QDebug> #include <QHash> -#include <qstandardpaths.h> +#include <QStandardPaths> KBuildMimeTypeFactory::KBuildMimeTypeFactory(KSycoca *db) : KMimeTypeFactory(db) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/kbuildservicefactory.cpp new/kservice-5.73.0/src/sycoca/kbuildservicefactory.cpp --- old/kservice-5.72.0/src/sycoca/kbuildservicefactory.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/kbuildservicefactory.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/kbuildservicetypefactory.cpp new/kservice-5.73.0/src/sycoca/kbuildservicetypefactory.cpp --- old/kservice-5.72.0/src/sycoca/kbuildservicetypefactory.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/kbuildservicetypefactory.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/kbuildsycoca.cpp new/kservice-5.73.0/src/sycoca/kbuildsycoca.cpp --- old/kservice-5.72.0/src/sycoca/kbuildsycoca.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/kbuildsycoca.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/kmimeassociations.cpp new/kservice-5.73.0/src/sycoca/kmimeassociations.cpp --- old/kservice-5.72.0/src/sycoca/kmimeassociations.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/kmimeassociations.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/ksycoca.cpp new/kservice-5.73.0/src/sycoca/ksycoca.cpp --- old/kservice-5.72.0/src/sycoca/ksycoca.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/ksycoca.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/ksycoca_p.h new/kservice-5.73.0/src/sycoca/ksycoca_p.h --- old/kservice-5.72.0/src/sycoca/ksycoca_p.h 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/ksycoca_p.h 2020-08-01 21:54:44.000000000 +0200 @@ -25,7 +25,7 @@ #include <QStringList> #include <QElapsedTimer> #include <QDateTime> -#include <kdirwatch.h> +#include <KDirWatch> class QFile; class QDataStream; class KSycocaAbstractDevice; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/src/sycoca/ksycocafactory_p.h new/kservice-5.73.0/src/sycoca/ksycocafactory_p.h --- old/kservice-5.72.0/src/sycoca/ksycocafactory_p.h 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/src/sycoca/ksycocafactory_p.h 2020-08-01 21:54:44.000000000 +0200 @@ -20,7 +20,7 @@ #define KSYCOCAFACTORY_H #include <ksycocaentry.h> -#include <qstandardpaths.h> +#include <QStandardPaths> #include <ksycoca.h> // for KSycoca::self() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/tests/CMakeLists.txt new/kservice-5.73.0/tests/CMakeLists.txt --- old/kservice-5.72.0/tests/CMakeLists.txt 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/tests/CMakeLists.txt 2020-08-01 21:54:44.000000000 +0200 @@ -28,7 +28,11 @@ 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}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/tests/pluginlocator/main.cpp new/kservice-5.73.0/tests/pluginlocator/main.cpp --- old/kservice-5.72.0/tests/pluginlocator/main.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/tests/pluginlocator/main.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/tests/pluginlocator/plugintest.cpp new/kservice-5.73.0/tests/pluginlocator/plugintest.cpp --- old/kservice-5.72.0/tests/pluginlocator/plugintest.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/tests/pluginlocator/plugintest.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -25,7 +25,7 @@ #include <kplugininfo.h> #include <kplugintrader.h> -#include <qcommandlineparser.h> +#include <QCommandLineParser> #include <QElapsedTimer> #include <QStandardPaths> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.72.0/tests/startserviceby.cpp new/kservice-5.73.0/tests/startserviceby.cpp --- old/kservice-5.72.0/tests/startserviceby.cpp 2020-07-04 15:21:16.000000000 +0200 +++ new/kservice-5.73.0/tests/startserviceby.cpp 2020-08-01 21:54:44.000000000 +0200 @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <qcoreapplication.h> +#include <QCoreApplication> #include <ktoolinvocation.h> #include <QDebug>
