gentoo resync : 16.04.2022

5 files changed, 226 insertions, 2 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 67b922f632f3..cab54d8cb7d2 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -2,8 +2,12 @@ AUX plasma-5.90.0-KDEBUG-426969.patch 3254 BLAKE2B 2b2bcafa630b3daaecd54e6cf2d10
 AUX plasma-5.90.0-KDEBUG-447752.patch 2649 BLAKE2B 879a0fbb02e6a90120797d2352e8b3c9874b3203fc1125a004b940f52757eea907a4499d047589c59b4cc7f87dd1ca15119aaa2d990462fda8cc989da5996826 SHA512 17e43da6fd6d6f956e17c889fd4bccdb39d88a1a08cd4cf6bf3af1021eae7dc034821b2b87e2bc5bf2eeedf0338e0d2afb3adba62c0d07a0c68bece08ac781e8
 AUX plasma-5.90.0-KDEBUG-448590.patch 1433 BLAKE2B 667d2f07b474ac5b5ceda34e1e819e7b62fc74463dcc763638d18b60b9dfd93eeca87519069792ff91a80cfe0d795562468b1423943b672556bb6b49a2e84362 SHA512 822f3795fc89f95deb71d6ab3608d38608cff9be48bb30748b2c52adecdf12899707ad2be918fe014087297539c42018914d4c77f7855d4d912844838cca871c
 AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee
+AUX plasma-5.92.0-fix-blurry-buttons.patch 5410 BLAKE2B 689bf20c1848fd5ac299991f6dcc1e6ee81ef2fecd68d87952967dbb2367326aee8d464588824b059f7162a1cc6092c84cce7d254ac20dbbef3da639a5eaa4e0 SHA512 facb4d4ca36f5edaad918253f8d79442d350a12d611d833d0c48684abd2160527813d7186614fc54d3d5f67171400bbaf56f64c0ffb98c2433e062ee024b180d
+AUX plasma-5.93.0-fix-widget-popups.patch 931 BLAKE2B 32488d998398ff027f3a265c43a89b2f72b10861e4993584d2fc665a3ef6d4ec9219e105f5de09ce53a83ad6f0ad1ab545ac92d0607406fd2c75984da322a5a0 SHA512 06c7d7d6710d176979756070f4492be2d3101d4c86728b8234484ad3fbc4b57d8d59d78d6ff34d9f79c578a1ca4ffe659819f46924d7ba309e76247e8d0e168b
 DIST plasma-framework-5.90.0.tar.xz 3143720 BLAKE2B 497a1808c2f07b985f3b458d2bf6b4b4e0198a8bd92cffdad86cc9470cd51c857c3de66edbe4d6ea543da74f6ba05fe5ce1b6746e2df7830839e45549ca01293 SHA512 0f22e100ad996be39a2cc5afa72d3e769dc512d3854d417e81536908bc4e6c9874788554fcea1ca1ec4798cd78681c78ab7c2242b95d7f5fdb6cfd9eeee9543b
 DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
+DIST plasma-framework-5.93.0.tar.xz 3148720 BLAKE2B 2e11e742279ce33b33bf5a7a7e4051e14bb7e7c2cdecb41e127bf07c5fbe91fd4ab8905cadb27a2a1be95ce4287e4eb8539cdfb9ad36e052f9789abf5d8159c3 SHA512 df876c422d2de82325537bfdce4db016dc649202f334de063403c15f44d554c4b0f6707e02c8890e269bdb71c17fdd31f651fad3ed7506f23a110d725fd8ccf8
 EBUILD plasma-5.90.0-r1.ebuild 2073 BLAKE2B 6a79b018dca1c936508c1b129df9bb44945e4787c2b0f448e451f287bbf5af111787034eabb107cd26fd63d596bd6f388d8d7b17f93bed09b4b8177bb75c39ff SHA512 ca9ef2b7ec8b87ab1df3eeaa8c90ff2aedc78eb4ab860e1539bd5d4bb3805cec253772e0bb17a79047138e41e014b6a5ff2e5a50f867be1a3cc2390ad5112560
-EBUILD plasma-5.92.0-r1.ebuild 2010 BLAKE2B e5efbe8b62a3bef9004a802f556a46ddfc7228ece7d75654c1530ab37e4058f0a638331315519729aede04712eae5ea1425501792f048ee981683779f5dadf47 SHA512 a2c4f4779dac37e55284fdead27dc05118be5cd0333aedc87f4056a91b972c03286f67606065d2a31b29c2207a13c7fc523a911b8906df9f22bd115bbc95e12d
+EBUILD plasma-5.92.0-r2.ebuild 2073 BLAKE2B a84f1823219690cefc3af290cebb69c72b84fded490dabed29274820c6476434a85f27ace4a2e4e655698ee6d7d3906e63161048efc8c839607807d0aea6c105 SHA512 c4c3b4c49ad410602f982de423673f334f854a58c4cb4ca9ecc579fc264c4366ffd2aa4caa70729d08e657417564c1e7c2252a660297cd3e855b0f3d527e63c5
+EBUILD plasma-5.93.0-r1.ebuild 2099 BLAKE2B d03ec534d8106fc96e796158049b4e662d87b92a3d4cae97799ba59072bd78fc207290c9441a5293c4e2e454c1540bf56a35b09e3eb0081a87557894a2fd4bf2 SHA512 be27bc951fdae92cfa43d8257cb8ea4aea3a101b120a973a19348683279694ae5a65c235a313746b18880639350f311c85914b6b3610191c1a797a475ae23119
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch b/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
new file mode 100644
index 000000000000..0286039ddb7b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
@@ -0,0 +1,110 @@
+From bd1ba6e539a326585a24fc21d0e27ef2c59e8731 Mon Sep 17 00:00:00 2001
+From: Noah Davis <noahadvs@gmail.com>
+Date: Wed, 6 Apr 2022 15:08:53 -0400
+Subject: [PATCH] PC3 toggle controls: fix odd heights misaligning indicators
+
+BUG: 447977
+---
+ src/declarativeimports/plasmacomponents3/CheckBox.qml       | 2 +-
+ src/declarativeimports/plasmacomponents3/CheckDelegate.qml  | 2 +-
+ src/declarativeimports/plasmacomponents3/MenuItem.qml       | 2 +-
+ src/declarativeimports/plasmacomponents3/RadioButton.qml    | 2 +-
+ src/declarativeimports/plasmacomponents3/RadioDelegate.qml  | 2 +-
+ src/declarativeimports/plasmacomponents3/Switch.qml         | 2 +-
+ src/declarativeimports/plasmacomponents3/SwitchDelegate.qml | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/declarativeimports/plasmacomponents3/CheckBox.qml b/src/declarativeimports/plasmacomponents3/CheckBox.qml
+index 1da39da24..fed972566 100644
+--- a/src/declarativeimports/plasmacomponents3/CheckBox.qml
++++ b/src/declarativeimports/plasmacomponents3/CheckBox.qml
+@@ -35,7 +35,7 @@ T.CheckBox {
+ 
+     indicator: CheckIndicator {
+         x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+-        y: control.topPadding + (control.availableHeight - height) / 2
++        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+         control: control
+     }
+ 
+diff --git a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
+index ef965becd..9d241467b 100644
+--- a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
++++ b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
+@@ -47,7 +47,7 @@ T.CheckDelegate {
+ 
+     indicator: CheckIndicator {
+         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+-        y: control.topPadding + (control.availableHeight - height) / 2
++        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+ 
+         control: control
+     }
+diff --git a/src/declarativeimports/plasmacomponents3/MenuItem.qml b/src/declarativeimports/plasmacomponents3/MenuItem.qml
+index 16f2a5e36..964c5930d 100644
+--- a/src/declarativeimports/plasmacomponents3/MenuItem.qml
++++ b/src/declarativeimports/plasmacomponents3/MenuItem.qml
+@@ -81,7 +81,7 @@ T.MenuItem {
+ 
+     indicator: Loader {
+         x: controlRoot.mirrored ? controlRoot.width - width - controlRoot.rightPadding : controlRoot.leftPadding
+-        y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
++        y: controlRoot.topPadding + Math.round((controlRoot.availableHeight - height) / 2)
+ 
+         visible: controlRoot.checkable
+         sourceComponent: controlRoot.autoExclusive ? radioComponent : checkComponent
+diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml
+index 7eeee3f9b..0b7a19894 100644
+--- a/src/declarativeimports/plasmacomponents3/RadioButton.qml
++++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml
+@@ -32,7 +32,7 @@ T.RadioButton {
+ 
+     indicator: RadioIndicator {
+         x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+-        y: control.topPadding + (control.availableHeight - height) / 2
++        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+         control: control
+     }
+ 
+diff --git a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
+index e25f28cc3..a915a4eac 100644
+--- a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
++++ b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
+@@ -47,7 +47,7 @@ T.RadioDelegate {
+ 
+     indicator: RadioIndicator {
+         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+-        y: control.topPadding + (control.availableHeight - height) / 2
++        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+ 
+         control: control
+     }
+diff --git a/src/declarativeimports/plasmacomponents3/Switch.qml b/src/declarativeimports/plasmacomponents3/Switch.qml
+index 32ef1274b..98de41388 100644
+--- a/src/declarativeimports/plasmacomponents3/Switch.qml
++++ b/src/declarativeimports/plasmacomponents3/Switch.qml
+@@ -32,7 +32,7 @@ T.Switch {
+ 
+     indicator: SwitchIndicator {
+         x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+-        y: control.topPadding + (control.availableHeight - height) / 2
++        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+         control: control
+     }
+ 
+diff --git a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
+index e6adf9a6e..0f3db70de 100644
+--- a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
++++ b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
+@@ -45,7 +45,7 @@ T.SwitchDelegate {
+ 
+     indicator: SwitchIndicator {
+         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+-        y: control.topPadding + (control.availableHeight - height) / 2
++        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
+ 
+         control: control
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
new file mode 100644
index 000000000000..7f95c6531a95
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
@@ -0,0 +1,29 @@
+From b62d83bef7733e4943e6f66787166b41198d1359 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 13 Apr 2022 16:05:32 +0200
+Subject: [PATCH] Dialog: Do not update layout parameters while hidden
+
+Wait until the dialog it's shown to position the components within.
+Otherwise we do it based on a random size.
+
+BUG: 452512
+---
+ src/plasmaquick/dialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 09937ef0f..9ca2c8a66 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -475,7 +475,7 @@ void DialogPrivate::getSizeHints(QSize &min, QSize &max) const
+ 
+ void DialogPrivate::updateLayoutParameters()
+ {
+-    if (!componentComplete || !mainItem || !mainItemLayout) {
++    if (!componentComplete || !mainItem || !mainItemLayout || q->visibility() == QWindow::Hidden) {
+         return;
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
index 3e5fa1db605e..8d660fd871a3 100644
--- a/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
@@ -59,7 +59,10 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
-PATCHES=( "${FILESDIR}/${P}-breeze-light-dark-visual-fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-breeze-light-dark-visual-fix.patch"
+	"${FILESDIR}/${P}-fix-blurry-buttons.patch" # KDE-bug 447977
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
new file mode 100644
index 000000000000..1548d3671d1d
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( media-libs/libglvnd[X?] )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/libglvnd
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.92.0-fix-blurry-buttons.patch" # KDE-bug 447977
+	"${FILESDIR}/${P}-fix-widget-popups.patch" # bug 838661, KDE-bug 452512
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}