qt5: update submodules for LTS 5.15

- Webengine-chromium branch changed from 83-based to 87-based.
- PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations
  has been removed from src/buildtools/configure.json
- DEPENDS nodejs-native added. This mandatory for chromium build.

Task-number: QTBUG-90623
Change-Id: Ic933c88399422941114915afe5baa202850928f4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

28 files changed, 165 insertions, 250 deletions

diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
index 8b5d41ba..43fc31fc 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -1,4 +1,4 @@
-From 5af62581e5116b57efbe4bb7cc467efeb0aab941 Mon Sep 17 00:00:00 2001
+From 0229d48e46497568217b426123a576a2eaaff4e9 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 30 Mar 2017 11:37:24 +0300
 Subject: [PATCH] chromium: workaround for too long .rps file name
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch
index a3f292c3..fa64d4a0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
-From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c Mon Sep 17 00:00:00 2001
+From a7012306f328056d5c08ec1320da4037ee8fc5ee Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 2 Feb 2019 19:28:59 -0800
 Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 25 deletions(-)
 
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index ca81bd8ce0f..d3c588b21e3 100644
+index 6a58d21cf07..c007eab8ec9 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -776,8 +776,6 @@ config("compiler_cpu_abi") {
+@@ -782,8 +782,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index ca81bd8ce0f..d3c588b21e3 100644
        }
        if (!is_nacl) {
          cflags += [
-@@ -790,8 +788,6 @@ config("compiler_cpu_abi") {
+@@ -796,8 +794,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
        if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index ca81bd8ce0f..d3c588b21e3 100644
        }
      } else if (current_cpu == "mipsel" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -800,9 +796,6 @@ config("compiler_cpu_abi") {
+@@ -806,9 +802,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index ca81bd8ce0f..d3c588b21e3 100644
            }
          } else {
            cflags += [ "-EL" ]
-@@ -881,10 +874,7 @@ config("compiler_cpu_abi") {
+@@ -887,10 +880,7 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "mips" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index ca81bd8ce0f..d3c588b21e3 100644
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
          }
-@@ -931,9 +921,6 @@ config("compiler_cpu_abi") {
+@@ -937,9 +927,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index ca81bd8ce0f..d3c588b21e3 100644
            }
          } else {
            cflags += [
-@@ -990,10 +977,7 @@ config("compiler_cpu_abi") {
+@@ -996,10 +983,7 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "mips64") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index ca81bd8ce0f..d3c588b21e3 100644
            cflags += [
              "-EB",
              "-mabi=64",
-@@ -1157,13 +1141,6 @@ config("compiler_deterministic") {
+@@ -1166,13 +1150,6 @@ config("compiler_deterministic") {
        }
      }
    }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
deleted file mode 100644
index c93ba991..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 23 Dec 2018 16:58:04 -0800
-Subject: [PATCH] chromium: stack pointer clobber
-
-Do not add stack pointer to clobber list
-
-it was being ignored until gcc 9.0 became capable
-of flagging this silent ignoring via [1]
-
-[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813<Paste>
-
-Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- chromium/third_party/lss/linux_syscall_support.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
-index d2baee9d243..fd8efdffea6 100644
---- a/chromium/third_party/lss/linux_syscall_support.h
-+++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -2017,7 +2017,7 @@ struct kernel_statfs {
-                              : "i" (__NR_##name), "ri" ((long)(arg1)),        \
-                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
-                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
--                             : "esp", "memory");                              \
-+                             : "memory");                                     \
-         LSS_RETURN(type,__res);                                               \
-       }
-     #undef  _syscall6
-@@ -2039,7 +2039,7 @@ struct kernel_statfs {
-                              : "i" (__NR_##name),  "0" ((long)(&__s)),        \
-                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
-                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
--                             : "esp", "memory");                              \
-+                             : "memory");                                     \
-         LSS_RETURN(type,__res);                                               \
-       }
-     LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
-@@ -2125,7 +2125,7 @@ struct kernel_statfs {
-                            : "0"(-EINVAL), "i"(__NR_clone),
-                              "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
-                              "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
--                           : "esp", "memory", "ecx", "edx", "esi", "edi");
-+                           : "memory", "ecx", "edx", "esi", "edi");
-       LSS_RETURN(int, __res);
-     }
- 
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch
index c3de3cc5..92f8a30e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
-From 7eeed60fceeca490c5252e256baff08100e13259 Mon Sep 17 00:00:00 2001
+From 475f0b52895b89b64936c37a338f0d0cf5552297 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 5 Feb 2019 14:32:20 -0800
 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
-index 00d1e7c6ca3..f2c36d72dd2 100644
+index 891c2c34bfb..5ab519bd133 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
-@@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) {
+@@ -115,8 +115,11 @@ if (use_arm_neon_optimizations) {
      # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
      #  "All implementations of the ARMv8.1 architecture are required to
      #   implement the CRC32* instructions. These are optional in ARMv8.0."
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch
index 5f3f4528..1c3a2154 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch
@@ -1,4 +1,4 @@
-From 0faac107930255380ea07aa75267153022de2248 Mon Sep 17 00:00:00 2001
+From b1571a939a3456b576de3a2d4897ea2b1b2b4b89 Mon Sep 17 00:00:00 2001
 From: Johannes Pointner <johannes.pointner@br-automation.com>
 Date: Fri, 3 May 2019 09:12:38 +0200
 Subject: [PATCH] chromium: Do not try to set the guessed values for
@@ -20,10 +20,10 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
  1 file changed, 9 deletions(-)
 
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index d3c588b21e3..6d49fde33cc 100644
+index c007eab8ec9..feb4340f522 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -777,15 +777,6 @@ config("compiler_cpu_abi") {
+@@ -783,15 +783,6 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
        }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch
index f560e315..c3b3c830 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch
@@ -1,4 +1,4 @@
-From 69abe5acb926cef9ac771015ade3873fa9985f3b Mon Sep 17 00:00:00 2001
+From abe0a1c661241943b40192cf3fe73227123d7369 Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Thu, 8 Mar 2018 15:39:55 +0100
 Subject: [PATCH] chromium: aarch64 skia build fix
@@ -24,41 +24,28 @@ moment.
 
 Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 ---
- .../skia/src/opts/SkRasterPipeline_opts.h       | 17 ++---------------
- 1 file changed, 2 insertions(+), 15 deletions(-)
+ chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-index 831f5b3bb03..bb9377c3641 100644
+index 659794d1b50..d5b609ba93d 100644
 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
 +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
- }
+@@ -984,7 +984,7 @@ SI F from_half(U16 h) {
+     memcpy(&fp16, &h, sizeof(U16));
+     return float(fp16);
  
- SI F from_half(U16 h) {
--#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
--    && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
--    __fp16 fp16;
--    memcpy(&fp16, &h, sizeof(U16));
--    return float(fp16);
--
--#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-+#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX)
++#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512)
      return _mm256_cvtph_ps(h);
  
  #else
-@@ -1009,14 +1003,7 @@ SI F from_half(U16 h) {
- }
+@@ -1008,7 +1008,7 @@ SI U16 to_half(F f) {
+     memcpy(&u16, &fp16, sizeof(U16));
+     return u16;
  
- SI U16 to_half(F f) {
--#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
--    && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
--    __fp16 fp16 = __fp16(f);
--    U16 u16;
--    memcpy(&u16, &fp16, sizeof(U16));
--    return u16;
--
--#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-+#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX)
++#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512)
      return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
  
  #else
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch
index 1c7a3b1e..ed7e2774 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,4 +1,4 @@
-From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 Mon Sep 17 00:00:00 2001
+From 5af48e4ca5d2515606a07c9896e927d65e77ca72 Mon Sep 17 00:00:00 2001
 From: Jiri Slaby <jslaby@suse.cz>
 Date: Thu, 11 Jul 2019 09:35:13 +0200
 Subject: [PATCH] chromium: fix build after y2038 changes in glibc
@@ -15,10 +15,10 @@ Upstream-Status: Pending
  1 file changed, 1 insertion(+)
 
 diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-index 0cbcb8130c6..bc3dd3bddda 100644
+index cf6e7927951..e5df6f9d92c 100644
 --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
 +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -71,6 +71,7 @@ typedef void* SockOptArg;
+@@ -70,6 +70,7 @@ typedef void* SockOptArg;
  #endif  // WEBRTC_POSIX
  
  #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 63a460cc..ba734781 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001
+From 80c09862860702ce559c150784de50aa56282802 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Nov 2019 10:07:43 -0800
 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
-index 717410f2ebc..a4cd55ca20e 100644
+index 2d184811a00..fb2ba0069f1 100644
 --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
 +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
 @@ -20,6 +20,11 @@
@@ -32,10 +32,10 @@ index 717410f2ebc..a4cd55ca20e 100644
  
  namespace ui {
 diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-index 01e49b7bbfd..4fccfd62f84 100644
+index b8d089f7381..5d2d08b1ec6 100644
 --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
 +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
+@@ -62,8 +62,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
        continue;
      std::string event_string = base::StringPrintf(
          "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Include-cstddef-for-size_t-definition.patch
index 41a8ce36..25ea5639 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
-From 022100d701dca71ecfe237e133712398bc1c59a7 Mon Sep 17 00:00:00 2001
+From 8c4ba9f35e835159502239e184646615e71db00c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 25 Dec 2019 15:41:16 -0800
 Subject: [PATCH] chromium: Include cstddef for size_t definition
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Move-CharAllocator-definition-to-a-header-f.patch
index abe1e16d..cd65c8b6 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
-From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c Mon Sep 17 00:00:00 2001
+From 6c1bd0d6abecc1f3c198e4b3e41975edef2ebcff Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 2 Jan 2020 17:13:55 -0800
 Subject: [PATCH] chromium: Move CharAllocator definition to a header file
@@ -13,11 +13,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 255 insertions(+), 251 deletions(-)
 
 diff --git a/chromium/cc/base/list_container_helper.cc b/chromium/cc/base/list_container_helper.cc
-index 3a4c0b6a2f9..89df57a7b8e 100644
+index 7b594b4a458..9dae1c360c4 100644
 --- a/chromium/cc/base/list_container_helper.cc
 +++ b/chromium/cc/base/list_container_helper.cc
-@@ -12,259 +12,8 @@
- #include "base/logging.h"
+@@ -13,259 +13,8 @@
+ #include "base/check_op.h"
  #include "base/memory/aligned_memory.h"
  
 -namespace {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch
index eaff07e0..c63047b8 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
-From e60314a1257964bbebc0e7633d9799fd7c7ec35b Mon Sep 17 00:00:00 2001
+From 79aff9ed2ef07c562ba6dcbdd7e0274eebd3dc29 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 1 Feb 2020 12:17:23 -0800
 Subject: [PATCH] chromium: Link v8 with libatomic on x86
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
-index ab20142de9a..4ef4aa80cc0 100644
+index ba99c75140b..33cf943bcba 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") {
+@@ -3862,7 +3862,8 @@ v8_source_set("v8_base_without_compiler") {
    if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||
        v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" ||
        v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
deleted file mode 100644
index 464f952b..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1b8d57ba6595bbd743f6570d834f6a08600fb117 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Jan 2020 16:53:46 -0800
-Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
-
-These headers are needed for uintXX_t and size_t definitions
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
-index 66cc46dc091..e8cadb2bb80 100644
---- a/chromium/third_party/webrtc/call/rtx_receive_stream.h
-+++ b/chromium/third_party/webrtc/call/rtx_receive_stream.h
-@@ -11,6 +11,7 @@
- #ifndef CALL_RTX_RECEIVE_STREAM_H_
- #define CALL_RTX_RECEIVE_STREAM_H_
- 
-+#include <cstdint>
- #include <map>
- #include <stdint.h>
- 
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-icu-use-system-library-only-targets.patch
index 8a6660ff..8c990ce7 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
-From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 Mon Sep 17 00:00:00 2001
+From b670124d771e503a17cf0d0ac7bbaf8ef601f31f Mon Sep 17 00:00:00 2001
 From: Andrej Valek <andrej.valek@siemens.com>
 Date: Fri, 17 Apr 2020 09:43:32 +0200
 Subject: [PATCH] chromium: icu: use system library only targets
@@ -20,13 +20,13 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
-index 73673fa20ac..a656692c7bf 100644
+index 2430d3e48e5..5d00226667d 100644
 --- a/chromium/third_party/icu/BUILD.gn
 +++ b/chromium/third_party/icu/BUILD.gn
-@@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni")
- import("//build/config/linux/pkg_config.gni")
+@@ -8,9 +8,13 @@ import("//build/config/linux/pkg_config.gni")
  import("//build/shim_headers.gni")
  import("//third_party/icu/config.gni")
+ import("//third_party/icu/sources.gni")
 +import("//v8/gni/snapshot_toolchain.gni")
  
  declare_args() {
@@ -37,7 +37,7 @@ index 73673fa20ac..a656692c7bf 100644
  }
  
  if (is_android) {
-@@ -23,6 +27,12 @@ if (is_mac) {
+@@ -24,6 +28,12 @@ if (is_mac && !icu_is_in_fuchsia) {
  assert(!icu_disable_thin_archive || !is_component_build,
         "icu_disable_thin_archive only works in static library builds")
  
@@ -50,7 +50,7 @@ index 73673fa20ac..a656692c7bf 100644
  # Meta target that includes both icuuc and icui18n. Most targets want both.
  # You can depend on the individually if you need to.
  group("icu") {
-@@ -1222,7 +1232,7 @@ config("system_icu_config") {
+@@ -413,7 +423,7 @@ config("system_icu_config") {
    }
  }
  
@@ -59,7 +59,7 @@ index 73673fa20ac..a656692c7bf 100644
    pkg_config("system_icui18n") {
      packages = [ "icu-i18n" ]
    }
-@@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") {
+@@ -626,7 +636,7 @@ shim_headers("icuuc_shim") {
  }
  
  config("icu_config") {
@@ -68,7 +68,7 @@ index 73673fa20ac..a656692c7bf 100644
      configs = [ ":system_icu_config"]
    } else {
      configs = [ ":bundled_icu_config"]
-@@ -1443,7 +1453,7 @@ config("icu_config") {
+@@ -634,7 +644,7 @@ config("icu_config") {
  }
  
  group("icuuc") {
@@ -77,7 +77,7 @@ index 73673fa20ac..a656692c7bf 100644
      deps = [ ":icuuc_shim" ]
      public_configs = [
        ":system_icu_config",
-@@ -1455,7 +1465,7 @@ group("icuuc") {
+@@ -646,7 +656,7 @@ group("icuuc") {
  }
  
  group("icui18n") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
index 1b43fcbb..070f994d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
@@ -1,4 +1,4 @@
-From 5aa69767be0fbbc7a3a5075c6c94366a535c99a8 Mon Sep 17 00:00:00 2001
+From 967aab36341387968070ae75edd503b1208a6961 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Mon, 20 Apr 2020 23:56:48 +0200
 Subject: [PATCH] chromium: Fix sandbox 'Aw, snap' for syscalls 403 and 407
@@ -48,10 +48,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  5 files changed, 36 insertions(+), 1 deletion(-)
 
 diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-index 768025ce192..87025d91785 100644
+index 3c67b124786..e6e989d7b49 100644
 --- a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
 +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -148,7 +148,14 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
+@@ -157,7 +157,14 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
      return Allow();
  #endif
  
@@ -68,7 +68,7 @@ index 768025ce192..87025d91785 100644
    }
  
 diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-index 76193b62c9f..7731c697002 100644
+index b6c8c637746..81972a9d998 100644
 --- a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
 +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
 @@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf_dsl::Policy {
@@ -102,11 +102,11 @@ index d9d18822f67..0db8745cb57 100644
  #if defined(__i386__) || \
      (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
 diff --git a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-index 1addd53843c..5de2162f981 100644
+index 85e2110b4c2..c39c22b5114 100644
 --- a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
 +++ b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,14 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
+@@ -1441,6 +1441,14 @@
+ #define __NR_io_pgetevents (__NR_SYSCALL_BASE+399)
  #endif
  
 +#if !defined(__NR_clock_gettime64)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch
new file mode 100644
index 00000000..10e924c0
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch
@@ -0,0 +1,22 @@
+From 5b64a08023887bd4664996175120312e07287f1b Mon Sep 17 00:00:00 2001
+From: Jani Suonpera <jani.suonpera@qt.io>
+Date: Thu, 4 Feb 2021 14:30:44 +0200
+Subject: [PATCH] Add missing include for C strncpy
+
+Task-number:QTBUG-90623
+---
+ .../mojo/public/cpp/platform/named_platform_channel_posix.cc     | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
+index 9082ac4da59..24b21771d89 100644
+--- a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
++++ b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
+@@ -8,6 +8,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
++#include <cstring> // strncpy
+ 
+ #include "base/files/file_util.h"
+ #include "base/files/scoped_file.h"
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 01c46c05..1caa4a67 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
-From 0dbcdee3ccc23d3a6c9e66b5abc3fb3d1ccbc297 Mon Sep 17 00:00:00 2001
+From 56486b901c7101c5b78b1282f5b81e80141f9b05 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:01:12 -0700
 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c
-index 854819bfbb4..a99d32741d0 100644
+index 5fdb4817af8..e5b9431daa0 100644
 --- a/chromium/sandbox/linux/suid/sandbox.c
 +++ b/chromium/sandbox/linux/suid/sandbox.c
 @@ -46,6 +46,15 @@ static bool DropRoot();
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 03226154..2e3b1155 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
-From bbb23eb876e1f4500e7c8fd716a73351ad660725 Mon Sep 17 00:00:00 2001
+From ee3e05b09ad149ea02d9d4b743ea75cdc38a6f4e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:09:06 -0700
 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,15 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
-index 044bd8d244f..cec43e1d59b 100644
+index 9d12c427bb3..900ab13519f 100644
 --- a/chromium/base/process/process_metrics_posix.cc
 +++ b/chromium/base/process/process_metrics_posix.cc
-@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -119,14 +119,14 @@ size_t ProcessMetrics::GetMallocUsage() {
    malloc_statistics_t stats = {0};
    malloc_zone_statistics(nullptr, &stats);
    return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_ANDROID)
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
    struct mallinfo minfo = mallinfo();
  #if BUILDFLAG(USE_TCMALLOC)
    return minfo.uordblks;
@@ -31,7 +31,7 @@ index 044bd8d244f..cec43e1d59b 100644
    return 0;
  #endif
 diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
-index 7e42cfc20bb..4e24fc711ad 100644
+index c327f486596..90129e851e8 100644
 --- a/chromium/base/trace_event/malloc_dump_provider.cc
 +++ b/chromium/base/trace_event/malloc_dump_provider.cc
 @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
@@ -42,7 +42,7 @@ index 7e42cfc20bb..4e24fc711ad 100644
    {
      base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
      if (!emit_metrics_on_memory_dump_)
-@@ -175,6 +176,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+@@ -170,6 +171,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
                            MemoryAllocatorDump::kUnitsBytes,
                            resident_size - allocated_objects_size);
    }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch
index 869ac113..5d97d60a 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
-From d1d6bd4260eb847c1493a8ce4a974bb8d8ee0218 Mon Sep 17 00:00:00 2001
+From 7f62849b103d44e6467b8fb722217586f8b68016 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:37:49 -0700
 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index 638c7312..9d3f327f 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
-From 7cf2404330f7888f3cc8a25becfe944cc2fc421e Mon Sep 17 00:00:00 2001
+From adf366d5da96db4a9538826a97cbd6833b17ac07 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:38:37 -0700
 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch
index 55939ddd..f6d604cb 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From 350b57a5cad7c655ccb68a8b4b91e7d32021a1d7 Mon Sep 17 00:00:00 2001
+From 0e1d9c34ad4488733c4cb5ec20b82e3d9473e5b6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
@@ -9,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
-index 5ea77ef2d27..85343a13905 100644
+index a5ca0b7191e..e80f67e54f1 100644
 --- a/chromium/base/allocator/allocator_check.cc
 +++ b/chromium/base/allocator/allocator_check.cc
 @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
    // Set by allocator_shim_override_ucrt_symbols_win.h when the
    // shimmed _set_new_mode() is called.
    return g_is_win_shim_layer_initialized;
--#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \
-+#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \
-     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+-#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
++#elif (defined(__GLIBC__) || defined(OS_CHROMEOS)) && \
+     BUILDFLAG(USE_TCMALLOC) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
  // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
  // TODO(primiano): replace with an include once base can depend on allocator.
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index aea690d9..a43b6083 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
-From fea443adcea6e081cfee94a19c75e7b0516e1bce Mon Sep 17 00:00:00 2001
+From 8fc1e879eb657d9a46e4a08ae8989e1b589f5745 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 15:27:50 -0700
 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  create mode 100644 chromium/net/dns/resolv_compat.h
 
 diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc
-index 2e0f06b0c1e..aaafef77d79 100644
+index 5a4aead0acf..3427923836b 100644
 --- a/chromium/net/dns/dns_config_service_posix.cc
 +++ b/chromium/net/dns/dns_config_service_posix.cc
-@@ -29,6 +29,10 @@
+@@ -30,6 +30,10 @@
  #include "net/dns/public/dns_protocol.h"
  #include "net/dns/serial_worker.h"
  
@@ -24,11 +24,11 @@ index 2e0f06b0c1e..aaafef77d79 100644
 +#include "net/dns/resolv_compat.h"
 +#endif
 +
- #if defined(OS_MACOSX) && !defined(OS_IOS)
+ #if defined(OS_MAC)
  #include "net/dns/dns_config_watcher_mac.h"
  #endif
 diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc
-index 1c014a65019..2670a827aa5 100644
+index 0672e711afb..300f77e3b38 100644
 --- a/chromium/net/dns/dns_reloader.cc
 +++ b/chromium/net/dns/dns_reloader.cc
 @@ -9,6 +9,10 @@
@@ -40,8 +40,8 @@ index 1c014a65019..2670a827aa5 100644
 +#endif
 +
  #include "base/lazy_instance.h"
- #include "base/logging.h"
  #include "base/macros.h"
+ #include "base/notreached.h"
 diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h
 new file mode 100644
 index 00000000000..4f0e852a19d
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index cd1059e3..d817c3d0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
-From 64e79d346a2038b976f5bafe2b0b2032b1628229 Mon Sep 17 00:00:00 2001
+From 107051f8490498b30757d79c97f9309057bc4cc8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 15:39:57 -0700
 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch
index 50d17413..bd69316b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,16 +1,16 @@
-From cecdf34d89110115948cfde44c04a43c9925b24a Mon Sep 17 00:00:00 2001
+From 3cc48f9e538838ef7bc6bc80041ed00d44bde697 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 16:41:23 -0700
 Subject: [PATCH] chromium: musl: Adjust default pthread stack size
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- chromium/base/threading/platform_thread_linux.cc               | 3 ++-
- chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ chromium/base/threading/platform_thread_linux.cc              | 3 ++-
+ .../third_party/blink/renderer/platform/wtf/stack_util.cc     | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
-index 74a01ad5af5..dab5773d73b 100644
+index c1a705e2b89..f322fdb8352 100644
 --- a/chromium/base/threading/platform_thread_linux.cc
 +++ b/chromium/base/threading/platform_thread_linux.cc
 @@ -377,7 +377,8 @@ void TerminateOnThread() {}
@@ -24,7 +24,7 @@ index 74a01ad5af5..dab5773d73b 100644
    // ThreadSanitizer bloats the stack heavily. Evidence has been that the
    // default stack size isn't enough for some browser tests.
 diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-index ab1dff4167e..b0763b0bd9a 100644
+index 71b901f4044..f33aba04bc3 100644
 --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
 +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
 @@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
deleted file mode 100644
index 37276844..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 68decc5d87b4eb013f1455fc4f81f67f926fa3b2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jul 2017 15:09:02 -0700
-Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
- for musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- chromium/base/allocator/allocator_shim.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
-index ef42d5ad67f..626e4c996a5 100644
---- a/chromium/base/allocator/allocator_shim.cc
-+++ b/chromium/base/allocator/allocator_shim.cc
-@@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
- // In the case of tcmalloc we also want to plumb into the glibc hooks
- // to avoid that allocations made in glibc itself (e.g., strdup()) get
- // accidentally performed on the glibc heap instead of the tcmalloc one.
--#if BUILDFLAG(USE_TCMALLOC)
-+#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__)
- #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
- #endif
- 
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
index 07a1e3d6..9ce9edce 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -1,4 +1,4 @@
-From ae4187267b4d0d2ff13a6593b69ca06cee321eea Mon Sep 17 00:00:00 2001
+From 46283c0005cfb5d882b76df89a5c4fd880c0de42 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 25 Sep 2018 12:35:07 -0700
 Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on
@@ -8,55 +8,61 @@ glibc defines both. musl libc only the former.
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- .../src/client/linux/dump_writer_common/ucontext_reader.cc    | 4 ++--
- .../src/client/linux/dump_writer_common/ucontext_reader.h     | 2 +-
- .../src/client/linux/minidump_writer/minidump_writer.h        | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
+ .../client/linux/dump_writer_common/ucontext_reader.cc    | 8 ++++----
+ .../src/client/linux/dump_writer_common/ucontext_reader.h | 4 ++--
+ .../src/client/linux/minidump_writer/minidump_writer.h    | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 6ee6cc1e4cd..a8f9ccc72ac 100644
+index 6eec1be2465..57d91943e83 100644
 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
 +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+@@ -48,8 +48,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_EIP];
  }
  
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fp) {
+-void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+-                                    const fpstate_t* fp) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
 +                                    const struct _fpstate* fp) {
    const greg_t* regs = uc->uc_mcontext.gregs;
  
    out->context_flags = MD_CONTEXT_X86_FULL |
-@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+@@ -96,8 +96,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RIP];
  }
  
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fpregs) {
+-void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+-                                    const fpstate_t* fpregs) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
 +                                    const struct _fpstate* fpregs) {
    const greg_t* regs = uc->uc_mcontext.gregs;
  
    out->context_flags = MD_CONTEXT_AMD64_FULL;
 diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index f830618f240..f3dde1f4dff 100644
+index 7d41008815f..6cacabe4369 100644
 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
 +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -50,7 +50,7 @@ struct UContextReader {
+@@ -50,8 +50,8 @@ struct UContextReader {
+   //   out: the minidump structure
    //   info: the collection of register structures.
  #if defined(__i386__) || defined(__x86_64)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                             const struct _libc_fpstate* fp);
+-  static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+-                             const fpstate_t* fp);
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
 +                             const struct _fpstate* fp);
  #elif defined(__aarch64__)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
                               const struct fpsimd_context* fpregs);
 diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index d1dc331215a..d1cc5624cd4 100644
+index e3b0b16daea..5d144dcd27c 100644
 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
 +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -48,7 +48,7 @@ class ExceptionHandler;
+@@ -49,7 +49,7 @@ class ExceptionHandler;
  #if defined(__aarch64__)
  typedef struct fpsimd_context fpstate_t;
  #elif !defined(__ARM_EABI__) && !defined(__mips__)
--typedef struct _libc_fpstate fpstate_t;
+-typedef std::remove_pointer<fpregset_t>::type fpstate_t;
 +typedef struct _fpstate fpstate_t;
  #endif
  
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index 63f93873..11ff47f0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
-From f12f5d2dc91548ca77b296a0be3705aacc9fca33 Mon Sep 17 00:00:00 2001
+From 78e9d21a5a43c8af5329ba10daee1859e08d8ccf Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 25 Sep 2018 12:59:05 -0700
 Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
@@ -7,13 +7,13 @@ Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- chromium/third_party/breakpad/breakpad/configure.ac            | 2 +-
- .../breakpad/breakpad/src/common/dwarf/elf_reader.cc           | 3 ++-
- .../breakpad/breakpad/src/common/linux/elf_core_dump.h         | 1 +
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ chromium/third_party/breakpad/breakpad/configure.ac             | 2 +-
+ .../breakpad/breakpad/src/common/dwarf/elf_reader.cc            | 2 ++
+ .../breakpad/breakpad/src/common/linux/elf_core_dump.h          | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac
-index 492d09038f9..a6403ed8c3c 100644
+index 08513687f34..13745540a5e 100644
 --- a/chromium/third_party/breakpad/breakpad/configure.ac
 +++ b/chromium/third_party/breakpad/breakpad/configure.ac
 @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32,
@@ -22,28 +22,25 @@ index 492d09038f9..a6403ed8c3c 100644
  AX_PTHREAD
 -AC_CHECK_HEADERS([a.out.h sys/random.h])
 +AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h])
- AC_CHECK_FUNCS([arc4random getrandom])
+ AC_CHECK_FUNCS([arc4random getcontext getrandom])
+ AM_CONDITIONAL([HAVE_GETCONTEXT], [test "x$ac_cv_func_getcontext" = xyes])
  
- AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
 diff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
-index 4135a51a980..be92b792d3c 100644
+index bbfdba68093..fa822e5453a 100644
 --- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
 +++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
-@@ -29,10 +29,11 @@
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE  // needed for pread()
- #endif
--
-+#include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
+@@ -36,7 +36,9 @@
  #include <sys/mman.h>
-+#include <sys/reg.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <config.h>
  #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
++#include <sys/reg.h>
+ 
+ #include <algorithm>
+ #include <map>
 diff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-index d03c7a88d38..28b55ab6300 100644
+index 6e153745dba..5cd2c6fcb23 100644
 --- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
 +++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
 @@ -33,6 +33,7 @@
@@ -52,5 +49,5 @@ index d03c7a88d38..28b55ab6300 100644
  
 +#include <sys/reg.h>
  #include <elf.h>
+ #include <limits.h>
  #include <link.h>
- #include <stddef.h>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch
index edeb3272..554afdfe 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
-From 3269ffba733ed7eeb7c2c36912dd19ca1ef35f8b Mon Sep 17 00:00:00 2001
+From 5ce942260f64c70234a0af73af9cc8d26e99f188 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 23 Dec 2018 16:58:04 -0800
 Subject: [PATCH] chromium: musl: pread pwrite
@@ -14,12 +14,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
-index fd8efdffea6..22a8863031c 100644
+index e4ac22644c0..37988077a23 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -1244,6 +1244,11 @@ struct kernel_statfs {
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
+@@ -1258,6 +1258,11 @@ struct kernel_statfs {
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
  #endif
 +#undef __NR_pread
 +#define __NR_pread __NR_pread64
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
index 72adf1cb..d2617a83 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -1,4 +1,4 @@
-From 0b04cbd5b93908bad4dfc6d829048fe90a09b868 Mon Sep 17 00:00:00 2001
+From b37418977ba9bb13dae396b929f3365866e86af1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 10 May 2020 08:16:01 -0700
 Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc
-index 7df6892d67e..030ff8896e4 100644
+index 71265568be5..42e0d298045 100644
 --- a/chromium/net/socket/udp_socket_posix.cc
 +++ b/chromium/net/socket/udp_socket_posix.cc
-@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
+@@ -1151,8 +1151,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
    for (auto& buffer : buffers)
      msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
    msgvec->reserve(buffers.size());