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

Accepting request 982011 from KDE:Frameworks5

Browse Source 
- Add patch to fix a multiscreen bug when PLASMA_USE_QT_SCALING=1
  (kde#450443, https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1781)
  * 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch (forwarded request 981524 from fusionfuture)

OBS-URL: https://build.opensuse.org/request/show/982011
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=190
This commit is contained in:
Dominique Leuenberger
2022-06-13 11:02:34 +00:00
committed by Git OBS Bridge
parent ae6316af72 a533ec9152
commit c7d69ef53f
9 changed files with 127 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
View File

@@ -1,40 +0,0 @@
From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Wed, 4 May 2022 10:45:52 -0600
Subject: [PATCH] applets/appmenu: fix top-level menu text coloration
28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but
neglected to respect the Plasma color scheme, if any. This causes
problems with Plasma themes that have their own colors and don't
respect the systemwide color scheme, such as Breeze Twilight.
Fix it by using the appropriate colors from the PlasmaCore color scheme
object, not the systemwide object provided by Qt.
BUG: 453348
FIXED-IN: 5.24.6
(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e)
---
applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml
index 441e99016..afb37589a 100644
--- a/applets/appmenu/package/contents/ui/MenuDelegate.qml
+++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml
@@ -66,9 +66,6 @@ AbstractButton {
contentItem: PC3.Label {
text: controlRoot.Kirigami.MnemonicData.richTextLabel
- // Kirigami.Theme.highlightedTextColor returns different colors
- // depending on window focus, which does not apply to this applet
- // instead, we use palette.highlightedText here, which returns consistent result
- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText
+ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor
}
}
--
2.36.0

41
0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch
View File

@@ -1,41 +0,0 @@
From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Mon, 16 May 2022 16:18:00 +0800
Subject: [PATCH] kcms/desktoptheme: find metadata.json when loading
ThemesModel
Before this commit ThemesModel only finds metadata.desktop, but after
KF5.94, the default theme metadata files have been ported to json format.
BUG: 453830
(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e)
---
kcms/desktoptheme/themesmodel.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
index 6f0ecf4e3..296951742 100644
--- a/kcms/desktoptheme/themesmodel.cpp
+++ b/kcms/desktoptheme/themesmodel.cpp
@@ -155,7 +155,15 @@ void ThemesModel::load()
const QDir cd(ppath);
const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
for (const QString &pack : entries) {
- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop");
+ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator());
+
+ QString _metadata = QStringLiteral("%1json").arg(prefix);
+ if (QFile::exists(_metadata)) {
+ themes << _metadata;
+ continue;
+ }
+
+ _metadata = QStringLiteral("%1desktop").arg(prefix);
if (QFile::exists(_metadata)) {
themes << _metadata;
}
--
2.36.0

66
0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch Normal file
View File

@@ -0,0 +1,66 @@
From 0cc230ec7f5bde0e61d1080512db72e3cc1a28f6 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Sun, 29 May 2022 14:47:39 +0800
Subject: [PATCH] shell: refresh geometries of all `DesktopView` and
`PanelView` when receiving `logicalDotsPerInchChanged`
Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
BUG: 450443
FIXED-IN: 5.24.6
---
shell/desktopview.cpp | 8 ++++++++
shell/panelview.cpp | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/shell/desktopview.cpp b/shell/desktopview.cpp
index 54f759f3b..8002f085e 100644
--- a/shell/desktopview.cpp
+++ b/shell/desktopview.cpp
@@ -118,12 +118,20 @@ void DesktopView::adaptToScreen()
if (m_oldScreen) {
disconnect(m_oldScreen.data(), &QScreen::geometryChanged, this, &DesktopView::screenGeometryChanged);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ disconnect(m_oldScreen.data(), &QScreen::logicalDotsPerInchChanged, this, &DesktopView::screenGeometryChanged);
+ }
}
if (m_windowType == Desktop || m_windowType == WindowedDesktop) {
screenGeometryChanged();
connect(m_screenToFollow.data(), &QScreen::geometryChanged, this, &DesktopView::screenGeometryChanged, Qt::UniqueConnection);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ connect(m_screenToFollow.data(), &QScreen::logicalDotsPerInchChanged, this, &DesktopView::screenGeometryChanged, Qt::UniqueConnection);
+ }
}
m_oldScreen = m_screenToFollow;
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index a0af15be8..aa921ddfa 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -935,10 +935,18 @@ void PanelView::setScreenToFollow(QScreen *screen)
// disconnect from old screen
disconnect(m_screenToFollow, &QScreen::virtualGeometryChanged, this, &PanelView::updateStruts);
disconnect(m_screenToFollow, &QScreen::geometryChanged, this, &PanelView::restore);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ disconnect(m_screenToFollow, &QScreen::logicalDotsPerInchChanged, this, &PanelView::restore);
+ }
}
connect(screen, &QScreen::virtualGeometryChanged, this, &PanelView::updateStruts, Qt::UniqueConnection);
connect(screen, &QScreen::geometryChanged, this, &PanelView::restore, Qt::UniqueConnection);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ connect(screen, &QScreen::logicalDotsPerInchChanged, this, &PanelView::restore, Qt::UniqueConnection);
+ }
/*connect(screen, &QObject::destroyed, this, [this]() {
if (PanelView::screen()) {
--
2.36.1

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

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

16
plasma-workspace-5.24.5.tar.xz.sig
View File

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmJxBm4ACgkQ11dEg7tX
sY1d+A//SK87vszjt4XgRT0bB1Dk6vd705eDgnOvN0jrWFtxvl9DgzptIZgJ2jr2
tilUQXavRNvue5/LIdsl+jW9IgAigvSNqgFxhNgSDTIwqOxHd75zeNWQtl4Eig/R
ec7AGDk1KznucG0HxDUkRZgcGy+vfHIcZExmak4jqPHkv7UYh5EcACFJMo8He1zT
I8l1KszVkTZmrYcZ0CpTXHxNbuwLYoYOfg7beLZ8jEcJut1GXD/El6w0hLPq+RpG
LAonvemjH6MZ45eeSQc4PdHcM+kRRwUEUbiuXJo+IUOmpeV9BmO/tt2q3+8zt8hV
selnNILbOVEL0qgFOCXsXZy3qDzYCEMxbS+JUmy6ZwmofUYY3PKW7d6UahraMvZK
0GbbyZgnVTnLmDOcYe+F0ha8n6OV9TpmVmV+z37R1WFq2bhyIWnZFPRJuuE6EQMs
rguV2JNIcFFU+yIaEUXym1QLMfG1zjbHhgerrM9PA0AbeAH7onIaV8YXAW9ILXQM
g0ReItXjwakd+L7wfmeWFqSAMvJT1V/NMdWBedzohAzMf76oUEC3C0NO9YSb/ky7
LPuBqMLB+jqTnLclxzKKQ21/2DmsG7EbY4PfJ6jUP+pf1YB079LFbAW36YwlX5E2
Hk3K6vdrRHtGzb+Kc13WxB3fFZmEGre7MmdxdZJ5yV1ya8ClMEw=
=yO51
-----END PGP SIGNATURE-----

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

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:565462d89e60fcbede133ceaf4fa75a92702187acdb291dbc8b9e1b90d077bc1
size 18568884

16
plasma-workspace-5.25.0.tar.xz.sig Normal file
View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmKhuysACgkQ11dEg7tX
sY0oixAArqKO211hLUhwnHo7GZav7n0pLxEotYctlI5W2sY0bQl/C6fww7inZNhU
AfcT0wsOivUpCnelWhx6FqZYnfFYkmEga4eC+9LjjlxBYM1XaCVLC4V75csxVZrr
dk61dZDckat81YItD6Ctxt483zjwcxD2KpPH1bvmvyev02CIaLRKGvKf9ekbX3Zk
wNYMc0gUewufB7q7zeh8bG//uybZX+w6CCeWZ1mPq/+k3Z+/Is6y9gk9lNBMjpKG
Ef3+rbySX2WI/+UlObKzc5k21IhKi4hc7RMJrTTRsGH0KMhNkVuSgGISGGL0EFiS
hFo1tDQp+Vz6HAsD2S8vNMUmW5bJ5Cs3WsLd18zx9WpzdUYNOurAcDU188m1Iurz
mOa5gRu7lmnCPj5pomaeoztX8MLhkuHP3WQEGzEVpc9PZ/SLBVmR5hjTEvYrRB07
V9wub5g8cVG+5zvRGXtyuIo5k7M1XtK01fN3C+sCzTmfuk6JNN1jD+hToeke8O1N
7Au8JoHg9jl5njsbjrj4KZ8ZFC3GhjqB25awJE3sAL5GupnJ2zMR6v1djrHi9jpO
qkqLAkSWxrU8N0kee5Egu7UEo70lKOcTrZygPTqWer+ko4VlRKjaqIr2I/X9OeZD
GfvhFXC7VUQmrIbCvrtxZag0WxGcGqp1X+sfn+kXM+UEtGT6WYY=
=b7fm
-----END PGP SIGNATURE-----

36
plasma5-workspace.changes
View File

@@ -1,3 +1,39 @@
-------------------------------------------------------------------
Thu Jun 9 11:39:29 UTC 2022 - Fusion Future <qydwhotmail@gmail.com>
- Add patch to fix a multiscreen bug when PLASMA_USE_QT_SCALING=1
(kde#450443, https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1781)
* 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch
-------------------------------------------------------------------
Thu Jun 9 11:15:05 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.25.0
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.25.0
- Too many changes to list here
- Drop patches, now upstream:
* 0001-startkde-Reload-systemd-on-Plasma-start.patch
-------------------------------------------------------------------
Tue Jun 7 12:55:36 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix opensuse-welcome autostart disabling:
* 0001-startkde-Reload-systemd-on-Plasma-start.patch
-------------------------------------------------------------------
Thu May 19 19:46:06 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.24.90
* New feature release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.24.90
- Too many changes to list here
- Drop patches, now upstream:
* 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
* 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch
-------------------------------------------------------------------
Wed May 18 18:34:03 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

30
plasma5-workspace.spec
View File

@@ -29,26 +29,25 @@ 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.24.5
Version: 5.25.0
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
Group: System/GUI/KDE
URL: http://www.kde.org/
Source: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
Source: plasma-workspace-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source1: plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
Source3: xprop-kde-full-session.desktop
# PATCH-FIX-UPSTREAM
Patch1: 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
Patch2: 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
# PATCH-FIX-UPSTREAM kde#450443 https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1781
Patch507: 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
%if 0%{?suse_version} < 1550
@@ -57,6 +56,7 @@ BuildRequires: gcc10-c++
BuildRequires: kf5-filesystem
BuildRequires: libQt5Gui-private-headers-devel
BuildRequires: libQt5PlatformHeaders-devel >= 5.4.0
BuildRequires: libicu-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: cmake(AppStreamQt) >= 0.10.4
@@ -474,20 +474,11 @@ fi
%config %{_kf5_configdir}/taskmanagerrulesrc
%config %{_kf5_configdir}/plasmanotifyrc
%if %{pkg_vcmp kf5-filesystem >= 20220307}
%{_libexecdir}/ksmserver-logout-greeter
%{_libexecdir}/plasma-changeicons
%{_libexecdir}/baloorunner
%{_libexecdir}/plasma-sourceenv.sh
%{_libexecdir}/plasma-dbus-run-session-if-needed
%else
%dir %{_kf5_libdir}/libexec
%{_kf5_libdir}/libexec/ksmserver-logout-greeter
%{_kf5_libdir}/libexec/plasma-changeicons
%{_kf5_libdir}/libexec/baloorunner
%{_kf5_libdir}/libexec/plasma-sourceenv.sh
%{_kf5_libdir}/libexec/plasma-dbus-run-session-if-needed
%endif
%{_kf5_libdir}/kconf_update_bin/krunnerglobalshortcuts
%{_kf5_libdir}/kconf_update_bin/krunnerhistory
%{_kf5_plugindir}/
@@ -550,20 +541,11 @@ fi
%{_kf5_sharedir}/kpackage/kcms/kcm_translations
# %%{_kf5_sharedir}/kpackage/kcms/kcm_feedback
%{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme
%if %{pkg_vcmp kf5-filesystem >= 20220307}
%dir %{_libexecdir}/kauth
%{_libexecdir}/kauth/fontinst
%{_libexecdir}/kauth/fontinst_helper
%{_libexecdir}/kauth/fontinst_x11
%{_libexecdir}/kfontprint
%else
%dir %{_kf5_libdir}/libexec/kauth
%{_kf5_libdir}/libexec/kauth/fontinst
%{_kf5_libdir}/libexec/kauth/fontinst_helper
%{_kf5_libdir}/libexec/kauth/fontinst_x11
%{_kf5_libdir}/libexec/kfontprint
%endif
%exclude %{_kf5_libdir}/libkfontinst.so
%{_kf5_libdir}/libkfontinst.so.*
%exclude %{_kf5_libdir}/libkfontinstui.so