Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plasma5-workspace for
openSUSE:Factory checked in at 2022-05-23 15:51:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old)
and /work/SRC/openSUSE:Factory/.plasma5-workspace.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace"
Mon May 23 15:51:28 2022 rev:189 rq:978156 version:5.24.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes
2022-05-05 23:05:38.453500938 +0200
+++
/work/SRC/openSUSE:Factory/.plasma5-workspace.new.2254/plasma5-workspace.changes
2022-05-23 15:51:30.130632609 +0200
@@ -1,0 +2,8 @@
+Wed May 18 18:34:03 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix appmenu text with certain themes (kde#453348):
+ * 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
+- Add patch to also show themes with a newer metadata format (kde#453830):
+ * 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch
+
+-------------------------------------------------------------------
New:
----
0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-workspace.spec ++++++
--- /var/tmp/diff_new_pack.kTaQQL/_old 2022-05-23 15:51:30.970633400 +0200
+++ /var/tmp/diff_new_pack.kTaQQL/_new 2022-05-23 15:51:30.974633404 +0200
@@ -41,6 +41,9 @@
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
++++++ 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch ++++++
>From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001
From: Nate Graham <n...@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
++++++ 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch ++++++
>From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotm...@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
