6 files changed, 31 insertions, 128 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 8de23c76..d15af51e 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -14,8 +14,9 @@ Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 ---
  src/buildtools/configure_host.pro | 14 +++++++-------
+ src/buildtools/gn.pro             |  4 ++--
  src/core/config/linux.pri         |  2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ 3 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
 index dd0d3e32..6312c867 100644
@@ -56,11 +57,26 @@ index dd0d3e32..6312c867 100644
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
+diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
+index b6bf9cf..ae419b1 100644
+--- a/src/buildtools/gn.pro
++++ b/src/buildtools/gn.pro
+@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
+             gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
+ 
+             gn_gen_args = --no-last-commit-position --out-path $$out_path \
+-                          --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
+-                          --ld \"$$which($$QMAKE_LINK)\"
++                          --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \
++                          --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\"
+ 
+             msvc:!clang_cl: gn_gen_args += --use-lto
+ 
 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 9fc8c6e8..f3768585 100644
+index 95b7a4b..db0658e 100644
 --- a/src/core/config/linux.pri
 +++ b/src/core/config/linux.pri
-@@ -113,7 +113,7 @@ contains(QT_ARCH, "mips") {
+@@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") {
  
  host_build {
      gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
deleted file mode 100644
index 4e901aa9..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b0e6bada9d4da53204dffa7d9343f925c7d5603e Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 15 Mar 2017 13:53:28 +0200
-Subject: [PATCH] chromium: Force host toolchain configuration
-
-Force gcc/g++ to be used for parts using host toolchain, since
-the option(host_build) does not work in yocto builds.
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- gn/build/gen.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gn/build/gen.py b/gn/build/gen.py
-index 87db4c26bcf..34c853b7f4a 100755
---- a/gn/build/gen.py
-+++ b/gn/build/gen.py
-@@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-     ld = os.environ.get('LD', 'g++')
-     ar = os.environ.get('AR', 'ar -X64')
-   else:
--    cc = os.environ.get('CC', 'cc')
--    cxx = os.environ.get('CXX', 'c++')
-+    cc = os.environ.get('CC_host', 'gcc')
-+    cxx = os.environ.get('CXX_host', 'g++')
-     ld = cxx
--    ar = os.environ.get('AR', 'ar')
-+    ar = os.environ.get('AR_host', 'ar')
- 
-   # QTBUG-64759
-   # cflags = os.environ.get('CFLAGS', '').split()
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
deleted file mode 100644
index 8281dd71..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 53b101c4d3d419920d8a9f96d8afe10716c137c5 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 5 Jun 2018 13:58:16 +0000
-Subject: [PATCH] chromium: Fix build with gcc8
-
----
- chromium/mojo/public/c/system/buffer.h       | 2 +-
- chromium/mojo/public/c/system/data_pipe.h    | 2 +-
- chromium/mojo/public/c/system/message_pipe.h | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h
-index 2cc54270ad1..917415f8db4 100644
---- a/chromium/mojo/public/c/system/buffer.h
-+++ b/chromium/mojo/public/c/system/buffer.h
-@@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
-   // See |MojoCreateSharedBufferFlags|.
-   MojoCreateSharedBufferFlags flags;
- };
--MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
-+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
- MOJO_STATIC_ASSERT(sizeof(MojoCreateSharedBufferOptions) == 8,
-                    "MojoCreateSharedBufferOptions has wrong size");
- 
-diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h
-index 3702cdb6249..a86c8e8b321 100644
---- a/chromium/mojo/public/c/system/data_pipe.h
-+++ b/chromium/mojo/public/c/system/data_pipe.h
-@@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
-   // system-dependent capacity of at least one element in size.
-   uint32_t capacity_num_bytes;
- };
--MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
-+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
- MOJO_STATIC_ASSERT(sizeof(MojoCreateDataPipeOptions) == 16,
-                    "MojoCreateDataPipeOptions has wrong size");
- 
-diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h
-index 9f222f9aa81..4878774707a 100644
---- a/chromium/mojo/public/c/system/message_pipe.h
-+++ b/chromium/mojo/public/c/system/message_pipe.h
-@@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
-   // See |MojoCreateMessagePipeFlags|.
-   MojoCreateMessagePipeFlags flags;
- };
--MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
-+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
- MOJO_STATIC_ASSERT(sizeof(MojoCreateMessagePipeOptions) == 8,
-                    "MojoCreateMessagePipeOptions has wrong size");
- 
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
index 3305c6b4..7823482b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
@@ -6,15 +6,15 @@ Subject: [PATCH] chromium: fix build with clang
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- chromium/build/config/compiler/BUILD.gn | 27 ++-----------------------
+ chromium/build/config/compiler/BUILD.gn | 27 ++-------------------------
  1 file changed, 2 insertions(+), 25 deletions(-)
 
 diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
 index d223a4f6fd4..1c42c49ea4a 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -544,13 +544,6 @@ config("compiler") {
-     ]
+@@ -561,13 +561,6 @@ config("compiler") {
+     }
    }
  
 -  # Tells the compiler not to use absolute paths when passing the default
@@ -27,7 +27,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
    # C11/C++11 compiler flags setup.
    # ---------------------------
    if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
-@@ -748,8 +741,6 @@ config("compiler_cpu_abi") {
+@@ -799,8 +792,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm") {
        if (is_clang && !is_android && !is_nacl) {
@@ -36,7 +36,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
        }
        if (!is_nacl) {
          cflags += [
-@@ -762,8 +753,6 @@ config("compiler_cpu_abi") {
+@@ -813,8 +804,6 @@ config("compiler_cpu_abi") {
        }
      } else if (current_cpu == "arm64") {
        if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -45,7 +45,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
        }
      } else if (current_cpu == "mipsel" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -772,9 +761,6 @@ config("compiler_cpu_abi") {
+@@ -823,9 +812,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +55,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
            }
          } else {
            cflags += [ "-EL" ]
-@@ -853,10 +839,7 @@ config("compiler_cpu_abi") {
+@@ -904,10 +890,7 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "mips" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
@@ -67,7 +67,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
          }
-@@ -902,9 +885,6 @@ config("compiler_cpu_abi") {
+@@ -954,9 +937,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -77,7 +77,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
            }
          } else {
            cflags += [
-@@ -961,10 +941,7 @@ config("compiler_cpu_abi") {
+@@ -1013,10 +993,7 @@ config("compiler_cpu_abi") {
      } else if (current_cpu == "mips64") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
deleted file mode 100644
index 5988ec7f..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4e99677795977faccd1f28ac8fb8b3cfd72c4dcd Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 2 Feb 2019 22:09:20 -0800
-Subject: [PATCH] chromium: Check for __ARM_FP & 2 before using __fp16
-
-The __fp16 type denotes half-precision (16-bit) floating-point.
-The recommended way to test for this hardware support is to test bit 1 in __ARM_FP
-and
-If 16-bit floating-point is available, one of __ARM_FP16_FORMAT_IEEE and
-__ARM_FP16_FORMAT_ALTERNATIVE will be defined to indicate the format in use
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-index 33d9e7aa39f..aaefa5371ae 100644
---- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
-@@ -679,7 +679,7 @@ SI F from_half(U16 h) {
- }
- 
- SI U16 to_half(F f) {
--#if defined(__ARM_FP16_FORMAT_IEEE)
-+#if defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2)
-     __fp16 fp16 = __fp16(f);
-     U16 u16;
-     memcpy(&u16, &fp16, sizeof(U16));
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
index 377795f8..9a080207 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -18,12 +18,12 @@ diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUIL
 index 05907b481ac..dbc4be143cd 100644
 --- a/chromium/third_party/zlib/BUILD.gn
 +++ b/chromium/third_party/zlib/BUILD.gn
-@@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") {
-     #  - ChromeOS has wrapper scripts that are borking the compiler flags.
+@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) {
+     #      implement the CRC32* instructions. These are optional in ARMv8.0."
      #  - Fuchsia just added a syscall for feature detection.
      # TODO(cavalcantii): crbug.com/810125.
 +    defines = []
-     if (!is_ios && !is_chromeos && !is_fuchsia) {
+     if (is_clang && (!is_ios && !is_fuchsia)) {
 -      defines = [ "CRC32_ARMV8_CRC32" ]
 +      if (current_cpu == "arm64") {
 +        defines += [ "CRC32_ARMV8_CRC32" ]