diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /kde-frameworks/plasma/files | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'kde-frameworks/plasma/files')
3 files changed, 190 insertions, 0 deletions
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch new file mode 100644 index 000000000000..bccc097a3b99 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch @@ -0,0 +1,90 @@ +From d40d36057a0ee9fcb4badc7ff8b56844da79dfc8 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Wed, 12 Jan 2022 22:21:34 +0000 +Subject: [PATCH] Always sync the setPanelBehavior to wayland + +Currently this code is in the else statement to if (type != +Dialog::Normal) { + +This doesn't make sense as panel roles apply explicitly to other types, +like Dialog::Dock. On X11 the equivalent always applies. + +BUG: 426969 + +* asturm 2022-01-22: Merged with below fixup: + +From b882b34d7b55975f679133ef86cfd12869e8bba5 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Thu, 13 Jan 2022 17:03:38 +0000 +Subject: [PATCH] Always sync the setPanelBehavior to wayland + +The previous patch moved some code that reapplied setRole in a way that +caused issues. + +BUG: 448373 + +--- a/src/plasmaquick/dialog.cpp ++++ b/src/plasmaquick/dialog.cpp +@@ -693,14 +693,13 @@ + + void DialogPrivate::applyType() + { +- if (type != Dialog::Normal) { + /*QXcbWindowFunctions::WmWindowType*/ int wmType = 0; + + #if HAVE_X11 + if (KWindowSystem::isPlatformX11()) { + switch (type) { + case Dialog::Normal: +- Q_UNREACHABLE(); ++ q->setFlags(Qt::FramelessWindowHint | q->flags()); + break; + case Dialog::Dock: + wmType = QXcbWindowFunctions::WmWindowType::Dock; +@@ -729,11 +728,15 @@ + } + #endif + +- if (!wmType) { ++ if (!wmType && type != Dialog::Normal) { + KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type)); + } + #if HAVE_KWAYLAND + if (shellSurface) { ++ if (q->flags() & Qt::WindowStaysOnTopHint) { ++ type = Dialog::Dock; ++ shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow); ++ } + switch (type) { + case Dialog::Dock: + shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel); +@@ -750,27 +753,13 @@ + case Dialog::CriticalNotification: + shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::CriticalNotification); + break; ++ case Dialog::Normal: ++ shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal); + default: + break; + } + } + #endif +- } else { +- q->setFlags(Qt::FramelessWindowHint | q->flags()); +- +-#if HAVE_KWAYLAND +- // Only possible after setup +- if (shellSurface) { +- if (q->flags() & Qt::WindowStaysOnTopHint) { +- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel); +- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow); +- } else { +- shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal); +- shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::AlwaysVisible); +- } +- } +-#endif +- } + + // an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it + // see bug 370433 diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch new file mode 100644 index 000000000000..62cb8a52b6c5 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch @@ -0,0 +1,68 @@ +From ecf0cc36936f69830a07937b97807ec0ba4d3f41 Mon Sep 17 00:00:00 2001 +From: Marco Martin <notmart@gmail.com> +Date: Mon, 10 Jan 2022 09:22:09 +0000 +Subject: [PATCH] Don't crash when a screen gets disabled and enabled again + +when a screen gets disabled, the containment loses its view, and when gets enabled again, +the process of the old orphaned containment getting a new view causes a plasma crash. +It comes from the wallpaper, which indicates a hierarchy of C++ owned objects +makes the internal one (wallpaper) to not reset correctly its window and have a stray pointer to it. + +BUG:447752 +--- + .../qml/plasmoid/containmentinterface.cpp | 21 +++++++++++++++---- + .../qml/plasmoid/containmentinterface.h | 1 + + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp +index d8a89014c..29a7738ca 100644 +--- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp ++++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp +@@ -74,10 +74,6 @@ void ContainmentInterface::init() + connect(m_activityInfo, &KActivities::Info::nameChanged, this, &ContainmentInterface::activityNameChanged); + Q_EMIT activityNameChanged(); + +- if (!m_containment->wallpaper().isEmpty()) { +- loadWallpaper(); +- } +- + AppletInterface::init(); + + // Create the ToolBox +@@ -1162,4 +1158,21 @@ bool ContainmentInterface::isLoading() const + return loading; + } + ++void ContainmentInterface::itemChange(ItemChange change, const ItemChangeData &value) ++{ ++ if (change == QQuickItem::ItemSceneChange) { ++ // we have a window: create the representations if needed ++ if (value.window && !m_containment->wallpaper().isEmpty()) { ++ loadWallpaper(); ++ } else if (m_wallpaperInterface) { ++ m_wallpaperInterface->deleteLater(); ++ m_wallpaperInterface = nullptr; ++ Q_EMIT wallpaperInterfaceChanged(); ++ } ++ } ++ ++ AppletInterface::itemChange(change, value); ++} ++ ++ + #include "moc_containmentinterface.cpp" +diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.h b/src/scriptengines/qml/plasmoid/containmentinterface.h +index a91c60c5e..f1276ee80 100644 +--- a/src/scriptengines/qml/plasmoid/containmentinterface.h ++++ b/src/scriptengines/qml/plasmoid/containmentinterface.h +@@ -169,6 +169,7 @@ protected: + void addContainmentActions(QMenu *desktopMenu, QEvent *event); + + virtual bool isLoading() const override; ++ void itemChange(ItemChange change, const ItemChangeData &value) override; + + Q_SIGNALS: + /** +-- +GitLab + diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch new file mode 100644 index 000000000000..4bbb7a8ce1b0 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch @@ -0,0 +1,32 @@ +From e9ba0c54f2c01bb530370c16502cf304fc18b3f6 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau <alexander.lohnau@gmx.de> +Date: Mon, 17 Jan 2022 19:58:53 +0100 +Subject: [PATCH] Corona::containmentForScreen: Ignore activities when an empty + string is used + +With the other overloads being deprecated, consumers are forced to put in an empty string +for the activity. As one can see in the pre-existing code, an empty string indicates +that the activity should be ignored. Consequently we should skip the activity check, when +we got an empty string. + +BUG: 448590 +--- + src/plasma/corona.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp +index f034d7b2e..8f532d690 100644 +--- a/src/plasma/corona.cpp ++++ b/src/plasma/corona.cpp +@@ -206,7 +206,7 @@ Containment *Corona::containmentForScreen(int screen, const QString &activity, c + for (Containment *cont : std::as_const(d->containments)) { + /* clang-format off */ + if (cont->lastScreen() == screen +- && (cont->activity().isEmpty() || cont->activity() == activity) ++ && ((cont->activity().isEmpty() || activity.isEmpty()) || cont->activity() == activity) + && (cont->containmentType() == Plasma::Types::DesktopContainment + || cont->containmentType() == Plasma::Types::CustomContainment)) { /* clang-format on */ + containment = cont; +-- +GitLab + |