Update to Qt 5.15.2

Signed-off-by: Jani Suonpera <jani.suonpera@qt.io>
Change-Id: I5992e74cf524f9378dab64503345111b1cc159f2

20 files changed, 120 insertions, 192 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
index f1fa3ed3..fa7de449 100644
--- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
@@ -1,4 +1,4 @@
-From 178aefa97fd7b725b1b802af7751df5f86a887af Mon Sep 17 00:00:00 2001
+From cc707f6c2d3dd152fcca23de0545351e99b3edcb Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 14 Dec 2017 11:28:10 +0200
 Subject: [PATCH] musl: link against libexecinfo
@@ -10,13 +10,13 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/core/core_module.pro b/src/core/core_module.pro
-index 5007012a..56c7ad4a 100644
+index 3b439e81..b1669e19 100644
 --- a/src/core/core_module.pro
 +++ b/src/core/core_module.pro
-@@ -57,7 +57,7 @@ linux {
- POST_TARGETDEPS += $$NINJA_TARGETDEPS
- 
+@@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri)
  
+ api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix()
+ api_library_path = $$OUT_PWD/api/$$getConfigDir()
 -LIBS_PRIVATE += -L$$api_library_path
 +LIBS_PRIVATE += -L$$api_library_path -lexecinfo
  CONFIG *= no_smart_library_merge
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
index 8cb665f1..6bd374d8 100644
--- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -5,22 +5,44 @@ Subject: [PATCH] mkspecs: Allow builds with libc != glibc
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- src/buildtools/config/support.pri | 5 -----
- 1 file changed, 5 deletions(-)
+ src/buildtools/config/support.pri | 4 ----
+ src/buildtools/configure.json     | 4 +---
+ 2 files changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index 8077b12f..aaf4db47 100644
+index 6768f0a1..1885f1b4 100644
 --- a/src/buildtools/config/support.pri
 +++ b/src/buildtools/config/support.pri
-@@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
-         return(false)
-     }
+@@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
  
+ defineTest(qtwebengine_checkForGlibc) {
+     module = $$1
 -    !qtConfig(webengine-system-glibc) {
--        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.")
+-        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
 -        return(false)
 -    }
--
-     !qtConfig(webengine-system-khr) {
-         qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)")
-         return(false)
+     return(true)
+ }
+ 
+diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
+index 96727a14..fef8fc5e 100644
+--- a/src/buildtools/configure.json
++++ b/src/buildtools/configure.json
+@@ -371,7 +371,6 @@
+                          && (!config.sanitizer || features.webengine-sanitizer)
+                          && (!config.linux || features.pkg-config)
+                          && (!config.linux || features.webengine-host-pkg-config)
+-                         && (!config.linux || features.webengine-system-glibc)
+                          && (!config.linux || features.webengine-system-khr)
+                          && (!config.linux || features.webengine-system-nss)
+                          && (!config.linux || features.webengine-system-dbus)
+@@ -732,8 +731,7 @@
+                         "webengine-system-fontconfig",
+                         "webengine-system-dbus",
+                         "webengine-system-nss",
+-                        "webengine-system-khr",
+-                        "webengine-system-glibc"
++                        "webengine-system-khr"
+                     ]
+                 },
+                 {
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 3abe38b6..8b5d41ba 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 105421c09f009b77019e60db2de22d5966a73602 Mon Sep 17 00:00:00 2001
+From 5af62581e5116b57efbe4bb7cc467efeb0aab941 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/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index 497dd3b8..c93ba991 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -1,4 +1,4 @@
-From 99453086770508f96eeb95635dda3f9831c485bf Mon Sep 17 00:00:00 2001
+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
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  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 8e0cc385792..d2bd9df4d40 100644
+index d2baee9d243..fd8efdffea6 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -2012,7 +2012,7 @@ struct kernel_statfs {
+@@ -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))         \
@@ -29,7 +29,7 @@ index 8e0cc385792..d2bd9df4d40 100644
          LSS_RETURN(type,__res);                                               \
        }
      #undef  _syscall6
-@@ -2034,7 +2034,7 @@ struct kernel_statfs {
+@@ -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))         \
@@ -38,7 +38,7 @@ index 8e0cc385792..d2bd9df4d40 100644
          LSS_RETURN(type,__res);                                               \
        }
      LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
-@@ -2120,7 +2120,7 @@ struct kernel_statfs {
+@@ -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)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index 253cdaf6..a3f292c3 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
-From d3889654a28d901d345cae8fc8ec23988a085dab Mon Sep 17 00:00:00 2001
+From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c 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 fdfcf65f5ab..13d71d04030 100644
+index ca81bd8ce0f..d3c588b21e3 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -779,8 +779,6 @@ config("compiler_cpu_abi") {
+@@ -776,8 +776,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index fdfcf65f5ab..13d71d04030 100644
        }
        if (!is_nacl) {
          cflags += [
-@@ -793,8 +791,6 @@ config("compiler_cpu_abi") {
+@@ -790,8 +788,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
        if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index fdfcf65f5ab..13d71d04030 100644
        }
      } else if (current_cpu == "mipsel" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -803,9 +799,6 @@ config("compiler_cpu_abi") {
+@@ -800,9 +796,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index fdfcf65f5ab..13d71d04030 100644
            }
          } else {
            cflags += [ "-EL" ]
-@@ -884,10 +877,7 @@ config("compiler_cpu_abi") {
+@@ -881,10 +874,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 fdfcf65f5ab..13d71d04030 100644
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
          }
-@@ -934,9 +924,6 @@ config("compiler_cpu_abi") {
+@@ -931,9 +921,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index fdfcf65f5ab..13d71d04030 100644
            }
          } else {
            cflags += [
-@@ -993,10 +980,7 @@ config("compiler_cpu_abi") {
+@@ -990,10 +977,7 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "mips64") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index fdfcf65f5ab..13d71d04030 100644
            cflags += [
              "-EB",
              "-mabi=64",
-@@ -1165,13 +1149,6 @@ config("compiler_deterministic") {
+@@ -1157,13 +1141,6 @@ config("compiler_deterministic") {
        }
      }
    }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
index 5b150b5f..c3de3cc5 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
-From 7a778d56065b041e55c60e500d5e60c71b7e345f Mon Sep 17 00:00:00 2001
+From 7eeed60fceeca490c5252e256baff08100e13259 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 4422fecc0c8..1b398ad981a 100644
+index 00d1e7c6ca3..f2c36d72dd2 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
-@@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) {
+@@ -86,8 +86,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-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
index 00293e5f..5f3f4528 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
@@ -1,7 +1,8 @@
-From 7cabdbd5f444dc10f4c87ed554792e97a527075b Mon Sep 17 00:00:00 2001
+From 0faac107930255380ea07aa75267153022de2248 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
+
  march/mtune/float-abi OE config machinary has computed these values already
  and fed it via compiler cmdline to chromium build
 
@@ -12,15 +13,17 @@ Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
+
+%% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
 ---
  chromium/build/config/compiler/BUILD.gn | 9 ---------
  1 file changed, 9 deletions(-)
 
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
-index 13d71d04030..3ebcf1ddbc3 100644
+index d3c588b21e3..6d49fde33cc 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -780,15 +780,6 @@ config("compiler_cpu_abi") {
+@@ -777,15 +777,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/0006-chromium-aarch64-skia-build-fix.patch
index 798b5f05..f560e315 100644
--- 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
@@ -1,4 +1,4 @@
-From e7e0646f07d1c0dcf6502cd1c074d50839f3d461 Mon Sep 17 00:00:00 2001
+From 69abe5acb926cef9ac771015ade3873fa9985f3b 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
@@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
  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 0d610ccfe33..c1844b61168 100644
+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) {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
index 307ce4d4..1c7a3b1e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,4 +1,4 @@
-From a5cdae084e84be8c847f4b0613b92e0462bbb038 Mon Sep 17 00:00:00 2001
+From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 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,7 +15,7 @@ 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 ead4e57dc15..7ba975e660a 100644
+index 0cbcb8130c6..bc3dd3bddda 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;
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/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 03bdc05a..63a460cc 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/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001
+From ddedffaeb9f04ac8530f87f5010e0008dc548b96 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
@@ -11,58 +11,37 @@ input.h [1]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- chromium/ui/events/ozone/evdev/event_converter_evdev.cc    | 4 ++--
- chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++---
- chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h  | 5 +++++
- 3 files changed, 10 insertions(+), 5 deletions(-)
+ chromium/ui/events/ozone/evdev/event_converter_evdev.h     | 5 +++++
+ chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-index 9f27d39e209..f565dd2ce5c 100644
---- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
-@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
- base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
-     const input_event& event) {
-   base::TimeTicks timestamp =
--      ui::EventTimeStampFromSeconds(event.time.tv_sec) +
--      base::TimeDelta::FromMicroseconds(event.time.tv_usec);
-+      ui::EventTimeStampFromSeconds(event.input_event_sec) +
-+      base::TimeDelta::FromMicroseconds(event.input_event_usec);
-   ValidateEventTimeClock(&timestamp);
-   return timestamp;
- }
+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
+--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
++++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
+@@ -20,6 +20,11 @@
+ #include "ui/events/ozone/evdev/event_dispatch_callback.h"
+ #include "ui/gfx/geometry/size.h"
+ 
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ struct input_event;
+ 
+ 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 363c3183e05..4fccfd62f84 100644
+index 01e49b7bbfd..4fccfd62f84 100644
 --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
 +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
-@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
-   for (int i = 0; i < kDebugBufferSize; ++i) {
-     struct TouchEvent* te =
-         &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
--    if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
-+    if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
+@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
        continue;
      std::string event_string = base::StringPrintf(
--        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec,
--        te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
-+        "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
+         "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
+-        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value,
+-        te->slot);
 +        te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
      report_content += event_string;
    }
    file.Write(0, report_content.c_str(), report_content.length());
-diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-index 0d5b83148f6..1f17608e94d 100644
---- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
-@@ -14,6 +14,11 @@
- 
- #include "base/component_export.h"
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- namespace ui {
- 
- class EventDeviceInfo;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
index 3659f586..41a8ce36 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
-From 58783bf8f46657200643543f765f405a91699440 Mon Sep 17 00:00:00 2001
+From 022100d701dca71ecfe237e133712398bc1c59a7 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
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-index b87fb2d0345..b3faffcfc79 100644
+index ec972949d89..2a76775cfb6 100644
 --- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
 +++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
  #include <map>
  #include <set>
  #include <vector>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
index 965ecd72..abe1e16d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
-From faff740bb831e1a25c7acb1754df9bbd028330b9 Mon Sep 17 00:00:00 2001
+From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c 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
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
index a6abd037..464f952b 100644
--- 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
@@ -1,4 +1,4 @@
-From 33005dfa49d65170fb006cd4ca4dbb8c6cf901e5 Mon Sep 17 00:00:00 2001
+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>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
index 169b4c9b..eaff07e0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
-From 910fe61d3ee439b26a6a33cc9f65e1f7a52f332d Mon Sep 17 00:00:00 2001
+From e60314a1257964bbebc0e7633d9799fd7c7ec35b 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 9107b302476..12d8171d238 100644
+index ab20142de9a..4ef4aa80cc0 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") {
+@@ -3543,7 +3543,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-Fix-bison-3.7.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
deleted file mode 100644
index 3272b727..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3ccc10f378ca26c35104e39e08771c053ae5b19e Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 14 Aug 2020 16:38:48 +0200
-Subject: [PATCH] chromium: Fix bison 3.7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Do a replace run inspired by newer versions of the script.
-
-Fixes: QTBUG-86018
-Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../renderer/build/scripts/rule_bison.py      | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-index f75e25fd23f..7e0767e951a 100755
---- a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-@@ -45,6 +45,19 @@ from utilities import abs
- 
- from blinkbuild.name_style_converter import NameStyleConverter
- 
-+def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
-+    prefix_lines = map(lambda s: s + '\n', prefix_lines)
-+    suffix_lines = map(lambda s: s + '\n', suffix_lines)
-+    with open(path, 'r') as f:
-+        old_lines = f.readlines()
-+    for i in range(len(old_lines)):
-+        for src, dest in replace_list:
-+            old_lines[i] = old_lines[i].replace(src, dest)
-+    new_lines = prefix_lines + old_lines + suffix_lines
-+    with open(path, 'w') as f:
-+        f.writelines(new_lines)
-+
-+
- assert len(sys.argv) == 4 or len(sys.argv) == 5
- 
- inputFile = abs(sys.argv[1])
-@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
- print >>outputHFile, outputHContents
- print >>outputHFile, '#endif  // %s' % headerGuard
- outputHFile.close()
-+
-+common_replace_list = [(inputRoot + '.hh',
-+                        inputRoot + '.h')]
-+modify_file(
-+    outputCpp, [], [],
-+    replace_list=common_replace_list)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
index 52607983..8a6660ff 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
-From 8c9a4027426b0a2c56cc834da0dbad5b8378c2c6 Mon Sep 17 00:00:00 2001
+From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 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,7 +20,7 @@ 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 023d6e13a2c..312f34d6186 100644
+index 73673fa20ac..a656692c7bf 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")
@@ -37,9 +37,9 @@ index 023d6e13a2c..312f34d6186 100644
  }
  
  if (is_android) {
-@@ -20,6 +24,12 @@ if (is_mac) {
-   import("//build/config/sanitizers/sanitizers.gni")
- }
+@@ -23,6 +27,12 @@ if (is_mac) {
+ assert(!icu_disable_thin_archive || !is_component_build,
+        "icu_disable_thin_archive only works in static library builds")
  
 +if (use_system_icu) {
 +  # Use system library only for target, otherwise use bundled
@@ -50,7 +50,7 @@ index 023d6e13a2c..312f34d6186 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") {
-@@ -1207,7 +1217,7 @@ config("system_icu_config") {
+@@ -1222,7 +1232,7 @@ config("system_icu_config") {
    }
  }
  
@@ -59,7 +59,7 @@ index 023d6e13a2c..312f34d6186 100644
    pkg_config("system_icui18n") {
      packages = [ "icu-i18n" ]
    }
-@@ -1420,7 +1430,7 @@ shim_headers("icuuc_shim") {
+@@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") {
  }
  
  config("icu_config") {
@@ -68,7 +68,7 @@ index 023d6e13a2c..312f34d6186 100644
      configs = [ ":system_icu_config"]
    } else {
      configs = [ ":bundled_icu_config"]
-@@ -1428,7 +1438,7 @@ config("icu_config") {
+@@ -1443,7 +1453,7 @@ config("icu_config") {
  }
  
  group("icuuc") {
@@ -77,7 +77,7 @@ index 023d6e13a2c..312f34d6186 100644
      deps = [ ":icuuc_shim" ]
      public_configs = [
        ":system_icu_config",
-@@ -1440,7 +1450,7 @@ group("icuuc") {
+@@ -1455,7 +1465,7 @@ group("icuuc") {
  }
  
  group("icui18n") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
deleted file mode 100644
index 2da3e09d..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1902fc967d6f900a4e918e56f21bc856a0462e4c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jul 2017 15:12:39 -0700
-Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
- LinuxSigInfo
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc
-index 003708d2c89..0fef3148f9d 100644
---- a/chromium/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc
-@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
-   // most versions of glibc don't include this information in siginfo_t. So,
-   // we need to explicitly copy it into a arch_sigsys structure.
-   struct arch_sigsys sigsys;
--  memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
-+  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
- 
- #if defined(__mips__)
-   // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
index 04bf89e4..50d17413 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -5,15 +5,15 @@ 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 ++-
- .../third_party/blink/renderer/platform/wtf/stack_util.cc     | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ 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(-)
 
 diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
-index 095c49b8dc0..d1479b54d48 100644
+index 74a01ad5af5..dab5773d73b 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,15 +24,15 @@ 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 b2421649ff3..a31b96e90e6 100644
+index ab1dff4167e..b0763b0bd9a 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() {
  // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
  // correctly for the main thread.
  
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
      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).
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
index e6fa0887..edeb3272 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
@@ -14,10 +14,10 @@ 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 d2bd9df4d40..88ea7f508aa 100644
+index fd8efdffea6..22a8863031c 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -1239,6 +1239,11 @@ struct kernel_statfs {
+@@ -1244,6 +1244,11 @@ struct kernel_statfs {
  #ifndef __NR_fallocate
  #define __NR_fallocate          285
  #endif
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
index 8db39395..72adf1cb 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -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 572472a6993..504fdb5d5c6 100644
+index 7df6892d67e..030ff8896e4 100644
 --- a/chromium/net/socket/udp_socket_posix.cc
 +++ b/chromium/net/socket/udp_socket_posix.cc
-@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
+@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
    for (auto& buffer : buffers)
      msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
    msgvec->reserve(buffers.size());