packaging: migrate from Qt 6.2.3 to 6.4.3

Python2 is removed from Debian stable/unstable and latest Ubuntu. So, we need to use a newest version of Qt (here Qt 6.4.3). Change-Id: I6c8b1eee644aab787d54e467f64011762ffd7548
2025-04-21 21:52:03 +02:00 · 2023-01-18 09:19:42 -05:00 · 2023-01-18 09:19:42 -05:00 · 4d2c55348b
commit 4d2c55348b
parent 2c97fea14d
24 changed files with 335 additions and 918 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -145,7 +145,7 @@ set(CMAKE_MODULE_PATH
  ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
 find_package(LibJami REQUIRED)
 if(LIBJAMI_FOUND)
-  include_directories(${LIBJAMI_INCLUDE_DIR})
+  include_directories(${LIBJAMI_INCLUDE_DIRS})
 endif()

 include(FindPython3)
--- a/extras/build/cmake/modules/FindLibJami.cmake
+++ b/extras/build/cmake/modules/FindLibJami.cmake
@ -20,19 +20,30 @@

 # Once done, this find module will set:
 #
-#   LIBJAMI_INCLUDE_DIR - libjami include directory
+#   LIBJAMI_INCLUDE_DIRS - libjami include directories
 #   LIBJAMI_FOUND - whether it was able to find the include directories
 #   LIBJAMI_LIB - path to libjami or libring library

 set(LIBJAMI_FOUND true)

 if(WITH_DAEMON_SUBMODULE)
-  set(LIBJAMI_INCLUDE_DIR ${DAEMON_DIR}/src/jami)
+  set(LIBJAMI_INCLUDE_DIRS ${DAEMON_DIR}/src/jami)
+else()
+  if(EXISTS ${LIBJAMI_INCLUDE_DIR}/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_INCLUDE_DIR})
+  elseif(EXISTS ${LIBJAMI_BUILD_DIR}/jami/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_BUILD_DIR}/jami)
+  elseif(EXISTS ${RING_INCLUDE_DIR}/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${RING_INCLUDE_DIR})
+  elseif(EXISTS ${RING_BUILD_DIR}/jami/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
+  elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
+  elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami)
  else()
-  find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
-  if(NOT LIBJAMI_INCLUDE_DIR)
    message(STATUS "Jami daemon headers not found!
-To build using the daemon git submodule, set -DWITH_DAEMON_SUBMODULE")
+Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
    set(LIBJAMI_FOUND false)
  endif()
 endif()
@ -104,5 +115,5 @@ endif()
 # Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES.
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig})

-message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
+message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIRS})
 message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
--- 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 := 2
+QT_MINOR := 4
 QT_PATCH := 3
-QT_TARBALL_CHECKSUM := f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771
-DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-2
+QT_TARBALL_CHECKSUM := 29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4
+DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-1
 DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
 QT_JAMI_PREFIX := /usr/lib/libqt-jami

@ -158,11 +158,9 @@ endif
 # Traditionally built packages (in Docker containers).
 #
 DISTRIBUTIONS := \
-	debian_10 \
 	debian_11 \
 	debian_testing \
 	debian_unstable \
-	ubuntu_18.04 \
 	ubuntu_20.04 \
 	ubuntu_22.04 \
 	ubuntu_22.10 \
--- a/extras/packaging/gnu-linux/docker/Dockerfile_debian_10
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_debian_10
@ -1,46 +0,0 @@
-FROM debian:buster
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update -y
-RUN apt-get install -y -o Acquire::Retries=10 \
-        devscripts \
-        apt-utils \
-        equivs \
-        gcc-8 \
-        g++-8 \
-        clang \
-        clang-tools \
-        libarchive-dev \
-        wget
-
-ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
-
-COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
-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
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-
-# Install CMake 3.19 for Qt 6
-ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
-RUN /opt/install-cmake.sh
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt install nodejs -y
-
-ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-RUN wget https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz -q -O /tmp/binutils.xz \
-    && cd /tmp/ \
-    && tar xvf binutils.xz \
-    && cd binutils-2.37 \
-    && ./configure \
-    && make \
-    && make install
-
-CMD ["/opt/build-package-debian.sh"]
--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
@ -32,6 +32,7 @@ RUN dnf install -y \
        libXfixes-devel \
        yasm \
        python2.7 \
+        python3-html5lib \
        speex-devel \
        gsm-devel \
        chrpath \
@ -97,7 +98,8 @@ RUN dnf install -y \
        ninja-build \
        clang \
        cmake \
-        fmt-devel
+        fmt-devel \
+        cups-devel #Chromium for Qt

 ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh

--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37
@ -33,6 +33,7 @@ RUN dnf install -y \
        libXfixes-devel \
        yasm \
        python2.7 \
+        python3-html5lib \
        speex-devel \
        gsm-devel \
        chrpath \
@ -98,7 +99,8 @@ RUN dnf install -y \
        ninja-build \
        clang \
        cmake \
-        fmt-devel
+        fmt-devel \
+        cups-devel #Chromium for Qt

 ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh

--- a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
@ -62,6 +62,7 @@ RUN zypper --non-interactive install -y \
        gtk3-devel\
        qrencode-devel \
        python3-python-dateutil \
+        python3-html5lib \
        libsndfile-devel \
        libdrm \
        gperf \
--- a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_18.04
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_18.04
@ -1,40 +0,0 @@
-FROM ubuntu:18.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y -o Acquire::Retries=10 \
-        devscripts \
-        equivs \
-        curl \
-        gcc-8 \
-        g++-8 \
-        clang \
-        clang-tools \
-        libarchive-dev \
-        software-properties-common \
-        wget
-
-# nodejs (more recent version needed for building libqt-jami)
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt install nodejs -y
-
-ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
-
-COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
-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
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-
-# Install CMake 3.19 for Qt 6
-ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
-RUN /opt/install-cmake.sh
-
-ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
-CMD ["/opt/build-package-debian.sh"]
--- a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04
@ -10,6 +10,10 @@ RUN apt-get update && \
        python-is-python3 \
        wget

+# nodejs
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN apt install nodejs -y
+
 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh

 COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
@ -21,9 +25,6 @@ RUN /opt/prebuild-package-debian.sh jami-deps
 # Install CMake 3.19 for Qt 6
 ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
 RUN /opt/install-cmake.sh
-# nodejs
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt install nodejs -y

 ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
 CMD ["/opt/build-package-debian.sh"]
--- a/extras/packaging/gnu-linux/rules/debian-qt/control
+++ b/extras/packaging/gnu-linux/rules/debian-qt/control
@ -91,6 +91,7 @@ Build-Depends: debhelper (>= 9),
               libgl1-mesa-dri,
 # pkg-kde-tools (>= 0.15.17~),
               python3:any,
+               python3-html5lib,
 # qtbase5-private-dev (>= 5.15.2+dfsg~),
               xauth <!nocheck>,
               xvfb <!nocheck>,
--- 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
@ -2,49 +2,38 @@
 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/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/bluetooth/public/cpp/bluetooth_uuid.h                            | 1 +
- qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h               | 1 +
+ .../chromium/content/public/browser/browsing_data_remover_delegate.h  | 1 +
+ .../chromium/device/base/synchronization/one_writer_seqlock.cc        | 1 +
+ .../extensions/browser/api/audio/audio_device_id_calculator.h         | 1 +
 qtwebengine/src/3rdparty/chromium/extensions/common/constants.h       | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h                            | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h                                           | 1 +
+ .../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/quic/core/crypto/quic_hkdf.h                 | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.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/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/angle/src/common/angleutils.h                               | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h          | 2 ++
- .../src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.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 +
- .../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/src/vk_mem_alloc.h                  | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.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 +
+ .../ppapi/utility/completion_callback_factory_thread_traits.h         | 6 ++++--
+ .../abseil-cpp/absl/strings/internal/str_format/extension.h           | 1 +
+ .../3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h  | 2 +-
+ .../3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h  | 1 +
+ .../third_party/blink/renderer/platform/graphics/dark_mode_types.h    | 2 ++
+ .../breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h  | 1 +
+ .../3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc | 1 +
+ .../3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++
+ .../chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h    | 1 +
+ .../src/trace_processor/importers/proto/proto_importer_module.h       | 2 ++
+ .../src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp | 4 ++++
+ .../src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h       | 1 +
+ .../chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h  | 1 +
+ .../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/v8/src/base/logging.h               | 1 +
 qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h                | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h                                    | 3 +++
- qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h                                | 1 +
+ .../src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h    | 1 +
 qtwebengine/src/core/browsing_data_remover_delegate_qt.h              | 2 ++
- 43 files changed, 61 insertions(+), 3 deletions(-)
+ 32 files changed, 48 insertions(+), 3 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
+index 1229e06..c7ed55e 100644
 --- a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
 +++ b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
@@ -5,6 +5,7 @@
@ -56,7 +45,7 @@ index 1229e06234..c7ed55e70f 100644
 
 #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 618e1e3769..bd0faf99ef 100644
+index 60c3c5c..6c8021c 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 @@
@ -68,7 +57,7 @@ index 618e1e3769..bd0faf99ef 100644
 #include <string>
 
 diff --git a/qtwebengine/src/3rdparty/chromium/base/logging.h b/qtwebengine/src/3rdparty/chromium/base/logging.h
-index c4db4c92dc..602560db1a 100644
+index a3ff92f..c272f79 100644
 --- a/qtwebengine/src/3rdparty/chromium/base/logging.h
 +++ b/qtwebengine/src/3rdparty/chromium/base/logging.h
@@ -7,6 +7,8 @@
@ -81,7 +70,7 @@ index c4db4c92dc..602560db1a 100644
 #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
+index 96f8c3b..c3f087b 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 @@
@ -94,7 +83,7 @@ index 96f8c3bd7c..c3f087b1a9 100644
 
 static_assert(TargetProperty::LAST_TARGET_PROPERTY <
 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 3896bc6e78..b93843dc16 100644
+index 3069c85..f4614b7 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 @@
@ -106,7 +95,7 @@ index 3896bc6e78..b93843dc16 100644
 #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 213b6301c0..9332e37e6f 100644
+index 80fd26f..3f08972 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 @@
@ -115,34 +104,10 @@ index 213b6301c0..9332e37e6f 100644
 #include "device/base/synchronization/one_writer_seqlock.h"
 +#include <cstdint>
 
- namespace device {
+ #include "base/threading/platform_thread.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 0c27ae7105..b64f82f754 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 <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h b/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h
-index afcaf9e4d1..5401e893a3 100644
--- a/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_FIDO_FIDO_TRANSPORT_PROTOCOL_H_
- #define DEVICE_FIDO_FIDO_TRANSPORT_PROTOCOL_H_
-
-+#include <cstdint>
- #include <string>
-
- #include "base/component_export.h"
 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 9d2858177e..d263f67032 100644
+index c24205c..ee67ecf 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 @@
@ -154,12 +119,12 @@ index 9d2858177e..d263f67032 100644
 #include <string>
 
 diff --git a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-index 782a171adf..867de7c240 100644
+index 9ac68e2..ef27610 100644
 --- a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
 +++ b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-@@ -11,6 +11,8 @@
- #include "components/services/app_service/public/mojom/types.mojom.h"
- #include "ui/base/layout.h"
+@@ -10,6 +10,8 @@
+ #include "build/chromeos_buildflags.h"
+ #include "extensions/common/extensions_export.h"
 
 +#include <cstdint>
 +
@ -167,32 +132,20 @@ index 782a171adf..867de7c240 100644
 
 // Scheme we serve extension content from.
 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 83615b30c8..8fa9fb1f6d 100644
+index a9c7adb..943bd4e 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
-@@ -5,6 +5,8 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
- #define 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/device_perf_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h
-index e33874ba3b..824a207a22 100644
--- a/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_
- #define GPU_CONFIG_DEVICE_PERF_INFO_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
 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
+index 027f1a5..70759b2 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 @@
@ -204,7 +157,7 @@ index 027f1a5af3..70759b2ae4 100644
 #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 f4077c21d7..d0420d5631 100644
+index 3ea2191..0a1ae11 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 @@
@ -216,7 +169,7 @@ index f4077c21d7..d0420d5631 100644
 #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 fa2450f3db..1125d3da53 100644
+index f72970c..d7f0b7d 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 @@
@ -228,68 +181,8 @@ index fa2450f3db..1125d3da53 100644
 #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 0b4cfc1f8e..6f197966e2 100644
--- a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-@@ -5,6 +5,7 @@
- #ifndef NET_BASE_PARSE_NUMBER_H_
- #define NET_BASE_PARSE_NUMBER_H_
-
-+#include <cstdint>
- #include "base/compiler_specific.h"
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-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 3247c6269f..76efd3f01d 100644
--- a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -5,6 +5,7 @@
- #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h
-index 9a14bc4649..8302073d8f 100644
--- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h
-@@ -6,6 +6,7 @@
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
-
- #include <vector>
-+#include <cstdint>
-
- #include "absl/strings/string_view.h"
- #include "quic/platform/api/quic_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h
-index c77219eb32..d3aa92be05 100644
--- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h
-@@ -8,6 +8,7 @@
- #include <map>
- #include <string>
- #include <vector>
-+#include <cstdint>
-
- #include "absl/strings/string_view.h"
- #include "quic/platform/api/quic_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-index 254398e622..8f03f9be85 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 "base/strings/string16.h"
-
- namespace chrome_pdf {
 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 ac0b31a75c..5d1c421d03 100644
+index b4fdb9a..375d3ef 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 {
@ -313,7 +206,7 @@ index ac0b31a75c..5d1c421d03 100644
 
 /// The non-thread-safe version of thread traits. Using this class as the
 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 a9b9e137de..562327f1c4 100644
+index c47536d..443f47a 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 @@
@ -325,7 +218,7 @@ index a9b9e137de..562327f1c4 100644
 #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 e9b79943dd..18428a5946 100644
+index e13aa22..0ce8484 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 @@
@ -338,7 +231,7 @@ index e9b79943dd..18428a5946 100644
 
 #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 a8f3bb28c6..bd9e105835 100644
+index 18175e1..2833285 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 @@
@ -347,22 +240,10 @@ index a8f3bb28c6..bd9e105835 100644
 #include <vector>
 +#include <cstdint>
 
- // This type is defined here to simplify ANGLE's integration with glslang for SPIRv.
+ // 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/angle/src/common/angleutils.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-index d132a72e8c..f49ba32d49 100644
--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-@@ -22,6 +22,7 @@
- #include <climits>
- #include <cstdarg>
- #include <cstddef>
-+#include <cstdint>
- #include <set>
- #include <sstream>
- #include <string>
 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
+index 14c5548..43c9a8d 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 @@
@ -375,7 +256,7 @@ index 14c5548766..43c9a8d6a5 100644
 
 enum class DarkModeResult : uint8_t {
 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
+index c7e4f2b..f30ce91 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 @@
@ -387,7 +268,7 @@ index c7e4f2b378..f30ce91b36 100644
 #include "client/linux/handler/microdump_extra_info.h"
 #include "common/using_std_string.h"
 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
+index a3099e1..2e6f0ee 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 @@
@ -399,7 +280,7 @@ index a3099e15db..2e6f0eea70 100644
 #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
+index d2731da..46bc87e 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 @@
@ -412,7 +293,7 @@ index d2731dac7a..46bc87ef92 100644
 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
+index 1b4c538..472042f 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 @@
@ -424,12 +305,12 @@ index 1b4c53815b..472042fabc 100644
 
 #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 dda2f85759..158b5e8baa 100644
+index c56f034..cd78249 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
-@@ -21,6 +21,8 @@
+@@ -20,6 +20,8 @@
+ #include "perfetto/ext/base/optional.h"
 #include "perfetto/trace_processor/status.h"
- #include "src/trace_processor/trace_blob_view.h"
 
 +#include <cstdint>
 +
@ -437,12 +318,12 @@ index dda2f85759..158b5e8baa 100644
 
 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 7260365b2c..503ed08ff6 100644
+index 3164650..512a269 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
-@@ -8,6 +8,10 @@
+@@ -10,6 +10,10 @@
 
- #include "include/utils/SkParse.h"
+ #include <algorithm> // std::lower_bound
 
 +#include <string.h>
 +#include <algorithm>
@ -451,20 +332,8 @@ index 7260365b2c..503ed08ff6 100644
 static constexpr const char* gColorNames[] = {
     "aliceblue",
     "antiquewhite",
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
-index 917e369c6d..0795b1d683 100644
--- a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
-@@ -3844,6 +3844,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(
- #ifdef VMA_IMPLEMENTATION
- #undef VMA_IMPLEMENTATION
-
-+#include <cstdio>
- #include <cstdint>
- #include <cstdlib>
- #include <cstring>
 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 b89f154072..8ebf6a42c3 100644
+index 5fd37b4..ce70405 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 @@
@ -473,10 +342,10 @@ index b89f154072..8ebf6a42c3 100644
 
 +#include <cstdint>
 #include <map>
- #include <set>
 #include <string>
+ #include <utility>
 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 7a936f23e7..21951a1d24 100644
+index ca24954..534214d 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 @@
@ -488,31 +357,31 @@ index 7a936f23e7..21951a1d24 100644
 #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 5e4f410d12..722e73d053 100644
+index 708d6c9..898016d 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
-@@ -5,6 +5,7 @@
- #ifndef UI_BASE_IME_LINUX_LINUX_INPUT_METHOD_CONTEXT_H_
- #define 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 "base/strings/string16.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 668f07489e..8357414e83 100644
+index d97a696..68b18d8 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_DETECTION_GESTURE_EVENT_DETAILS_H_
- #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
+ #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
+index 7ff15f0..136cebc 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 @@
@ -525,7 +394,7 @@ index 7ff15f0fc5..136cebc09e 100644
 
 enum class ScrollGranularity : uint8_t {
 diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-index fe39f98822..dbe130581c 100644
+index fdac44e..a752dba 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 @@
@ -537,7 +406,7 @@ index fe39f98822..dbe130581c 100644
 #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 9079d15662..770f2c8b6e 100644
+index 61644ff..6fbc037 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 @@
@ -548,24 +417,8 @@ index 9079d15662..770f2c8b6e 100644
 #include <limits>
 #include <type_traits>
 
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h b/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h
-index 03af2cc5e2..07774cd611 100644
--- a/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h
-@@ -15,8 +15,11 @@
- #include "src/compiler/code-assembler.h"
- #include "src/objects/arguments.h"
- #include "src/objects/bigint.h"
-+#include "src/objects/cell.h"
- #include "src/objects/feedback-vector.h"
- #include "src/objects/js-function.h"
-+#include "src/objects/js-generator.h"
-+#include "src/objects/js-promise.h"
- #include "src/objects/objects.h"
- #include "src/objects/promise.h"
- #include "src/objects/shared-function-info.h"
 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
+index c1d69c1..eb33c68 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 @@
@ -577,10 +430,10 @@ index c1d69c18f0..eb33c6816a 100644
 
 // 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 a10409f397..b9f5e59d8a 100644
+index 4e690ff..dfa884c 100644
 --- a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
 +++ b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-@@ -42,6 +42,8 @@
+@@ -6,6 +6,8 @@
 
 #include "content/public/browser/browsing_data_remover_delegate.h"
 
--- a/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-qtbug-101201-fatal-error-getcurrenkeyboard.patch
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/0001-qtbug-101201-fatal-error-getcurrenkeyboard.patch
@ -1,59 +0,0 @@
-Subject: [PATCH] Fix fatal error in getCurrentKeyboardLayout()
-
-FATAL:xkb_keyboard_layout_engine.cc(640)] Keymap file failed to load: dk(polytonic)
-
-Remove unnecessary tokenization of XKB layout.
-Parsing of layout configuration is already handled by
-XkbKeyboardLayoutEngine::ParseLayoutName().
-
-Fixes: QTBUG-101201
-Task-number: QTBUG-92971
-Pick-to: 6.2 6.3
-Change-Id: Ia4f09ed99eb82064a3b12e14eda69a6e0e12b0dd
-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
- .../src/core/ozone/ozone_platform_qt.cpp      | 24 ++++---------------
- 1 file changed, 5 insertions(+), 19 deletions(-)
-
-diff --git a/qtwebengine/src/core/ozone/ozone_platform_qt.cpp b/qtwebengine/src/core/ozone/ozone_platform_qt.cpp
-index 33d7bd992b..543e4bd371 100644
--- a/qtwebengine/src/core/ozone/ozone_platform_qt.cpp
-+++ b/qtwebengine/src/core/ozone/ozone_platform_qt.cpp
-@@ -184,29 +184,15 @@ static std::string getCurrentKeyboardLayout()
-     if (XkbRF_GetNamesProp(dpy, nullptr, &vdr) == 0)
-         return std::string();
-
-    char *layout = strtok(vdr.layout, ",");
-    for (int i = 0; i < state.group; i++) {
-        layout = strtok(nullptr, ",");
-        if (layout == nullptr)
-            return std::string();
-    }
-+    if (!vdr.layout)
-+        return std::string();
-
-     if (!vdr.variant)
-        return layout;
-
-    char *variant = strtok(vdr.variant, ",");
-    if (!variant)
-        return layout;
-
-    for (int i = 0; i < state.group; i++) {
-        variant = strtok(nullptr, ",");
-        if (variant == nullptr)
-            return layout;
-    }
-+        return std::string(vdr.layout);
-
-    std::string layoutWithVariant = layout;
-+    std::string layoutWithVariant = vdr.layout;
-     layoutWithVariant = layoutWithVariant.append("-");
-    layoutWithVariant = layoutWithVariant.append(variant);
-+    layoutWithVariant = layoutWithVariant.append(vdr.variant);
-     return layoutWithVariant;
- }
- #endif // BUILDFLAG(USE_XKBCOMMON)
--
-2.35.3
--- a/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-check-ulimit.patch
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/0002-check-ulimit.patch
@ -1,33 +0,0 @@
-From 517d0890f9e95c841bea3421f2455651ca0d8070 Mon Sep 17 00:00:00 2001
-From: Alexey Edelev <alexey.edelev@qt.io>
-Date: Wed, 23 Nov 2022 12:40:45 +0100
-Subject: [PATCH] Fix Linux build with CMake versions >= 3.25
-
-The 'LINUX' variable exists in CMake since the version 3.25. This
-variable previously was undefined while preparsing the configure.cmake
-files. Since the CMake script that defines the 'check_for_ulimit'
-function is not included while evaluating configure.cmake first time
-we need to add a stub.
-
-Change-Id: I25bdec4f4a1b6af23174507a8f0f9cbf01f0c398
-Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
-(cherry picked from commit 240e71877865ed07e4c8d5bd4553aa0772c2adf4)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
-
- qtwebengine/configure.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/qtwebengine/configure.cmake b/qtwebengine/configure.cmake
-index 015bcd1..d8e7fea 100644
--- a/qtwebengine/configure.cmake
-+++ b/qtwebengine/configure.cmake
-@@ -4,6 +4,8 @@ if(QT_CONFIGURE_RUNNING)
-     endfunction()
-     function(add_check_for_support)
-     endfunction()
-+    function(check_for_ulimit)
-+    endfunction()
- else()
-     find_package(Ninja 1.7.2)
-     find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT)
--- a/extras/packaging/gnu-linux/rules/debian-qt/patches/series
+++ b/extras/packaging/gnu-linux/rules/debian-qt/patches/series
@ -1,3 +1 @@
-0001-qtbug-101201-fatal-error-getcurrenkeyboard.patch
-0002-check-ulimit.patch
-0003-fix-gcc13.patch
+0001-fix-gcc13.patch
--- a/extras/packaging/gnu-linux/rules/debian-qt/rules
+++ b/extras/packaging/gnu-linux/rules/debian-qt/rules
@ -7,18 +7,6 @@
 	dh $@

 override_dh_auto_configure:
-	# Qt 6.2 build for gcc 8
-	sed -i 's,->GetProperty({,->GetProperty(GetPropertyRequest{,g' qtwebengine/src/3rdparty/chromium/ui/gfx/x/property_cache.cc
-	sed -i 's/max(),/max()/g' qtwebengine/src/3rdparty/chromium/ui/gfx/x/property_cache.cc
-	sed -i 's,PresentPixmap({,PresentPixmap(x11::Present::PresentPixmapRequest{,g' qtwebengine/src/3rdparty/chromium/components/viz/service/display_embedder/output_presenter_x11.cc
-	sed -i 's/last_target_msc_,/last_target_msc_/g' qtwebengine/src/3rdparty/chromium/components/viz/service/display_embedder/output_presenter_x11.cc
-	# Avoid MakeFlatSet
-	sed -i 's,const auto& GetNeverSniffedMimeTypes,/*const auto& GetNeverSniffedMimeTypes{,g' qtwebengine/src/3rdparty/chromium/services/network/public/cpp/cross_origin_read_blocking.cc
-	sed -i '1,/\/\/ static/{s/\/\/ static/*\/\}\/\/ static/;}' qtwebengine/src/3rdparty/chromium/services/network/public/cpp/cross_origin_read_blocking.cc
-	cp qtwebengine/src/3rdparty/chromium/services/network/public/cpp/cross_origin_read_blocking.cc temp
-	tac temp | sed '1,/return MimeType::kOthers/{s/return MimeType::kOthers/*\/return MimeType::kOthers/;}' | tac > qtwebengine/src/3rdparty/chromium/services/network/public/cpp/cross_origin_read_blocking.cc
-	rm temp -f
-	sed -i 's,if (base::Contains,/*if (base::Contains,g' qtwebengine/src/3rdparty/chromium/services/network/public/cpp/cross_origin_read_blocking.cc
 	CXXFLAGS="-flto -flto-partition=none" CFLAGS="-flto -flto-partition=none" ./configure \
 	  -opensource \
 	  -confirm-license \
--- a/extras/packaging/gnu-linux/rules/debian/jami-all.postinst
+++ b/extras/packaging/gnu-linux/rules/debian/jami-all.postinst
@ -19,11 +19,11 @@ set -e
 # of the distribution or version. The end tag is automatically appended,
 # depending on the system the postinst script is run on. Examples:
 #
-# Ubuntu 18.04:
-# $JAMI_REPO = $JAMI_REPO_BASE/ubuntu_18.04/
+# Ubuntu 22.04:
+# $JAMI_REPO = $JAMI_REPO_BASE/ubuntu_22.04/
 #
-# Debian 10:
-# $JAMI_REPO = $JAMI_REPO_BASE/debian_10
+# Debian 11:
+# $JAMI_REPO = $JAMI_REPO_BASE/debian_11
 #
 # To update the appended end tags, modify the switch in [2].
 JAMI_REPO_BASE="https://dl.jami.net/nightly"
@ -91,14 +91,8 @@ if [ -f /etc/os-release ]; then
    . /etc/os-release

    # Set-up Jami repository end tag
-    if [ "${VERSION_CODENAME}" = "buster" ] || [ "${ID}_${VERSION_ID}" = "debian_10" ]; then
-        ENDTAG="debian_10"
-    elif [ "${VERSION_CODENAME}" = "bullseye" ] || [ "${ID}_${VERSION_ID}" = "debian_11" ]; then
+    if [ "${VERSION_CODENAME}" = "bullseye" ] || [ "${ID}_${VERSION_ID}" = "debian_11" ]; then
        ENDTAG="debian_11"
-    elif [ "${ID}_${VERSION_ID}" = "trisquel_9.0" ]; then
-        ENDTAG="ubuntu_18.04"
-    elif [ "${UBUNTU_CODENAME}" = "bionic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.04" ]; then
-        ENDTAG="ubuntu_18.04"
    elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then
        ENDTAG="ubuntu_20.04"
    elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then
--- a/extras/packaging/gnu-linux/rules/debian/rules
+++ b/extras/packaging/gnu-linux/rules/debian/rules
@ -28,14 +28,6 @@ JAMI_DAEMON_PKG_NAME="jami-daemon"

 # Bundled packages from contrib
 BUNDLED_PKGS=""
-ifeq (debian_10,$(findstring debian_10, $(DISTRIBUTION)))
-# Daemon's bundled libarchive does not build on Debian 10
-BUNDLED_PKGS="--disable-libarchive"
-endif
-ifeq (ubuntu_18.04,$(findstring ubuntu_18.04, $(DISTRIBUTION)))
-# Daemon's bundled libarchive does not build on Ubuntu 18.04
-BUNDLED_PKGS="--disable-libarchive"
-endif
 ifeq (raspbian_10_armhf,$(findstring raspbian_10_armhf, $(DISTRIBUTION)))
 # Raspbian's yaml-cpp lib does not work properly
 BUNDLED_PKGS="--enable-ffmpeg --enable-yaml-cpp"
@ -68,9 +60,6 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	# Daemon contribs build + configure
 	mkdir -p daemon/contrib/native
-ifeq (ubuntu_18.04,$(findstring ubuntu_18.04, $(DISTRIBUTION)))
-	sed -i 's/GNUTLS_CONF :=/& --without-zstd/' daemon/contrib/src/gnutls/rules.mak
-endif
 	cd daemon/contrib/native && \
 	../bootstrap \
 	  --host=${HOST_ARCH} \
--- a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
@ -26,9 +26,7 @@ License:       GPLv3+
 Vendor:        Savoir-faire Linux Inc.
 URL:           https://jami.net/
 Source:        jami-libqt-%{version}.tar.xz
-Patch0:        0001-qtbug-101201-fatal-error-getcurrenkeyboard.patch
-Patch1:        0002-check-ulimit.patch
-Patch2:        0003-fix-gcc13.patch
+Patch0:        0001-fix-gcc13.patch

 %global gst 0.10
 %if 0%{?fedora} || 0%{?rhel} > 7
@ -64,8 +62,6 @@ This package contains Qt libraries for Jami.
 %prep
 %setup -n qt-everywhere-src-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1

 %build
 echo "Building Qt using %{job_count} parallel jobs"
--- a/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-gcc13.patch
+++ b/extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-gcc13.patch
@ -2,49 +2,38 @@
 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/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/bluetooth/public/cpp/bluetooth_uuid.h                            | 1 +
- qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h               | 1 +
+ .../chromium/content/public/browser/browsing_data_remover_delegate.h  | 1 +
+ .../chromium/device/base/synchronization/one_writer_seqlock.cc        | 1 +
+ .../extensions/browser/api/audio/audio_device_id_calculator.h         | 1 +
 qtwebengine/src/3rdparty/chromium/extensions/common/constants.h       | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h                            | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h                                           | 1 +
+ .../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/quic/core/crypto/quic_hkdf.h                 | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.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/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/angle/src/common/angleutils.h                               | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h          | 2 ++
- .../src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.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 +
- .../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/src/vk_mem_alloc.h                  | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.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 +
+ .../ppapi/utility/completion_callback_factory_thread_traits.h         | 6 ++++--
+ .../abseil-cpp/absl/strings/internal/str_format/extension.h           | 1 +
+ .../3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h  | 2 +-
+ .../3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h  | 1 +
+ .../third_party/blink/renderer/platform/graphics/dark_mode_types.h    | 2 ++
+ .../breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h  | 1 +
+ .../3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc | 1 +
+ .../3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h | 2 ++
+ .../chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h    | 1 +
+ .../src/trace_processor/importers/proto/proto_importer_module.h       | 2 ++
+ .../src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp | 4 ++++
+ .../src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h       | 1 +
+ .../chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h  | 1 +
+ .../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/v8/src/base/logging.h               | 1 +
 qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h                | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h                                    | 3 +++
- qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h                                | 1 +
+ .../src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h    | 1 +
 qtwebengine/src/core/browsing_data_remover_delegate_qt.h              | 2 ++
- 43 files changed, 61 insertions(+), 3 deletions(-)
+ 32 files changed, 48 insertions(+), 3 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
+index 1229e06..c7ed55e 100644
 --- a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
 +++ b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
@@ -5,6 +5,7 @@
@ -56,7 +45,7 @@ index 1229e06234..c7ed55e70f 100644
 
 #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 618e1e3769..bd0faf99ef 100644
+index 60c3c5c..6c8021c 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 @@
@ -68,7 +57,7 @@ index 618e1e3769..bd0faf99ef 100644
 #include <string>
 
 diff --git a/qtwebengine/src/3rdparty/chromium/base/logging.h b/qtwebengine/src/3rdparty/chromium/base/logging.h
-index c4db4c92dc..602560db1a 100644
+index a3ff92f..c272f79 100644
 --- a/qtwebengine/src/3rdparty/chromium/base/logging.h
 +++ b/qtwebengine/src/3rdparty/chromium/base/logging.h
@@ -7,6 +7,8 @@
@ -81,7 +70,7 @@ index c4db4c92dc..602560db1a 100644
 #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
+index 96f8c3b..c3f087b 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 @@
@ -94,7 +83,7 @@ index 96f8c3bd7c..c3f087b1a9 100644
 
 static_assert(TargetProperty::LAST_TARGET_PROPERTY <
 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 3896bc6e78..b93843dc16 100644
+index 3069c85..f4614b7 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 @@
@ -106,7 +95,7 @@ index 3896bc6e78..b93843dc16 100644
 #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 213b6301c0..9332e37e6f 100644
+index 80fd26f..3f08972 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 @@
@ -115,34 +104,10 @@ index 213b6301c0..9332e37e6f 100644
 #include "device/base/synchronization/one_writer_seqlock.h"
 +#include <cstdint>
 
- namespace device {
+ #include "base/threading/platform_thread.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 0c27ae7105..b64f82f754 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 <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h b/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h
-index afcaf9e4d1..5401e893a3 100644
--- a/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/fido/fido_transport_protocol.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_FIDO_FIDO_TRANSPORT_PROTOCOL_H_
- #define DEVICE_FIDO_FIDO_TRANSPORT_PROTOCOL_H_
-
-+#include <cstdint>
- #include <string>
-
- #include "base/component_export.h"
 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 9d2858177e..d263f67032 100644
+index c24205c..ee67ecf 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 @@
@ -154,12 +119,12 @@ index 9d2858177e..d263f67032 100644
 #include <string>
 
 diff --git a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-index 782a171adf..867de7c240 100644
+index 9ac68e2..ef27610 100644
 --- a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
 +++ b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-@@ -11,6 +11,8 @@
- #include "components/services/app_service/public/mojom/types.mojom.h"
- #include "ui/base/layout.h"
+@@ -10,6 +10,8 @@
+ #include "build/chromeos_buildflags.h"
+ #include "extensions/common/extensions_export.h"
 
 +#include <cstdint>
 +
@ -167,32 +132,20 @@ index 782a171adf..867de7c240 100644
 
 // Scheme we serve extension content from.
 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 83615b30c8..8fa9fb1f6d 100644
+index a9c7adb..943bd4e 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
-@@ -5,6 +5,8 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
- #define 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/device_perf_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h
-index e33874ba3b..824a207a22 100644
--- a/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_
- #define GPU_CONFIG_DEVICE_PERF_INFO_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
 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
+index 027f1a5..70759b2 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 @@
@ -204,7 +157,7 @@ index 027f1a5af3..70759b2ae4 100644
 #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 f4077c21d7..d0420d5631 100644
+index 3ea2191..0a1ae11 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 @@
@ -216,7 +169,7 @@ index f4077c21d7..d0420d5631 100644
 #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 fa2450f3db..1125d3da53 100644
+index f72970c..d7f0b7d 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 @@
@ -228,68 +181,8 @@ index fa2450f3db..1125d3da53 100644
 #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 0b4cfc1f8e..6f197966e2 100644
--- a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-@@ -5,6 +5,7 @@
- #ifndef NET_BASE_PARSE_NUMBER_H_
- #define NET_BASE_PARSE_NUMBER_H_
-
-+#include <cstdint>
- #include "base/compiler_specific.h"
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-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 3247c6269f..76efd3f01d 100644
--- a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -5,6 +5,7 @@
- #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h
-index 9a14bc4649..8302073d8f 100644
--- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/crypto/quic_hkdf.h
-@@ -6,6 +6,7 @@
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
-
- #include <vector>
-+#include <cstdint>
-
- #include "absl/strings/string_view.h"
- #include "quic/platform/api/quic_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h
-index c77219eb32..d3aa92be05 100644
--- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_tag.h
-@@ -8,6 +8,7 @@
- #include <map>
- #include <string>
- #include <vector>
-+#include <cstdint>
-
- #include "absl/strings/string_view.h"
- #include "quic/platform/api/quic_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-index 254398e622..8f03f9be85 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 "base/strings/string16.h"
-
- namespace chrome_pdf {
 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 ac0b31a75c..5d1c421d03 100644
+index b4fdb9a..375d3ef 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 {
@ -313,7 +206,7 @@ index ac0b31a75c..5d1c421d03 100644
 
 /// The non-thread-safe version of thread traits. Using this class as the
 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 a9b9e137de..562327f1c4 100644
+index c47536d..443f47a 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 @@
@ -325,7 +218,7 @@ index a9b9e137de..562327f1c4 100644
 #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 e9b79943dd..18428a5946 100644
+index e13aa22..0ce8484 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 @@
@ -338,7 +231,7 @@ index e9b79943dd..18428a5946 100644
 
 #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 a8f3bb28c6..bd9e105835 100644
+index 18175e1..2833285 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 @@
@ -347,22 +240,10 @@ index a8f3bb28c6..bd9e105835 100644
 #include <vector>
 +#include <cstdint>
 
- // This type is defined here to simplify ANGLE's integration with glslang for SPIRv.
+ // 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/angle/src/common/angleutils.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-index d132a72e8c..f49ba32d49 100644
--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
-@@ -22,6 +22,7 @@
- #include <climits>
- #include <cstdarg>
- #include <cstddef>
-+#include <cstdint>
- #include <set>
- #include <sstream>
- #include <string>
 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
+index 14c5548..43c9a8d 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 @@
@ -375,7 +256,7 @@ index 14c5548766..43c9a8d6a5 100644
 
 enum class DarkModeResult : uint8_t {
 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
+index c7e4f2b..f30ce91 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 @@
@ -387,7 +268,7 @@ index c7e4f2b378..f30ce91b36 100644
 #include "client/linux/handler/microdump_extra_info.h"
 #include "common/using_std_string.h"
 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
+index a3099e1..2e6f0ee 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 @@
@ -399,7 +280,7 @@ index a3099e15db..2e6f0eea70 100644
 #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
+index d2731da..46bc87e 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 @@
@ -412,7 +293,7 @@ index d2731dac7a..46bc87ef92 100644
 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
+index 1b4c538..472042f 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 @@
@ -424,12 +305,12 @@ index 1b4c53815b..472042fabc 100644
 
 #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 dda2f85759..158b5e8baa 100644
+index c56f034..cd78249 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
-@@ -21,6 +21,8 @@
+@@ -20,6 +20,8 @@
+ #include "perfetto/ext/base/optional.h"
 #include "perfetto/trace_processor/status.h"
- #include "src/trace_processor/trace_blob_view.h"
 
 +#include <cstdint>
 +
@ -437,12 +318,12 @@ index dda2f85759..158b5e8baa 100644
 
 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 7260365b2c..503ed08ff6 100644
+index 3164650..512a269 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
-@@ -8,6 +8,10 @@
+@@ -10,6 +10,10 @@
 
- #include "include/utils/SkParse.h"
+ #include <algorithm> // std::lower_bound
 
 +#include <string.h>
 +#include <algorithm>
@ -451,20 +332,8 @@ index 7260365b2c..503ed08ff6 100644
 static constexpr const char* gColorNames[] = {
     "aliceblue",
     "antiquewhite",
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
-index 917e369c6d..0795b1d683 100644
--- a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
-@@ -3844,6 +3844,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(
- #ifdef VMA_IMPLEMENTATION
- #undef VMA_IMPLEMENTATION
-
-+#include <cstdio>
- #include <cstdint>
- #include <cstdlib>
- #include <cstring>
 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 b89f154072..8ebf6a42c3 100644
+index 5fd37b4..ce70405 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 @@
@ -473,10 +342,10 @@ index b89f154072..8ebf6a42c3 100644
 
 +#include <cstdint>
 #include <map>
- #include <set>
 #include <string>
+ #include <utility>
 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 7a936f23e7..21951a1d24 100644
+index ca24954..534214d 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 @@
@ -488,31 +357,31 @@ index 7a936f23e7..21951a1d24 100644
 #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 5e4f410d12..722e73d053 100644
+index 708d6c9..898016d 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
-@@ -5,6 +5,7 @@
- #ifndef UI_BASE_IME_LINUX_LINUX_INPUT_METHOD_CONTEXT_H_
- #define 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 "base/strings/string16.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 668f07489e..8357414e83 100644
+index d97a696..68b18d8 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_DETECTION_GESTURE_EVENT_DETAILS_H_
- #define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
+ #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
+index 7ff15f0..136cebc 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 @@
@ -525,7 +394,7 @@ index 7ff15f0fc5..136cebc09e 100644
 
 enum class ScrollGranularity : uint8_t {
 diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-index fe39f98822..dbe130581c 100644
+index fdac44e..a752dba 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 @@
@ -537,7 +406,7 @@ index fe39f98822..dbe130581c 100644
 #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 9079d15662..770f2c8b6e 100644
+index 61644ff..6fbc037 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 @@
@ -548,24 +417,8 @@ index 9079d15662..770f2c8b6e 100644
 #include <limits>
 #include <type_traits>
 
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h b/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h
-index 03af2cc5e2..07774cd611 100644
--- a/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/codegen/code-stub-assembler.h
-@@ -15,8 +15,11 @@
- #include "src/compiler/code-assembler.h"
- #include "src/objects/arguments.h"
- #include "src/objects/bigint.h"
-+#include "src/objects/cell.h"
- #include "src/objects/feedback-vector.h"
- #include "src/objects/js-function.h"
-+#include "src/objects/js-generator.h"
-+#include "src/objects/js-promise.h"
- #include "src/objects/objects.h"
- #include "src/objects/promise.h"
- #include "src/objects/shared-function-info.h"
 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
+index c1d69c1..eb33c68 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 @@
@ -577,10 +430,10 @@ index c1d69c18f0..eb33c6816a 100644
 
 // 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 a10409f397..b9f5e59d8a 100644
+index 4e690ff..dfa884c 100644
 --- a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
 +++ b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-@@ -42,6 +42,8 @@
+@@ -6,6 +6,8 @@
 
 #include "content/public/browser/browsing_data_remover_delegate.h"
 
--- a/extras/packaging/gnu-linux/rules/rpm/patches/0001-qtbug-101201-fatal-error-getcurrenkeyboard.patch
+++ b/extras/packaging/gnu-linux/rules/rpm/patches/0001-qtbug-101201-fatal-error-getcurrenkeyboard.patch
@ -1,59 +0,0 @@
-Subject: [PATCH] Fix fatal error in getCurrentKeyboardLayout()
-
-FATAL:xkb_keyboard_layout_engine.cc(640)] Keymap file failed to load: dk(polytonic)
-
-Remove unnecessary tokenization of XKB layout.
-Parsing of layout configuration is already handled by
-XkbKeyboardLayoutEngine::ParseLayoutName().
-
-Fixes: QTBUG-101201
-Task-number: QTBUG-92971
-Pick-to: 6.2 6.3
-Change-Id: Ia4f09ed99eb82064a3b12e14eda69a6e0e12b0dd
-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
- .../src/core/ozone/ozone_platform_qt.cpp      | 24 ++++---------------
- 1 file changed, 5 insertions(+), 19 deletions(-)
-
-diff --git a/qtwebengine/src/core/ozone/ozone_platform_qt.cpp b/qtwebengine/src/core/ozone/ozone_platform_qt.cpp
-index 33d7bd992b..543e4bd371 100644
--- a/qtwebengine/src/core/ozone/ozone_platform_qt.cpp
-+++ b/qtwebengine/src/core/ozone/ozone_platform_qt.cpp
-@@ -184,29 +184,15 @@ static std::string getCurrentKeyboardLayout()
-     if (XkbRF_GetNamesProp(dpy, nullptr, &vdr) == 0)
-         return std::string();
-
-    char *layout = strtok(vdr.layout, ",");
-    for (int i = 0; i < state.group; i++) {
-        layout = strtok(nullptr, ",");
-        if (layout == nullptr)
-            return std::string();
-    }
-+    if (!vdr.layout)
-+        return std::string();
-
-     if (!vdr.variant)
-        return layout;
-
-    char *variant = strtok(vdr.variant, ",");
-    if (!variant)
-        return layout;
-
-    for (int i = 0; i < state.group; i++) {
-        variant = strtok(nullptr, ",");
-        if (variant == nullptr)
-            return layout;
-    }
-+        return std::string(vdr.layout);
-
-    std::string layoutWithVariant = layout;
-+    std::string layoutWithVariant = vdr.layout;
-     layoutWithVariant = layoutWithVariant.append("-");
-    layoutWithVariant = layoutWithVariant.append(variant);
-+    layoutWithVariant = layoutWithVariant.append(vdr.variant);
-     return layoutWithVariant;
- }
- #endif // BUILDFLAG(USE_XKBCOMMON)
--
-2.35.3
--- a/extras/packaging/gnu-linux/rules/rpm/patches/0002-check-ulimit.patch
+++ b/extras/packaging/gnu-linux/rules/rpm/patches/0002-check-ulimit.patch
@ -1,33 +0,0 @@
-From 517d0890f9e95c841bea3421f2455651ca0d8070 Mon Sep 17 00:00:00 2001
-From: Alexey Edelev <alexey.edelev@qt.io>
-Date: Wed, 23 Nov 2022 12:40:45 +0100
-Subject: [PATCH] Fix Linux build with CMake versions >= 3.25
-
-The 'LINUX' variable exists in CMake since the version 3.25. This
-variable previously was undefined while preparsing the configure.cmake
-files. Since the CMake script that defines the 'check_for_ulimit'
-function is not included while evaluating configure.cmake first time
-we need to add a stub.
-
-Change-Id: I25bdec4f4a1b6af23174507a8f0f9cbf01f0c398
-Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
-(cherry picked from commit 240e71877865ed07e4c8d5bd4553aa0772c2adf4)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
-
- qtwebengine/configure.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/qtwebengine/configure.cmake b/qtwebengine/configure.cmake
-index 015bcd1..d8e7fea 100644
--- a/qtwebengine/configure.cmake
-+++ b/qtwebengine/configure.cmake
-@@ -4,6 +4,8 @@ if(QT_CONFIGURE_RUNNING)
-     endfunction()
-     function(add_check_for_support)
-     endfunction()
-+    function(check_for_ulimit)
-+    endfunction()
- else()
-     find_package(Ninja 1.7.2)
-     find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT)
--- 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=2
+QT_MINOR=4
 QT_PATCH=3
-QT_RELEASE_PATCH=5
+QT_RELEASE_PATCH=1

 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="f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771"
+QT_TARBALL_SHA256="29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4"
 QT_TARBALL_FILE_NAME=$(basename "$QT_TARBALL_URL")
 CACHED_QT_TARBALL=$TARBALLS/$QT_TARBALL_FILE_NAME

--- a/src/libclient/CMakeLists.txt
+++ b/src/libclient/CMakeLists.txt
@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH
  ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
 find_package(LibJami REQUIRED)
 if(LIBJAMI_FOUND)
-  include_directories(${LIBJAMI_INCLUDE_DIR})
+  include_directories(${LIBJAMI_INCLUDE_DIRS})
 endif()

 string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
--- a/src/libclient/qtwrapper/CMakeLists.txt
+++ b/src/libclient/qtwrapper/CMakeLists.txt
@ -46,7 +46,7 @@ else()
 endif()

 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${LIBJAMI_INCLUDE_DIR})
+include_directories(${LIBJAMI_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus)