Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2019-02-28 21:28:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Thu Feb 28 21:28:19 2019 rev:66 rq:678674 version:5.55.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2019-02-14 14:24:17.239904893 +0100 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new.28833/kcoreaddons.changes 2019-02-28 21:28:34.549829311 +0100 @@ -1,0 +2,7 @@ +Fri Feb 15 09:17:36 UTC 2019 - alarr...@suse.com + +- Add 0001-Do-not-use-functor-if-Qt-lt-5.10.patch to revert the removal of + support for Qt 5.9 +- Downgrade the Qt version requirement to build with 5.9 + +------------------------------------------------------------------- New: ---- 0001-Do-not-use-functor-if-Qt-lt-5.10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.ef3W7o/_old 2019-02-28 21:28:36.525828650 +0100 +++ /var/tmp/diff_new_pack.ef3W7o/_new 2019-02-28 21:28:36.561828638 +0100 @@ -32,6 +32,8 @@ URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE +Patch0: 0001-Do-not-use-functor-if-Qt-lt-5.10.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes @@ -80,6 +82,10 @@ %prep %setup -q +%autopatch -p1 +%if 0%{?suse_version} == 1500 +sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt +%endif %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert -DKDE4_DEFAULT_HOME=".kde4" ++++++ 0001-Do-not-use-functor-if-Qt-lt-5.10.patch ++++++ >From 16e8cf1e6607ae496515edce00a771ad0153b348 Mon Sep 17 00:00:00 2001 From: Milian Wolff <m...@milianw.de> Date: Thu, 11 Jan 2018 15:39:35 +0100 Subject: Optimize: use QMetaObject::invokeMethod with functor Summary: When using this method with a string argument, the method would need to be queried every time via QMetaObject::indexOfMethod. Using a functor one can get rid of this, saving a few cycles which can add up when handling many inotify events. Note that the benchmark timing does not really improve significantly. Using a profiler like perf, we do see that less cycles are consumed though. In my measurement, this reduces the cpu cyles by about 2%. Reviewers: dfaure Subscribers: #frameworks Tags: #frameworks Differential Revision: https://phabricator.kde.org/D9823 --- src/lib/io/kdirwatch.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/lib/io/kdirwatch.cpp') Rebased by Antonio Larrosa <alarr...@suse.com> to recover this patch which was later removed by https://cgit.kde.org/kcoreaddons.git/commit/src/lib/io/kdirwatch.cpp?id=026bbfe17707b0f3999b8b461e24480a8a539226 diff --git a/src/lib/io/kdirwatch.cpp b/src/lib/io/kdirwatch.cpp index eb8aeeb..7213ee6 100644 --- a/src/lib/io/kdirwatch.cpp +++ b/src/lib/io/kdirwatch.cpp @@ -1405,16 +1405,28 @@ void KDirWatchPrivate::emitEvent(Entry *e, int event, const QString &fileName) // Emit the signals delayed, to avoid unexpected re-entrance from the slots (#220153) if (event & Deleted) { +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(c.instance, "setDeleted", Qt::QueuedConnection, Q_ARG(QString, path)); +#else QMetaObject::invokeMethod(c.instance, [c, path]() { c.instance->setDeleted(path); }, Qt::QueuedConnection); +#endif } if (event & Created) { +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(c.instance, "setCreated", Qt::QueuedConnection, Q_ARG(QString, path)); +#else QMetaObject::invokeMethod(c.instance, [c, path]() { c.instance->setCreated(path); }, Qt::QueuedConnection); +#endif // possible emit Change event after creation } if (event & Changed) { +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(c.instance, "setDirty", Qt::QueuedConnection, Q_ARG(QString, path)); +#else QMetaObject::invokeMethod(c.instance, [c, path]() { c.instance->setDirty(path); }, Qt::QueuedConnection); +#endif } } } -- cgit v1.1
