diff --git a/Fix-a-dangling-reference-to-the-list-of-database-files.patch b/Fix-a-dangling-reference-to-the-list-of-database-files.patch new file mode 100644 index 0000000..d883de8 --- /dev/null +++ b/Fix-a-dangling-reference-to-the-list-of-database-files.patch @@ -0,0 +1,34 @@ +From 847c1dbed6b422211285fb19d7fd07d8112349ff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= +Date: Wed, 14 Oct 2020 10:43:01 +0200 +Subject: [PATCH] Fix a dangling reference to the list of database files + +CCBUG: 427650 +--- + src/service/plugins/sqlite/Database.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/service/plugins/sqlite/Database.cpp b/src/service/plugins/sqlite/Database.cpp +index 3fd877e..ac9a8d1 100644 +--- a/src/service/plugins/sqlite/Database.cpp ++++ b/src/service/plugins/sqlite/Database.cpp +@@ -26,6 +26,7 @@ + // System + #include + #include ++#include + + // Local + #include "DebugResources.h" +@@ -91,7 +92,7 @@ void ResourcesDatabaseInitializer::initDatabase(bool retryOnFail) + = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + + QStringLiteral("/kactivitymanagerd/resources/working-backup/"); + +- const QStringList databaseFiles{"database", "database-wal", "database-shm"}; ++ static const std::array databaseFiles{"database", "database-wal", "database-shm"}; + + { + QDir dir; +-- +GitLab + diff --git a/kactivitymanagerd.changes b/kactivitymanagerd.changes index b0b4690..ca78781 100644 --- a/kactivitymanagerd.changes +++ b/kactivitymanagerd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 16 05:41:16 UTC 2020 - Wolfgang Bauer + +- Add Fix-a-dangling-reference-to-the-list-of-database-files.patch + to fix possible crashes (kde#427650) + ------------------------------------------------------------------- Thu Oct 8 16:55:19 UTC 2020 - Fabian Vogt diff --git a/kactivitymanagerd.spec b/kactivitymanagerd.spec index 5b86590..a3670a9 100644 --- a/kactivitymanagerd.spec +++ b/kactivitymanagerd.spec @@ -31,6 +31,8 @@ Source: kactivitymanagerd-%{version}.tar.xz Source1: kactivitymanagerd-%{version}.tar.xz.sig Source2: plasma.keyring %endif +# PATCH-FIX-UPSTREAM +Patch: Fix-a-dangling-reference-to-the-list-of-database-files.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -84,6 +86,7 @@ Provides translations to the package %{name}. %prep %setup -q -n kactivitymanagerd-%{version} +%autopatch -p1 %build %cmake_kf5 -d build