From 7d972c5079b88520804932edf949a71e919d4c5e2841e6f073998d980303a42f Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 4 Apr 2023 19:39:23 +0000 Subject: [PATCH] Update to 6.5.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-webengine?expand=0&rev=34 --- _constraints | 2 +- qt6-webengine.changes | 6 + qt6-webengine.spec | 128 ++++++----- qtwebengine-everywhere-src-6.4.3.tar.xz | 3 - qtwebengine-everywhere-src-6.5.0.tar.xz | 3 + qtwebengine-gcc13.patch | 283 ++++++------------------ 6 files changed, 135 insertions(+), 290 deletions(-) delete mode 100644 qtwebengine-everywhere-src-6.4.3.tar.xz create mode 100644 qtwebengine-everywhere-src-6.5.0.tar.xz diff --git a/_constraints b/_constraints index db74108..b8c5b7c 100644 --- a/_constraints +++ b/_constraints @@ -5,7 +5,7 @@ - 12 + 16 20 diff --git a/qt6-webengine.changes b/qt6-webengine.changes index b771a0e..c226eba 100644 --- a/qt6-webengine.changes +++ b/qt6-webengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 3 10:03:15 UTC 2023 - Christophe Marin + +- Update to 6.5.0 + * https://www.qt.io/blog/qt-6.5-lts-released + ------------------------------------------------------------------- Tue Mar 28 22:20:44 UTC 2023 - Christophe Marin diff --git a/qt6-webengine.spec b/qt6-webengine.spec index bfc3376..1951ddd 100644 --- a/qt6-webengine.spec +++ b/qt6-webengine.spec @@ -1,7 +1,7 @@ # # spec file for package qt6-webengine # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define real_version 6.4.3 -%define short_version 6.4 +%define real_version 6.5.0 +%define short_version 6.5 %define tar_name qtwebengine-everywhere-src %define tar_suffix %{nil} # @@ -28,21 +28,14 @@ %define pkg_suffix -docs %endif # -%if %{?suse_version} > 1500 || 0%{?sle_version} > 150300 -%bcond_without system_vpx -# icu >= 68 is required +%if 0%{?suse_version} > 1500 +# The antique version in Leap 15 is too old for building chromium +%bcond_without system_harfbuzz +# The ICU version is also too old incrementExact() appeared in ICU 71 %bcond_without system_icu -%define _use_system_icu ON -%else -%bcond_with system_vpx -%bcond_with system_icu -%define _use_system_icu OFF %endif -%bcond_without system_ffmpeg -%bcond_without system_minizip -# Name: qt6-webengine%{?pkg_suffix} -Version: 6.4.3 +Version: 6.5.0 Release: 0 Summary: Web browser engine for Qt applications License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only @@ -73,6 +66,7 @@ BuildRequires: pipewire-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-html5lib +BuildRequires: python3-importlib-metadata BuildRequires: qt6-core-private-devel BuildRequires: qt6-gui-private-devel BuildRequires: qt6-qml-private-devel @@ -80,26 +74,26 @@ BuildRequires: qt6-quick-private-devel BuildRequires: qt6-quickwidgets-private-devel BuildRequires: qt6-widgets-private-devel BuildRequires: snappy-devel -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Designer) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6GuiTools) -BuildRequires: cmake(Qt6Network) -BuildRequires: cmake(Qt6OpenGL) -BuildRequires: cmake(Qt6OpenGLWidgets) -BuildRequires: cmake(Qt6Positioning) -BuildRequires: cmake(Qt6PrintSupport) -BuildRequires: cmake(Qt6Qml) -BuildRequires: cmake(Qt6QmlModels) -BuildRequires: cmake(Qt6QmlTools) -BuildRequires: cmake(Qt6Quick) -BuildRequires: cmake(Qt6QuickControls2) -BuildRequires: cmake(Qt6QuickTest) -BuildRequires: cmake(Qt6QuickWidgets) -BuildRequires: cmake(Qt6WebChannel) -BuildRequires: cmake(Qt6WebSockets) -BuildRequires: cmake(Qt6Widgets) -BuildRequires: cmake(Qt6WidgetsTools) +BuildRequires: cmake(Qt6Core) = %{real_version} +BuildRequires: cmake(Qt6Designer) = %{real_version} +BuildRequires: cmake(Qt6Gui) = %{real_version} +BuildRequires: cmake(Qt6GuiTools) = %{real_version} +BuildRequires: cmake(Qt6Network) = %{real_version} +BuildRequires: cmake(Qt6OpenGL) = %{real_version} +BuildRequires: cmake(Qt6OpenGLWidgets) = %{real_version} +BuildRequires: cmake(Qt6Positioning) = %{real_version} +BuildRequires: cmake(Qt6PrintSupport) = %{real_version} +BuildRequires: cmake(Qt6Qml) = %{real_version} +BuildRequires: cmake(Qt6QmlModels) = %{real_version} +BuildRequires: cmake(Qt6QmlTools) = %{real_version} +BuildRequires: cmake(Qt6Quick) = %{real_version} +BuildRequires: cmake(Qt6QuickControls2) = %{real_version} +BuildRequires: cmake(Qt6QuickTest) = %{real_version} +BuildRequires: cmake(Qt6QuickWidgets) = %{real_version} +BuildRequires: cmake(Qt6WebChannel) = %{real_version} +BuildRequires: cmake(Qt6WebSockets) = %{real_version} +BuildRequires: cmake(Qt6Widgets) = %{real_version} +BuildRequires: cmake(Qt6WidgetsTools) = %{real_version} BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(epoxy) @@ -109,20 +103,21 @@ BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(glproto) -BuildRequires: pkgconfig(harfbuzz) >= 2.4.0 +%if %{with system_harfbuzz} +BuildRequires: pkgconfig(harfbuzz) +%endif %if %{with system_icu} -BuildRequires: pkgconfig(icu-i18n) >= 68 -BuildRequires: pkgconfig(icu-uc) >= 68 +BuildRequires: pkgconfig(icu-i18n) >= 71 +BuildRequires: pkgconfig(icu-uc) >= 71 %endif BuildRequires: pkgconfig(lcms2) -%if %{with system_ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) -%endif BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libevent) +BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libpulse) >= 0.9.10 BuildRequires: pkgconfig(libwebp) @@ -131,9 +126,7 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(nss) >= 3.26 BuildRequires: pkgconfig(opus) >= 1.3.1 BuildRequires: pkgconfig(re2) -%if %{with system_vpx} BuildRequires: pkgconfig(vpx) >= 1.10.0 -%endif BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) @@ -149,9 +142,7 @@ BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) -%if %{with system_minizip} BuildRequires: pkgconfig(minizip) -%endif %if "%{qt6_flavor}" == "docs" BuildRequires: qt6-tools %{qt6_doc_packages} @@ -189,8 +180,8 @@ QML files and plugins from the Qt 6 Pdf module %package -n qt6-pdf-devel Summary: Development files for the Qt 6 Pdf library Requires: libQt6Pdf6 = %{version} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6Network) +Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6Network) = %{real_version} %description -n qt6-pdf-devel Development files for the Qt 6 Pdf library. @@ -213,8 +204,8 @@ The Qt6 PdfQuick library. Summary: Development files for the Qt 6 PdfQuick library Requires: libQt6PdfQuick6 = %{version} Requires: qt6-pdf-private-devel = %{version} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6Qml) +Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6Qml) = %{real_version} %requires_eq qt6-quick-private-devel %description -n qt6-pdfquick-devel @@ -237,9 +228,9 @@ The Qt6 PdfWidgets library. %package -n qt6-pdfwidgets-devel Summary: Development files for the Qt 6 PdfWidgets library Requires: libQt6PdfWidgets6 = %{version} -Requires: cmake(Qt6Gui) +Requires: cmake(Qt6Gui) = %{real_version} Requires: cmake(Qt6Pdf) = %{real_version} -Requires: cmake(Qt6Widgets) +Requires: cmake(Qt6Widgets) = %{real_version} %description -n qt6-pdfwidgets-devel Development files for the Qt 6 PdfWidgets library. @@ -262,11 +253,11 @@ The Qt6 WebEngineCore library. %package -n qt6-webenginecore-devel Summary: Development files for the Qt 6 WebEngineCore library Requires: libQt6WebEngineCore6 = %{version} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6Network) -Requires: cmake(Qt6Positioning) -Requires: cmake(Qt6Quick) -Requires: cmake(Qt6WebChannel) +Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6Network) = %{real_version} +Requires: cmake(Qt6Positioning) = %{real_version} +Requires: cmake(Qt6Quick) = %{real_version} +Requires: cmake(Qt6WebChannel) = %{real_version} %description -n qt6-webenginecore-devel Development files for the Qt 6 WebEngineCore library. @@ -289,7 +280,7 @@ The Qt6 WebEngineQuick library. %package -n qt6-webenginequick-devel Summary: Development files for the Qt 6 WebEngineQuick library Requires: libQt6WebEngineQuick6 = %{version} -Requires: cmake(Qt6Qml) +Requires: cmake(Qt6Qml) = %{real_version} Requires: cmake(Qt6WebEngineCore) = %{real_version} %description -n qt6-webenginequick-devel @@ -312,10 +303,10 @@ The Qt6 WebEngineWidgets library. %package -n qt6-webenginewidgets-devel Summary: Development files for the Qt 6 WebEngineWidgets library Requires: libQt6WebEngineWidgets6 = %{version} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6PrintSupport) -Requires: cmake(Qt6QuickWidgets) -Requires: cmake(Qt6WebEngineCore) +Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6PrintSupport) = %{real_version} +Requires: cmake(Qt6QuickWidgets) = %{real_version} +Requires: cmake(Qt6WebEngineCore) = %{real_version} %requires_eq qt6-quick-private-devel %description -n qt6-webenginewidgets-devel @@ -353,17 +344,22 @@ export NINJAFLAGS="%{?_smp_mflags}" -DFEATURE_webengine_developer_build:BOOL=OFF \ -DFEATURE_webengine_embedded_build:BOOL=OFF \ -DFEATURE_webengine_extensions:BOOL=ON \ - -DFEATURE_webengine_printing_and_pdf:BOOL=ON \ -DFEATURE_webengine_kerberos:BOOL=ON \ -DFEATURE_webengine_native_spellchecker:BOOL=OFF \ + -DFEATURE_webengine_printing_and_pdf:BOOL=ON \ + -DFEATURE_webengine_proprietary_codecs:BOOL=ON \ + -DFEATURE_webengine_system_ffmpeg:BOOL=ON \ +%if %{without system_harfbuzz} + -DFEATURE_webengine-system-harfbuzz:BOOL=OFF \ +%endif +%if %{with system_icu} + -DFEATURE_webengine_system_icu:BOOL=ON \ +%else + -DFEATURE_webengine_system_icu:BOOL=OFF \ +%endif -DFEATURE_webengine_system_libevent:BOOL=ON \ -DFEATURE_webengine_webrtc:BOOL=ON \ -DFEATURE_webengine_webrtc_pipewire:BOOL=ON \ - -DFEATURE_webengine_system_icu:BOOL=%{_use_system_icu} \ -%if %{with system_ffmpeg} - -DFEATURE_webengine_system_ffmpeg:BOOL=ON \ - -DFEATURE_webengine_proprietary_codecs:BOOL=ON \ -%endif -DQT_BUILD_EXAMPLES:BOOL=ON %{qt6_build} diff --git a/qtwebengine-everywhere-src-6.4.3.tar.xz b/qtwebengine-everywhere-src-6.4.3.tar.xz deleted file mode 100644 index f2544d6..0000000 --- a/qtwebengine-everywhere-src-6.4.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55f85af736a1dc79a41b8d95014ba27d8fce0be44293a69e64fece7fa12b2925 -size 440562844 diff --git a/qtwebengine-everywhere-src-6.5.0.tar.xz b/qtwebengine-everywhere-src-6.5.0.tar.xz new file mode 100644 index 0000000..2fb3452 --- /dev/null +++ b/qtwebengine-everywhere-src-6.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a10da34a71b307e9ff11ec086455dd20b83d5b0ee6bda499c4ba9221e306f07 +size 411792556 diff --git a/qtwebengine-gcc13.patch b/qtwebengine-gcc13.patch index 20cc140..429a8ed 100644 --- a/qtwebengine-gcc13.patch +++ b/qtwebengine-gcc13.patch @@ -1,59 +1,47 @@ -From 8bf8d12dc49a59c04e721553de49a5616ef8c47d Mon Sep 17 00:00:00 2001 +From 9de0d8a90d9b0176542db8b54d678a9fcbb69337 Mon Sep 17 00:00:00 2001 From: Martin Negyokru Date: Fri, 3 Mar 2023 16:56:50 +0100 Subject: [PATCH] Fixes for building with GCC-13 +Pick-to: 102-based +Pick-to: 87-based Fixes: QTBUG-111697 Change-Id: I51fca3b3eb627b2617ff5c6c051fa1182671244d Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/464490 Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit 9de0d8a90d9b0176542db8b54d678a9fcbb69337) -Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/468197 --- - src/3rdparty/chromium/base/debug/profiler.h | 1 + - src/3rdparty/chromium/base/debug/stack_trace.h | 1 + - src/3rdparty/chromium/cc/trees/target_property.cc | 2 ++ - src/3rdparty/chromium/components/metrics/psi_memory_parser.h | 2 ++ - .../components/viz/common/shared_element_resource_id.h | 1 + + chromium/base/debug/profiler.h | 1 + + chromium/cc/trees/target_property.cc | 2 ++ + chromium/components/metrics/psi_memory_parser.h | 2 ++ + chromium/components/viz/common/shared_element_resource_id.h | 1 + .../content/public/browser/browsing_data_remover_delegate.h | 1 + - .../chromium/device/base/synchronization/one_writer_seqlock.h | 1 + - .../chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 + - src/3rdparty/chromium/extensions/common/constants.h | 2 ++ - .../extensions/renderer/bindings/api_invocation_errors.h | 1 + - src/3rdparty/chromium/gpu/config/gpu_feature_info.h | 1 + - src/3rdparty/chromium/net/base/parse_number.h | 2 ++ - src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h | 1 + + chromium/device/base/synchronization/one_writer_seqlock.h | 1 + + chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 + + chromium/extensions/common/constants.h | 2 ++ + chromium/extensions/renderer/bindings/api_invocation_errors.h | 1 + + chromium/gpu/config/gpu_feature_info.h | 1 + + chromium/net/base/parse_number.h | 2 ++ + chromium/net/cookies/cookie_inclusion_status.h | 1 + .../quiche/src/quiche/quic/core/crypto/quic_hkdf.h | 1 + .../quiche/src/quiche/quic/core/quic_connection_id.h | 1 + - src/3rdparty/chromium/pdf/document_attachment_info.h | 1 + + chromium/pdf/document_attachment_info.h | 1 + .../sandbox/linux/syscall_broker/broker_file_permission.h | 1 + - .../abseil-cpp/absl/strings/internal/str_format/extension.h | 1 + - .../chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 + + chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 + .../blink/public/common/bluetooth/web_bluetooth_device_id.h | 1 + + .../blink/public/common/interest_group/auction_config.h | 1 + .../public/common/origin_trials/origin_trial_public_key.h | 1 + .../platform/graphics/paint/effect_paint_property_node.h | 2 +- - .../breakpad/src/client/linux/handler/minidump_descriptor.h | 1 + - .../chromium/third_party/dawn/src/dawn/native/CacheKey.h | 1 + - .../third_party/dawn/src/tint/reader/spirv/entry_point_info.h | 1 + - .../chromium/third_party/dawn/src/tint/reader/spirv/namer.h | 1 + - .../chromium/third_party/dawn/src/tint/reader/wgsl/token.h | 1 + - .../chromium/third_party/dawn/src/tint/writer/spirv/operand.h | 1 + - .../chromium/third_party/libgav1/src/src/utils/threadpool.cc | 1 + - .../chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++ + chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++ .../third_party/perfetto/include/perfetto/ext/base/uuid.h | 1 + - .../trace_processor/importers/proto/proto_importer_module.h | 2 ++ .../vulkan_memory_allocator/include/vk_mem_alloc.h | 4 ++++ - .../desktop_capture/linux/wayland/xdg_session_details.h | 1 + .../third_party/webrtc/rtc_base/third_party/base64/base64.h | 1 + - src/3rdparty/chromium/ui/base/prediction/kalman_filter.h | 2 ++ - src/3rdparty/chromium/ui/events/types/scroll_types.h | 2 ++ - src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h | 1 + - src/3rdparty/chromium/v8/src/base/logging.h | 1 + - .../chromium/v8/src/inspector/v8-string-conversions.h | 1 + - 40 files changed, 51 insertions(+), 1 deletion(-) + chromium/ui/base/prediction/kalman_filter.h | 2 ++ + chromium/ui/events/types/scroll_types.h | 2 ++ + chromium/ui/gfx/geometry/linear_gradient.h | 1 + + 28 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h -index 1229e06..be6e272 100644 +index 5f0deadd5d3..80c73feb922 100644 --- a/src/3rdparty/chromium/base/debug/profiler.h +++ b/src/3rdparty/chromium/base/debug/profiler.h @@ -6,6 +6,7 @@ @@ -64,20 +52,8 @@ index 1229e06..be6e272 100644 #include -diff --git a/src/3rdparty/chromium/base/debug/stack_trace.h b/src/3rdparty/chromium/base/debug/stack_trace.h -index 60c3c5c..6c8021c 100644 ---- a/src/3rdparty/chromium/base/debug/stack_trace.h -+++ b/src/3rdparty/chromium/base/debug/stack_trace.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc -index 96f8c3b..eba2b20 100644 +index f6e873a01a1..714bd5efed1 100644 --- a/src/3rdparty/chromium/cc/trees/target_property.cc +++ b/src/3rdparty/chromium/cc/trees/target_property.cc @@ -2,6 +2,8 @@ @@ -90,7 +66,7 @@ index 96f8c3b..eba2b20 100644 #include "ui/gfx/animation/keyframe/target_property.h" diff --git a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h -index c1384dd..da6b5fd 100644 +index b8b22f4ab74..3d7ec9ca63a 100644 --- a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h +++ b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h @@ -5,6 +5,8 @@ @@ -103,7 +79,7 @@ index c1384dd..da6b5fd 100644 #include "base/gtest_prod_util.h" diff --git a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h -index 2aba73e..2e028fd 100644 +index b39a2d3dc18..ca3d8aedaef 100644 --- a/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h +++ b/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h @@ -5,6 +5,7 @@ @@ -115,7 +91,7 @@ index 2aba73e..2e028fd 100644 #include diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h -index 3069c85..f4614b7 100644 +index ee75332f05f..c0168281e81 100644 --- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h +++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h @@ -5,6 +5,7 @@ @@ -127,7 +103,7 @@ index 3069c85..f4614b7 100644 #include #include "base/callback_forward.h" diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h -index 6a3eeda..5253013 100644 +index 528b6683ca2..e37a16b81be 100644 --- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h +++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h @@ -6,6 +6,7 @@ @@ -135,11 +111,11 @@ index 6a3eeda..5253013 100644 #include +#include + #include #include "base/atomicops.h" - #include "base/check.h" diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h -index 3cf2914..4b05524 100644 +index 816d3405eb0..15c4004c013 100644 --- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h +++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h @@ -5,6 +5,7 @@ @@ -151,7 +127,7 @@ index 3cf2914..4b05524 100644 #include #include diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h -index 9ac68e2..fef102c 100644 +index bf6bac2b47c..b1a0d56ea64 100644 --- a/src/3rdparty/chromium/extensions/common/constants.h +++ b/src/3rdparty/chromium/extensions/common/constants.h @@ -5,6 +5,8 @@ @@ -164,7 +140,7 @@ index 9ac68e2..fef102c 100644 #include "base/strings/string_piece_forward.h" #include "build/chromeos_buildflags.h" diff --git a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h -index 4ba8de8..6352b90 100644 +index e21700ecfc4..3b704e83b06 100644 --- a/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h +++ b/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h @@ -5,6 +5,7 @@ @@ -176,7 +152,7 @@ index 4ba8de8..6352b90 100644 #include diff --git a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -index 027f1a5..70759b2 100644 +index 1a7028e4717..b9e951c0a4f 100644 --- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h +++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h @@ -5,6 +5,7 @@ @@ -188,7 +164,7 @@ index 027f1a5..70759b2 100644 #include diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h -index 4e49ab7..8655ff1 100644 +index d6adf388e6f..ea360d1c927 100644 --- a/src/3rdparty/chromium/net/base/parse_number.h +++ b/src/3rdparty/chromium/net/base/parse_number.h @@ -5,6 +5,8 @@ @@ -201,7 +177,7 @@ index 4e49ab7..8655ff1 100644 #include "net/base/net_export.h" diff --git a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h -index 2e9c319..4d723d1 100644 +index 5f289ddcd94..44f2f9eb1ff 100644 --- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h +++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h @@ -6,6 +6,7 @@ @@ -213,7 +189,7 @@ index 2e9c319..4d723d1 100644 #include #include diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h -index 6a300ed..3e30f1c 100644 +index 6a300ed0c0b..3e30f1cb02f 100644 --- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h +++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h @@ -5,6 +5,7 @@ @@ -225,7 +201,7 @@ index 6a300ed..3e30f1c 100644 #include "absl/strings/string_view.h" diff --git a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h -index 52f1501..db4d310 100644 +index 52f15017283..db4d3108497 100644 --- a/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h +++ b/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h @@ -5,6 +5,7 @@ @@ -237,7 +213,7 @@ index 52f1501..db4d310 100644 #include diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h -index 138ca2e..08f06e7 100644 +index e0fffc2ca4e..095463fcb5b 100644 --- a/src/3rdparty/chromium/pdf/document_attachment_info.h +++ b/src/3rdparty/chromium/pdf/document_attachment_info.h @@ -5,6 +5,7 @@ @@ -249,7 +225,7 @@ index 138ca2e..08f06e7 100644 diff --git a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -index 0aad3ac..3571b8a 100644 +index b167ffb099a..2347d546167 100644 --- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h +++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h @@ -6,6 +6,7 @@ @@ -260,20 +236,8 @@ index 0aad3ac..3571b8a 100644 #include #include "sandbox/sandbox_export.h" -diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -index c47536d..55e8ac8 100644 ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h -@@ -19,6 +19,7 @@ - #include - - #include -+#include - #include - #include - diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -index 18175e1..9edfd8f 100644 +index 4b76d33af2f..4db1902d1b7 100644 --- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h +++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h @@ -12,6 +12,7 @@ @@ -285,7 +249,7 @@ index 18175e1..9edfd8f 100644 #include diff --git a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -index 1fc53a3..3143003 100644 +index 7a74887af96..058870eef35 100644 --- a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h +++ b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h @@ -6,6 +6,7 @@ @@ -296,8 +260,20 @@ index 1fc53a3..3143003 100644 #include #include "third_party/blink/public/common/common_export.h" +diff --git a/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h b/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h +index 5151ab7483f..51e7e1a58f0 100644 +--- a/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h ++++ b/src/3rdparty/chromium/third_party/blink/public/common/interest_group/auction_config.h +@@ -7,6 +7,7 @@ + + #include + ++#include + #include + #include + #include diff --git a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h -index c63049b..82b2783 100644 +index c1b5f59f57e..246200991a5 100644 --- a/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h +++ b/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h @@ -6,6 +6,7 @@ @@ -309,10 +285,10 @@ index c63049b..82b2783 100644 namespace blink { diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h -index 80b3150..dc14d2c 100644 +index e40a7620795..745b7b0891f 100644 --- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h +++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h -@@ -116,7 +116,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode +@@ -122,7 +122,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode // An identifier for a document transition shared element. `id.valid()` // returns true if this has been set, and false otherwise. @@ -321,92 +297,8 @@ index 80b3150..dc14d2c 100644 // An identifier to tag shared element resources generated and cached in the // Viz process. This generated resource can be used as content for other -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h -index c7e4f2b..e491a1f 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h -@@ -33,6 +33,7 @@ - #include - #include - -+#include - #include - - #include "client/linux/handler/microdump_extra_info.h" -diff --git a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h -index 2d58d76..a0e0216 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h -@@ -19,6 +19,7 @@ - #include "dawn/common/ityp_array.h" - - #include -+#include - #include - #include - #include -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h -index 374bd83..0884eb2 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_ - #define SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_ - -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h -index fa5fc3a..6cec934 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_SPIRV_NAMER_H_ - #define SRC_TINT_READER_SPIRV_NAMER_H_ - -+#include - #include - #include - #include -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h -index 7b5b675..62b1ca7 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_WGSL_TOKEN_H_ - #define SRC_TINT_READER_WGSL_TOKEN_H_ - -+#include - #include - #include - #include // NOLINT: cpplint doesn't recognise this -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h -index 46a5deb..4c3080f 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_WRITER_SPIRV_OPERAND_H_ - #define SRC_TINT_WRITER_SPIRV_OPERAND_H_ - -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc -index a3099e1..4072cfb 100644 ---- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc -+++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc -@@ -23,6 +23,7 @@ - #if defined(__ANDROID__) || defined(__GLIBC__) - #include - #include -+#include - #endif - #include - #include diff --git a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -index d2731da..46bc87e 100644 +index d2731dac7a3..46bc87ef92a 100644 --- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h +++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h @@ -5,6 +5,8 @@ @@ -419,7 +311,7 @@ index d2731da..46bc87e 100644 namespace annotation_flags { diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h -index 1b4c538..472042f 100644 +index 1b4c53815bc..472042fabc4 100644 --- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h +++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h @@ -18,6 +18,7 @@ @@ -430,21 +322,8 @@ index 1b4c538..472042f 100644 #include #include "perfetto/ext/base/optional.h" -diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h -index c56f034..bc2386e 100644 ---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h -+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h -@@ -17,6 +17,8 @@ - #ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_IMPORTER_MODULE_H_ - #define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PROTO_IMPORTER_MODULE_H_ - -+#include -+ - #include "perfetto/ext/base/optional.h" - #include "perfetto/trace_processor/status.h" - diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h -index b7c586b..9e073d4 100644 +index b7c586b80eb..9e073d4e1b8 100644 --- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h @@ -2393,6 +2393,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock V @@ -458,20 +337,8 @@ index b7c586b..9e073d4 100644 #if VMA_RECORDING_ENABLED #include #if defined(_WIN32) -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h -index b70ac4a..7ba5555 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h -@@ -13,6 +13,7 @@ - - #include - -+#include - #include - - namespace webrtc { diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h -index ca24954..534214d 100644 +index 4190a79dc09..5a9285f0071 100644 --- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h +++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h @@ -12,6 +12,7 @@ @@ -483,7 +350,7 @@ index ca24954..534214d 100644 #include diff --git a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -index 5a0047b..6a76850 100644 +index bee3f946e9c..f7c8716ca33 100644 --- a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h +++ b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h @@ -5,6 +5,8 @@ @@ -496,7 +363,7 @@ index 5a0047b..6a76850 100644 #include "ui/gfx/geometry/matrix3_f.h" diff --git a/src/3rdparty/chromium/ui/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h -index 7ff15f0..136cebc 100644 +index be6b2779f41..dbe2e5cf746 100644 --- a/src/3rdparty/chromium/ui/events/types/scroll_types.h +++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h @@ -5,6 +5,8 @@ @@ -509,7 +376,7 @@ index 7ff15f0..136cebc 100644 enum class ScrollGranularity : uint8_t { diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -index 1ad025f..bb74ea3 100644 +index 65cd4cb07c7..ab0ce5808c3 100644 --- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h +++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h @@ -6,6 +6,7 @@ @@ -520,30 +387,6 @@ index 1ad025f..bb74ea3 100644 #include #include "ui/gfx/geometry/geometry_skia_export.h" -diff --git a/src/3rdparty/chromium/v8/src/base/logging.h b/src/3rdparty/chromium/v8/src/base/logging.h -index fdac44e..a752dba 100644 ---- a/src/3rdparty/chromium/v8/src/base/logging.h -+++ b/src/3rdparty/chromium/v8/src/base/logging.h -@@ -5,6 +5,7 @@ - #ifndef V8_BASE_LOGGING_H_ - #define V8_BASE_LOGGING_H_ - -+#include - #include - #include - #include -diff --git a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -index c1d69c1..eb33c68 100644 ---- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -+++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h -@@ -5,6 +5,7 @@ - #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - -+#include - #include - - // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may -- 2.40.0