gentoo resync : 02.02.2022

3 files changed, 67 insertions, 1 deletions

diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 97f4a1bece52..f0c059ffb515 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,6 @@
+AUX qqc2-desktop-style-5.90.0-KDEBUG-447289.patch 2692 BLAKE2B d6c6038c6aba645b866d1ed9f9666291fb2ac0ef107705b26813811e06b8e8f777c341298c0ef1bc9df403f8f0969ce9f80317e010751c267b07fcd6442f56d4 SHA512 57e48a1975ae4670cc3bf74ce6b1b8e54818e28518ee2d0831b1eb276b656252146309dc929f4e795d50a00dab1e9a85ff29dabef4cccd9ae89ed679fb68c924
 DIST qqc2-desktop-style-5.88.0.tar.xz 62656 BLAKE2B daf5c039728be40f8980edc05cab1f43f96ae987c9f1569fcb661fff9e1047f1e937f4d3d5a870ccf61825abe66bb6b637ba1d9d5d4abccc6e8b4a29a92ee6b5 SHA512 a0433c619b3978c5884e3fc8067f254f487fd22c5668fe683e35e7a8bb5ddea90c2d72bf6c0586cd03fdf4fa8238653fb37fe0c35f4cf96fe57e13d569816606
 DIST qqc2-desktop-style-5.90.0.tar.xz 65004 BLAKE2B 19d0dbdfe2c6891458e80a2e1935f2a5357db565ac213eb31232b127136d6fc426ce8a8240837fa3f341753d311ca5caaf416a7bfde309dcca787199891bb660 SHA512 c0d95897624d08fd378a1c3e0392d703034775cf4ff7ec463c8117db071c0ada697d0bc05bf0382b19c9fbb865a75371062bc13cbeea7f65213db214b12bdc00
 EBUILD qqc2-desktop-style-5.88.0.ebuild 725 BLAKE2B a9c667c828982fce0fcdd0a9e4446dd63091260f4ab852759a8aae9cab244c97bc4ff7f8dec4bbbcb2cacae0185a68e4aa51c797e34a84ca04c7be978214301f SHA512 06d28314b8add5679c69fd0d778f80c5b81eabe79956d61a202aff5bba867fd4a1d96b8ef042d616cf60f7f2211fdadd98f676b998496a1e0486a41ebd776e1d
-EBUILD qqc2-desktop-style-5.90.0.ebuild 728 BLAKE2B 205cc37f90622e03fc1892dd1e52e5301d4431cc65fea1584e16a81b86f26435aa9ae8fe8aac18514885be272dfe3cb6b06bc4066170dae88e3d403812a72253 SHA512 11a0a78dcf3dbb7f664a3a169673492324873486837742b5a2eeb0e6157186125f443e55b431ecd419b5b8a19f9321c70013d363fa1c1eeb7c04388cdab1d7ad
+EBUILD qqc2-desktop-style-5.90.0-r1.ebuild 780 BLAKE2B c7a1d125bcf197b55ada26c9027add799c010084455cc6df247a23701667c8adfe641cf9f338eb7f16b2a08b9f16383c4603ceefbf91bc79b6fd754777064c3c SHA512 a450c3880c0d13c4a3f8f7a046c7228e1c42f399f5296fb4ecdaa0d08162ca0a84b0855804d289490613f546abd517fede06bd0a179ebf8a93966229cdd08202
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
new file mode 100644
index 000000000000..69991acb5c75
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
@@ -0,0 +1,63 @@
+From bc0ca29bd47ce45b30c66bd8743b6a48e20123d2 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 23 Dec 2021 12:11:28 -0700
+Subject: [PATCH] Use metrics from Breeze for menu items
+
+We can't read them dynamically right now, unfortunately. So the values
+are hardcoded.
+
+BUG: 447289
+FIXED-IN: 5.91
+---
+ org.kde.desktop/Menu.qml     | 3 +++
+ org.kde.desktop/MenuItem.qml | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/org.kde.desktop/Menu.qml b/org.kde.desktop/Menu.qml
+index adaf644..205c0b7 100644
+--- a/org.kde.desktop/Menu.qml
++++ b/org.kde.desktop/Menu.qml
+@@ -37,6 +37,9 @@ T.Menu {
+             }
+             return maxWidth;
+         }
++
++        spacing: 0 // Hardcoded to the Breeze theme value
++
+         interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+         clip: true
+         currentIndex: control.currentIndex || 0
+diff --git a/org.kde.desktop/MenuItem.qml b/org.kde.desktop/MenuItem.qml
+index d8a7cf0..f0c95e5 100644
+--- a/org.kde.desktop/MenuItem.qml
++++ b/org.kde.desktop/MenuItem.qml
+@@ -25,7 +25,7 @@ T.MenuItem {
+ 
+     Layout.fillWidth: true
+     padding: Kirigami.Units.smallSpacing
+-    verticalPadding: Math.floor(Kirigami.Units.smallSpacing * 1.5)
++    verticalPadding: 4 // Hardcoded to the Breeze theme value
+     hoverEnabled: !Kirigami.Settings.isMobile
+ 
+     Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible
+@@ -53,7 +53,7 @@ T.MenuItem {
+             visible: (controlRoot.ListView.view && controlRoot.ListView.view.hasIcons) || (controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0))
+             source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : ""
+             color: controlRoot.icon ? controlRoot.icon.color : "transparent"
+-            Layout.preferredHeight: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
++            Layout.preferredHeight: Kirigami.Units.iconSizes.small
+             Layout.preferredWidth: Layout.preferredHeight
+         }
+         Label {
+@@ -94,7 +94,7 @@ T.MenuItem {
+         x: controlRoot.mirrored ? controlRoot.padding : controlRoot.width - width - controlRoot.padding
+         y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
+         source: controlRoot.mirrored ? "go-next-symbolic-rtl" : "go-next-symbolic"
+-        width: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
++        width: Kirigami.Units.iconSizes.small
+         height: width
+         visible: controlRoot.subMenu
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
index 6b92d3a6fc3c..0f870ace3d87 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
@@ -27,3 +27,5 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
+
+PATCHES=( "${FILESDIR}/${P}-KDEBUG-447289.patch" )