Accepting request 842017 from home:wolfi323:test
- Add Fix-a-dangling-reference-to-the-list-of-database-files.patch to fix possible crashes (kde#427650) OBS-URL: https://build.opensuse.org/request/show/842017 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivitymanagerd?expand=0&rev=123
This commit is contained in:
parent
75364da1df
commit
e95e7905af
34
Fix-a-dangling-reference-to-the-list-of-database-files.patch
Normal file
34
Fix-a-dangling-reference-to-the-list-of-database-files.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 847c1dbed6b422211285fb19d7fd07d8112349ff Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@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
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 16 05:41:16 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
|
||||||
|
- 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 <fabian@ritter-vogt.de>
|
Thu Oct 8 16:55:19 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
@ -31,6 +31,8 @@ Source: kactivitymanagerd-%{version}.tar.xz
|
|||||||
Source1: kactivitymanagerd-%{version}.tar.xz.sig
|
Source1: kactivitymanagerd-%{version}.tar.xz.sig
|
||||||
Source2: plasma.keyring
|
Source2: plasma.keyring
|
||||||
%endif
|
%endif
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch: Fix-a-dangling-reference-to-the-list-of-database-files.patch
|
||||||
%if 0%{?suse_version} > 1325
|
%if 0%{?suse_version} > 1325
|
||||||
BuildRequires: libboost_headers-devel
|
BuildRequires: libboost_headers-devel
|
||||||
%else
|
%else
|
||||||
@ -84,6 +86,7 @@ Provides translations to the package %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kactivitymanagerd-%{version}
|
%setup -q -n kactivitymanagerd-%{version}
|
||||||
|
%autopatch -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Loading…
Reference in New Issue
Block a user