gentoo resync : 17.08.2021

2 files changed, 81 insertions, 0 deletions

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
+