commit: a495637d3bf85df7b5923da57bbd86e9a3470125 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Sep 23 17:06:22 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Sep 23 20:07:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a495637d
kde-plasma/plasma-workspace: fonts: honor & present system defaults Upstream commit dc24b7c1c4e2c9dfb74090f716da029e44e209ff KDE-bug: https://bugs.kde.org/show_bug.cgi?id=416140 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...5-fonts-honor-and-present-system-defaults.patch | 55 ++++++++++++++++++++++ .../plasma-workspace-5.25.5-r3.ebuild | 1 + 2 files changed, 56 insertions(+) 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 <sit...@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.p...@enioka.com> ++ SPDX-FileCopyrightText: 2022 Harald Sitter <sit...@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/plasma-workspace-5.25.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild index d89fa2ebf96d..5e8c8067b58e 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r3.ebuild @@ -158,6 +158,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 "${FILESDIR}/${P}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html "${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6 + "${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140 ) src_prepare() {
