commit: 4e57d2b93959aa52fa3f6867d416e0469969d253 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Aug 14 00:06:33 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Aug 14 15:34:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e57d2b9
dev-qt/qtwebengine: update 6.7 and 6.8 patchsets 6.7-10 -> 6.7-11, and 6.8-2 -> 6.8-3 changes: Added: * clang19.patch (imported from files/) * musl-no-settls.patch (wrt bug #937875) 6.7-10 -> 6.7-11 specific changes: Added: * QTBUG-113574.patch (imported from files/) 6.7-11 -> 6.7-12 changes (in preparation for 6.7.3): Removed: * ninja1.12.patch (upstreamed) Technically needs a revbump for bug #937875 (runtime issue), but do not wish for every users to rebuild over a musl fix. musl users reading this are invited to `emerge -1 qtwebengine:6`. Stable users are not believed to be affected, and there's to hope 6.7.3 releases & is stabilized before musl-1.2.5 is (or a := forces a rebuild first). Closes: https://bugs.gentoo.org/937875 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/Manifest | 5 +- .../files/qtwebengine-6.7.2-QTBUG-113574.patch | 41 ------------ .../files/qtwebengine-6.7.2-clang19.patch | 76 ---------------------- dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 4 +- dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 4 +- dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 3 +- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +- 7 files changed, 7 insertions(+), 128 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index b3f79b883766..b150eeb57f17 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,5 +1,6 @@ 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-10.tar.xz 7940 BLAKE2B f3ed0e75731f29f37714ef7c0536f92a758bb1f204cf3b6aa3b9b32ab9baae27a7649d030bee5962964619692dd5888d089bf4437505d1c1c330cc4c05aca17e SHA512 db3a566a073daa34d678a06b51cf57e8818f2d42847dc9e606522040bbd3b75ae56fd41ce466880855cfdf558d680204dc5ccea8046749b18784e75aa12efe47 -DIST qtwebengine-6.8-patchset-2.tar.xz 7932 BLAKE2B 3642f619c66075e26703200818e833786a8686bf39258eee9bba95e234f79878f0b98680e8228a5b2cc39b02b0ecc36074ac96eb09f3bca145bb7aa9fd023310 SHA512 4a248d6e7bd052b5681a531fe503954aa519a8ed46cce2b3fafe8de603818f20e80a365e304f919817a6a0c12fdc517a0471f5c6dc499e648fd5405456c9fba3 +DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f +DIST qtwebengine-6.7-patchset-12.tar.xz 9788 BLAKE2B 2465c43fe859ea6edbb1c14d82f9bd41e5bda5a32a9412e25a5eac385d2125d81e72a9f80f83b4c41da82b3fb96c31ad4603ad061077a927882d165ba5f3d7e4 SHA512 a50823e486106da69de7c6010cfdfd92d3312c574d00616ae83fe54de187ea3bd6d41310a9a3951c876432542ddea23a8391580beddf1b096fdf7c7dbab37e72 +DIST qtwebengine-6.8-patchset-3.tar.xz 9260 BLAKE2B 6d4e0bcc24ecc16ce92f6d4483268e81f0d9a9cb2a351a46cd93b9103a6cedd478f3004a67380f364523db9c7c152eb4b5cb39046edaf52b223490e32d9022a2 SHA512 10982a896e61b18153fd8b38431cfba6956dacda2efd3d08d89e9617a2c1fb2d1286d32213b50ccc25046bf539862b3ba4379824526e021a5e793df986888881 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 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 deleted file mode 100644 index d8a9158c8a01..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 <[email protected]> -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/files/qtwebengine-6.7.2-clang19.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch deleted file mode 100644 index 3951fa56605a..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch +++ /dev/null @@ -1,76 +0,0 @@ -Patch status: fixed in >=chromium-127.0.6524.0 - -https://bugs.gentoo.org/937541 -https://github.com/google/perfetto/commit/e2f661907a717551235563389977b7468da6d45e -https://android-review.googlesource.com/c/platform/external/perfetto/+/3114454 -https://chromium-review.googlesource.com/c/chromium/src/+/5604664 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h -@@ -1647,5 +1647,5 @@ - } - table_ = temporary_table; -- Allocator::template BackingWriteBarrier(&table_); -+ Allocator::BackingWriteBarrier(&table_); - - HashTableBucketInitializer<Traits, Allocator, Value>::InitializeTable( -@@ -1701,5 +1701,5 @@ - // the current table has to be atomic to prevent races with concurrent marker. - AsAtomicPtr(&table_)->store(new_hash_table.table_, std::memory_order_relaxed); -- Allocator::template BackingWriteBarrier(&table_); -+ Allocator::BackingWriteBarrier(&table_); - table_size_ = new_table_size; - -@@ -1853,6 +1853,6 @@ - // there is *no* risk of data races when reading. - AtomicWriteSwap(table_, other.table_); -- Allocator::template BackingWriteBarrier(&table_); -- Allocator::template BackingWriteBarrier(&other.table_); -+ Allocator::BackingWriteBarrier(&table_); -+ Allocator::BackingWriteBarrier(&other.table_); - if (IsWeak<ValueType>::value) { - // Weak processing is omitted when no backing store is present. In case such ---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h -+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h -@@ -329,5 +329,5 @@ - - static void Flush() { -- Base::template Trace([](typename Base::TraceContext ctx) { ctx.Flush(); }); -+ Base::Trace([](typename Base::TraceContext ctx) { ctx.Flush(); }); - } - -@@ -335,6 +335,5 @@ - static bool IsEnabled() { - bool enabled = false; -- Base::template CallIfEnabled( -- [&](uint32_t /*instances*/) { enabled = true; }); -+ Base::CallIfEnabled([&](uint32_t /*instances*/) { enabled = true; }); - return enabled; - } -@@ -350,5 +349,5 @@ - const DynamicCategory& dynamic_category) { - bool enabled = false; -- Base::template Trace([&](typename Base::TraceContext ctx) { -+ Base::Trace([&](typename Base::TraceContext ctx) { - enabled = enabled || IsDynamicCategoryEnabled(&ctx, dynamic_category); - }); -@@ -497,5 +496,5 @@ - PERFETTO_DCHECK(track.uuid == desc.uuid()); - TrackRegistry::Get()->UpdateTrack(track, desc.SerializeAsString()); -- Base::template Trace([&](typename Base::TraceContext ctx) { -+ Base::Trace([&](typename Base::TraceContext ctx) { - TrackEventInternal::WriteTrackDescriptor( - track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(), -@@ -1048,5 +1047,5 @@ - using CatTraits = CategoryTraits<CategoryType>; - if (CatTraits::kIsDynamic) { -- Base::template TraceWithInstances(instances, std::move(lambda)); -+ Base::TraceWithInstances(instances, std::move(lambda)); - } else { - Base::template TraceWithInstances<CategoryTracePointTraits>( -@@ -1062,5 +1061,5 @@ - std::function<void(protos::pbzero::TrackDescriptor*)> callback) { - TrackRegistry::Get()->UpdateTrack(track, std::move(callback)); -- Base::template Trace([&](typename Base::TraceContext ctx) { -+ Base::Trace([&](typename Base::TraceContext ctx) { - TrackEventInternal::WriteTrackDescriptor( - track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(), diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index 652140a1537f..a18dca6881d4 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-11.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -110,8 +110,6 @@ 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 - "${FILESDIR}"/${PN}-6.7.2-clang19.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 084612a1d845..4315b3198309 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-12.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -110,8 +110,6 @@ 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 - "${FILESDIR}"/${PN}-6.7.2-clang19.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 894e87964faf..937f5ca9c883 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -110,7 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions - "${FILESDIR}"/${PN}-6.7.2-clang19.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 66f2a52045b6..937f5ca9c883 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then
