diff --git a/INSTALL.md b/INSTALL.md
index fcd2e9e601297e57b7f50493b354e2eb940c833f..4a10f49bbc1f309f2425965aa14eee7cdd07ca04 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -7,9 +7,9 @@ There are essentially two ways to build `client-qt`:
## Disclaimer
-Because the client-qt is multi-platforms and supporting macOS, we need a recent version of Qt to do rendering with Metal. So, Qt 6.4 is necessary.
+Because the client-qt is multi-platforms and supporting macOS, we need a recent version of Qt to do rendering with Metal. So, Qt 6.5 is necessary.
This version is generally not packaged on a lot of platforms, and to control available plugins and such, we have our own Qt packaged (available on https://jami.net on the distributions we support).
-So, you will need to get Qt 6.4 first. For this, there is 3 methods:
+So, you will need to get Qt 6.5 first. For this, there is 3 methods:
### Qt from our repo (recommended)
@@ -49,7 +49,7 @@ sudo dnf update && sudo dnf install jami-libqt
### Qt from your distribution
-If Qt 6.4 is available, you can use the packages from your distribution:
+If Qt 6.5 is available, you can use the packages from your distribution:
It should be (For now qt5 only is packaged by distributions, so names can change).
@@ -118,7 +118,7 @@ Then, you can build daemon and the client using:
If you use a Qt version that is not system-wide installed, you need to
specify its path using the `--qt` flag, e.g.
-`./build.py --install --qt=/home/<username>/Qt/6.4.1/gcc_64`.
+`./build.py --install --qt=/home/<username>/Qt/6.5.1/gcc_64`.
Now you will have the daemon in `daemon/bin/dbus/jamid` and the client in
`build/jami`. You can now run Jami using:
@@ -134,7 +134,7 @@ Notes:
## Build only the client
-In order to use the Qt Client it is necessary to have the Qt version 6.4 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download).
+In order to use the Qt Client it is necessary to have the Qt version 6.5 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download).
## Build only this repository
@@ -184,7 +184,7 @@ Only 64-bit MSVC build can be compiled.
- Download [Qt (Open Source)](https://www.qt.io/download-open-source?hsCtaTracking=9f6a2170-a938-42df-a8e2-a9f0b1d6cdce%7C6cb0de4f-9bb5-4778-ab02-bfb62735f3e5)
-- Using the online installer, install the following Qt 6.4.3 components:
+- Using the online installer, install the following Qt 6.5.3 components:
- Git 2.10.2
- MSVC 2019 64-bit
@@ -207,7 +207,7 @@ Only 64-bit MSVC build can be compiled.
| | Qt Version |
| -------------------- | ---------- |
- | Minimum requirement: | 6.4.3 |
+ | Minimum requirement: | 6.5.3 |
- Install [Python3](https://www.python.org/downloads/) for Windows
@@ -233,7 +233,7 @@ Only 64-bit MSVC build can be compiled.
- Using a new **Non-Elevated Command Prompt**
```bash
- python build.py --install --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.4.3/msvc2019_64)
+ python build.py --install --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.5.3/msvc2019_64)
```
> **SDK** Note:
@@ -276,7 +276,7 @@ Once the build has finished, you should then be able to use the Visual Studio So
```
python extras\scripts\build-windows.py --init
- python extras\scripts\build-windows.py --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.4.3/msvc2019_64)
+ python extras\scripts\build-windows.py --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.5.3/msvc2019_64)
```
## Building On MacOS
@@ -286,9 +286,9 @@ Once the build has finished, you should then be able to use the Visual Studio So
- macOS minimum version 10.15
- install python3
- download xcode
-- install Qt 6.4
+- install Qt 6.5
-Qt 6.4 can be installed via brew
+Qt 6.5 can be installed via brew
```bash
brew install qt
diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile
index 57d7166f0d359d39e56a99e1bbc5f4a31a8e44aa..28e476e9d7151bb56ccec7c9dc336333580154e6 100644
--- a/extras/packaging/gnu-linux/Makefile
+++ b/extras/packaging/gnu-linux/Makefile
@@ -46,10 +46,10 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc
# Qt versions
QT_MAJOR := 6
-QT_MINOR := 4
+QT_MINOR := 5
QT_PATCH := 3
-QT_TARBALL_CHECKSUM := 29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4
-DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-3
+QT_TARBALL_CHECKSUM := 7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb
+DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-0
DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
QT_JAMI_PREFIX := /usr/lib/libqt-jami
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_debian_11 b/extras/packaging/gnu-linux/docker/Dockerfile_debian_11
index c033deba3a85ac738200e4c11fd33b43a19baa73..8b1831a2029efe585b13e9af6670e0dceaebd109 100644
--- a/extras/packaging/gnu-linux/docker/Dockerfile_debian_11
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_debian_11
@@ -18,7 +18,7 @@ RUN /opt/prebuild-package-debian.sh qt-deps
COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
RUN /opt/prebuild-package-debian.sh jami-deps
-# Install CMake 3.19 for Qt 6
+# Install CMake 3.20 for Qt 6
ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
RUN /opt/install-cmake.sh
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4 b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
index 9b83123488f3d56bbabf9fac6bd0e12f1f11bf44..f413b1d50eb3c514cac1beec2461b86553faf2bf 100644
--- a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
@@ -70,7 +70,8 @@ RUN zypper --non-interactive install -y \
nodejs12 \
mozilla-nss-devel \
python-xml \
- python-six \
+ python3-six \
+ python3-importlib-metadata \
libxcb* \
libxkb* \
libX11-devel \
diff --git a/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-gcc13.patch b/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-gcc13.patch
deleted file mode 100644
index fec1e6a0a4a17cdb727132d0f43b97a8ff90196f..0000000000000000000000000000000000000000
--- a/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-gcc13.patch
+++ /dev/null
@@ -1,740 +0,0 @@
- qtwebengine/src/3rdparty/chromium/base/debug/profiler.h | 1 +
- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h | 1 +
- qtwebengine/src/3rdparty/chromium/base/logging.h | 2 ++
- qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc | 2 ++
- qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h | 1 +
- qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h | 1 +
- qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/common/constants.h | 2 ++
- qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h | 2 ++
- qtwebengine/src/3rdparty/chromium/net/base/parse_number.h | 1 +
- qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h | 1 +
- qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h | 1 +
- qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h | 6 ++++--
- qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h | 4 ++--
- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp | 4 ++++
- qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h | 1 +
- qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h | 2 ++
- qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h | 1 +
- qtwebengine/src/core/browsing_data_remover_delegate_qt.h | 2 ++
- 54 files changed, 71 insertions(+), 5 deletions(-)
-
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-index 1229e06234..c7ed55e70f 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_DEBUG_PROFILER_H_
- #define BASE_DEBUG_PROFILER_H_
-
-+#include <cstdint>
- #include <stddef.h>
-
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-index 60c3c5c474..6c8021cfde 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
-
-+#include <cstdint>
- #include <iosfwd>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/base/logging.h b/qtwebengine/src/3rdparty/chromium/base/logging.h
-index a3ff92f0fd..c272f796a9 100644
---- a/qtwebengine/src/3rdparty/chromium/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/logging.h
-@@ -7,6 +7,8 @@
-
- #include <stddef.h>
-
-+
-+#include <cstdint>
- #include <cassert>
- #include <cstdint>
- #include <sstream>
-diff --git a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-index 96f8c3bd7c..c3f087b1a9 100644
---- a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-+++ b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-@@ -6,6 +6,8 @@
-
- #include "ui/gfx/animation/keyframe/target_property.h"
-
-+#include <cstdint>
-+
- namespace cc {
-
- static_assert(TargetProperty::LAST_TARGET_PROPERTY <
-diff --git a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-index 2aba73ebcb..2e028fddcf 100644
---- a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-index 3069c858d3..f4614b73c6 100644
---- a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-+++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "base/callback_forward.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-index 80fd26f4f4..3f08972a7a 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
-
- #include "device/base/synchronization/one_writer_seqlock.h"
-+#include <cstdint>
-
- #include "base/threading/platform_thread.h"
-
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-index 6a3eeda565..525301379c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
-
- #include <atomic>
-+#include <cstdint>
-
- #include "base/atomicops.h"
- #include "base/check.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-index 3cf2914e10..4b0552440c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
-
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-index c24205c402..ee67ecf189 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
-
-+#include <cstdint>
- #include <map>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-index 9ac68e2be9..ef2761020d 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-@@ -10,6 +10,8 @@
- #include "build/chromeos_buildflags.h"
- #include "extensions/common/extensions_export.h"
-
-+#include <cstdint>
-+
- namespace extensions {
-
- // Scheme we serve extension content from.
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-index 4ba8de8460..6352b90196 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
-
-+#include <cstdint>
- #include <set>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-index a9c7adb5b5..943bd4e470 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-@@ -7,6 +7,8 @@
-
- #include <stdint.h>
-
-+#include <cstdint>
-+
- namespace gpu {
- namespace webgpu {
-
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-index 027f1a5af3..70759b2ae4 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-index 3ea2191b50..0a1ae11202 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_PREFERENCES_H_
- #define GPU_CONFIG_GPU_PREFERENCES_H_
-
-+#include <cstdint>
- #include <stddef.h>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-index f72970c67a..d7f0b7d492 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_CONFIG_GPU_UTIL_H_
- #define GPU_CONFIG_GPU_UTIL_H_
-
-+#include <cstdint>
-+
- #include "build/build_config.h"
- #include "gpu/config/gpu_feature_info.h"
- #include "gpu/gpu_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-index 4e49ab7112..e99d2dd7aa 100644
---- a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-@@ -7,6 +7,7 @@
-
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-+#include <cstdint>
-
- // This file contains utility functions for parsing numbers, in the context of
- // network protocols.
-diff --git a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-index 2e9c319a3d..4d723d18f2 100644
---- a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -6,6 +6,7 @@
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
-
- #include <bitset>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-index 6a300ed0c0..3e30f1cb02 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
-
-+#include <cstdint>
- #include <vector>
-
- #include "absl/strings/string_view.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-index 52f1501728..db4d310849 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-index 138ca2efec..08f06e7b8c 100644
---- a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-@@ -5,6 +5,7 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
-
-+#include <cstdint>
- #include <string>
-
-
-diff --git a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-index b4fdb9a6d3..375d3ef327 100644
---- a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-+++ b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-@@ -38,6 +38,10 @@ namespace pp {
- /// As a further optimization, we can add support for this later.
- class ThreadSafeThreadTraits {
- public:
-+
-+ typedef pp::Lock Lock;
-+ typedef pp::AutoLock AutoLock;
-+
- class RefCount {
- public:
- /// Default constructor. In debug mode, this checks that the object is being
-@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
- int32_t ref_;
- };
-
-- typedef pp::Lock Lock;
-- typedef pp::AutoLock AutoLock;
- };
-
- /// The non-thread-safe version of thread traits. Using this class as the
-diff --git a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-index 0aad3ac782..7f7a1057d7 100644
---- a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-+++ b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-@@ -5,6 +5,7 @@
- #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
- #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
-
-+#include <cstdint>
- #include <bitset>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-index c47536d63e..443f47afd0 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-@@ -18,6 +18,7 @@
-
- #include <limits.h>
-
-+#include <cstdint>
- #include <cstddef>
- #include <cstring>
- #include <ostream>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-index e13aa2221d..0ce848486d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-@@ -7,7 +7,7 @@
- #define GLSLANG_SHADERLANG_H_
-
- #include <stddef.h>
--
-+#include <cstdint>
- #include "KHR/khrplatform.h"
-
- #include <array>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-index 18175e15c7..28332857bc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-@@ -14,6 +14,7 @@
- #include <array>
- #include <string>
- #include <vector>
-+#include <cstdint>
-
- // This type is defined here to simplify ANGLE's integration with glslang for SPIR-V.
- using ShCompileOptions = uint64_t;
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-index c63049b174..82b27837b5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
-
- #include <array>
-+#include <cstdint>
-
- namespace blink {
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-index 14c5548766..43c9a8d6a5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-@@ -5,6 +5,8 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
-
-+#include <cstdint>
-+
- namespace blink {
-
- enum class DarkModeResult : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-index 80b3150b67..6377196230 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-@@ -116,7 +116,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.
-- DocumentTransitionSharedElementId document_transition_shared_element_id;
-+ cc::DocumentTransitionSharedElementId document_transition_shared_element_id;
-
- // An identifier to tag shared element resources generated and cached in the
- // Viz process. This generated resource can be used as content for other
-@@ -285,7 +285,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
- return state_.compositor_element_id;
- }
-
-- const blink::DocumentTransitionSharedElementId&
-+ const cc::DocumentTransitionSharedElementId&
- DocumentTransitionSharedElementId() const {
- return state_.document_transition_shared_element_id;
- }
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-index c7e4f2b378..f30ce91b36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-@@ -34,6 +34,7 @@
- #include <sys/types.h>
-
- #include <string>
-+#include <cstdint>
-
- #include "client/linux/handler/microdump_extra_info.h"
- #include "common/using_std_string.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-index 2d58d76cb6..139af564ea 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-@@ -18,6 +18,7 @@
- #include "dawn/common/TypedInteger.h"
- #include "dawn/common/ityp_array.h"
-
-+#include <cstdint>
- #include <bitset>
- #include <iostream>
- #include <limits>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-index 374bd8302a..0884eb2a19 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-index fa5fc3a7e9..6cec934670 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <unordered_map>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-index f378d57817..98d1336f9a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_WGSL_LEXER_H_
- #define SRC_TINT_READER_WGSL_LEXER_H_
-
-+#include <cstdint>
- #include <string>
-
- #include "src/tint/reader/wgsl/token.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-index 7b5b6754ed..62b1ca7e36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <string_view>
- #include <variant> // NOLINT: cpplint doesn't recognise this
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-index 4be648b37a..cac7238ef2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-@@ -14,6 +14,7 @@
-
- #include "src/tint/writer/spirv/instruction.h"
-
-+#include <cstdint>
- #include <utility>
-
- namespace tint::writer::spirv {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-index 46a5deb55b..4c3080ff25 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-index a3099e15db..2e6f0eea70 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-@@ -30,6 +30,7 @@
- #include <cstddef>
- #include <cstdint>
- #include <cstring>
-+#include <cstdio>
- #include <new>
- #include <utility>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-index d2731dac7a..46bc87ef92 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
-
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-index 1b4c53815b..472042fabc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "perfetto/ext/base/optional.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-index c56f0344f9..cd7824929e 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-@@ -20,6 +20,8 @@
- #include "perfetto/ext/base/optional.h"
- #include "perfetto/trace_processor/status.h"
-
-+#include <cstdint>
-+
- namespace perfetto {
-
- namespace protos {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-index 3164650728..512a26943d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -10,6 +10,10 @@
-
- #include <algorithm> // std::lower_bound
-
-+#include <string.h>
-+#include <algorithm>
-+#include <iterator>
-+
- static constexpr const char* gColorNames[] = {
- "aliceblue",
- "antiquewhite",
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-index b7c586b80e..19ccbb024a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -146,6 +146,7 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
- #endif // #if VMA_VULKAN_VERSION >= 1001000
- #endif // #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES
-
-+#include <cstdio>
- #ifndef VULKAN_H_
- #include <vulkan/vulkan.h>
- #endif
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-index 5fd37b4613..ce70405dd2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-@@ -11,6 +11,7 @@
- #ifndef CALL_RTP_DEMUXER_H_
- #define CALL_RTP_DEMUXER_H_
-
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <utility>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-index b70ac4aa59..7ba5555647 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-@@ -13,6 +13,7 @@
-
- #include <gio/gio.h>
-
-+#include <cstdint>
- #include <string>
-
- namespace webrtc {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-index ca249541d0..534214dbfa 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-index 708d6c98ac..898016d886 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
-
-+#include <cstdint>
- #include "base/component_export.h"
- #include "ui/base/ime/text_input_type.h"
-
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-index d97a696fd5..68b18d80cd 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-@@ -5,6 +5,7 @@
- #ifndef UI_EVENTS_GESTURE_EVENT_DETAILS_H_
- #define UI_EVENTS_GESTURE_EVENT_DETAILS_H_
-
-+#include <cstdint>
- #include <string.h>
-
- #include "base/check_op.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-index 7ff15f0fc5..136cebc09e 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
-
-+#include <cstdint>
-+
- namespace ui {
-
- enum class ScrollGranularity : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-index 1ad025fec1..adadf96190 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-@@ -5,6 +5,7 @@
- #ifndef UI_GFX_LINEAR_GRADIENT_H_
- #define UI_GFX_LINEAR_GRADIENT_H_
-
-+#include <cstdint>
- #include <array>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-index fdac44e31e..a752dba6a2 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_LOGGING_H_
- #define V8_BASE_LOGGING_H_
-
-+#include <cstdint>
- #include <cstring>
- #include <sstream>
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-index 61644ffe05..6fbc037437 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_MACROS_H_
- #define V8_BASE_MACROS_H_
-
-+#include <cstdint>
- #include <limits>
- #include <type_traits>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-index c1d69c18f0..eb33c6816a 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
-
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
-diff --git a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-index 4e690ffb19..dfa884cd65 100644
---- a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-+++ b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-@@ -6,6 +6,8 @@
-
- #include "content/public/browser/browsing_data_remover_delegate.h"
-
-+#include <cstdint>
-+
- namespace QtWebEngineCore {
-
- class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate {
diff --git a/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-mathops.patch b/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-mathops.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8ed8490992258dc0e63a8578b0a6804045a20950
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-mathops.patch
@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
diff --git a/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch b/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
deleted file mode 100644
index c2ca9dbceaa43d8d91cf5550e932ed4dc27f43c0..0000000000000000000000000000000000000000
--- a/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f4410fcbb093f259eaff4a20fc4266a535479235 Mon Sep 17 00:00:00 2001
-From: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
-Date: Mon, 29 May 2023 13:09:53 -0400
-Subject: [PATCH] OpenFile portal: do not use O_PATH fds
-
-Using O_PATH requires correctly specifying whether the fd is writable or
-not. Stating that the fd is writable without it actually being writable
-results into rejection on xdg-desktop-portal side. Other implementations
-like xdg-open or gtk have also moved away from O_PATH fds so this will
-make a matching implementation and avoid possible rejections from xdp.
-
-Fixes: QTBUG-113143
-Original: https://codereview.qt-project.org/c/qt/qtbase/+/475425
----
- qtbase/src/gui/platform/unix/qgenericunixservices.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-index a0e5466c58..fe0fdaa625 100644
---- a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-+++ b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-@@ -163,8 +163,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
- // handle_token (s) - A string that will be used as the last element of the @handle.
- // writable (b) - Whether to allow the chosen application to write to the file.
-
--#ifdef O_PATH
-- const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH);
-+ const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_RDONLY);
- if (fd != -1) {
- QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
- "/org/freedesktop/portal/desktop"_L1,
-@@ -174,16 +173,13 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
- QDBusUnixFileDescriptor descriptor;
- descriptor.giveFileDescriptor(fd);
-
-- const QVariantMap options = {{"writable"_L1, true}};
-+ const QVariantMap options = {};
-
- // FIXME parent_window_id
- message << QString() << QVariant::fromValue(descriptor) << options;
-
- return QDBusConnection::sessionBus().call(message);
- }
--#else
-- Q_UNUSED(url);
--#endif
-
- return QDBusMessage::createError(QDBusError::InternalError, qt_error_string());
- }
---
-2.40.1
-
diff --git a/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-fix-binary-tokenizer.patch b/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-fix-binary-tokenizer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..31a12b1fa4a8da82930a8515b2ba6465138764eb
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-fix-binary-tokenizer.patch
@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+ }
+ catch (const DeadlyImportError& e)
+ {
+- if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++ if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+ throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+ }
+ throw;
diff --git a/extras/packaging/gnu-linux/rules/debian-qt/patches/0015-remove-deleted-xkb-keys.patch b/extras/packaging/gnu-linux/rules/debian-qt/patches/0015-remove-deleted-xkb-keys.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a3ef5b389a5debc50a1f35a5aa351ced16fc7d3e
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/0015-remove-deleted-xkb-keys.patch
@@ -0,0 +1,45 @@
+diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
+index 8a2769a3ed..584d3620c9 100644
+--- a/qtbase/src/corelib/global/qnamespace.h
++++ b/qtbase/src/corelib/global/qnamespace.h
+@@ -832,10 +832,6 @@ namespace Qt {
+ Key_Dead_Small_Schwa = 0x0100128a,
+ Key_Dead_Capital_Schwa = 0x0100128b,
+ Key_Dead_Greek = 0x0100128c,
+- Key_Dead_Lowline = 0x01001290,
+- Key_Dead_Aboveverticalline = 0x01001291,
+- Key_Dead_Belowverticalline = 0x01001292,
+- Key_Dead_Longsolidusoverlay = 0x01001293,
+
+ // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
+ Key_Back = 0x01000061,
+diff --git a/qtbase/src/corelib/global/qnamespace.qdoc b/qtbase/src/corelib/global/qnamespace.qdoc
+index 78c69176d8..1623517b5a 100644
+--- a/qtbase/src/corelib/global/qnamespace.qdoc
++++ b/qtbase/src/corelib/global/qnamespace.qdoc
+@@ -1654,10 +1654,6 @@
+ \value Key_Dead_Small_Schwa
+ \value Key_Dead_Capital_Schwa
+ \value Key_Dead_Greek
+- \value Key_Dead_Lowline
+- \value Key_Dead_Aboveverticalline
+- \value Key_Dead_Belowverticalline
+- \value Key_Dead_Longsolidusoverlay
+ \value Key_Back
+ \value Key_Forward
+ \value Key_Stop
+diff --git a/qtbase/src/gui/platform/unix/qxkbcommon.cpp b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+index fc014b38e2..af1cbbd42a 100644
+--- a/qtbase/src/gui/platform/unix/qxkbcommon.cpp
++++ b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
+ Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
+ Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
+ Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
+- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
+- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
+- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
+- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+
+ // Special keys from X.org - This include multimedia keys,
+ // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/extras/packaging/gnu-linux/rules/debian-qt/patches/0016-fix-vaapi.patch b/extras/packaging/gnu-linux/rules/debian-qt/patches/0016-fix-vaapi.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9690c4cd3daa1842a13161358aba464e53d987f2
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/0016-fix-vaapi.patch
@@ -0,0 +1,29 @@
+ qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+index ec212f5a35..58bf4dce7d 100644
+--- a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
++++ b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+@@ -37,7 +37,10 @@ static Libs loadLibs()
+ return {};
+ }
+
+-constexpr size_t symbolsCount = 39
++constexpr size_t symbolsCount = 38
++#if VA_CHECK_VERSION(1, 9, 0)
++ + 1
++#endif
+ #ifdef DYNAMIC_RESOLVE_VA_DRM_SYMBOLS
+ + 1
+ #endif
+@@ -79,7 +82,9 @@ DEFINE_FUNC(vaEndPicture, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaCreateBuffer, 7, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaMapBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaUnmapBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
++#if VA_CHECK_VERSION(1, 9, 0)
+ DEFINE_FUNC(vaSyncBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
++#endif
+ DEFINE_FUNC(vaDestroyBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+
+ DEFINE_FUNC(vaCreateSurfaces, 8, VA_STATUS_ERROR_OPERATION_FAILED);
diff --git a/extras/packaging/gnu-linux/rules/debian-qt/patches/series b/extras/packaging/gnu-linux/rules/debian-qt/patches/series
index 4fc743c265ad6e0b87b83de1f2cdfcf32e988bee..705cea850c88e74a6fb2b10f45de0df4ac32adfa 100644
--- a/extras/packaging/gnu-linux/rules/debian-qt/patches/series
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/series
@@ -1,5 +1,4 @@
-0001-fix-gcc13.patch
-0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
-0003-fix-mathops.patch
-0004-fix-binary-tokenizer.patch
-0005-importlib.patch
\ No newline at end of file
+0001-fix-mathops.patch
+0002-fix-binary-tokenizer.patch
+0015-remove-deleted-xkb-keys.patch
+0016-fix-vaapi.patch
\ No newline at end of file
diff --git a/extras/packaging/gnu-linux/rules/debian/control b/extras/packaging/gnu-linux/rules/debian/control
index 135a51da0d1b6214c45576653ee833e9ab62eb4a..86d17d1170c90d3adb41f549b5df9b3c58428862 100644
--- a/extras/packaging/gnu-linux/rules/debian/control
+++ b/extras/packaging/gnu-linux/rules/debian/control
@@ -68,7 +68,7 @@ Depends: gnupg,
Replaces: jami,
jami-libclient,
jami-daemon,
- libqt-jami (>= 6.4.3),
+ libqt-jami (>= 6.5.3),
Conflicts: jami,
jami-libclient,
jami-libclient-gnome,
@@ -84,7 +84,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
jami-daemon (=${binary:Version}),
- libqt-jami (>= 6.4.3)
+ libqt-jami (>= 6.5.3)
Provides: jami-qt
Replaces: jami-all,
jami-libclient (<= 20220516.0214.9b42ad3~dfsg1-1)
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
index b40ad29a82012941d7734fdae97dc1f46f73120a..0cc87e1e3a7b4c54f294945fae929eb343044f90 100644
--- a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
@@ -26,11 +26,10 @@ License: GPLv3+
Vendor: Savoir-faire Linux Inc.
URL: https://jami.net/
Source: jami-libqt-%{version}.tar.xz
-Patch0: 0001-fix-gcc13.patch
-Patch1: 0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
-Patch2: 0003-fix-mathops.patch
-Patch3: 0004-fix-binary-tokenizer.patch
-Patch4: 0005-importlib.patch
+Patch0: 0001-fix-mathops.patch
+Patch1: 0002-fix-binary-tokenizer.patch
+Patch2: 0015-remove-deleted-xkb-keys.patch
+Patch3: 0016-fix-vaapi.patch
%global gst 0.10
%if 0%{?fedora} || 0%{?rhel} > 7
@@ -45,13 +44,13 @@ BuildRequires: bison
BuildRequires: gperf
BuildRequires: flex
BuildRequires: vulkan-devel
-BuildRequires: python-six
%if %{defined suse_version}
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg
BuildRequires: python-xml
BuildRequires: mozilla-nss-devel
%else
+BuildRequires: python-six
BuildRequires: pkgconfig(gstreamer-%{gst})
BuildRequires: pkgconfig(gstreamer-app-%{gst})
BuildRequires: pkgconfig(gstreamer-audio-%{gst})
@@ -70,7 +69,6 @@ This package contains Qt libraries for Jami.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
echo "Building Qt using %{job_count} parallel jobs"
diff --git a/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-gcc13.patch b/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-gcc13.patch
deleted file mode 100644
index fec1e6a0a4a17cdb727132d0f43b97a8ff90196f..0000000000000000000000000000000000000000
--- a/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-gcc13.patch
+++ /dev/null
@@ -1,740 +0,0 @@
- qtwebengine/src/3rdparty/chromium/base/debug/profiler.h | 1 +
- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h | 1 +
- qtwebengine/src/3rdparty/chromium/base/logging.h | 2 ++
- qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc | 2 ++
- qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h | 1 +
- qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h | 1 +
- qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/common/constants.h | 2 ++
- qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h | 2 ++
- qtwebengine/src/3rdparty/chromium/net/base/parse_number.h | 1 +
- qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h | 1 +
- qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h | 1 +
- qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h | 6 ++++--
- qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h | 4 ++--
- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp | 4 ++++
- qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h | 1 +
- qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h | 2 ++
- qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h | 1 +
- qtwebengine/src/core/browsing_data_remover_delegate_qt.h | 2 ++
- 54 files changed, 71 insertions(+), 5 deletions(-)
-
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-index 1229e06234..c7ed55e70f 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_DEBUG_PROFILER_H_
- #define BASE_DEBUG_PROFILER_H_
-
-+#include <cstdint>
- #include <stddef.h>
-
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-index 60c3c5c474..6c8021cfde 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-@@ -7,6 +7,7 @@
-
- #include <stddef.h>
-
-+#include <cstdint>
- #include <iosfwd>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/base/logging.h b/qtwebengine/src/3rdparty/chromium/base/logging.h
-index a3ff92f0fd..c272f796a9 100644
---- a/qtwebengine/src/3rdparty/chromium/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/logging.h
-@@ -7,6 +7,8 @@
-
- #include <stddef.h>
-
-+
-+#include <cstdint>
- #include <cassert>
- #include <cstdint>
- #include <sstream>
-diff --git a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-index 96f8c3bd7c..c3f087b1a9 100644
---- a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-+++ b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-@@ -6,6 +6,8 @@
-
- #include "ui/gfx/animation/keyframe/target_property.h"
-
-+#include <cstdint>
-+
- namespace cc {
-
- static_assert(TargetProperty::LAST_TARGET_PROPERTY <
-diff --git a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-index 2aba73ebcb..2e028fddcf 100644
---- a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-index 3069c858d3..f4614b73c6 100644
---- a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-+++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "base/callback_forward.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-index 80fd26f4f4..3f08972a7a 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
-
- #include "device/base/synchronization/one_writer_seqlock.h"
-+#include <cstdint>
-
- #include "base/threading/platform_thread.h"
-
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-index 6a3eeda565..525301379c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
-
- #include <atomic>
-+#include <cstdint>
-
- #include "base/atomicops.h"
- #include "base/check.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-index 3cf2914e10..4b0552440c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
-
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-index c24205c402..ee67ecf189 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
-
-+#include <cstdint>
- #include <map>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-index 9ac68e2be9..ef2761020d 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-@@ -10,6 +10,8 @@
- #include "build/chromeos_buildflags.h"
- #include "extensions/common/extensions_export.h"
-
-+#include <cstdint>
-+
- namespace extensions {
-
- // Scheme we serve extension content from.
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-index 4ba8de8460..6352b90196 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
-
-+#include <cstdint>
- #include <set>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-index a9c7adb5b5..943bd4e470 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-@@ -7,6 +7,8 @@
-
- #include <stdint.h>
-
-+#include <cstdint>
-+
- namespace gpu {
- namespace webgpu {
-
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-index 027f1a5af3..70759b2ae4 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-index 3ea2191b50..0a1ae11202 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_PREFERENCES_H_
- #define GPU_CONFIG_GPU_PREFERENCES_H_
-
-+#include <cstdint>
- #include <stddef.h>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-index f72970c67a..d7f0b7d492 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_CONFIG_GPU_UTIL_H_
- #define GPU_CONFIG_GPU_UTIL_H_
-
-+#include <cstdint>
-+
- #include "build/build_config.h"
- #include "gpu/config/gpu_feature_info.h"
- #include "gpu/gpu_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-index 4e49ab7112..e99d2dd7aa 100644
---- a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-@@ -7,6 +7,7 @@
-
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-+#include <cstdint>
-
- // This file contains utility functions for parsing numbers, in the context of
- // network protocols.
-diff --git a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-index 2e9c319a3d..4d723d18f2 100644
---- a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -6,6 +6,7 @@
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
-
- #include <bitset>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-index 6a300ed0c0..3e30f1cb02 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
-
-+#include <cstdint>
- #include <vector>
-
- #include "absl/strings/string_view.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-index 52f1501728..db4d310849 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-index 138ca2efec..08f06e7b8c 100644
---- a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-@@ -5,6 +5,7 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
-
-+#include <cstdint>
- #include <string>
-
-
-diff --git a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-index b4fdb9a6d3..375d3ef327 100644
---- a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-+++ b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-@@ -38,6 +38,10 @@ namespace pp {
- /// As a further optimization, we can add support for this later.
- class ThreadSafeThreadTraits {
- public:
-+
-+ typedef pp::Lock Lock;
-+ typedef pp::AutoLock AutoLock;
-+
- class RefCount {
- public:
- /// Default constructor. In debug mode, this checks that the object is being
-@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
- int32_t ref_;
- };
-
-- typedef pp::Lock Lock;
-- typedef pp::AutoLock AutoLock;
- };
-
- /// The non-thread-safe version of thread traits. Using this class as the
-diff --git a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-index 0aad3ac782..7f7a1057d7 100644
---- a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-+++ b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-@@ -5,6 +5,7 @@
- #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
- #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
-
-+#include <cstdint>
- #include <bitset>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-index c47536d63e..443f47afd0 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-@@ -18,6 +18,7 @@
-
- #include <limits.h>
-
-+#include <cstdint>
- #include <cstddef>
- #include <cstring>
- #include <ostream>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-index e13aa2221d..0ce848486d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-@@ -7,7 +7,7 @@
- #define GLSLANG_SHADERLANG_H_
-
- #include <stddef.h>
--
-+#include <cstdint>
- #include "KHR/khrplatform.h"
-
- #include <array>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-index 18175e15c7..28332857bc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-@@ -14,6 +14,7 @@
- #include <array>
- #include <string>
- #include <vector>
-+#include <cstdint>
-
- // This type is defined here to simplify ANGLE's integration with glslang for SPIR-V.
- using ShCompileOptions = uint64_t;
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-index c63049b174..82b27837b5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
-
- #include <array>
-+#include <cstdint>
-
- namespace blink {
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-index 14c5548766..43c9a8d6a5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-@@ -5,6 +5,8 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
-
-+#include <cstdint>
-+
- namespace blink {
-
- enum class DarkModeResult : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-index 80b3150b67..6377196230 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-@@ -116,7 +116,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.
-- DocumentTransitionSharedElementId document_transition_shared_element_id;
-+ cc::DocumentTransitionSharedElementId document_transition_shared_element_id;
-
- // An identifier to tag shared element resources generated and cached in the
- // Viz process. This generated resource can be used as content for other
-@@ -285,7 +285,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
- return state_.compositor_element_id;
- }
-
-- const blink::DocumentTransitionSharedElementId&
-+ const cc::DocumentTransitionSharedElementId&
- DocumentTransitionSharedElementId() const {
- return state_.document_transition_shared_element_id;
- }
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-index c7e4f2b378..f30ce91b36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-@@ -34,6 +34,7 @@
- #include <sys/types.h>
-
- #include <string>
-+#include <cstdint>
-
- #include "client/linux/handler/microdump_extra_info.h"
- #include "common/using_std_string.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-index 2d58d76cb6..139af564ea 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-@@ -18,6 +18,7 @@
- #include "dawn/common/TypedInteger.h"
- #include "dawn/common/ityp_array.h"
-
-+#include <cstdint>
- #include <bitset>
- #include <iostream>
- #include <limits>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-index 374bd8302a..0884eb2a19 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-index fa5fc3a7e9..6cec934670 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <unordered_map>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-index f378d57817..98d1336f9a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_WGSL_LEXER_H_
- #define SRC_TINT_READER_WGSL_LEXER_H_
-
-+#include <cstdint>
- #include <string>
-
- #include "src/tint/reader/wgsl/token.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-index 7b5b6754ed..62b1ca7e36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <string_view>
- #include <variant> // NOLINT: cpplint doesn't recognise this
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-index 4be648b37a..cac7238ef2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-@@ -14,6 +14,7 @@
-
- #include "src/tint/writer/spirv/instruction.h"
-
-+#include <cstdint>
- #include <utility>
-
- namespace tint::writer::spirv {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-index 46a5deb55b..4c3080ff25 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-index a3099e15db..2e6f0eea70 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-@@ -30,6 +30,7 @@
- #include <cstddef>
- #include <cstdint>
- #include <cstring>
-+#include <cstdio>
- #include <new>
- #include <utility>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-index d2731dac7a..46bc87ef92 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
-
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
-
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-index 1b4c53815b..472042fabc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
-
- #include <array>
-+#include <cstdint>
- #include <string>
-
- #include "perfetto/ext/base/optional.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-index c56f0344f9..cd7824929e 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-@@ -20,6 +20,8 @@
- #include "perfetto/ext/base/optional.h"
- #include "perfetto/trace_processor/status.h"
-
-+#include <cstdint>
-+
- namespace perfetto {
-
- namespace protos {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-index 3164650728..512a26943d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -10,6 +10,10 @@
-
- #include <algorithm> // std::lower_bound
-
-+#include <string.h>
-+#include <algorithm>
-+#include <iterator>
-+
- static constexpr const char* gColorNames[] = {
- "aliceblue",
- "antiquewhite",
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-index b7c586b80e..19ccbb024a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -146,6 +146,7 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
- #endif // #if VMA_VULKAN_VERSION >= 1001000
- #endif // #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES
-
-+#include <cstdio>
- #ifndef VULKAN_H_
- #include <vulkan/vulkan.h>
- #endif
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-index 5fd37b4613..ce70405dd2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-@@ -11,6 +11,7 @@
- #ifndef CALL_RTP_DEMUXER_H_
- #define CALL_RTP_DEMUXER_H_
-
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <utility>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-index b70ac4aa59..7ba5555647 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-@@ -13,6 +13,7 @@
-
- #include <gio/gio.h>
-
-+#include <cstdint>
- #include <string>
-
- namespace webrtc {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-index ca249541d0..534214dbfa 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-index 708d6c98ac..898016d886 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
-
-+#include <cstdint>
- #include "base/component_export.h"
- #include "ui/base/ime/text_input_type.h"
-
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-index d97a696fd5..68b18d80cd 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-@@ -5,6 +5,7 @@
- #ifndef UI_EVENTS_GESTURE_EVENT_DETAILS_H_
- #define UI_EVENTS_GESTURE_EVENT_DETAILS_H_
-
-+#include <cstdint>
- #include <string.h>
-
- #include "base/check_op.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-index 7ff15f0fc5..136cebc09e 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
-
-+#include <cstdint>
-+
- namespace ui {
-
- enum class ScrollGranularity : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-index 1ad025fec1..adadf96190 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-@@ -5,6 +5,7 @@
- #ifndef UI_GFX_LINEAR_GRADIENT_H_
- #define UI_GFX_LINEAR_GRADIENT_H_
-
-+#include <cstdint>
- #include <array>
- #include <string>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-index fdac44e31e..a752dba6a2 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_LOGGING_H_
- #define V8_BASE_LOGGING_H_
-
-+#include <cstdint>
- #include <cstring>
- #include <sstream>
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-index 61644ffe05..6fbc037437 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_MACROS_H_
- #define V8_BASE_MACROS_H_
-
-+#include <cstdint>
- #include <limits>
- #include <type_traits>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-index c1d69c18f0..eb33c6816a 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-+++ b/qtwebengine/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 <cstdint>
- #include <string>
-
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
-diff --git a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-index 4e690ffb19..dfa884cd65 100644
---- a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-+++ b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-@@ -6,6 +6,8 @@
-
- #include "content/public/browser/browsing_data_remover_delegate.h"
-
-+#include <cstdint>
-+
- namespace QtWebEngineCore {
-
- class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate {
diff --git a/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-mathops.patch b/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-mathops.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8ed8490992258dc0e63a8578b0a6804045a20950
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-mathops.patch
@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
diff --git a/extras/packaging/gnu-linux/rules/rpm/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch b/extras/packaging/gnu-linux/rules/rpm/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
deleted file mode 100644
index c2ca9dbceaa43d8d91cf5550e932ed4dc27f43c0..0000000000000000000000000000000000000000
--- a/extras/packaging/gnu-linux/rules/rpm/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f4410fcbb093f259eaff4a20fc4266a535479235 Mon Sep 17 00:00:00 2001
-From: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
-Date: Mon, 29 May 2023 13:09:53 -0400
-Subject: [PATCH] OpenFile portal: do not use O_PATH fds
-
-Using O_PATH requires correctly specifying whether the fd is writable or
-not. Stating that the fd is writable without it actually being writable
-results into rejection on xdg-desktop-portal side. Other implementations
-like xdg-open or gtk have also moved away from O_PATH fds so this will
-make a matching implementation and avoid possible rejections from xdp.
-
-Fixes: QTBUG-113143
-Original: https://codereview.qt-project.org/c/qt/qtbase/+/475425
----
- qtbase/src/gui/platform/unix/qgenericunixservices.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-index a0e5466c58..fe0fdaa625 100644
---- a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-+++ b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-@@ -163,8 +163,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
- // handle_token (s) - A string that will be used as the last element of the @handle.
- // writable (b) - Whether to allow the chosen application to write to the file.
-
--#ifdef O_PATH
-- const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH);
-+ const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_RDONLY);
- if (fd != -1) {
- QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
- "/org/freedesktop/portal/desktop"_L1,
-@@ -174,16 +173,13 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
- QDBusUnixFileDescriptor descriptor;
- descriptor.giveFileDescriptor(fd);
-
-- const QVariantMap options = {{"writable"_L1, true}};
-+ const QVariantMap options = {};
-
- // FIXME parent_window_id
- message << QString() << QVariant::fromValue(descriptor) << options;
-
- return QDBusConnection::sessionBus().call(message);
- }
--#else
-- Q_UNUSED(url);
--#endif
-
- return QDBusMessage::createError(QDBusError::InternalError, qt_error_string());
- }
---
-2.40.1
-
diff --git a/extras/packaging/gnu-linux/rules/rpm/patches/0002-fix-binary-tokenizer.patch b/extras/packaging/gnu-linux/rules/rpm/patches/0002-fix-binary-tokenizer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..31a12b1fa4a8da82930a8515b2ba6465138764eb
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/rpm/patches/0002-fix-binary-tokenizer.patch
@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+ }
+ catch (const DeadlyImportError& e)
+ {
+- if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++ if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+ throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+ }
+ throw;
diff --git a/extras/packaging/gnu-linux/rules/rpm/patches/0015-remove-deleted-xkb-keys.patch b/extras/packaging/gnu-linux/rules/rpm/patches/0015-remove-deleted-xkb-keys.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a3ef5b389a5debc50a1f35a5aa351ced16fc7d3e
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/rpm/patches/0015-remove-deleted-xkb-keys.patch
@@ -0,0 +1,45 @@
+diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
+index 8a2769a3ed..584d3620c9 100644
+--- a/qtbase/src/corelib/global/qnamespace.h
++++ b/qtbase/src/corelib/global/qnamespace.h
+@@ -832,10 +832,6 @@ namespace Qt {
+ Key_Dead_Small_Schwa = 0x0100128a,
+ Key_Dead_Capital_Schwa = 0x0100128b,
+ Key_Dead_Greek = 0x0100128c,
+- Key_Dead_Lowline = 0x01001290,
+- Key_Dead_Aboveverticalline = 0x01001291,
+- Key_Dead_Belowverticalline = 0x01001292,
+- Key_Dead_Longsolidusoverlay = 0x01001293,
+
+ // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
+ Key_Back = 0x01000061,
+diff --git a/qtbase/src/corelib/global/qnamespace.qdoc b/qtbase/src/corelib/global/qnamespace.qdoc
+index 78c69176d8..1623517b5a 100644
+--- a/qtbase/src/corelib/global/qnamespace.qdoc
++++ b/qtbase/src/corelib/global/qnamespace.qdoc
+@@ -1654,10 +1654,6 @@
+ \value Key_Dead_Small_Schwa
+ \value Key_Dead_Capital_Schwa
+ \value Key_Dead_Greek
+- \value Key_Dead_Lowline
+- \value Key_Dead_Aboveverticalline
+- \value Key_Dead_Belowverticalline
+- \value Key_Dead_Longsolidusoverlay
+ \value Key_Back
+ \value Key_Forward
+ \value Key_Stop
+diff --git a/qtbase/src/gui/platform/unix/qxkbcommon.cpp b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+index fc014b38e2..af1cbbd42a 100644
+--- a/qtbase/src/gui/platform/unix/qxkbcommon.cpp
++++ b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
+ Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
+ Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
+ Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
+- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
+- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
+- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
+- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+
+ // Special keys from X.org - This include multimedia keys,
+ // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/extras/packaging/gnu-linux/rules/rpm/patches/0016-fix-vaapi.patch b/extras/packaging/gnu-linux/rules/rpm/patches/0016-fix-vaapi.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9690c4cd3daa1842a13161358aba464e53d987f2
--- /dev/null
+++ b/extras/packaging/gnu-linux/rules/rpm/patches/0016-fix-vaapi.patch
@@ -0,0 +1,29 @@
+ qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+index ec212f5a35..58bf4dce7d 100644
+--- a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
++++ b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+@@ -37,7 +37,10 @@ static Libs loadLibs()
+ return {};
+ }
+
+-constexpr size_t symbolsCount = 39
++constexpr size_t symbolsCount = 38
++#if VA_CHECK_VERSION(1, 9, 0)
++ + 1
++#endif
+ #ifdef DYNAMIC_RESOLVE_VA_DRM_SYMBOLS
+ + 1
+ #endif
+@@ -79,7 +82,9 @@ DEFINE_FUNC(vaEndPicture, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaCreateBuffer, 7, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaMapBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaUnmapBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
++#if VA_CHECK_VERSION(1, 9, 0)
+ DEFINE_FUNC(vaSyncBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
++#endif
+ DEFINE_FUNC(vaDestroyBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+
+ DEFINE_FUNC(vaCreateSurfaces, 8, VA_STATUS_ERROR_OPERATION_FAILED);
diff --git a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh
index d1c0f6984fdfdb0945a7bb899d374e529ec058ee..e15185feda75ed96b58030a4b3f1bef1f643621d 100755
--- a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh
+++ b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh
@@ -44,9 +44,9 @@ LD_LIBRARY_PATH="${QT_JAMI_PREFIX}/lib:${LD_LIBRARY_PATH}"
PKG_CONFIG_PATH="${QT_JAMI_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
CMAKE_PREFIX_PATH="${QT_JAMI_PREFIX}/lib/cmake:${CMAKE_PREFIX_PATH}"
QT_MAJOR=6
-QT_MINOR=4
+QT_MINOR=5
QT_PATCH=3
-QT_RELEASE_PATCH=3
+QT_RELEASE_PATCH=0
QT_MAJOR_MINOR=${QT_MAJOR}.${QT_MINOR}
QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
@@ -54,7 +54,7 @@ QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
QT_TARBALL_URL=https://download.qt.io/archive/qt/$QT_MAJOR_MINOR/\
$QT_MAJOR_MINOR_PATCH/single/qt-everywhere-src-$QT_MAJOR_MINOR_PATCH.tar.xz
-QT_TARBALL_SHA256="29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4"
+QT_TARBALL_SHA256="7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb"
QT_TARBALL_FILE_NAME=$(basename "$QT_TARBALL_URL")
CACHED_QT_TARBALL=$TARBALLS/$QT_TARBALL_FILE_NAME
diff --git a/extras/packaging/gnu-linux/scripts/install-cmake.sh b/extras/packaging/gnu-linux/scripts/install-cmake.sh
index db868a917e5c512bee80e739634953b26f03eb72..9db2198007e51c77e71e9cd69d2d87cf29e76065 100755
--- a/extras/packaging/gnu-linux/scripts/install-cmake.sh
+++ b/extras/packaging/gnu-linux/scripts/install-cmake.sh
@@ -7,9 +7,9 @@ then
apt-get remove cmake cmake-data -y
fi
-wget https://github.com/Kitware/CMake/releases/download/v3.19.8/cmake-3.19.8-Linux-x86_64.sh \
+wget https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4-linux-x86_64.sh\
-q -O /tmp/cmake-install.sh
-echo "aa5a0e0dd5594b7fd7c107a001a2bfb5f83d9b5d89cf4acabf423c5d977863ad /tmp/cmake-install.sh" | sha256sum --check
+echo "63cb3406f5320edc94504212fe75e8625751ec21e8d5dab76d8ed67ed780066e /tmp/cmake-install.sh" | sha256sum --check
chmod u+x /tmp/cmake-install.sh
/tmp/cmake-install.sh --skip-license --prefix=/usr/local/
rm /tmp/cmake-install.sh
\ No newline at end of file
diff --git a/extras/scripts/build-windows.py b/extras/scripts/build-windows.py
index be09a42bc22f19099c28838a63ebe1a309187d6f..f3224b94815de6e092313663d55a479668086cd5 100644
--- a/extras/scripts/build-windows.py
+++ b/extras/scripts/build-windows.py
@@ -28,7 +28,7 @@ mutually exclusive required arguments:
-z, --zip Build portable archive
examples:
-1. build.py --qt=C:/Qt/6.4.3/msvc2019_64 # Build the app using a specific Qt
+1. build.py --qt=C:/Qt/6.5.3/msvc2019_64 # Build the app using a specific Qt
2. build.py --init pack --msi # Build the app and an MSI installer
3. build.py --init --tests # Build the app and run tests
build.py pack --zip --skip-build # Generate a 7z archive of the app