gentoo auto-resync : 23:09:2022 - 23:30:45

2 files changed, 88 insertions, 0 deletions

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
new file mode 100644
index 000000000000..4e2b579646fc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch
@@ -0,0 +1,55 @@
+From dc24b7c1c4e2c9dfb74090f716da029e44e209ff Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 19 Sep 2022 12:39:54 +0200
+Subject: [PATCH] fonts: honor & present system defaults
+
+previously we'd pretend that a missing value meant our "plasma-ish"
+defaults would apply but that is utterly false. when no hitting is set,
+no hinting is set. this can happen when the system default fontconfigs
+don't set up any hinting.
+
+BUG: 416140
+
+
+(cherry picked from commit 5dd8cc919f54bf28152a80e1fa6f3f649ea4e47a)
+---
+ kcms/fonts/fontsaasettings.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/kcms/fonts/fontsaasettings.cpp b/kcms/fonts/fontsaasettings.cpp
+index a7159b0e63..e7192aa89d 100644
+--- a/kcms/fonts/fontsaasettings.cpp
++++ b/kcms/fonts/fontsaasettings.cpp
+@@ -1,5 +1,6 @@
+ /*
+     SPDX-FileCopyrightText: 2020 Benjamin Port <benjamin.port@enioka.com>
++    SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
+ 
+     SPDX-License-Identifier: GPL-2.0-or-later
+ */
+@@ -211,18 +212,18 @@ public:
+         // sub pixel
+         KXftConfig::SubPixel::Type spType = KXftConfig::SubPixel::NotSet;
+         xft.getSubPixelType(spType);
+-        // if it is not set, we set it to rgb
++        // if it is not set, we have no subpixel hinting
+         if (spType == KXftConfig::SubPixel::NotSet) {
+-            spType = KXftConfig::SubPixel::Rgb;
++            spType = KXftConfig::SubPixel::None;
+         }
+         setSubPixel(spType);
+ 
+         // hinting
+         KXftConfig::Hint::Style hStyle = KXftConfig::Hint::NotSet;
+         xft.getHintStyle(hStyle);
+-        // if it is not set, we set it to slight hinting
++        // if it is not set, we have no hinting
+         if (hStyle == KXftConfig::Hint::NotSet) {
+-            hStyle = KXftConfig::Hint::Slight;
++            hStyle = KXftConfig::Hint::None;
+         }
+         setHinting(hStyle);
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
new file mode 100644
index 000000000000..457470f0807c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch
@@ -0,0 +1,33 @@
+From 9c7ac7061c5c85d63875eaee70793ba04334c1d0 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 16 Sep 2022 14:34:27 +0000
+Subject: [PATCH] Revert "Revert "Prevent panel going out of screen
+ boundaries""
+
+This reverts commit 17774bc4c673294a7c8a6e80660d83cce1ba8891
+
+There is still a known culprit (duplicate display names) so the hack shouldn't be reverted.
+
+CCBUG: 353975
+CCBUG: 438114
+---
+ shell/panelview.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index b5c87bbf71..4be1e26ca4 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -859,6 +859,9 @@ void PanelView::moveEvent(QMoveEvent *ev)
+     updateEnabledBorders();
+     m_strutsTimer.start(STRUTSTIMERDELAY);
+     PlasmaQuick::ContainmentView::moveEvent(ev);
++    if (m_screenToFollow && !m_screenToFollow->geometry().contains(geometry())) {
++        positionPanel();
++    }
+ }
+ 
+ void PanelView::keyPressEvent(QKeyEvent *event)
+-- 
+GitLab
+