Hello community, here is the log from the commit of package baloo5 for openSUSE:Leap:15.2 checked in at 2020-02-27 06:40:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/baloo5 (Old) and /work/SRC/openSUSE:Leap:15.2/.baloo5.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo5" Thu Feb 27 06:40:05 2020 rev:56 rq:777700 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/baloo5/baloo5.changes 2020-02-16 18:26:22.974657138 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.baloo5.new.26092/baloo5.changes 2020-02-27 06:40:06.813435923 +0100 @@ -1,0 +2,12 @@ +Tue Feb 18 15:53:33 UTC 2020 - Stefan Brüns <[email protected]> + +- Fix FileIndexScheduler being stuck after suspending it: + 0001-FileIndexScheduler-Force-evaluation-of-indexerState-.patch + +------------------------------------------------------------------- +Sat Feb 15 17:53:07 UTC 2020 - Wolfgang Bauer <[email protected]> + +- Add Sync-IndexerConfig-on-exit.patch to fix settings not getting + saved (kde#417127) + +------------------------------------------------------------------- New: ---- 0001-FileIndexScheduler-Force-evaluation-of-indexerState-.patch Sync-IndexerConfig-on-exit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo5.spec ++++++ --- /var/tmp/diff_new_pack.4WsXhJ/_old 2020-02-27 06:40:07.161436648 +0100 +++ /var/tmp/diff_new_pack.4WsXhJ/_new 2020-02-27 06:40:07.161436648 +0100 @@ -35,6 +35,10 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch: Sync-IndexerConfig-on-exit.patch +# PATCH-FIX-UPSTREAM -- Fix scheduler being stuck in Suspended state +Patch1: 0001-FileIndexScheduler-Force-evaluation-of-indexerState-.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem BuildRequires: libattr-devel @@ -146,6 +150,7 @@ %prep %setup -q -n baloo-%{version} +%autopatch -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-FileIndexScheduler-Force-evaluation-of-indexerState-.patch ++++++ >From f421ca39ad8e24e780d7c4956493d0c53d47e924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Tue, 11 Feb 2020 16:50:17 +0100 Subject: [PATCH] [FileIndexScheduler] Force evaluation of indexerState after suspend/resume Summary: When the scheduler is idle when suspending scheduleIndexing() has to be triggered, otherwise indexerState is only evaluated on the first external trigger (e.g. a changed file). On resume, scheduleIndexing() never updated the state, as Suspended did not qualify as an Idle state. This had the effect of the scheduler being stuck in the Suspended state. Test Plan: balooctl suspend && balooctl status balooctl resume && balooctl status Reviewers: #baloo, ngraham Subscribers: kde-frameworks-devel Tags: #frameworks, #baloo Differential Revision: https://phabricator.kde.org/D27326 --- src/file/fileindexscheduler.cpp | 2 ++ src/file/fileindexscheduler.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/file/fileindexscheduler.cpp b/src/file/fileindexscheduler.cpp index c3ca4a73..9cab41db 100644 --- a/src/file/fileindexscheduler.cpp +++ b/src/file/fileindexscheduler.cpp @@ -248,6 +248,8 @@ void FileIndexScheduler::setSuspend(bool suspend) qCDebug(BALOO) << "Suspending"; if (m_indexerState == ContentIndexing) { m_contentIndexer->quit(); + } else { + scheduleIndexing(); } } else { qCDebug(BALOO) << "Resuming"; diff --git a/src/file/fileindexscheduler.h b/src/file/fileindexscheduler.h index 1b446044..afa8067c 100644 --- a/src/file/fileindexscheduler.h +++ b/src/file/fileindexscheduler.h @@ -104,6 +104,7 @@ private: void setSuspend(bool suspend); bool isIndexerIdle() { return m_isGoingIdle || + (m_indexerState == Suspended) || (m_indexerState == Idle) || (m_indexerState == LowPowerIdle); } -- 2.25.0 ++++++ Sync-IndexerConfig-on-exit.patch ++++++ >From a0f8e748159b6bc0b8e5eaa1f9eb58a18ca736fa Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Thu, 13 Feb 2020 16:52:40 +0000 Subject: Sync IndexerConfig on exit Summary: KCoreConfigSkeleton, unlike KConfig does not automagically save on exit. BUG: 417127 Test Plan: balooctl disable balooctl enable Subscribers: kde-frameworks-devel, #baloo Tags: #frameworks, #baloo Differential Revision: https://phabricator.kde.org/D27376 --- src/lib/indexerconfig.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/indexerconfig.cpp b/src/lib/indexerconfig.cpp index 66786b9..19ae342 100644 --- a/src/lib/indexerconfig.cpp +++ b/src/lib/indexerconfig.cpp @@ -43,6 +43,7 @@ IndexerConfig::IndexerConfig() IndexerConfig::~IndexerConfig() { + d->m_settings.save(); delete d; } -- cgit v1.1
