Hello community, here is the log from the commit of package kded for openSUSE:Factory checked in at 2016-01-20 09:42:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kded (Old) and /work/SRC/openSUSE:Factory/.kded.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded" Changes: -------- --- /work/SRC/openSUSE:Factory/kded/kded.changes 2015-12-29 12:51:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kded.new/kded.changes 2016-01-20 09:42:21.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 2 17:42:34 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.18.0 + * Adapt to Qt 5.6's threaded dbus: messageFilter must trigger + module loading in the main thread + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.18.0.php + +------------------------------------------------------------------- Old: ---- kded-5.17.0.tar.xz New: ---- kded-5.18.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kded.spec ++++++ --- /var/tmp/diff_new_pack.hdpR5S/_old 2016-01-20 09:42:22.000000000 +0100 +++ /var/tmp/diff_new_pack.hdpR5S/_new 2016-01-20 09:42:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kded # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.17 +%define _tar_path 5.18 Name: kded -Version: 5.17.0 +Version: 5.18.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kded-5.17.0.tar.xz -> kded-5.18.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.17.0/CMakeLists.txt new/kded-5.18.0/CMakeLists.txt --- old/kded-5.17.0/CMakeLists.txt 2015-12-06 22:21:53.000000000 +0100 +++ new/kded-5.18.0/CMakeLists.txt 2016-01-02 17:29:41.000000000 +0100 @@ -3,7 +3,7 @@ project(KDED) include(FeatureSummary) -find_package(ECM 5.17.0 NO_MODULE) +find_package(ECM 5.18.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -16,8 +16,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.17.0") # handled by release scripts -set(KF5_DEP_VERSION "5.17.0") # handled by release scripts +set(KF5_VERSION "5.18.0") # handled by release scripts +set(KF5_DEP_VERSION "5.18.0") # handled by release scripts find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.17.0/src/kded.cpp new/kded-5.18.0/src/kded.cpp --- old/kded-5.17.0/src/kded.cpp 2015-12-06 22:21:53.000000000 +0100 +++ new/kded-5.18.0/src/kded.cpp 2016-01-02 17:29:41.000000000 +0100 @@ -140,11 +140,14 @@ return; } - KDEDModule *module = self()->loadModule(obj, true); - if (!module) { - qCWarning(KDED) << "Failed to load module for " << obj; - } - Q_UNUSED(module); +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + // messageFilter runs in a secondary thread since Qt 5.6, so we use invokeMethod + // to load the module in the main thread. But we need to block so that the object + // can then process the message. + QMetaObject::invokeMethod(self(), "loadModule", Qt::BlockingQueuedConnection, Q_ARG(QString, obj), Q_ARG(bool, true)); +#else + self()->loadModule(obj, true); +#endif } static int phaseForModule(const KPluginMetaData &module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.17.0/src/kded.h new/kded-5.18.0/src/kded.h --- old/kded-5.17.0/src/kded.h 2015-12-06 22:21:53.000000000 +0100 +++ new/kded-5.18.0/src/kded.h 2016-01-02 17:29:41.000000000 +0100 @@ -52,7 +52,6 @@ void noDemandLoad(const QString &obj); // Don't load obj on demand - KDEDModule *loadModule(const QString &obj, bool onDemand); QStringList loadedModules(); bool unloadModule(const QString &obj); //bool isWindowRegistered(qlonglong windowId) const; @@ -109,6 +108,8 @@ void setModuleAutoloading(const QString &module, bool autoload); public Q_SLOTS: + KDEDModule *loadModule(const QString &obj, bool onDemand); + /** * Loads / unloads modules according to config */
