Hello community, here is the log from the commit of package kded for openSUSE:Leap:15.2 checked in at 2020-05-12 11:38:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kded (Old) and /work/SRC/openSUSE:Leap:15.2/.kded.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded" Tue May 12 11:38:13 2020 rev:68 rq:802161 version:5.70.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kded/kded.changes 2020-04-21 19:04:48.463657190 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.kded.new.2738/kded.changes 2020-05-12 11:38:57.940571854 +0200 @@ -1,0 +2,11 @@ +Sun May 3 09:39:52 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.70.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.70.0 +- Changes since 5.69.0: + * Port KToolInvocation::kdeinitExecWait to QProcess + * Drop delayed second phase + +------------------------------------------------------------------- Old: ---- kded-5.69.0.tar.xz kded-5.69.0.tar.xz.sig New: ---- kded-5.70.0.tar.xz kded-5.70.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.8mdWQa/_old 2020-05-12 11:38:58.464572955 +0200 +++ /var/tmp/diff_new_pack.8mdWQa/_new 2020-05-12 11:38:58.468572964 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.69 +%define _tar_path 5.70 # 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: kded -Version: 5.69.0 +Version: 5.70.0 Release: 0 Summary: Central daemon of KDE workspaces License: LGPL-2.1-or-later ++++++ kded-5.69.0.tar.xz -> kded-5.70.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.69.0/CMakeLists.txt new/kded-5.70.0/CMakeLists.txt --- old/kded-5.69.0/CMakeLists.txt 2020-04-05 00:57:00.000000000 +0200 +++ new/kded-5.70.0/CMakeLists.txt 2020-05-03 00:16:45.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.69.0") # handled by release scripts -set(KF5_DEP_VERSION "5.69.0") # handled by release scripts +set(KF5_VERSION "5.70.0") # handled by release scripts +set(KF5_DEP_VERSION "5.70.0") # handled by release scripts project(KDED VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.69.0 NO_MODULE) +find_package(ECM 5.70.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/kded-5.69.0/src/kded.cpp new/kded-5.70.0/src/kded.cpp --- old/kded-5.69.0/src/kded.cpp 2020-04-05 00:57:00.000000000 +0200 +++ new/kded-5.70.0/src/kded.cpp 2020-05-03 00:16:45.000000000 +0200 @@ -30,6 +30,7 @@ #include <QTimer> #include <QCommandLineParser> #include <QApplication> +#include <QProcess> #include <QDBusConnection> #include <QDBusConnectionInterface> @@ -40,7 +41,6 @@ #include <ksharedconfig.h> #include <KDirWatch> #include <KServiceTypeTrader> -#include <KToolInvocation> #include <KPluginInfo> #include <KPluginMetaData> @@ -66,8 +66,9 @@ static void runKonfUpdate() { - KToolInvocation::kdeinitExecWait(QStringLiteral(KCONF_UPDATE_EXE), - QStringList(), nullptr, nullptr, "0" /*no startup notification*/); + QProcess kconfUpdate; + kconfUpdate.start(QStringLiteral(KCONF_UPDATE_EXE)); + kconfUpdate.waitForFinished(); } Kded::Kded() @@ -211,12 +212,6 @@ } } - // There will be a "phase 2" only if we're in the KDE startup. - // If kded is restarted by its crashhandled or by hand, - // then there will be no second phase autoload, so load - // these modules now, if in a KDE session. - const bool loadPhase2Now = (kde_running && qEnvironmentVariableIntValue("KDED_STARTED_BY_KDEINIT") == 0); - // Preload kded modules. const QVector<KPluginMetaData> kdedModules = availableModules(); for (const KPluginMetaData &module : kdedModules) { @@ -238,7 +233,7 @@ break; case 2: // autoload delayed, only in KDE default: - if (!loadPhase2Now) { + if (!kde_running) { prevent_autoload = true; } break; @@ -267,16 +262,7 @@ void Kded::loadSecondPhase() { - qCDebug(KDED) << "Loading second phase autoload"; - KSharedConfig::Ptr config = KSharedConfig::openConfig(); - const QVector<KPluginMetaData> kdedModules = availableModules(); - for (const KPluginMetaData &module : kdedModules) { - const bool autoload = isModuleAutoloaded(module); - if (autoload && phaseForModule(module) == 2) { - qCDebug(KDED) << "2nd phase: loading" << module.pluginId(); - loadModule(module, false); - } - } + qCDebug(KDED) << "Second phase autoload is deprecated"; } void Kded::noDemandLoad(const QString &obj) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.69.0/src/kded.h new/kded-5.70.0/src/kded.h --- old/kded-5.69.0/src/kded.h 2020-04-05 00:57:00.000000000 +0200 +++ new/kded-5.70.0/src/kded.h 2020-05-03 00:16:45.000000000 +0200 @@ -70,6 +70,7 @@ void unregisterWindowId(qlonglong windowId, const QString &sender); //@} void recreate(bool initial); + // TODO KF6 remove void loadSecondPhase(); //@{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.69.0/src/kdedadaptor.h new/kded-5.70.0/src/kdedadaptor.h --- old/kded-5.69.0/src/kdedadaptor.h 2020-04-05 00:57:00.000000000 +0200 +++ new/kded-5.70.0/src/kdedadaptor.h 2020-05-03 00:16:45.000000000 +0200 @@ -39,6 +39,7 @@ void registerWindowId(qlonglong windowId, const QDBusMessage &); void unregisterWindowId(qlonglong windowId, const QDBusMessage &); void reconfigure(); + // TODO KF6 remove void loadSecondPhase(); void quit();
