From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- .../plasma/files/plasma-5.90.0-KDEBUG-426969.patch | 90 ---------------------- .../plasma/files/plasma-5.90.0-KDEBUG-447752.patch | 68 ---------------- .../plasma/files/plasma-5.90.0-KDEBUG-448590.patch | 32 -------- .../plasma-5.93.0-fix-osd-dialog-position.patch | 32 ++++++++ ...ma-5.93.0-keep-legacy-highlight-behaviour.patch | 33 ++++++++ 5 files changed, 65 insertions(+), 190 deletions(-) delete mode 100644 kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch delete mode 100644 kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch delete mode 100644 kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch create mode 100644 kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch create mode 100644 kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch (limited to 'kde-frameworks/plasma/files') 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 deleted file mode 100644 index bccc097a3b99..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d40d36057a0ee9fcb4badc7ff8b56844da79dfc8 Mon Sep 17 00:00:00 2001 -From: David Edmundson -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 -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(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 deleted file mode 100644 index 62cb8a52b6c5..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ecf0cc36936f69830a07937b97807ec0ba4d3f41 Mon Sep 17 00:00:00 2001 -From: Marco Martin -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 deleted file mode 100644 index 4bbb7a8ce1b0..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e9ba0c54f2c01bb530370c16502cf304fc18b3f6 Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau -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 - diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch new file mode 100644 index 000000000000..088230402863 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.93.0-fix-osd-dialog-position.patch @@ -0,0 +1,32 @@ +From aec00b32980390b93411f140dfb0503a671c2163 Mon Sep 17 00:00:00 2001 +From: Jim Jones +Date: Wed, 20 Apr 2022 16:18:20 +0000 +Subject: [PATCH] Fix osd dialog position + +After the upgrade to kde-frameworks-5.93 the osd volume indicator is displayed in the top left corner of the screen instead of being displayed in the center of the screen. + +BUG: 452648 +--- + src/plasmaquick/dialog.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp +index 9ca2c8a66..1e6736dee 100644 +--- a/src/plasmaquick/dialog.cpp ++++ b/src/plasmaquick/dialog.cpp +@@ -1237,11 +1237,7 @@ bool Dialog::event(QEvent *event) + { + if (event->type() == QEvent::Expose) { + if (!KWindowSystem::isPlatformWayland() || !isExposed()) { +- auto ret = QQuickWindow::event(event); +- if (d->mainItem) { +- d->syncToMainItemSize(); +- } +- return ret; ++ return QQuickWindow::event(event); + } + + /* +-- +GitLab + diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch new file mode 100644 index 000000000000..20935856caa8 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.93.0-keep-legacy-highlight-behaviour.patch @@ -0,0 +1,33 @@ +From 734b956c27bd76df7fed6979beb27c2f30cbd3bf Mon Sep 17 00:00:00 2001 +From: Aleix Pol +Date: Wed, 13 Apr 2022 17:25:52 +0200 +Subject: [PATCH] Keep PlasmaComponents.Highlight on its former behaviour + +Otherwise some applets like Kickoff Legacy don't get a highlight + +BUG: 452555 +--- + src/declarativeimports/plasmacomponents/qml/Highlight.qml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/declarativeimports/plasmacomponents/qml/Highlight.qml b/src/declarativeimports/plasmacomponents/qml/Highlight.qml +index 672e57231..3672050b7 100644 +--- a/src/declarativeimports/plasmacomponents/qml/Highlight.qml ++++ b/src/declarativeimports/plasmacomponents/qml/Highlight.qml +@@ -4,6 +4,7 @@ + SPDX-License-Identifier: LGPL-2.0-or-later + */ + ++import QtQuick 2.15 + import org.kde.plasma.extras 2.0 as PlasmaExtras + + /** +@@ -15,4 +16,5 @@ PlasmaExtras.Highlight + id: root + // At some point we had the "hover" property which was replaced with "hovered" + property alias hover: root.hovered ++ hovered: true + } +-- +GitLab + -- cgit v1.2.3