5 files changed, 100 insertions, 1 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 7f0fc2a97177..c990774caaf9 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index e6add1a7c043..c696495a7868 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,9 +1,11 @@
+AUX qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch 2515 BLAKE2B 63c7c6b76ba832ed47f9fd1d9e45f330bb41f893c5e600ac8d649ca3a53700f209ceeba9e3cc9725c75000cd31573a66a52c4d724bedf956e344507bbc0736a0 SHA512 3b885094d7f4be4f22f979926177cbe3e343a979a3cce61f70afe83352946de9d85a94eaea2510fffb7f3168926636881c65f414d70be126224ea3863a1f8cc6
 DIST qqc2-desktop-style-5.116.1.tar.xz 73068 BLAKE2B 713b863a08785f8d8a3509aad938818881e71bc2b966d10d823a805733bf2a5382337b7966a5c11c005ddf99a5e9ef377d59658568fc8cdcbdd1c35be41e1b09 SHA512 80520c19717f9150b6b0e91f45e65ef967f7fbadaff5b1f6bdab526822706a361e0094ded93826ea9fb2dc3028f8cd076e03b2067dbfc1d43ff764bc5ae5facb
 DIST qqc2-desktop-style-6.6.0.tar.xz 87472 BLAKE2B 18aff83ea6a83e6426a15ec5a7af4ece5146ba3276272a2f0d5c67089f44e8f93c40d2b4083dcb4d0aa7ba3c85c4c3efd549b1d37fc07494a22600600dad2d88 SHA512 2b48f438a613d90b7033d1ff3b903408c480dfa57ceada81af15e109e06eb3d7ca78364652278ea5bc2f08961e156818165f1b658229b0c53844e2ebc1e17fea
 DIST qqc2-desktop-style-6.7.0.tar.xz 87720 BLAKE2B 10fe8d08c6a01e5a54206186d296229f860d3d102390f6b3e29a5a49a66e444f0991c3d613ef80d2daa101311f39d3dc9757fbcafae9cc4cd08b497b835d02c0 SHA512 4660ee29d33d6140284267ff2cfdf2721fd437f1d4cf953448ed6b1368a9e068c60eb324acf407a7c5a7eb229a3956161162a7033d03bff4341b42080bec9eac
 DIST qqc2-desktop-style-6.8.0.tar.xz 87748 BLAKE2B e39cf26a741d7ce584a1d9a3427c614d010c2961adbc0923129ba05e691a6af84f232316f4c018517258c576bb48cb5800f695bcfed4161b6b2f1faad172dd66 SHA512 5e362c713a6f72e759fc09fcac563094b6c0d2aa5616ac5569147aa7a3c93b1858f122161bcee02dd161f4dd40f6cd6c6df76d7c3a2af8cec660646e72324b5c
 EBUILD qqc2-desktop-style-5.116.1.ebuild 808 BLAKE2B 8b4d1cc19b59bac2b5bb4370536588312f31dc82fa47d26fce75df5e3065c89266991bbf3bdfcb827620f4c14d8e43b51e102fe326d548c832f02a870925646f SHA512 1f19b438f5548d925d9290180e5da98d601899551586ca1aa203135aa81bea26c01839dda38defe3802d7cb6c193002a2ebf8434e6dcec92dd612a433600e51b
 EBUILD qqc2-desktop-style-6.6.0.ebuild 952 BLAKE2B f91fc15329ea5856014d900896a64c613d2dfc982b7460e95db52d8aad0eccc77950c8bc21dba473f215b7635d84589c70421b691f431bfa84e0024da80fab8e SHA512 41386fb76222b9493560e670638785f6f6188cd94e9296cf96575cbd4da10ac0f0c5ded8bbe227c4fc491b8bf80cf364e093ef18b38732b25741472916337294
+EBUILD qqc2-desktop-style-6.7.0-r1.ebuild 1042 BLAKE2B 0513842202811fc070ad3cf0328f2387780f70e99bddc7d0313943df86808598808c351f85e1afb536048ba3fd31e778a798f17c9ad1080ad338a1c321532ed3 SHA512 54dba885ac415b37b87860bedda3257ba87ea27dff403b33ef42ac45edb8f90e5364d064fd4c5166fdab5051016eff17a011ebb37d805da5be51615019ae17d0
 EBUILD qqc2-desktop-style-6.7.0.ebuild 953 BLAKE2B 1d3b56e0175696e7b3059edab538e1e503c33061013ce6dacf0e6fc4033aa4ef84b7052a4c10838fe91d0e316282792380d046873ec56975738b7a65e49b4069 SHA512 cb9402f1e114456a8ac0c518ab3047e2bace3a2a546126b8265a4abaa2e9f8fed6c1aca7f6475377c62a2464bcbd253893a2907fd05811eb426e828d4768de8d
-EBUILD qqc2-desktop-style-6.8.0.ebuild 954 BLAKE2B bf1863d1ec5cfc39c33896e4fbe49a7191edbc15236638907b831dba20f43e359da43699015b1b5f6b3823132a3623d20c659694ef9b6ffe687e13e8cc38a6fe SHA512 50ccacc107af774b529c0a23f32216929bc591a1922b90e853291ed9f9549930f4a79e4bd441df194875656603e2941babe120150cc3f5ff3641535c495236b0
+EBUILD qqc2-desktop-style-6.8.0-r1.ebuild 1049 BLAKE2B ccf9a7fd894e36975a3f4c70ed11054fda8f9630920440a1646f474dc3759d812939a57faa726fa68594ddf80f0607a5241c9a4b780c8a2912d374ff96181b08 SHA512 f36bbbe4c4ceceba06899faf874992d7bffa0aa572a063413f277ac6934da897fca203b3ab642844d790c6fff92c492ac5496179aa82dd118f09beb29e4ec1fe
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch
new file mode 100644
index 000000000000..251e9d3728f6
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch
@@ -0,0 +1,53 @@
+From e82957f5e6fc72e446239e2ee5139b93d3ceac85 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 22 Nov 2024 21:57:01 +0000
+Subject: [PATCH] Use Qt text rendering when high DPI scaling
+
+It is known that native rendering performs badly with scaling and an
+existing workaround is in place.
+
+The current check does not work on Wayland that has per-window rather
+than per-screen scaling. Given Qt changes hinting preferences when any
+scaling is used anyway, we may as well commit to using the non-native
+rendering throughout.
+
+For QtQuick the Qt renderer is more performant, handles transformations
+better and avoids this issue. Given the results look basically
+identical, we can simplify the existing code.
+
+BUG: 479891
+---
+ .../plasmadesktoptheme.cpp                      | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
+index 51a3241f..fac0831f 100644
+--- a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
++++ b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
+@@ -50,14 +50,15 @@ public:
+         connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, this, &StyleSingleton::notifyWatchersConfigurationChange);
+         qGuiApp->installEventFilter(this);
+ 
+-        // Use NativeTextRendering as the default text rendering type when the scale factor is an integer.
+-        // NativeTextRendering is still distorted sometimes with fractional scale factors,
+-        // despite https://bugreports.qt.io/browse/QTBUG-67007 being closed.
+-        qreal devicePixelRatio = qGuiApp->devicePixelRatio();
+-        QQuickWindow::TextRenderType defaultTextRenderType =
+-            int(devicePixelRatio) == devicePixelRatio ? QQuickWindow::NativeTextRendering : QQuickWindow::QtTextRendering;
+-        QQuickWindow::setTextRenderType(defaultTextRenderType);
+-
++        // NativeTextRendering is still distorted sometimes with fractional scale factors
++        // Given Qt disables all hinting with native rendering when any scaling is used anyway
++        // we can use Qt's rendering throughout
++        // QTBUG-126577
++        if (qApp->devicePixelRatio() == 1.0) {
++            QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
++        } else {
++            QQuickWindow::setTextRenderType(QQuickWindow::QtTextRendering);
++        }
+         smallFont = loadSmallFont();
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild
new file mode 100644
index 000000000000..66285380137c
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# Qt_6_PRIVATE_API matches org.kde.desktop.so, see also:
+# https://invent.kde.org/frameworks/qqc2-desktop-style/-/merge_requests/379
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6=
+	=kde-frameworks/kcolorscheme-${PVCUT}*:6
+	=kde-frameworks/kconfig-${PVCUT}*:6
+	=kde-frameworks/kiconthemes-${PVCUT}*:6
+	=kde-frameworks/kirigami-${PVCUT}*:6
+	=kde-frameworks/sonnet-${PVCUT}*:6[qml]
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-qt-textrendering-w-highdpi.patch" # KDE-bug #479891
+)
+
+CMAKE_SKIP_TESTS=(
+	# bug 926509
+	animationspeedmodifiertest
+)
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.8.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.8.0-r1.ebuild
index d69938e4187e..f63d2fa1dfd0 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.8.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.8.0-r1.ebuild
@@ -30,6 +30,10 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-6.7.0-use-qt-textrendering-w-highdpi.patch" # KDE-bug #479891
+)
+
 CMAKE_SKIP_TESTS=(
 	# bug 926509
 	animationspeedmodifiertest