diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2024-08-13 20:06:33 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-08-14 11:34:23 -0400 |
| commit | 4e57d2b93959aa52fa3f6867d416e0469969d253 (patch) | |
| tree | 294820c85483cfae4876eeed59721e8b87b6f9e2 /dev-qt/qtwebengine/files | |
| parent | 1a209033b6a4f7ed41cbb5e374064c802d0fe188 (diff) | |
| download | gentoo-4e57d2b93959aa52fa3f6867d416e0469969d253.tar.gz gentoo-4e57d2b93959aa52fa3f6867d416e0469969d253.tar.bz2 gentoo-4e57d2b93959aa52fa3f6867d416e0469969d253.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine/files')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch | 41 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.7.2-clang19.patch | 76 |
2 files changed, 0 insertions, 117 deletions
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 <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/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(), |
