Plasma 5.20.1(.1), not build tested as OBS appears to have some issues.
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivitymanagerd?expand=0&rev=124
This commit is contained in:
parent
e95e7905af
commit
035fdf821b
@ -1,34 +0,0 @@
|
|||||||
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 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:3edc81cc588db4405e1b51831288bdd9ad5c33ef097620549bf936fc7ec21fbe
|
|
||||||
size 94596
|
|
@ -1,11 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9/OV8ACgkQ7JTRj38F
|
|
||||||
mX6+Jgf+M/MHxRUl8a4WkmE5k8BdEnHs3ukCRpLtzlcxBVQ/5/Qp+KaFNss9HJvU
|
|
||||||
RNuGkjhludIg8wgX5dL/fLkR7hByCtWR28oAdut6xPyYBp224aUtT6ygoUt1BS0Y
|
|
||||||
Kir1OJdXWGy5uldIVhafbBjaff3KD0nFosrZi1kGgrRDCfFlHIH7poxSfNoe66/Q
|
|
||||||
T/ULtNvY/o99oLokWemo11QT8iA8eEKJQ2M7D0OEY9sFnlEWkQ9s97p/h/shEQ/a
|
|
||||||
iJvvD4+y8ylftsUw5IXdKX8vQEKzxhWyygOeDw/IyBRGf/8wgwOWLEvacWza6j7q
|
|
||||||
4/tx7C15BLBTjivrkBd7tmdFLgdcmg==
|
|
||||||
=sKG4
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
kactivitymanagerd-5.20.1.tar.xz
Normal file
3
kactivitymanagerd-5.20.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:cb07812a1ea5a52e6bd6f4bc7a0639df6280fe66eac0f727559f7d25f4fb5e85
|
||||||
|
size 94596
|
11
kactivitymanagerd-5.20.1.tar.xz.sig
Normal file
11
kactivitymanagerd-5.20.1.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl+OzX8ACgkQ7JTRj38F
|
||||||
|
mX51IAgAmwcwnulsCu5kCP2qgR+YPEVOuONmJdrIwvBEVdO1YWrBtSjcEAHlyoJ6
|
||||||
|
vUI4im97iI6wE6+8n2+1j1FYYtAdkAonVzliBeLdv9JN/u0YlHBHbIXFCBTXX+6A
|
||||||
|
IwkwaBlnR431Tl70sOvFHN8ZXl/iUQSFfUVvJPttKIKut2SJRMq8Jr06Ruy/JEsv
|
||||||
|
qv6oFPcWoU0wyZFiZlwiMpwv2HErXd87KTHnAiZ2QL/jQXHx0SwAB+7g9e/c751F
|
||||||
|
2I+Aa6A2oTh6mBbcAel5RhsdxOR/swYzlGXCfY7YQJ5IdNLV8ks8G760JD44bdK6
|
||||||
|
idLdg9H+R+zn59ZX5kXpnRDEBVIebQ==
|
||||||
|
=ZqlL
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 20 14:30:32 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 5.20.1
|
||||||
|
* New bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
* https://kde.org/announcements/plasma-5.20.1
|
||||||
|
- Changes since 5.20.0:
|
||||||
|
* Fix a dangling reference to the list of database files
|
||||||
|
- Drop patches, now upstream:
|
||||||
|
* Fix-a-dangling-reference-to-the-list-of-database-files.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Oct 16 05:41:16 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
Fri Oct 16 05:41:16 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
Name: kactivitymanagerd
|
Name: kactivitymanagerd
|
||||||
Version: 5.20.0
|
Version: 5.20.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: KDE Plasma Activities support
|
Summary: KDE Plasma Activities support
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
@ -31,8 +31,6 @@ 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
|
||||||
@ -67,9 +65,9 @@ Recommends: %{name}-lang
|
|||||||
# for kactivitymanagerd_plugin_sqlite.so
|
# for kactivitymanagerd_plugin_sqlite.so
|
||||||
Requires: libQt5Sql5-sqlite
|
Requires: libQt5Sql5-sqlite
|
||||||
Provides: kactivities4 = %{version}
|
Provides: kactivities4 = %{version}
|
||||||
Provides: kactivities5 = 5.20.0
|
Provides: kactivities5 = 5.20.1
|
||||||
Obsoletes: kactivities4 < %{version}
|
Obsoletes: kactivities4 < %{version}
|
||||||
Obsoletes: kactivities5 < 5.20.0
|
Obsoletes: kactivities5 < 5.20.1
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
|
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
|
||||||
@ -78,8 +76,8 @@ Kactivities provides an API for using and interacting with the Plasma Activities
|
|||||||
Summary: KDE Plasma Activities support
|
Summary: KDE Plasma Activities support
|
||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
Provides: libKF5Activities5-lang = 5.20.0
|
Provides: libKF5Activities5-lang = 5.20.1
|
||||||
Obsoletes: libKF5Activities5-lang < 5.20.0
|
Obsoletes: libKF5Activities5-lang < 5.20.1
|
||||||
|
|
||||||
%description lang
|
%description lang
|
||||||
Provides translations to the package %{name}.
|
Provides translations to the package %{name}.
|
||||||
|
Loading…
Reference in New Issue
Block a user