4 files changed, 91 insertions, 3 deletions
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index b87e7c29f4bb..dab02256e36d 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,6 +1,8 @@
+AUX plasma-5.85.0-fix-pinned-calendar-dots.patch 1466 BLAKE2B 1d4f72269928e35e0364a325f9700cd0b265cf26b00d46b228aec9cb5fdc82cc652a572a3057720beb2acc783eb7ce451dbbe358f80ed7d48549cd144d4d6cf8 SHA512 4f6e331a3502b9d73c554a44569569989c7b8f33dfe7a4362654ed899dde302541024c30b98b7f31636fc40c19cb48e263266c6f89c27028bea6119d5f823071
+AUX plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch 1766 BLAKE2B 07e8f384a2dde888465b4c6e3317afdd511ddc03fbc18ccf6e76d235bd6552c9b0dbd292f19244e0792129c68b2284af9220f9ef54240bee1255e35a5e94d907 SHA512 5f452b6634bd53f7265dfad2a38e40aa46ff69d10081b51c47b1aed97cabd28d545e7fd985ff26412c07315214821f201e5ff2de3d895e8afde9523d187b932c
 DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623ff8f31d5de0ae812ffc1666badf388fa711887afd9479d718cd50f9bdea42d725f30fbae8d32d87cd071b30b1ba49768377a8d07e9bbc3 SHA512 3e8608f7c7d6da150a30fd48e2ac5115f95f6346056ef2f12134ba8e93617c7b067b8ccb1bab5e1586f3ef1af7f010b8ddd9fe0a9a7ee0def01bc991be8e546c
 DIST plasma-framework-5.82.0.tar.xz 3160744 BLAKE2B b0e8ebf51fa41b7ea2f3290b157d30fbf2cf2bf5fdf867c7601ece615d8f2ad93b87976f7b093bc7909e1286021db8d1ec5971cbc8b361888450a9e6a9bd64d7 SHA512 e973d1b2683a88f370587a8dba71b1f3ff8a5e23127dbe4c30161fb827b6e3c83e7eb0a6860478d160c6fa69bef9fde0f16f0a8d315672df433ac9d7157b8ea9
-DIST plasma-framework-5.84.0.tar.xz 3145140 BLAKE2B c5f4a9e2c0121cca55ec55ea821f16b5433039fa70f485c0e049dcf7940703a937e01dee7361ba0df50284b5693fc6661ed7c8ec4ceb5d45591d61e72cdfc4c6 SHA512 e8032f80ec91d56d0f72faca27e1878e7e2e581943746214a359faee45f85dc125b02198a1623ec8cc5a74fbcd38f93bf2faf5e17f73ab410805adbf71579577
+DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
 EBUILD plasma-5.82.0.ebuild 2030 BLAKE2B a64a05c28c10890fb3f845286362f0041de75d1f895e1166ee7f1d4ea2f84249582fb4f06c202d4493b97c05359df34c3c1a6938042c9a0ef740d96c3906d398 SHA512 1faab810a201f647dabe24e7d192b53c1b7cbde16287f35c4ccfeaada018d5c967b07589e6d82734f1f5a229d351bd19666ad16d888f34dd4c599d12e07c501a
-EBUILD plasma-5.84.0.ebuild 1873 BLAKE2B 61ec97aeabbe98de2cb75c2d4c024594663449c0ce1539f938dddf100794ae0581792e740cfee737826d7ea839b712b62bb340169b8b45d4eb8deba0950881da SHA512 9696abd6e13747f68cd9ec1c7f61839d55d36ad93d960d31da2094f5edc7dbf07107f7af8af04b16943e7f3ae7e544b7816277c2bfebade1071d8e29b8350f2c
+EBUILD plasma-5.85.0-r1.ebuild 2022 BLAKE2B 0f37aaa9e3d1919e8a6e93a35edbf040859e0962d198094d8d6a9ad5cad3a372e1fd95b8d7232a9fd1288a830cd9ec5dc4570250e15eeaaeb50d246ca9f0758e SHA512 d42e5b1873538ea5b30c5bfb20c9212acc324c0cecf475cf67589634b9c30fc2adacdf917dc9a0d7e6158934f984c4c8f8ca2e9e31d59fbd985630dace5c1672
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch
new file mode 100644
index 000000000000..0342024ca89d
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-pinned-calendar-dots.patch
@@ -0,0 +1,37 @@
+From 19fe24ef9377178413438d7749630053995af229 Mon Sep 17 00:00:00 2001
+From: Eugene Popov <popov895@ukr.net>
+Date: Mon, 9 Aug 2021 15:56:02 +0000
+Subject: [PATCH] [Calendar] Fix pinned calendar displaying the wrong number of
+ dots
+
+Use assignment instead of binding for the rootIndex property of the DelegateModel.
+
+BUG: 440627
+FIXED-IN: 5.86
+---
+ src/declarativeimports/calendar/qml/DayDelegate.qml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/calendar/qml/DayDelegate.qml b/src/declarativeimports/calendar/qml/DayDelegate.qml
+index af31991db..3f7fc681b 100644
+--- a/src/declarativeimports/calendar/qml/DayDelegate.qml
++++ b/src/declarativeimports/calendar/qml/DayDelegate.qml
+@@ -81,13 +81,14 @@ PlasmaComponents3.AbstractButton {
+             Repeater {
+                 model: DelegateModel {
+                     model: dayStyle.dayModel
+-                    rootIndex: modelIndex(index)
+                     delegate: Rectangle {
+                         width: PlasmaCore.Units.smallSpacing * 1.5
+                         height: width
+                         radius: width / 2
+                         color: model.eventColor ? Kirigami.ColorUtils.linearInterpolation(model.eventColor, PlasmaCore.Theme.textColor, 0.2) : PlasmaCore.Theme.highlightColor
+                     }
++
++                    Component.onCompleted: rootIndex = modelIndex(index)
+                 }
+             }
+         }
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch
new file mode 100644
index 000000000000..9c0e9046496a
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch
@@ -0,0 +1,44 @@
+From 837bb6975f6a0661d211107823b7587808fc3d4e Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 15 Aug 2021 09:33:10 -0600
+Subject: [PATCH] Fix Plasma (non-Qt) icon scaling with integer scale factors
+
+An embarrassing error in 4edb830f53aac4833ece024df59441029b01fde6
+caused the function which returns an appropriate scale factor for icons
+to both take and return integer values rather than floating point
+values, preventing it from working properly with any scale factor other
+than an integer scale factor (e.g. 200%). This commit fixes that issue.
+---
+ src/declarativeimports/core/units.cpp | 2 +-
+ src/declarativeimports/core/units.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp
+index 6788ed952..fbcc6d888 100644
+--- a/src/declarativeimports/core/units.cpp
++++ b/src/declarativeimports/core/units.cpp
+@@ -174,7 +174,7 @@ int Units::roundToIconSize(int size)
+     }
+ }
+ 
+-int Units::bestIconScaleForDevicePixelRatio(const int ratio)
++qreal Units::bestIconScaleForDevicePixelRatio(const qreal ratio)
+ {
+     if (ratio < 1.5) {
+         return 1;
+diff --git a/src/declarativeimports/core/units.h b/src/declarativeimports/core/units.h
+index c19cf0dd8..855738e7d 100644
+--- a/src/declarativeimports/core/units.h
++++ b/src/declarativeimports/core/units.h
+@@ -271,7 +271,7 @@ private:
+      * Note that this function is only relevant when using Plasma scaling and
+      * when using Qt scaling, it always returns 1.
+      */
+-    static int bestIconScaleForDevicePixelRatio(const int ratio);
++    static qreal bestIconScaleForDevicePixelRatio(const qreal ratio);
+ 
+     /**
+      * @return The dpi-adjusted size for a given icon size
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.84.0.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
index 30849cdadab1..2051388092d6 100644
--- a/kde-frameworks/plasma/plasma-5.84.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 	!gles2-only? ( virtual/opengl )
 	wayland? (
 		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/mesa[egl]
+		media-libs/mesa[egl(+)]
 	)
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
@@ -61,6 +61,11 @@ DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch
+	"${FILESDIR}"/${P}-fix-pinned-calendar-dots.patch # KDE-bug 440627
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)