gentoo auto-resync : 03:07:2024 - 08:05:42

4 files changed, 46 insertions, 2 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 480009b86066..b261ec235ee5 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,6 @@
 AUX qtwebengine-5.15.14_p20240510-icu-75.patch 5107 BLAKE2B fc61801f5bbf5583610afe5af8ed60a90f94a248c0aa16b94f6df96e239e9c1cfe1fc40da487d3a25fc600a798b33c5bf8384c6d6cfcd0ff9446c20aae5f8f84 SHA512 b812dc26e6135cd69df9ef3b9049509be9888e012394af3c496b03666e80c63f4c827916398d94f7499f73739ca70829108b60705d5b2329f3134dd695a029eb
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
+AUX qtwebengine-6.7.2-QTBUG-113574.patch 1696 BLAKE2B 10d4bca0527636a3934ccfdf6e52fca4ca369d07624c3b63377dc899a2f0313a936347d73dccf2f35d259f43c9c76bb7519b85339468b93b49862d3d5057f23b SHA512 bb2489a41da7b7a00fe58fee963b89e6ba8ece2c1a8f29e75169db7400a475473866c71bc78825875d007cac1e98175251b1f5fb4bdfbdd4318d32fc6f7871a2
 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
 DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5 SHA512 1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1
@@ -9,8 +10,8 @@ DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f
 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7659 BLAKE2B d930e49649e91657fbe65668a0dfe41ebd4732d4901c36f59f562094d9cb9d339157bf0f5c4e8b530270a13c8a40449ac4800ce9a17a29069be1c7177c288452 SHA512 6c621d916a502e778fb9662dba61161eb55b6ab37bd1045d5a96924bc943428b3ef28512d7838b31b4bfaa0ac43e23b10a66d67fdce2505139325cc837dd756f
 EBUILD qtwebengine-6.7.1.ebuild 10335 BLAKE2B 07a6b771a160576cd1812da7fb42bc020c603288bb2220af2d80dd5a8a1e21b324b6d040936fab0986dfa8eb19e5567b56e4b872c8315ce9321534327c31b158 SHA512 fae01a93192be9ad56c3970b523cf0c606e794944b468b95646aee20a234cb785216eae6c652a64e49b24b26c4c210daae60df1b85275973f418b9630bcfee29
-EBUILD qtwebengine-6.7.2.ebuild 10337 BLAKE2B df8461aaee9ab10b7b99f6ebcd72ce425dc3f489577e690d189a3ca1b859ab010267be175da5461fcbb81b22d534834206ffa35829200fcfae3dc68431132506 SHA512 127fa4f0abf8452bfbe1002d704fd86743e6d38fa072dee29da338886f8b47a681a909df36021255cdb28f3ad9026ea118db1374e20e98122baa789e71bd9c00
-EBUILD qtwebengine-6.7.9999.ebuild 10337 BLAKE2B df8461aaee9ab10b7b99f6ebcd72ce425dc3f489577e690d189a3ca1b859ab010267be175da5461fcbb81b22d534834206ffa35829200fcfae3dc68431132506 SHA512 127fa4f0abf8452bfbe1002d704fd86743e6d38fa072dee29da338886f8b47a681a909df36021255cdb28f3ad9026ea118db1374e20e98122baa789e71bd9c00
+EBUILD qtwebengine-6.7.2.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f
+EBUILD qtwebengine-6.7.9999.ebuild 10383 BLAKE2B a48d23b446dd01073e0250213733c41ffe0d856c2a7db95aa3d160c49e8f1ea07b93c2e8fa016ebc8477e98b781af0374b6c090b0bd45f19d873c63fe3711147 SHA512 bccd4d397ce5ed9ebe91c7c422e91f6def0af290d572261331e574bcd1f6954c7656c7272ccd5d6869766f08e457b0a96eabdb4b9e321a5f90bf8cbeda3aa03f
 EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c
 EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ae67d7f4cbe977649ad447d81fed709e92edbdeff622a8998f3b03a02a3764653ecece43d4be4df40492a18ef056d6f3b4b386145c5e5c0ce8b2a3fa0a1dcdb SHA512 8c440f9cdf9e4209c8f9079a29232126bfbcbb4c34135c20e3fd5dbd28237917cb5f8cbdcb3ba31899653aeab9615fe92af82ee27362e173a45c3441e3a5b76c
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
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 <davidedmundson@kde.org>
+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() {