gentoo resync : 05.12.2021

5 files changed, 200 insertions, 2 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 89069b019c14..197cf2e41899 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -4,8 +4,11 @@ AUX plasma-5.85.0-fix-pinned-calendar-dots.patch 1466 BLAKE2B 1d4f72269928e35e03
 AUX plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch 1766 BLAKE2B 07e8f384a2dde888465b4c6e3317afdd511ddc03fbc18ccf6e76d235bd6552c9b0dbd292f19244e0792129c68b2284af9220f9ef54240bee1255e35a5e94d907 SHA512 5f452b6634bd53f7265dfad2a38e40aa46ff69d10081b51c47b1aed97cabd28d545e7fd985ff26412c07315214821f201e5ff2de3d895e8afde9523d187b932c
 AUX plasma-5.85.0-fix-svgicon-memleak.patch 1613 BLAKE2B be00da72ac0a1a8ce97cf771ea83db44fe97142ddadfc1a1b283cce5297568ec0566b7a2ce626ad7d7e4f7bbc82edf260dcda1db6ea8cf8ed1c132b3a25dedce SHA512 c8dbb37558ecf3491edbbbda6f93075d7ddea7561eb42b30416d61f7b7256966c609862fb8e0c746b9a93d2caff37b8afef9eff0d5db271d6e3cff8aef2d560b
 AUX plasma-5.85.0-fix-theme-memleak.patch 3873 BLAKE2B 8ec65e67dab0020febd483b4b369d26d4f9e7a1782b783c2910e80db643f92562559053a6319b57af4f905daeaa970db7d78e1a2c11b07dcdbc9d3bb74f52c10 SHA512 fe93829d4881a71bd4671af187a7210fb8fec1c92b29917d1530c58d1247976d59ea2e16eb0eec0c14e25824a9b15caebb7912f7db23b6088c1352e9925d15a9
+AUX plasma-5.88.0-fix-centered-text.patch 5964 BLAKE2B 882776806b609517a0eeca3febf8defa11395efcfe216dc5dfd2e7d7f6b5ff949b137a73c4b69b286160760c0e3a9473d22ee48f4dd55286bddd209b3a539d52 SHA512 62d2e0df039011ede515e3e96980dfd2f1a8d1ae4d442a2b21e0f6c00c3480b19729cb321cda9b5ddafa0ae94fac1aed806c3f2501d4bef18819a5183ef4da52
+AUX plasma-5.88.0-fix-misrenderings-with-transparency.patch 1262 BLAKE2B 89c5112182f20d1beda6f11c411720a991c490ee1082f1197012f4faca2309bce2f17a0792758006a0f9851060d2b641799835824dc24967b6a4afc0897f9737 SHA512 3ea8b7df68d99fcc9ea1bfd2f8ec291d2f46e64ebf91ce0e3a5cc0260f33107f88a8c167fd1e401ab2b5e2f4d88d7125208d8de497da2f7b6a9487ac6218691b
+AUX plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch 1068 BLAKE2B 61fd267c09e56c1f4f71ad95644271078459a484c2c4a3afd9a1a60528f22694c19cf17ef7387a1931db5b3f900a29fb045eac155fb017cf9c01492a90552482 SHA512 e29ceffd67d587a45e23ef01f661343ed0b6d44bc97ad6d1f26061f1be0b61805d3aedf01a96c7a3e01619d5ca2c72f94e8785898cfa4d003e60c1ceebe93efb
 DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
-DIST plasma-framework-5.87.0.tar.xz 3139456 BLAKE2B bc04461b82084e2f341f6b47bda054fb5ff70f3d23ad05af203218b2d8a6e4a4ec2b898b3901e2845fd58ceb5157077edfdda2ee6378c7ab0418eeef1e19b4e5 SHA512 e74f60a15329fbda1a5c8e978914844dc5bf6486c241a9e44905a2955399dc67605361618ec3b33815a0af85b7711e18ede1d481b81d9909cf87e6b0e32374fb
+DIST plasma-framework-5.88.0.tar.xz 3142640 BLAKE2B cbd0cc61b6c39e56a1bceed44d7f04f0033c0daaa3073760f04536b22760147b1bb82f5b85d70d48301083e9ae13e3f6bbebafa75e264762157e2fcaf658123d SHA512 b99c8d5722198d7f2096734f62f913f74471810331980a2722f1864602f3facf796c17a494d16fca7dbbe4389fd5db64b9fe82fd34f148f4ff6230ffde0ded93
 EBUILD plasma-5.85.0-r3.ebuild 2329 BLAKE2B eab27d4eea5e926738094e0e3f711369a229f87922aa1256f75e9b240111f0c6f8a430102c807ed4cb93dcfd392005f13c0f81f572134a51e0c47d32c49da4e1 SHA512 f40ddb75ef8316018d0eda6db3602ecea8958d26446517c790fed6776f297a78e7d22bbc113149f625b8b2f37b9ed98dcfad73fe7dd176db6e7c4388ecb8aafc
-EBUILD plasma-5.87.0.ebuild 1943 BLAKE2B 4f9cabe4ac6c36839d71bfbad8cd5b6652d22723eba67017ae7587941de3efb6595c4f472770bee802a4421f6c711e83832185e3a8d333e358a0b4cdb1a79526 SHA512 23aa0e6f6349402291049e4203dff1a9263fd797a749cb274e4d53b8032eac9931f1d457290499ae9694ef93dbbd82b329d9c55e707496906f89adc3f0b6c122
+EBUILD plasma-5.88.0-r1.ebuild 2153 BLAKE2B 6e4081e90377066182d6e46fa9de7aba401c289c9b85a15a4adcf96e52374a268b887aece51906a08a748445a88ee4180c421d928c7018f5b6247710aa37d25a SHA512 79292b0b55a982d17b87db87fdc21119198014b925d12147729c581481881707d6a9cef9c22493722a08c70b7896508db02682c74a52b6ae84a1fb9a31e31fad
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
new file mode 100644
index 000000000000..8fb393a568d6
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
@@ -0,0 +1,121 @@
+From 92ac1038cff333d70a71331b2a5fa0b9d91bc39d Mon Sep 17 00:00:00 2001
+From: Eugene Popov <popov895@ukr.net>
+Date: Fri, 19 Nov 2021 11:13:03 +0000
+Subject: [PATCH] Fix IconLabel
+
+---
+ .../plasmacomponents3/private/IconLabel.qml   | 97 +++++++++++--------
+ 1 file changed, 55 insertions(+), 42 deletions(-)
+
+diff --git a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
+index 467c2f54b..74a8ff3a5 100644
+--- a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
++++ b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
+@@ -24,49 +24,62 @@ T.Control {
+     PlasmaCore.ColorScope.inherit: true
+     implicitWidth: implicitContentWidth + leftPadding + rightPadding
+     implicitHeight: implicitContentHeight + topPadding + bottomPadding
+-    contentItem: GridLayout {
+-        rowSpacing: root.spacing
+-        columnSpacing: root.spacing
+-        flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
+-        PlasmaCore.IconItem {
+-            id: iconItem
+-            visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
+-            colorGroup: root.PlasmaCore.ColorScope.colorGroup
+-            implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
+-            implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
+-            Layout.fillWidth: true
+-            Layout.fillHeight: true
+-            Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
+-            Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
+-            Layout.alignment: if (root.textBesideIcon) {
+-                Qt.AlignRight | Qt.AlignVCenter
+-            } else if (root.textUnderIcon) {
+-                Qt.AlignHCenter | Qt.AlignBottom
+-            } else {
+-                Qt.AlignCenter
++    contentItem: Item {
++        implicitWidth: gridLayout.implicitWidth
++        implicitHeight: gridLayout.implicitHeight
++        GridLayout {
++            id: gridLayout
++            rowSpacing: root.spacing
++            columnSpacing: root.spacing
++            flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
++            x: {
++                if (root.alignment & Qt.AlignLeft) {
++                    return 0;
++                }
++                if (root.alignment & Qt.AlignRight) {
++                    return parent.width - width;
++                }
++                return Math.round((parent.width - width) / 2);
+             }
+-        }
+-        T.Label {
+-            id: label
+-            visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
+-            palette: root.palette
+-            font: root.font
+-            horizontalAlignment: root.alignment & Qt.AlignHorizontal_Mask || Text.AlignHCenter
+-            verticalAlignment: root.alignment & Qt.AlignVertical_Mask || Text.AlignVCenter
+-            // Work around Qt bug where NativeRendering breaks for non-integer scale factors
+-            // https://bugreports.qt.io/browse/QTBUG-70481
+-            renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
+-            color: PlasmaCore.ColorScope.textColor
+-            linkColor: PlasmaCore.Theme.linkColor
+-            elide: Text.ElideRight
+-            Layout.fillWidth: root.alignment & Qt.AlignHorizontal_Mask
+-            Layout.fillHeight: root.alignment & Qt.AlignVertical_Mask
+-            Layout.alignment: if (root.textBesideIcon) {
+-                Qt.AlignLeft | Qt.AlignVCenter
+-            } else if (root.textUnderIcon) {
+-                Qt.AlignHCenter | Qt.AlignTop
+-            } else {
+-                Qt.AlignCenter
++            y: {
++                if (root.alignment & Qt.AlignTop) {
++                    return 0;
++                }
++                if (root.alignment & Qt.AlignBottom) {
++                    return parent.height - height;
++                }
++                return Math.round((parent.height - height) / 2);
++            }
++            width: Math.min(parent.width, implicitWidth)
++            height: Math.min(parent.height, implicitHeight)
++            PlasmaCore.IconItem {
++                id: iconItem
++                visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
++                colorGroup: root.PlasmaCore.ColorScope.colorGroup
++                implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
++                implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
++                Layout.alignment: Qt.AlignCenter
++                Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
++                Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
++            }
++            T.Label {
++                id: label
++                visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
++                palette: root.palette
++                font: root.font
++                // Work around Qt bug where NativeRendering breaks for non-integer scale factors
++                // https://bugreports.qt.io/browse/QTBUG-70481
++                renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
++                color: PlasmaCore.ColorScope.textColor
++                linkColor: PlasmaCore.Theme.linkColor
++                elide: Text.ElideRight
++                Layout.alignment: Qt.AlignCenter
++                Layout.fillWidth: {
++                    if (!iconItem.visible || parent.flow === GridLayout.TopToBottom) {
++                        return implicitWidth > parent.width;
++                    }
++                    return iconItem.implicitWidth + parent.columnSpacing + implicitWidth > parent.width;
++                }
+             }
+         }
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
new file mode 100644
index 000000000000..d1e6f37d8a2b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
@@ -0,0 +1,34 @@
+From 6176d8ef8f36290075c5bd8932d623e68468a1cd Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Tue, 16 Nov 2021 11:05:17 +0100
+Subject: [PATCH] Do updateTheme after QQuickWindow::event
+
+doing updatetheme there will ensure that the window size is correct,
+so then when the surface commit will happen, we'll have the blur
+and contrast regions wit hthe proper geometry
+
+BUG:305247
+---
+ src/plasmaquick/dialog.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index eac7d432a..343bfe4c0 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -1243,10 +1243,12 @@ bool Dialog::event(QEvent *event)
+         // sometimes non null regions arrive even for non visible windows
+         // for which surface creation would fail
+         if (!d->shellSurface && isVisible()) {
++            const bool ret = QQuickWindow::event(event);
+             KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
+             d->setupWaylandIntegration();
+             d->updateVisibility(true);
+             d->updateTheme();
++            return ret;
+         }
+ #endif
+     } else if (event->type() == QEvent::PlatformSurface) {
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch b/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
new file mode 100644
index 000000000000..0631155c89bf
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
@@ -0,0 +1,34 @@
+From 2ba1b0b642d540f74f0e21e7aaa272644ea4eda5 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 8 Nov 2021 16:12:38 +0000
+Subject: [PATCH] make the OSD an actual wayland OSD
+
+when the OnScreenDisplay type is set, set it on the plasma shell surface
+so KWin can actually treat it as such
+
+CCBUG:428859
+---
+ src/plasmaquick/dialog.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 4cea3a28e..3254b8320 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -736,6 +736,13 @@ void DialogPrivate::applyType()
+         if (!wmType) {
+             KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
+         }
++#if HAVE_KWAYLAND
++        if (type == Dialog::OnScreenDisplay) {
++            if (shellSurface) {
++                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::OnScreenDisplay);
++            }
++        }
++#endif
+     } else {
+         q->setFlags(Qt::FramelessWindowHint | q->flags());
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.87.0.ebuild b/kde-frameworks/plasma/plasma-5.88.0-r1.ebuild
index 1ccc68601353..5a0e6848003e 100644
--- a/kde-frameworks/plasma/plasma-5.87.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.88.0-r1.ebuild
@@ -59,6 +59,12 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-OSD-an-actual-wayland-OSD.patch
+	"${FILESDIR}"/${P}-fix-misrenderings-with-transparency.patch # KDE-bug 305247
+	"${FILESDIR}"/${P}-fix-centered-text.patch # KDE-bug 442830
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)