From e8769453265943ebf373a6d99fa88834c8109356 Mon Sep 17 00:00:00 2001 From: Wolfgang Müller Date: Tue, 5 Nov 2024 22:04:25 +0100 Subject: desktop-plasma: Remove obsolete patches These fixes are now all available on unstable Plasma packages, so remove them here. --- ...s-PlaceholderMessage-Relax-list-type-to-T.patch | 37 ------------ ...nager-Avoid-infinite-loop-in-ActivityList.patch | 70 ---------------------- 2 files changed, 107 deletions(-) delete mode 100644 desktop-plasma/patches/kde-plasma/libplasma-6.1.5/0001-PlasmaExtras-PlaceholderMessage-Relax-list-type-to-T.patch delete mode 100644 desktop-plasma/patches/kde-plasma/plasma-desktop/0001-activitymanager-Avoid-infinite-loop-in-ActivityList.patch (limited to 'desktop-plasma/patches/kde-plasma') diff --git a/desktop-plasma/patches/kde-plasma/libplasma-6.1.5/0001-PlasmaExtras-PlaceholderMessage-Relax-list-type-to-T.patch b/desktop-plasma/patches/kde-plasma/libplasma-6.1.5/0001-PlasmaExtras-PlaceholderMessage-Relax-list-type-to-T.patch deleted file mode 100644 index bab012b..0000000 --- a/desktop-plasma/patches/kde-plasma/libplasma-6.1.5/0001-PlasmaExtras-PlaceholderMessage-Relax-list-type-to-T.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d91e9a330eacf673c6c3e18ae218e3d1fb81f7fe Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Sat, 15 Jun 2024 02:36:26 +0600 -Subject: [PATCH] PlasmaExtras/PlaceholderMessage: Relax list type to T.Action - -Properties should be using Templates version for maximum flexibility. - -CCBUG: 487904 ---- - .../plasmaextracomponents/qml/PlaceholderMessage.qml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml -index 0e227f08a..b23b529c0 100644 ---- a/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml -+++ b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml -@@ -6,7 +6,7 @@ - - import QtQuick - import QtQuick.Layouts --import QtQuick.Controls as QQC2 -+import QtQuick.Templates as T - - import org.kde.plasma.components as PlasmaComponents3 - import org.kde.kirigami as Kirigami -@@ -214,7 +214,7 @@ ColumnLayout { - * - * @since 5.72 - */ -- property QQC2.Action helpfulAction -+ property T.Action helpfulAction - - spacing: Kirigami.Units.gridUnit - --- -2.46.0 - diff --git a/desktop-plasma/patches/kde-plasma/plasma-desktop/0001-activitymanager-Avoid-infinite-loop-in-ActivityList.patch b/desktop-plasma/patches/kde-plasma/plasma-desktop/0001-activitymanager-Avoid-infinite-loop-in-ActivityList.patch deleted file mode 100644 index 977ce66..0000000 --- a/desktop-plasma/patches/kde-plasma/plasma-desktop/0001-activitymanager-Avoid-infinite-loop-in-ActivityList.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6ee8b63fa490477b03f4104ed91ab585c53d8001 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= -Date: Sat, 12 Oct 2024 14:39:03 +0200 -Subject: [PATCH] activitymanager: Avoid infinite loop in ActivityList - -When updating the selection in the activity manager we search through -activities using using a do while loop. Each iteration of the loop -increments or decrements selectedIndex depending on the search -direction, wrapping around if needed. The loop stops only once we have -found a visible item to select or if we have looped back to the item we -started with. The latter is done by comparing selectedIndex with the -index we started at, saved earlier in startingWithSelected. - -If the user triggers the activity manager and starts searching -activities right away without first selecting one, startingWithSelected -will remain at its initial value of -1. If there are no matches and the -user then attempts to select the next or previous item, we will loop -infinitely because there are no visible items and selectedIndex can -never again equal -1. This infinite loop will hang the entirety of -plasmashell. - -To fix this, keep track of how many items we have visited and forcibly -break out of the loop if we have seen all activities (meaning that we -have wrapped around). This does not rely on the value of either -selectedIndex or startingWithSelected, meaning it also works if no -activities are visible. We can also keep the old selection behaviour by -setting selectedIndex to startingWithSelected right before we break. ---- - .../contents/activitymanager/ActivityList.qml | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/desktoppackage/contents/activitymanager/ActivityList.qml b/desktoppackage/contents/activitymanager/ActivityList.qml -index 4b3402736..7a5cd7bab 100644 ---- a/desktoppackage/contents/activitymanager/ActivityList.qml -+++ b/desktoppackage/contents/activitymanager/ActivityList.qml -@@ -28,9 +28,11 @@ Flickable { - function _selectRelativeToCurrent(distance) - { - var startingWithSelected = selectedIndex; -+ var visited = 0; - - do { - selectedIndex += distance; -+ visited++; - - if (selectedIndex >= activitiesList.count) { - selectedIndex = 0; -@@ -40,11 +42,15 @@ Flickable { - selectedIndex = activitiesList.count - 1; - } - -- // Searching for the first item that is visible, or back to the one -- // that we started with -- } while (!activitiesList.itemAt(selectedIndex).visible -- && startingWithSelected !== selectedIndex); -+ if (visited >= activitiesList.count) { -+ // we've visited all activities but could not find a visible -+ // one, so stop searching and select the one we started with -+ selectedIndex = startingWithSelected; -+ break; -+ } - -+ // Searching for the first item that is visible -+ } while (!activitiesList.itemAt(selectedIndex).visible); - _updateSelectedItem(); - - } --- -2.47.0 - -- cgit v1.2.3-2-gb3c3