pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 843328 from KDE:Frameworks5

Browse Source 
- Drop workaround for old powerdevil
- 5.20.1.1 is actually still 5.20.1, set the macro that way

- Update to 5.20.1.1
  * New bugfix release
  * For more details please see:
  * https://kde.org/announcements/plasma-5.20.1
- Changes since 5.20.0:
  * [applets/devicenotifier] Don't offer to unmount non-removable devices (kde#427176)
  * [applets/systemtray] Fix icon size for 24px panels (kde#427690)
  * Make Prison a required dependency
  * [notifications] Fix margins of close button timeout indicator (kde#425911)
  * [Notifications] Also check transient parent for whether it's a dialog
  * Revert "krdb: Call xrdb with -nocpp" to fix gitk runtime errors
- Drop patches, now upstream:
  * 0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch

OBS-URL: https://build.opensuse.org/request/show/843328
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=149
This commit is contained in:
Dominique Leuenberger 2020-10-22 12:25:08 +00:00 committed by Git OBS Bridge
commit c8b158ccd5
7 changed files with 42 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch
View File

@ -1,40 +0,0 @@
From ae43cd883313e2309b3f90416b69e2e008b54a25 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 1 Oct 2020 11:16:02 +0000
Subject: [PATCH] Revert "krdb: Call xrdb with -nocpp" to fix gitk runtime
errors
This commit was preventing gitk from starting with
'unknown color name "BACKGROUND"' errors.
This reverts commit d360e3dcb608bd96d674bbae597b7938334972fd.
(cherry picked from commit f0764d87fe5275a123cdf6dca1ab3d0399c97578)
---
kcms/krdb/krdb.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
index c47e0353b..59ba546c4 100644
--- a/kcms/krdb/krdb.cpp
+++ b/kcms/krdb/krdb.cpp
@@ -493,11 +493,11 @@ void runRdb( uint flags )
tmpFile.flush();
KProcess proc;
- proc << QStringLiteral("xrdb") << QStringLiteral("-nocpp")
-#ifdef NDEBUG
- << QStringLiteral("-quiet")
+#ifndef NDEBUG
+ proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << tmpFile.fileName();
+#else
+ proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
#endif
- << QStringLiteral("-merge") << tmpFile.fileName();
proc.execute();
applyGtkStyles(exportColors, 1);
--
2.25.1

3
plasma-workspace-5.20.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20fc599fdfc6477c7315fdf3059bae7ac4843294e550a8d18b6cf1af2ed2b2ca
size 8991780

11
plasma-workspace-5.20.0.tar.xz.sig
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl+AWb0ACgkQ7JTRj38F
mX7djgf/UHrS1PgK4OckDF7EAzMtG7y8XXdHSGt8Fhb40LhaGRuKdIBqYnC6wSqj
88jFr6Ue2p20DS+sfHD+IY5F4bqdKuEzZA8F8Ly/R0kFBOIYGdwG1ulxM6EY5vji
WGjLIs9W8rVxyLup61O0P7DCkRkgKpgxn88CuI5PoJEzeuCOTSAGKnifIeTwjrSL
2tiFuulydAlUfDjWHhZlcZmDRg7bP8G3BAi6nMZ3/mBe9m4mhqcuQ+KMIx0KWtTt
50WjZL+G6Ljit0LEkYrb9JDpdZn+f71KXE0D/XkXsKum2wNnPpZ37h/D3FGaBDEs
77yzKR/qlbKUpQmBY0L9kMWrKZLxNA==
=yn2n
-----END PGP SIGNATURE-----

3
plasma-workspace-5.20.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75b625dc705ec72c374dbcdb4c359ce199a33dea4af72dbf45d3830e375439a6
size 8994820

11
plasma-workspace-5.20.1.1.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl+O95IACgkQ7JTRj38F
mX58qggAlB/jUh1BQ3gfYUKvWHT5XPIbNXhIv1Tt0+vF+a6EXg0McmsIaOvC7Ps0
n89siyatt/QeAnSCJJDz/6wPBnYhG0sz1naO1attg3cahHgc4hAD1P+gPbZqzHUa
xd0t4ruq/HPGxA//JbM7BFWBeqIfqQLtKQE8n2h7rLLyAAUYILb7C3oBTdj3DU1a
PZ2Opb1tI+8WP2tHZkuLCYS7Xjy0Gk8DfSoASdQb6EO2XE2brCrPr1yFkdXQXwxD
CuSEbzDkTh1dICzexo9qMjCunsF224jmHoP9nsSo1v1wIXgeI6k5k/rove7EEqHG
DkRc2u6QuOiWdcvUhg5hxnm+kVL/Pw==
=U9nJ
-----END PGP SIGNATURE-----

23
plasma5-workspace.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Thu Oct 22 07:20:57 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Drop workaround for old powerdevil
- 5.20.1.1 is actually still 5.20.1, set the macro that way
-------------------------------------------------------------------
Tue Oct 20 14:30:36 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.20.1.1
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma-5.20.1
- Changes since 5.20.0:
* [applets/devicenotifier] Don't offer to unmount non-removable devices (kde#427176)
* [applets/systemtray] Fix icon size for 24px panels (kde#427690)
* Make Prison a required dependency
* [notifications] Fix margins of close button timeout indicator (kde#425911)
* [Notifications] Also check transient parent for whether it's a dialog
* Revert "krdb: Call xrdb with -nocpp" to fix gitk runtime errors
- Drop patches, now upstream:
* 0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch
-------------------------------------------------------------------
Wed Oct 14 17:22:00 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

12
plasma5-workspace.spec
View File

@ -27,20 +27,19 @@ Name: plasma5-workspace
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
Version: 5.20.0
Version: 5.20.1.1
Release: 0
%global _plasma5_bugfix 5.20.1
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
Group: System/GUI/KDE
URL: http://www.kde.org/
Source: plasma-workspace-%{version}.tar.xz
Source: https://download.kde.org/stable/plasma/5.20.1/plasma-workspace-%{version}.tar.xz
%if %{with lang}
Source1: plasma-workspace-%{version}.tar.xz.sig
Source1: https://download.kde.org/stable/plasma/5.20.1/plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
Source3: baselibs.conf
# PATCH-FIX-UPSTREAM
Patch1: 0001-Revert-krdb-Call-xrdb-with-nocpp-to-fix-gitk-runtime.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
@ -265,8 +264,7 @@ Requires: libkscreen2-plugin >= %{_plasma5_bugfix}
Requires: plasma5-desktop >= %{_plasma5_bugfix}
Requires: plasma5-workspace >= %{_plasma5_bugfix}
Requires: polkit-kde-agent-5 >= %{_plasma5_bugfix}
# Workaround, until security whitelisted it (boo#1176474)
Requires: powerdevil5 >= 5.19.0
Requires: powerdevil5 >= %{_plasma5_bugfix}
Requires: systemsettings5 >= %{_plasma5_bugfix}
Requires(post): update-alternatives
Requires(postun): update-alternatives