gentoo auto-resync : 26:07:2022 - 14:59:07

6 files changed, 216 insertions, 0 deletions

diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index d4b9853f0828..d667622b457f 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,10 @@
+AUX qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch 1122 BLAKE2B d6ebe10059ab464d7b23b984c5cd6f3ef53119d859c66748edd1d2aa5b266ce282998eda840bd6453e9e1907c8cc70029ada9d0bd20e95e0f72d96118ca63052 SHA512 745f9e2ccd408d74081e65e3e0894f8bb47166f8725c40c88e7cab3087bb78397920b236d6225687548362e36a43904bff8d6855908e5ea2359b0b301e5cd526
+AUX qqc2-desktop-style-5.96.0-fix-menubar-theme.patch 1139 BLAKE2B 54cedc67638008e3111d85542096197b73aa24ab70b9e8e2f8b6df8cc2e2b6a5c7a2212442cec138a87c460710e36b1f6d7127fe1e698d5d63818e87487e4da0 SHA512 a9149516f9b7286669de5e16311105b627d33d1e8e01eb065e712db31cb184504e4eec95f1a196adb5c4c8d1e9c32d0cb2c33261eab5c4efb117c542e8a30222
+AUX qqc2-desktop-style-5.96.0-fix-precision.patch 2790 BLAKE2B 8d596e297587bbf7106b7e1d9d0a3f71645409330632db32afe7f12a4f27723c7195b6de3badcb9072c906692046feb957bf598f9187185341ad80b107a1d90f SHA512 dade8a1d8d26dae251b7c808ce0e3ee7dbc0e8418d292ab2daa907004526e87378bada6e02430576cb55c3ccec571fd3699ecdf85a6ab3634d3db1ca52a04bde
+AUX qqc2-desktop-style-5.96.0-strip-out-apersands.patch 1729 BLAKE2B 6134a0aa51a5a4fd8b91c70cf88df49535de8192953050e2212cbd20fd9f1f6be1474442824395d9b69a37e571ad618db76ae1ea9f57802b00824c8b2a105d5b SHA512 51e5b32ecdbcb95fffbd455475bcd566ef173cf7984af9573775dab4008ce0a389baa7c8d5a00ee3e3477ce1cea410dc2445d7f48fad3853a0873f8d6b4f8b97
 DIST qqc2-desktop-style-5.92.0.tar.xz 65396 BLAKE2B 1cf4e6d27c7db8f518f5c9e46f77373a72b30a3060bac3e46d94473bcf6c6fa17c26a90d9589550bee2974b3c541963ed614a6422690b32d97a80b7dbfbc5434 SHA512 698675c526f8c1174c617045113c613a1eb4684db30bf6d88600b9863273c814c4ebe0bcf45b60f24023d7b3d8ef59dab4ab1b704add55131431cc3e701b3549
 DIST qqc2-desktop-style-5.96.0.tar.xz 64896 BLAKE2B f2bc4a599feb1aa0ed7d604cc0c81c20d5f07471845d9fd8c28a112c7c6ff0bb66223975a44a2e1ee771b540e1634e6d4be8eb8aa0761db63068fb8411515ce7 SHA512 ef9342933beecfd7ddc5c934c2d0f399f3d3eb8dd1f02b5e0f397e1d377ec06487363bcd7f6d1be3679b4db971fec80904e20acb391b57b2795f6be3a73e6db9
 EBUILD qqc2-desktop-style-5.92.0.ebuild 725 BLAKE2B 519eeacecba5a7692f868ab520f9aaf407250943f0c9a7ae50b861be49f3555fe8c1ae6ab84fe779486b93d5649e040ea0a0893982f452f3195eca6f4c2d7611 SHA512 5b969c02b61b9381c6992fdb512082042c7abd6ccbef1453cda96316f73123119ccb9b6b9f118d5a2a2732a9f0af0f8ba6c3d31bdc23f0b98a476ce0e6264a35
+EBUILD qqc2-desktop-style-5.96.0-r1.ebuild 1029 BLAKE2B c61624355837e4f7a1823ed48e33f15df9ca54c816fbbb4c9b72493ed4b532081335ee97d07b950d8abb6ac349b9a1c2fe2d58c97ffc45c49a787d0cd08e886e SHA512 86235763d9c7d2f801a40b7b4f1481a747a373a8b5582ef75564f7cb480d43b16ba610862b2eccfcb09ef7c9773255679171054abf49fcd8c3c2c1fe8cc3581e
 EBUILD qqc2-desktop-style-5.96.0.ebuild 746 BLAKE2B fa0c7f0add9c717e7951c2bdd5e10cbedb445acaa46c79d27918e5a8e3c823f0745269d98955fcbf99e30f673bc11aaf0b0018e17f27378e0d79de65b906c32c SHA512 461be09283fac87fcbc9cd640da371f5634dbecba99ca50d4b20d2ef6abb1a7fb1c205cfa47eda68936089c218566bed3c1484f7c0ed1b65e73ac05bc067e97a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch
new file mode 100644
index 000000000000..6f31670f5a52
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-drop-layout-direction-hack.patch
@@ -0,0 +1,27 @@
+From 6a095ad15153479e22472628ddfe1bab1183d911 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Sat, 4 Jun 2022 03:11:58 +0300
+Subject: [PATCH] ProgressBar: Drop layout direction hack
+
+It is not needed anymore: mirroring is now handled correctly in the
+Breeze theme implementation.
+---
+ org.kde.desktop/ProgressBar.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml
+index 23c1df3..2d075c7 100644
+--- a/org.kde.desktop/ProgressBar.qml
++++ b/org.kde.desktop/ProgressBar.qml
+@@ -26,7 +26,7 @@ T.ProgressBar {
+         control: controlRoot
+         maximum: indeterminate ? 0 : 10000 * controlRoot.to
+         minimum: indeterminate ? 0 : 10000 * controlRoot.from
+-        value: indeterminate ? 0 : 10000 * ((Qt.application.layoutDirection === Qt.LeftToRight ? controlRoot.visualPosition : 1 - controlRoot.visualPosition) * (controlRoot.to - controlRoot.from) + controlRoot.from)
++        value: indeterminate ? 0 : 10000 * controlRoot.value
+         horizontal: true
+         enabled: controlRoot.enabled
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch
new file mode 100644
index 000000000000..6cb908283ffc
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-menubar-theme.patch
@@ -0,0 +1,31 @@
+From 299748e9bdc01a30e90cb7413b0815564864dc3b Mon Sep 17 00:00:00 2001
+From: Kartikey Subramanium <kartikey@tutanota.com>
+Date: Wed, 20 Jul 2022 14:33:55 +0000
+Subject: [PATCH] Fix QQC2 MenuBar theme.
+
+BUG: 456729
+
+| Before | After |
+| ------ | ------ |
+| ![Screenshot_20220720_193546](/uploads/4eded8d26fe77b8a64d9abd7806ecf2f/Screenshot_20220720_193546.png) | ![Screenshot_20220720_193536](/uploads/825c2cc901d859ea5cd84fe299bdc941/Screenshot_20220720_193536.png) |
+---
+ org.kde.desktop/MenuBar.qml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/org.kde.desktop/MenuBar.qml b/org.kde.desktop/MenuBar.qml
+index f10b01a..68b92af 100644
+--- a/org.kde.desktop/MenuBar.qml
++++ b/org.kde.desktop/MenuBar.qml
+@@ -13,6 +13,9 @@ import org.kde.kirigami 2.4 as Kirigami
+ T.MenuBar {
+     id: controlRoot
+ 
++    Kirigami.Theme.colorSet: Kirigami.Theme.Header
++    Kirigami.Theme.inherit: false
++
+     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                             contentWidth + leftPadding + rightPadding)
+     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch
new file mode 100644
index 000000000000..36705ce0c8b6
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-fix-precision.patch
@@ -0,0 +1,70 @@
+From efb795efbe0579cb30cc042d61214c139c5fb110 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Fri, 22 Jul 2022 20:31:48 +0300
+Subject: [PATCH] ProgressBar,Slider: Adapt great precision to the harsh
+ reality
+
+Test case: `to` values >= 214749 should work.
+
+BUG: 455339
+---
+ org.kde.desktop/ProgressBar.qml | 10 +++++++---
+ org.kde.desktop/Slider.qml      | 12 ++++++++----
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/org.kde.desktop/ProgressBar.qml b/org.kde.desktop/ProgressBar.qml
+index 18d879b..77beb1b 100644
+--- a/org.kde.desktop/ProgressBar.qml
++++ b/org.kde.desktop/ProgressBar.qml
+@@ -22,11 +22,15 @@ T.ProgressBar {
+     contentItem: Item {}
+ 
+     background: StylePrivate.StyleItem {
++        // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow.
++        property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000)
++            ? 10000 : 1
++
+         elementType: "progressbar"
+         control: controlRoot
+-        maximum: indeterminate ? 0 : 10000 * controlRoot.to
+-        minimum: indeterminate ? 0 : 10000 * controlRoot.from
+-        value: indeterminate ? 0 : 10000 * controlRoot.value
++        maximum: indeterminate ? 0 : factor * controlRoot.to
++        minimum: indeterminate ? 0 : factor * controlRoot.from
++        value: indeterminate ? 0 : factor * controlRoot.value
+         horizontal: true
+         enabled: controlRoot.enabled
+ 
+diff --git a/org.kde.desktop/Slider.qml b/org.kde.desktop/Slider.qml
+index 58bc99a..49b8ccb 100644
+--- a/org.kde.desktop/Slider.qml
++++ b/org.kde.desktop/Slider.qml
+@@ -28,6 +28,10 @@ T.Slider {
+     snapMode: T.Slider.SnapOnRelease
+ 
+     background: StylePrivate.StyleItem {
++        // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow.
++        property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000)
++            ? 10000 : 1
++
+         control: controlRoot
+         elementType: "slider"
+         sunken: controlRoot.pressed
+@@ -36,10 +40,10 @@ T.Slider {
+         contentHeight: horizontal ? (Kirigami.Settings.tabletMode ? 24 : 22) : controlRoot.implicitHeight
+         anchors.verticalCenter: controlRoot.verticalCenter
+ 
+-        maximum: 10000 * controlRoot.to
+-        minimum: 10000 * controlRoot.from
+-        step: 10000 * controlRoot.stepSize
+-        value: 10000 * controlRoot.value
++        maximum: factor * controlRoot.to
++        minimum: factor * controlRoot.from
++        step: factor * controlRoot.stepSize
++        value: factor * controlRoot.value
+         horizontal: controlRoot.orientation === Qt.Horizontal
+         enabled: controlRoot.enabled
+         hasFocus: controlRoot.activeFocus
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch
new file mode 100644
index 000000000000..59bb60c6c347
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.96.0-strip-out-apersands.patch
@@ -0,0 +1,47 @@
+From 939273025ed92246b5e6d1e3a944a8c88bbc682b Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Fri, 22 Jul 2022 21:27:04 +0300
+Subject: [PATCH] ToolTip: Sync to PC3: Strip out ampersands
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Easily reproducible broken example: put a notes applet on a desktop,
+hover over its "Configure…" button (it should be fine so far), then
+right click it, press Escape (or otherwise close the context menu, and
+hover again: now the tooltip spells "&Configure…" because for some
+reason a mnemonic was added during this time.
+---
+ org.kde.desktop/ToolTip.qml | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/org.kde.desktop/ToolTip.qml b/org.kde.desktop/ToolTip.qml
+index 40dfcbd..3a03cc5 100644
+--- a/org.kde.desktop/ToolTip.qml
++++ b/org.kde.desktop/ToolTip.qml
+@@ -13,7 +13,7 @@ import QtQuick.Layouts 1.15
+ import org.kde.kirigami 2.12 as Kirigami
+ 
+ T.ToolTip {
+-    id: controlRoot
++    id: control
+ 
+     Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip
+     Kirigami.Theme.inherit: false
+@@ -41,9 +41,11 @@ T.ToolTip {
+     closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
+ 
+     contentItem: Controls.Label {
+-        text: controlRoot.text
++        // Strip out ampersands right before non-whitespace characters, i.e.
++        // those used to determine the alt key shortcut
++        text: control.text.replace(/&(?=\S)/g, "")
+         wrapMode: Text.WordWrap
+-        font: controlRoot.font
++        font: control.font
+         Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip
+         color: Kirigami.Theme.textColor
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild
new file mode 100644
index 000000000000..4f8f1501b88f
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.96.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-menubar-theme.patch" # KDE-bug #456729
+	"${FILESDIR}/${P}-drop-layout-direction-hack.patch" # mirror fix in breeze 5.24.6-r1
+	"${FILESDIR}/${P}-fix-precision.patch" # KDE-bug #455339
+	"${FILESDIR}/${P}-strip-out-apersands.patch" # KDE-bug #457079
+)