commit: ba3225bd988d6f3ea815e8033a0c50ea79b78b62 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 27 18:16:28 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 27 18:42:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba3225bd
kde-frameworks/qqc2-desktop-style: drop 6.7.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/qqc2-desktop-style/Manifest | 1 - ...tyle-6.7.0-use-qt-textrendering-w-highdpi.patch | 53 ---------------------- .../qqc2-desktop-style-6.7.0-r1.ebuild | 40 ---------------- 3 files changed, 94 deletions(-) diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest index e589efab838b..4024fdab3028 100644 --- a/kde-frameworks/qqc2-desktop-style/Manifest +++ b/kde-frameworks/qqc2-desktop-style/Manifest @@ -1,4 +1,3 @@ DIST qqc2-desktop-style-5.116.1.tar.xz 73068 BLAKE2B 713b863a08785f8d8a3509aad938818881e71bc2b966d10d823a805733bf2a5382337b7966a5c11c005ddf99a5e9ef377d59658568fc8cdcbdd1c35be41e1b09 SHA512 80520c19717f9150b6b0e91f45e65ef967f7fbadaff5b1f6bdab526822706a361e0094ded93826ea9fb2dc3028f8cd076e03b2067dbfc1d43ff764bc5ae5facb DIST qqc2-desktop-style-6.10.0.tar.xz 88972 BLAKE2B 45bf37292339d96531c8fe7abda489e08582d661bfba52b40d5c194788b462444d73eb860d5cc7f500316197e8a1c4f3425f35fcf64884d85ec4dddf946f392a SHA512 0075ed93195623a20fe79ca34d5b87aa8e7de00d8afbc1294804f90eb0a861fc357be5343ef57910ff21b6b6872bc695dd94e5456f4921964e778caff641d7fd -DIST qqc2-desktop-style-6.7.0.tar.xz 87720 BLAKE2B 10fe8d08c6a01e5a54206186d296229f860d3d102390f6b3e29a5a49a66e444f0991c3d613ef80d2daa101311f39d3dc9757fbcafae9cc4cd08b497b835d02c0 SHA512 4660ee29d33d6140284267ff2cfdf2721fd437f1d4cf953448ed6b1368a9e068c60eb324acf407a7c5a7eb229a3956161162a7033d03bff4341b42080bec9eac DIST qqc2-desktop-style-6.9.0.tar.xz 88324 BLAKE2B 8ce9ccbb2bbfbfe08ff6a9bb41a6548be102ed57e79f898154af5d5d7c4d897b95b90f4776467d45efe8fc872ae68cf961e7454d548fb8c21a55c02eb901c167 SHA512 057aa1448393f94dc39edbb3b45fda3d84fb5986a37c5c62ced56ebe08f29d905d28d4d25bcb484e8b264cbab395baf27387a9c62f9f84495d2038d8c0e7bd96 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 deleted file mode 100644 index 251e9d3728f6..000000000000 --- a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-6.7.0-use-qt-textrendering-w-highdpi.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e82957f5e6fc72e446239e2ee5139b93d3ceac85 Mon Sep 17 00:00:00 2001 -From: David Edmundson <k...@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 deleted file mode 100644 index 0f7867d20a4c..000000000000 --- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.7.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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 -)
