gentoo auto-resync : 23:03:2023 - 00:43:55

3 files changed, 80 insertions, 1 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index d9e875160a05..192c9c1dd9ab 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,9 @@
 AUX plasma-desktop-5.26.5-missing-kpackage-1.patch 607 BLAKE2B 9259235c168e4139578e55656e5d870e7f9dea8b224913cf27874614c1023c48ed88ee0d196c62c70b4efcd5b75879fac69edac194fe1774575070318c705602 SHA512 1b70359238da9c73a5a25e4399871a37016b14737258cf37dee71c089aca443af4a5b2a8e83a9855517a163a6d57dbc82b665e4e8c1c416c0924c63777a5ccea
 AUX plasma-desktop-5.26.5-missing-kpackage-2.patch 1123 BLAKE2B 160c72f267016be9a320bd735b1d84e3cba30a28a09665a2f4e4a73eb9834c9b04feb468b1359867d77ee062a84278a65048f727595ac211b492b8490a00e8b3 SHA512 cb75f2a27d4436f5828929fd05d92ec3847c2741a776eeeb7df26fc406da5751ec542f94db9a6e1d71e063e7c292f09c1233e81693409d33d9f65641c558f6ad
+AUX plasma-desktop-5.27.3-kicker-hide-separators.patch 3944 BLAKE2B 3de0993f53a60bbfabe88cba2a99556c1313ebe44a63f3641bde22e6ced9021b3e406eebc94aef9f2b135afddaec6cccdaa03b76ba5af0c3bf32960b3ce91025 SHA512 79b0a29d217fbb526fd6f522edd89da8402c1dca84efbd5930e006ce97eb9fa72c19222aab4478245fe71098d724de2c9920803e0765867c1768c6e522ca12e7
 DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B 093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce SHA512 6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182
 DIST plasma-desktop-5.27.3.tar.xz 14331384 BLAKE2B 7cc83b1cb86eb72df841313cf8351d9c74d2ab4e825b34c778039cd326c179e3c65d02a0a1fc48843c23fb1b01495ef871034b36d8495a6bf42de021e14acb2d SHA512 ac31bedb13c74f3cacd76d099a25da16bc617a7c0c3c9bc0e605eca1754e5f295519372c1c0a0d32c2248e2550159cc0ba97ca349dea43b3be85f32caf69e968
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
 EBUILD plasma-desktop-5.26.5-r2.ebuild 5670 BLAKE2B bb1797e33205edb737cecbb075d7632ceae2f1794b9d71c23c6c00d5dcd6b98c2a43f44fc97a454521ae11032ab9765f29351bb663c1f2052cf5416821d4d8fe SHA512 ed1c75f01fd9f080141adc186a47fc102f080b8691f7ec1af2ade8bbbb5dea43eb68155fa4c307f1f0bdb53baab2d86dba4e43669d5251c1ff1bb9c30b210565
-EBUILD plasma-desktop-5.27.3.ebuild 5276 BLAKE2B a89b14d3f258fe2d2807ef82ebdb6a886255b65fdc47ce255cc28e5f492885434060cc4a1433ace401c80aa23a247129a1c6f4e8091ec168a07a50faa95ab4d1 SHA512 5ffe37184eae53e4b9e5811f082bf810ba40e9f83ba2ec5036220bb00b520686f61b6b6121c1d3a577b0b2bde630c9b627d28d5c1d2feb4cdc5225ce84d1ddf6
+EBUILD plasma-desktop-5.27.3-r1.ebuild 5342 BLAKE2B da19bc1bbb85d74f92357d35fb7065941ee5cfd62d27e35f433452ba51c38d8b0ae68a0f662dd2a2a37ced13a6e5e232eecc8c43615e064e5b90cec3f00c7375 SHA512 d9d773d62ac7e4eaabd391b49537efe0d9a475afcd45de27c473d6d2bca51525a0f872ceeecc616c343d736d726d6603228f8bcfc852eef546083db28cc863e9
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.3-kicker-hide-separators.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.3-kicker-hide-separators.patch
new file mode 100644
index 000000000000..30f95a901839
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.3-kicker-hide-separators.patch
@@ -0,0 +1,77 @@
+From d492a691d44a2878eb3c189219dc04260294bb77 Mon Sep 17 00:00:00 2001
+From: Joshua Goins <josh@redstrate.com>
+Date: Sat, 18 Mar 2023 10:39:49 -0400
+Subject: [PATCH] applets/kicker: Hide separators when sorted alphabetically
+
+Users are able to manually add separator items at custom positions in
+their menu structures. When they do so, the location of these
+separators are inherently custom, and only make sense when the menu
+structure is being displayed in its custom order. When using the option
+to display everything alphabetically, the separators' custom position
+no longer exists and any automatic placement becomes nonsensical.
+
+Currently, the separators get sorted to the beginning of the list,
+which looks quite weird. This commit instead hides the separators when
+sorting alphabetically. Only Kicker is affected by this change; the
+underlying model providing the items is unchanged.
+
+BUG: 465865
+FIXED-IN: 5.27.4
+(cherry picked from commit 90ad64ba638649b68cf2ffb7f68e227e86a8b8f1)
+---
+ applets/kicker/package/contents/ui/ItemListDelegate.qml | 4 +++-
+ applets/kicker/package/contents/ui/ItemListDialog.qml   | 2 ++
+ applets/kicker/package/contents/ui/ItemListView.qml     | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/applets/kicker/package/contents/ui/ItemListDelegate.qml b/applets/kicker/package/contents/ui/ItemListDelegate.qml
+index 0eefe24e9e..ea7a0455c9 100644
+--- a/applets/kicker/package/contents/ui/ItemListDelegate.qml
++++ b/applets/kicker/package/contents/ui/ItemListDelegate.qml
+@@ -25,6 +25,7 @@ Item {
+ 
+     readonly property real fullTextWidth: Math.ceil(icon.width + label.implicitWidth + arrow.width + row.anchors.leftMargin + row.anchors.rightMargin + row.actualSpacing)
+     property bool isSeparator: (model.isSeparator === true)
++    property bool sorted: (model.sorted === true)
+     property bool hasChildren: (model.hasChildren === true)
+     property bool hasActionList: ((model.favoriteId !== null)
+         || (("hasActionList" in model) && (model.hasActionList === true)))
+@@ -251,7 +252,8 @@ Item {
+         anchors.rightMargin: highlightItemSvg.margins.right
+         anchors.verticalCenter: parent.verticalCenter
+ 
+-        active: item.isSeparator
++        // Separator positions don't make sense when sorting everything alphabetically
++        active: item.isSeparator && !item.sorted
+ 
+         asynchronous: false
+         sourceComponent: separatorComponent
+diff --git a/applets/kicker/package/contents/ui/ItemListDialog.qml b/applets/kicker/package/contents/ui/ItemListDialog.qml
+index ffdb2e97c8..d97650cbbe 100644
+--- a/applets/kicker/package/contents/ui/ItemListDialog.qml
++++ b/applets/kicker/package/contents/ui/ItemListDialog.qml
+@@ -70,6 +70,8 @@ Kicker.SubMenu {
+         Kicker.FunnelModel {
+             id: funnelModel
+ 
++            property bool sorted: sourceModel.hasOwnProperty("sorted") ? sourceModel.sorted : false
++
+             Component.onCompleted: {
+                 kicker.reset.connect(funnelModel.reset);
+             }
+diff --git a/applets/kicker/package/contents/ui/ItemListView.qml b/applets/kicker/package/contents/ui/ItemListView.qml
+index 29ff51da05..d931b9fcff 100644
+--- a/applets/kicker/package/contents/ui/ItemListView.qml
++++ b/applets/kicker/package/contents/ui/ItemListView.qml
+@@ -30,7 +30,7 @@ FocusScope {
+     property int itemHeight: Math.ceil((Math.max(theme.mSize(theme.defaultFont).height, PlasmaCore.Units.iconSizes.small)
+         + Math.max(highlightItemSvg.margins.top + highlightItemSvg.margins.bottom,
+         listItemSvg.margins.top + listItemSvg.margins.bottom)) / 2) * 2
+-    property int separatorHeight: lineSvg.horLineHeight + (2 * PlasmaCore.Units.smallSpacing)
++    property int separatorHeight: model.sorted === true ? 0 : lineSvg.horLineHeight + (2 * PlasmaCore.Units.smallSpacing)
+ 
+     property alias currentIndex: listView.currentIndex
+     property alias currentItem: listView.currentItem
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.3-r1.ebuild
index cb0f572091a5..4a4ff2f230a9 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.27.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.3-r1.ebuild
@@ -127,6 +127,7 @@ BDEPEND="
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-kicker-hide-separators.patch" # KDE-bug 465865
 )
 
 src_prepare() {