diff options
Diffstat (limited to 'dev-qt/qtwebengine/files')
3 files changed, 49 insertions, 41 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch new file mode 100644 index 000000000000..d3073b6c5ab6 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240510-gcc15.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/936416 + +Backport of two upstream commits: +* https://chromium-review.googlesource.com/c/chromium/src/+/5512719 +* https://quiche.googlesource.com/quiche/+/c1af894e0f5c4f732a983e7c93227854e203570e%5E%21/#F0 +--- a/src/3rdparty/chromium/base/containers/id_map.h ++++ b/src/3rdparty/chromium/base/containers/id_map.h +@@ -153,8 +153,8 @@ class IDMap final { + } + + const Iterator& operator=(const Iterator& iter) { +- map_ = iter.map; +- iter_ = iter.iter; ++ map_ = iter.map_; ++ iter_ = iter.iter_; + Init(); + return *this; + } +--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h ++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_interval_deque.h +@@ -198,12 +198,12 @@ class QUIC_NO_EXPORT QuicIntervalDeque { + Iterator operator+(difference_type amount) const { + Iterator copy = *this; + copy.index_ += amount; +- DCHECK(copy.index_ < copy.deque_->size()); ++ DCHECK(copy.index_ < copy.deque_->Size()); + return copy; + } + Iterator& operator+=(difference_type amount) { + index_ += amount; +- DCHECK(index_ < deque_->size()); ++ DCHECK(index_ < deque_->Size()); + return *this; + } + difference_type operator-(const Iterator& rhs) const { diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch new file mode 100644 index 000000000000..cbfa44edce31 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch @@ -0,0 +1,14 @@ +# https://bugs.gentoo.org/913923 + + Fix missing {-no,}-webengine-re2 command line options + +--- a/src/core/configure.json ++++ b/src/core/configure.json +@@ -16,6 +16,7 @@ + "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } }, + "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, + "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } }, ++ "webengine-re2": { "type": "enum", "name": "webengine-system-re2", "values": { "system": "yes", "qt": "no" } }, + "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } }, + "webengine-pepper-plugins": "boolean", + "webengine-printing-and-pdf": "boolean", 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(); - } - } |