gentoo resync : 05.12.2021

3 files changed, 61 insertions, 2 deletions

diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index e26b61a53a6d..b207709a1ecd 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,6 @@
+AUX kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch 2047 BLAKE2B c166bb6c57b263abbe78cbeaebf6f9b9a3c8629dcad73ad1dcbaebc0a258904543ccb9b0a1127efc0c52a07f13b10fe0ebfb31243471bd38658496ac13ffc0fa SHA512 b87f1baf2093599c3ce0dc8766c3f0ee187656df92c1468c98b323c381f473ded33b03be244021b23b2fe6c5a739620c40b84cc74bf3b68e45cd581ee2915b82
 DIST kirigami2-5.85.0.tar.xz 323312 BLAKE2B 4953b9d3f0114aa7f12b23c7c12092cc0de57ff67e73130a1428e7c334d34b5a87dc8c7b2095dbaa2f28f6a96cc8be67682a73b2785a19f39ac9396c20646213 SHA512 239a8f7e5e77ca19cd9b8e45a383959c0c5b07dda279862c3aa0474fd34d58d905ca947c7f19eec3bc2de53557e8ae7dd8cb5a4879a53c28436e6636931c2603
-DIST kirigami2-5.87.0.tar.xz 332160 BLAKE2B 18506c0883e56113220b920413d00da7bbbd7807425296c5e3678c6c92960f7dd12b85b70fa267154f05f93a7b5e3fb09842681742e0753a256401dba3f7da10 SHA512 b6c552232aa9d68b62285eaa4ef0cbe0cefcc2294328fd539a0765abc153f1de7308c9e517206de6d879ce9501ffd059d8ec65df707bd28b45412409b839c25b
+DIST kirigami2-5.88.0.tar.xz 333324 BLAKE2B cac7a79d5d3fd75aab31f0c7d6fe51b6dd6bf8755822a85682db7742cafc88007012e541de09ef302e1b2208a055c9cb4cce208362323c558e547a256f3bd397 SHA512 adb20c007bd8d1206be87d936a9affe1f7e2203158ec5ee241bde8e60e2b6e1d701393c4d85841644321f70496de1e67cb4feb9009c2cd7d153eba2407c480fb
 EBUILD kirigami-5.85.0.ebuild 980 BLAKE2B 999fece128f09c3c6ae2f44728b0116e8f61a4546e17d05b88522de2bb07d4cd839537d02e9f221f822317484660321ae8b6f0472d19dfc602b5ee9bff969177 SHA512 dea66074332475e1e478e01f885e91628e767213cc37069dc9e5e5c1e91676130add99d6bb6a584bb979dc8824ef33cbd6b7be6e73a9350434038ab4e6f783cb
-EBUILD kirigami-5.87.0.ebuild 983 BLAKE2B af4c4f0de065b04abea3693bdd35ea019e8aecf35abefdd3e2c20aec6afe929dbc580ba7fc7f33583440043680606c995008e8552340e2ae245a0893f4a6fac2 SHA512 f4ead26545ce0e5f5c71c4e4ca01ed0b91a0ff37b6f920e52875ba5618c035152c0e9a50174b3fd95c2dbbc460ff9fd47625a4e4393772a6fc0260de91e7abe7
+EBUILD kirigami-5.88.0-r1.ebuild 1065 BLAKE2B c3f27710bbd992a284c7b7e4dd6fe5f4032858983bfe71c5678c77d927576c5dee89ce638b9a4f1fcdbe1b1c2bc8ac8b43459186568f9e66616ecdb36712a4d8 SHA512 9d2912211a57c9feded6f8194c699c0bfd65d2fe811c32c92472bf592b3f0fae7b982ee34ead4a0cb84ae9a9f5307849d966ec11755a5e76b907c16406a6bcdd
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch b/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
new file mode 100644
index 000000000000..85b2a24f5909
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
@@ -0,0 +1,56 @@
+From 67ec2a1873e3d750529043b243043cfd2e2f9ec6 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Wed, 10 Nov 2021 20:44:53 -0700
+Subject: [PATCH] PageRowGlobalToolBarUI: don't animate opacity
+
+Doing so causes flickering in System Settings and KInfoCenter because of
+how the titles are rendered. It also doesn't make conceptual sense since
+the style of toolbar generally doesn't change so the user would never
+actually see the animated opacity change in the first place.
+
+BUG: 417636
+FIXED-IN: 5.89
+---
+ .../globaltoolbar/PageRowGlobalToolBarUI.qml        | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
+index 640ab51e..c536fed7 100644
+--- a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
++++ b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
+@@ -106,8 +106,8 @@ Kirigami.AbstractApplicationHeader {
+             Layout.preferredHeight: -1
+             property Kirigami.PageRow pageRow: root
+ 
+-            opacity: layerIsMainRow && active
+-            enabled: opacity > 0
++            visible: layerIsMainRow && active
++            enabled: visible
+ 
+             asynchronous: true
+ 
+@@ -115,13 +115,6 @@ Kirigami.AbstractApplicationHeader {
+ 
+             //TODO: different implementation?
+             source: globalToolBar.actualStyle == Kirigami.ApplicationHeaderStyle.TabBar ? Qt.resolvedUrl("TabBarControl.qml") : Qt.resolvedUrl("BreadcrumbControl.qml")
+-
+-            Behavior on opacity {
+-                OpacityAnimator {
+-                    duration: Kirigami.Units.longDuration
+-                    easing.type: Easing.InOutQuad
+-                }
+-            }
+         }
+ 
+         Item {
+@@ -137,6 +130,6 @@ Kirigami.AbstractApplicationHeader {
+             Layout.preferredWidth: height
+         }
+     }
+-    background.opacity: breadcrumbLoader.opacity
++    background.visible: breadcrumbLoader.visible
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.87.0.ebuild b/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild
index 32d0b42c0693..a161344b23b0 100644
--- a/kde-frameworks/kirigami/kirigami-5.87.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild
@@ -37,6 +37,8 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 "
 
+PATCHES=( "${FILESDIR}"/${P}-PageRowGlobalToolBarUI-dont-animate-opacity.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=$(usex examples)