Hello community,
here is the log from the commit of package kactivitymanagerd for
openSUSE:Factory checked in at 2020-10-18 16:18:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kactivitymanagerd (Old)
and /work/SRC/openSUSE:Factory/.kactivitymanagerd.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivitymanagerd"
Sun Oct 18 16:18:09 2020 rev:86 rq:842135 version:5.20.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kactivitymanagerd/kactivitymanagerd.changes
2020-10-13 15:28:02.724826986 +0200
+++
/work/SRC/openSUSE:Factory/.kactivitymanagerd.new.3486/kactivitymanagerd.changes
2020-10-18 16:18:13.652405535 +0200
@@ -1,0 +2,6 @@
+Fri Oct 16 05:41:16 UTC 2020 - Wolfgang Bauer <wba...@tmo.at>
+
+- Add Fix-a-dangling-reference-to-the-list-of-database-files.patch
+ to fix possible crashes (kde#427650)
+
+-------------------------------------------------------------------
New:
----
Fix-a-dangling-reference-to-the-list-of-database-files.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kactivitymanagerd.spec ++++++
--- /var/tmp/diff_new_pack.RbU1RA/_old 2020-10-18 16:18:15.480406348 +0200
+++ /var/tmp/diff_new_pack.RbU1RA/_new 2020-10-18 16:18:15.484406350 +0200
@@ -31,6 +31,8 @@
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 @@
%prep
%setup -q -n kactivitymanagerd-%{version}
+%autopatch -p1
%build
%cmake_kf5 -d build
++++++ Fix-a-dangling-reference-to-the-list-of-database-files.patch ++++++
>From 847c1dbed6b422211285fb19d7fd07d8112349ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cu...@kde.org>
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 <cmath>
#include <memory>
+#include <array>
// 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<QString, 3> databaseFiles{"database",
"database-wal", "database-shm"};
{
QDir dir;
--
GitLab
