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-09-11 21:57:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old)
and /work/SRC/openSUSE:Factory/.plasma5-workspace.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace"
Sun Sep 11 21:57:16 2022 rev:196 rq:1002405 version:5.25.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes
2022-09-08 14:21:24.706351225 +0200
+++
/work/SRC/openSUSE:Factory/.plasma5-workspace.new.2083/plasma5-workspace.changes
2022-09-11 21:57:17.601618635 +0200
@@ -1,0 +2,6 @@
+Thu Sep 8 20:29:10 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Add patch to fix widget explorer crash (kde#458829):
+ * 0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch
+
+-------------------------------------------------------------------
New:
----
0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-workspace.spec ++++++
--- /var/tmp/diff_new_pack.WEPoJh/_old 2022-09-11 21:57:19.201623137 +0200
+++ /var/tmp/diff_new_pack.WEPoJh/_new 2022-09-11 21:57:19.209623159 +0200
@@ -41,6 +41,8 @@
Source2: plasma.keyring
%endif
Source3: xprop-kde-full-session.desktop
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
++++++ 0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch ++++++
>From 7fbac131624007745e726e7006706d0e8761e463 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <[email protected]>
Date: Sun, 21 Aug 2022 16:33:50 +0200
Subject: [PATCH] [widgetexplorer] Don't recurse into applet's containments
The intention of this code appears to be finding system tray applets, since the
systemtray is a containment within another applet/containment
However the code causes an infinit recursion since we are calling
addContainment on the same containment again
The recursion also is unnecessary since corona->containments() already lists
the system tray containment, so we don't need to find it by recursing through
the panel's children
(cherry picked from commit c7ba560ccaac5e469cb2d6bf66c39e1acf967454)
---
components/shellprivate/widgetexplorer/widgetexplorer.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
index bd7db9518..0022a1247 100644
--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
+++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
@@ -280,10 +280,6 @@ void WidgetExplorerPrivate::addContainment(Containment
*containment)
foreach (Applet *applet, containment->applets()) {
if (applet->pluginMetaData().isValid()) {
- Containment *childContainment =
applet->property("containment").value<Containment *>();
- if (childContainment) {
- addContainment(childContainment);
- }
runningApplets[applet->pluginMetaData().pluginId()]++;
} else {
qDebug() << "Invalid plugin metadata. :(";
--
2.37.3
