27 files changed, 92 insertions, 474 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 a783a1e7..1df41114 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 0e5ecca67b6a9fb71bb200af534f22cb820ac652 Mon Sep 17 00:00:00 2001
+From 6c4a4b7c3dbfb1fc851522a67e1bcb7862b91184 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 659f938a..75dad974 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 52bcf1b214cd39139fdd547fef514acaf19bd3f8 Mon Sep 17 00:00:00 2001
+From 35cd9c8391865012644038b1af425ac7e2ae1828 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 0b14cf81..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 1af3e18800c3be5c4fbe1aa96fc1a0c454d89817 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 f79c07a5..2f22f282 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 1572f98f6be6ac77a45dfd5442b2f6ba1a03e360 Mon Sep 17 00:00:00 2001
+From 2fed766cdca44dc67a508b26ea66feab47eb49fd 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 fb2a35e87f2..6cca80181ed 100644
+index 891c2c34bfb..5ab519bd133 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
-@@ -89,8 +89,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 37442d0a..92e16f40 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 4e0bc86764ac1e324c50e698b47c630efab07632 Mon Sep 17 00:00:00 2001
+From 6c43c38e14a889950f1401d484fe16594cac2c22 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/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch
index 0dacc25f..f8e7d4ba 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,4 +1,4 @@
-From 3be4bd9030c774e5e06abd5e74f9f5465510b2db Mon Sep 17 00:00:00 2001
+From b2521c339d944c1f5333ccc258cbae2fd8b741a2 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/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index b7c9f1b1..6677a03a 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/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From e61af5f5bc6a14a3e77373eee1055cd15c54797f Mon Sep 17 00:00:00 2001
+From 5fc06ad92eaeb20e3b0afbc47a2436bf9038d942 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/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
deleted file mode 100644
index 5da3c36f..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2eab9281d34bf53fd5a4b58184f9e165e27f9eaf 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
-
-Upstream-Status: Inappropriate
-
-GCC (tested rocko's 7.3.0) cannot find these intrinsics and the build fails:
-
-../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::F neon::from_half(neon::U16)':
-../../third_party/skia/src/opts/SkRasterPipeline_opts.h:657:26: error: cannot convert 'neon::U16 {aka short unsigned int}' to 'float16x4_    t {aka __vector(4) __    fp16}' for argument '1' to '
-float32x4_t vcvt_f32_f16(float16x4_t)'
-     return vcvt_f32_f16(h);
-                          ^
-../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::U16 neon::to_half(neon::F)':
-../../third_party/skia/src/opts/SkRasterPipeline_opts.h:677:26: error: cannot convert 'neon::F {aka float}' to 'float32x4_t {aka __vector    (4) float}' for argum    ent '1' to 'float16x4_t vcvt
-_f16_f32(float32x4_t)'
-     return vcvt_f16_f32(f);
-                          ^
-
-Upstream seems to have had similar issues according to
-https://skia-review.googlesource.com/c/skia/+/84222, but there is no fix at the
-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(-)
-
-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
---- 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) {
- }
- 
- 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)
-     return _mm256_cvtph_ps(h);
- 
- #else
-@@ -1009,14 +1003,7 @@ SI F from_half(U16 h) {
- }
- 
- 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)
-     return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
- 
- #else
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch
index 78dbba17..064bb576 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
-From 533788149c8b24d7da2702866594cd7a44c8f571 Mon Sep 17 00:00:00 2001
+From 3ed9af348ff76523e5aa16317a354b47dcae1766 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/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch
index d018397e..2ee2cce0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
-From ec96f37700a45c317027ad917a835e1eac2169fc Mon Sep 17 00:00:00 2001
+From 159ee1528e0870555bf1bac8f24795d84c223a56 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/0009-chromium-Link-v8-with-libatomic-on-x86.patch
index 1ce09e34..3abfb814 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
-From 15e16b5f8405a402b94bd1be48d1eabff474795f Mon Sep 17 00:00:00 2001
+From 496d125361f53ef9b3e4e92bdcfa19aec57c0007 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/0013-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch
index a8b52c39..355ff4fa 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
-From f0aebd4351e729d281fb597627ff87cbe8a67dd0 Mon Sep 17 00:00:00 2001
+From acdb51541e4eb73177b28c79d395d8d6964ed161 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/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 a8f3feb9..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 93a8a2a4c33ffece095ab3438eb3c7a4f60ead34 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/0015-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index e1624cb9..9acb43ab 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
-From d6a03a1de746c5fc460f3e63fe2ceec050663da4 Mon Sep 17 00:00:00 2001
+From a4e658527d513366e614c188f0572b4f32c385d1 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index ef45ed08..dbb4e4df 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
-From 73d501e0503fc5a9a2229933f976c713b6e7f28a Mon Sep 17 00:00:00 2001
+From 4ad1b69cbb61baba2d8796d721b2009c33c00640 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 1bf34c9d9ea..00e46d30b3a 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;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
index 7cc717e2..cb49de14 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
-From 181e65fb3a39ad4fb08c676b0ee67d887aeb68c7 Mon Sep 17 00:00:00 2001
+From c86fd26828f794d1e547d2d81970ecf3d701e9f7 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/0014-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
deleted file mode 100644
index 7708a4c0..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From d073427b25915e1784c3d74296b68fef0076ceb0 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken as is from meta-browser. Saw my application freeze for syscall 0407
-trouble:
-
-| ../../../../git/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc:**CRASHING**:seccomp-bpf failure in syscall 0407
-
-Original commit message:
-
-* syscall 403: reported by ArchLinux users [1-2]
-* syscall 407: reported by me [3]
-
-Looking at [4-5] it seems that glibc (>=2.31?) introduced extra syscalls for
-32Bit systems to handle time64:
-
-* __NR_clock_gettime -> __NR_clock_gettime64
-* __NR_clock_nanosleep -> __NR_clock_nanosleep_time64
-
-To fix
-| ../../sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc:**CRASHING**:seccomp-bpf failure in syscall 0403
-| ../../sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc:**CRASHING**:seccomp-bpf failure in syscall 0407
-
-we handle new systemcalls in the same way as 64bit systems do and 32bit systems
-did before glibc 2.31.
-
-[1] https://bugs.archlinux32.org/index.php?do=details&task_id=105
-[2] https://bbs.archlinux32.org/viewtopic.php?id=2897
-[3] https://github.com/OSSystems/meta-browser/issues/357
-[4] https://sourceware.org/git/?p=glibc.git;a=commit;h=2e44b10b42d68d9887ccab17b76db5d7bbae4fb6
-[5] https://github.com/bminor/glibc/blob/019d828669df966dc4ef2684fce0b1c17bef9aae/sysdeps/unix/sysv/linux/clock_gettime.c#L30
-
-Upstream Status: Pending [Have no idea where to send this]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc | 9 ++++++++-
- .../syscall_parameters_restrictions_unittests.cc         | 6 ++++++
- .../sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc    | 6 ++++++
- .../sandbox/linux/system_headers/arm_linux_syscalls.h    | 8 ++++++++
- .../sandbox/linux/system_headers/mips_linux_syscalls.h   | 8 ++++++++
- 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 712f9699a94..2a80dd2d2b3 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,
-     return Allow();
- #endif
- 
--  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
-+  if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep
-+#if defined(__NR_clock_gettime64)
-+                                  || sysno == __NR_clock_gettime64
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+                                  || sysno == __NR_clock_nanosleep_time64
-+#endif
-+  ) {
-     return RestrictClockID();
-   }
- 
-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 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 {
-       case __NR_clock_gettime:
-       case __NR_clock_getres:
-       case __NR_clock_nanosleep:
-+#if defined(__NR_clock_nanosleep_time64)
-+      case __NR_clock_nanosleep_time64:
-+#endif
-+#if defined(__NR_clock_gettime64)
-+      case __NR_clock_gettime64:
-+#endif
-         return RestrictClockID();
-       default:
-         return Allow();
-diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index d9d18822f67..0db8745cb57 100644
---- a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -39,6 +39,12 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
-                                 // filtered by RestrictClokID().
-     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
-     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
-+#if defined(__NR_clock_gettime64)
-+    case __NR_clock_gettime64:  // Parameters filtered by RestrictClockID().
-+#endif
-+#if defined(__NR_clock_nanosleep_time64)
-+    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
-+#endif
-     case __NR_clock_settime:    // Privileged.
- #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
---- 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)
- #endif
- 
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff --git a/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h b/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
-index ddbf97f3d8b..fa01b3bbc66 100644
---- a/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ b/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1433,4 +1433,12 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
- 
-+#if !defined(__NR_clock_gettime64)
-+#define __NR_clock_gettime64 (__NR_Linux + 403)
-+#endif
-+
-+#if !defined(__NR_clock_nanosleep_time64)
-+#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index 96d5f6c0..96862bb5 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
-From 486e9c6aa16c9f2ea69a454bacbb15a11c0f96f2 Mon Sep 17 00:00:00 2001
+From 953e53d9f6f43db1a8648b6a6644528ed145aca8 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/0019-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
index f01dbc80..56e0d365 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From 4d4ec444217441b360e0ed7d784558b8acbcd4ab Mon Sep 17 00:00:00 2001
+From a7bf393630fe1ad70cf32765c56a1a4f1c0e4d4c 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..7017d48b5a0 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/0021-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index c359002e..eae797ce 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
-From 50a0f95d35c5180ee04fd66ec5135bf020acdad2 Mon Sep 17 00:00:00 2001
+From d9897081f0ca3b0da9fd3e6fed67a703f3848d6a 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
@@ -6,29 +6,13 @@ Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- chromium/net/dns/dns_config_service_posix.cc |  4 +++
- chromium/net/dns/dns_reloader.cc             |  4 +++
- chromium/net/dns/resolv_compat.h             | 29 ++++++++++++++++++++
- 3 files changed, 37 insertions(+)
+ chromium/net/dns/dns_reloader.cc |  4 ++++
+ chromium/net/dns/resolv_compat.h | 29 +++++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+)
  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 eaa5336c339..18b40d7d005 100644
---- a/chromium/net/dns/dns_config_service_posix.cc
-+++ b/chromium/net/dns/dns_config_service_posix.cc
-@@ -29,6 +29,10 @@
- #include "net/dns/public/dns_protocol.h"
- #include "net/dns/serial_worker.h"
- 
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#include "net/dns/resolv_compat.h"
-+#endif
-+
- #if defined(OS_MACOSX) && !defined(OS_IOS)
- #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 +24,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/0022-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index 2cdec0e0..71232258 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
-From 095231f601a93c46408364d9ffd1378a14cc8d83 Mon Sep 17 00:00:00 2001
+From 9b3aa55d2ca61650ed99b17be5ca97989ead3a15 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/0023-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Adjust-default-pthread-stack-size.patch
index 808cf67a..25aed494 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
-From c24db93fd5fa5728da55448865ba6bb4d6355491 Mon Sep 17 00:00:00 2001
+From 36174b6d0a7db78739c90ab51643b68cc64c1d5e 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
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  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 095c49b8dc0..d1479b54d48 100644
+index c1a705e2b89..f322fdb8352 100644
 --- a/chromium/base/threading/platform_thread_linux.cc
 +++ b/chromium/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,8 @@ void TerminateOnThread() {}
+@@ -377,7 +377,8 @@ void TerminateOnThread() {}
  
  size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
  #if !defined(THREAD_SANITIZER)
@@ -24,10 +24,10 @@ index 095c49b8dc0..d1479b54d48 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 1aaaa1c60d2..f49152fa6ac 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
-@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() {
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
  // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
  // correctly for the main thread.
  
@@ -36,7 +36,7 @@ index 1aaaa1c60d2..f49152fa6ac 100644
      defined(OS_FUCHSIA)
    // pthread_getattr_np() can fail if the thread is not invoked by
    // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -96,7 +96,7 @@ return Threading::ThreadStackSize();
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
  }
  
  void* GetStackStart() {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index e4ecf41e..6c46ba03 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
-From 426b9ef79898e82ee04cfbe7c19746bdfd1c92ac Mon Sep 17 00:00:00 2001
+From 05bbf1b0d31cdeb8ac3c439fda261acb146cfe8d 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,24 @@ 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..d7d5dcf0e92 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
+@@ -30,6 +30,8 @@
  #define _GNU_SOURCE  // needed for pread()
  #endif
--
+ 
 +#include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
 +#include <sys/reg.h>
- #include <unistd.h>
  #include <fcntl.h>
+ #include <limits.h>
  #include <string.h>
 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 +48,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/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
deleted file mode 100644
index 96eac41d..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a07b5244ac103dd49c3deab81b6bed7589f5384e 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-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
index 1e615637..f6dd35a4 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
-From 1506681955d4f7a70372cb27bf47dddd1ca00954 Mon Sep 17 00:00:00 2001
+From dc3766d6b9c173d53027e6fddb8432afcced7398 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
@@ -10,17 +10,18 @@ libc either
 Upstream-Status: Submitted [https://codereview.chromium.org/1743093002/]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- chromium/third_party/lss/linux_syscall_support.h | 5 +++++
- 1 file changed, 5 insertions(+)
+ chromium/third_party/lss/linux_syscall_support.h | 6 ++++++
+ 1 file changed, 6 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..f56203ccce4 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,12 @@ struct kernel_statfs {
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
  #endif
++
 +#undef __NR_pread
 +#define __NR_pread __NR_pread64
 +#undef __NR_pwrite
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
index 97035dc5..3c1062fd 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -1,4 +1,4 @@
-From 2e220677883ce371119b9b07b2a90ff6bde1b6d3 Mon Sep 17 00:00:00 2001
+From e6953baf7bb353a8b0d901f75aff7d45b74798b2 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());
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
deleted file mode 100644
index 786e65d8..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 01c128d575571f525a586fa769debf62826db888 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
- linux
-
-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(-)
-
-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
---- 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) {
- }
- 
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fp) {
-+                                    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) {
- }
- 
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fpregs) {
-+                                    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
---- 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 {
-   //   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);
-+                             const struct _fpstate* fp);
- #elif defined(__aarch64__)
-   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
---- 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;
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
--typedef struct _libc_fpstate fpstate_t;
-+typedef struct _fpstate fpstate_t;
- #endif
- 
- // These entries store a list of memory regions that the client wants included