From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4E9315802E for ; Wed, 3 Jul 2024 00:39:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E63A32BC017; Wed, 3 Jul 2024 00:39:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9CFA2BC017 for ; Wed, 3 Jul 2024 00:39:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCD3934164C for ; Wed, 3 Jul 2024 00:39:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DDDF1BC0 for ; Wed, 3 Jul 2024 00:39:36 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1719967151.b82f15dc07759e6099ddcd020876762a25360b85.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b82f15dc07759e6099ddcd020876762a25360b85 X-VCS-Branch: master Date: Wed, 3 Jul 2024 00:39:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69db99d4-f4f5-42ca-a69a-1d73386def47 X-Archives-Hash: f477f362f1a96d02543d5c9fb7207259 commit: b82f15dc07759e6099ddcd020876762a25360b85 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jul 2 21:27:57 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jul 3 00:39:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b82f15dc dev-qt/qtwebengine: backport wayland text rendering fix (qt6) See patch header. Tempting to revbump, albeit will still spare users for now. Will at least give stable users the fixed vresion when stabilized soon. ~testing users annoyed by this are invited to manually rebuild. Also add to 6.7.9999 so it is not forgotten with 6.7.3, "currently" not marked to be picked to the 6.7 branch for the 6.7.3 release and may or may not still be needed until 6.8.0. Signed-off-by: Ionen Wolkens gentoo.org> .../files/qtwebengine-6.7.2-QTBUG-113574.patch | 41 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 + 3 files changed, 43 insertions(+) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch new file mode 100644 index 000000000000..d8a9158c8a01 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch @@ -0,0 +1,41 @@ +Backport of [1] from 6.8/6.9 for [2]. + +[1] https://codereview.qt-project.org/c/qt/qtwebengine/+/569910 +[2] https://bugreports.qt.io/browse/QTBUG-113574 + +From 21a9add47def34322b799683e1e1daff88dc4a06 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Wed, 19 Jun 2024 10:37:45 +0100 +Subject: [PATCH] Use device pixel ratio of the window rather than the screen + +Window device pixel ratio can differ from the screen depending on the +platform. The window is the more authorative source with new events in +Qt to support that. + +In Chromium the rendering is still based off a screen factor, but each +view will have a completely independent set of screen variables, so we +can adjust the screen to match our current view. + +Chromium itself also alters the screen scale factor on a per window +basis for their own native Wayland backend or if recording a window. +--- a/src/core/render_widget_host_view_qt.cpp ++++ b/src/core/render_widget_host_view_qt.cpp +@@ -875,4 +875,9 @@ + + display::ScreenInfos newScreenInfos = screenInfosFromQtForUpdate(window->screen()); ++ ++ // We always want to use the scale from our current window ++ // This screen information is stored on a per-view basis ++ auto &screen = newScreenInfos.mutable_current(); ++ screen.device_scale_factor = window->devicePixelRatio(); + if (screen_infos_ == newScreenInfos) + return false; +--- a/src/core/render_widget_host_view_qt_delegate_item.cpp ++++ b/src/core/render_widget_host_view_qt_delegate_item.cpp +@@ -346,4 +346,6 @@ + onHide(); + } ++ } else if (change == QQuickItem::ItemDevicePixelRatioHasChanged) { ++ m_client->visualPropertiesChanged(); + } + } diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index 3726d7743a00..1ad6561ecc65 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild @@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index 3726d7743a00..1ad6561ecc65 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch ) python_check_deps() {