10 files changed, 127 insertions, 181 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
deleted file mode 100644
index 0e9ea724..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
-From: Cleiton Bueno <cleitonrbueno@gmail.com>
-Date: Thu, 24 Dec 2015 12:46:58 -0200
-Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
- qtwebengine compile
-
-Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc
-index 6d926378be..738d3fdedf 100644
---- a/chromium/ui/gfx/codec/jpeg_codec.cc
-+++ b/chromium/ui/gfx/codec/jpeg_codec.cc
-@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
-   // tell libjpeg where to write the next data
-   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
-   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
--  return 1;
-+  return TRUE;
- }
- 
- // Cleans up the JpegEncoderState to prepare for returning in the final form.
-@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   cinfo.data_precision = 8;
- 
-   jpeg_set_defaults(&cinfo);
--  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
-+  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
- 
-   // set up the destination manager
-   jpeg_destination_mgr destmgr;
-@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
-   JpegEncoderState state(output);
-   cinfo.client_data = &state;
- 
--  jpeg_start_compress(&cinfo, 1);
-+  jpeg_start_compress(&cinfo, TRUE);
- 
-   // feed it the rows, doing necessary conversions for the color format
- #ifdef JCS_EXTENSIONS
-@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
- //   set to a positive value if TRUE is returned. A FALSE return should only
- //   be used when I/O suspension is desired."
- boolean FillInputBuffer(j_decompress_ptr cinfo) {
--  return false;
-+  return FALSE;
- }
- 
- // Skip data in the buffer. Since we have all the data at once, this operation
-@@ -488,8 +488,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
-   cinfo.client_data = &state;
- 
-   // fill the file metadata into our buffer
--  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
--    return false;
-+  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
-+    return FALSE;
- 
-   // we want to always get RGB data out
-   switch (cinfo.jpeg_color_space) {
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
deleted file mode 100644
index 275ef9e8..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
-From: Frieder Schrempf <frieder.schrempf@online.de>
-Date: Mon, 1 Dec 2014 14:34:40 +0000
-Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/functions.prf | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index 56894e58..ef418a4c 100644
---- a/mkspecs/features/functions.prf
-+++ b/mkspecs/features/functions.prf
-@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
-       return(false)
-     }
-     gcc:!clang:!isGCCVersionSupported(): return(false)
-+  } else:linux-oe-g++* {
-+    !gcc:!clang {
-+      skipBuild("Qt WebEngine on Linux requires clang or GCC.")
-+      return(false)
-+    }
-+    gcc:!clang:!isGCCVersionSupported(): return(false)
-   } else:win32 {
-     winrt {
-       skipBuild("WinRT is not supported.")
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
index 4a1a975f..3b24e064 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001
+From 5616656eb6d7423aaea107513209dac88c79d916 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
@@ -10,16 +10,16 @@ Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ chromium/tools/gn/bootstrap/bootstrap.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
-index 43d252b43e..e58347848e 100755
+index b1ff7e7..bccabbb 100755
 --- a/chromium/tools/gn/bootstrap/bootstrap.py
 +++ b/chromium/tools/gn/bootstrap/bootstrap.py
-@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options):
-     ld = os.environ.get('LD', 'link.exe')
-     ar = os.environ.get('AR', 'lib.exe')
+@@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options):
+     ld = os.environ.get('LD', cxx)
+     ar = os.environ.get('AR', 'ar -X64')
    else:
 -    cc = os.environ.get('CC', 'cc')
 -    cxx = os.environ.get('CXX', 'c++')
@@ -29,12 +29,5 @@ index 43d252b43e..e58347848e 100755
 -    ar = os.environ.get('AR', 'ar')
 +    ar = os.environ.get('AR_host', 'ar')
  
--  cflags = os.environ.get('CFLAGS', '').split()
--  cflags_cc = os.environ.get('CXXFLAGS', '').split()
--  ldflags = os.environ.get('LDFLAGS', '').split()
-+  cflags = os.environ.get('CFLAGS_host', '').split()
-+  cflags_cc = os.environ.get('CXXFLAGS_host', '').split()
-+  ldflags = os.environ.get('LDFLAGS_host', '').split()
-   include_dirs = [root_gen_dir, SRC_ROOT]
-   libs = []
- 
+   # QTBUG-64759
+   # cflags = os.environ.get('CFLAGS', '').split()
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
index bda0ba1a..464c7648 100644
--- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
-From 9bdd03ad0bbb221ad7bffe0e570605c21c28b1b5 Mon Sep 17 00:00:00 2001
+From 2a3c39550955ed44cfc8410ab2da124c58ca66c0 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] Force host toolchain configuration
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index f1b3d47b..12123729 100644
+index dd0d3e3..70161c8 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
 @@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -30,7 +30,7 @@ index f1b3d47b..12123729 100644
  !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
  else: GN_TARGET_CPU = $$GN_HOST_CPU
  GN_OS = $$gnOS()
-@@ -29,9 +29,9 @@ GN_CONTENTS = \
+@@ -31,9 +31,9 @@ GN_CONTENTS = \
  "import(\"//build/config/sysroot.gni\")" \
  "import(\"//build/toolchain/gcc_toolchain.gni\")" \
  "gcc_toolchain(\"host\") {" \
@@ -42,8 +42,8 @@ index f1b3d47b..12123729 100644
 +"  ld = \"$$which(g++)\" " \
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
- "  toolchain_args = { " \
-@@ -42,9 +42,9 @@ GN_CONTENTS = \
+ "  extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
+@@ -45,9 +45,9 @@ GN_CONTENTS = \
  "  } " \
  "}" \
  "gcc_toolchain(\"v8_snapshot\") {" \
@@ -57,10 +57,10 @@ index f1b3d47b..12123729 100644
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 714c864d..f66ca551 100644
+index 6f7b27f..1b9434b 100644
 --- a/src/core/config/linux.pri
 +++ b/src/core/config/linux.pri
-@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build {
+@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") {
  
  host_build {
      gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index bf1f1891..1e187956 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,19 +1,41 @@
-From e695f37fc52defd1b96664b003444692e9b6cb65 Mon Sep 17 00:00:00 2001
+From f6c6a5522f006b14c4d9c4daa23f96c4e8e65a32 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
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
+ chromium/base/process/process_metrics_posix.cc    | 4 ++--
  chromium/base/trace_event/malloc_dump_provider.cc | 3 ++-
  chromium/content/child/content_child_helpers.cc   | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ 3 files changed, 5 insertions(+), 4 deletions(-)
 
+diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
+index 0eb5c1f..8af7799 100644
+--- a/chromium/base/process/process_metrics_posix.cc
++++ b/chromium/base/process/process_metrics_posix.cc
+@@ -94,14 +94,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)
+   struct mallinfo minfo = mallinfo();
+ #if defined(USE_TCMALLOC)
+   return minfo.uordblks;
+ #else
+   return minfo.hblkhd + minfo.arena;
+ #endif
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
 diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
-index 7d0cb57931..10be59ebad 100644
+index 14ba0a2..e5d9581 100644
 --- a/chromium/base/trace_event/malloc_dump_provider.cc
 +++ b/chromium/base/trace_event/malloc_dump_provider.cc
-@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
+@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
  // the current process.
  bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
                                        ProcessMemoryDump* pmd) {
@@ -21,7 +43,7 @@ index 7d0cb57931..10be59ebad 100644
    size_t total_virtual_size = 0;
    size_t resident_size = 0;
    size_t allocated_objects_size = 0;
-@@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+@@ -317,7 +318,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
      pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc");
    }
    tid_dumping_heap_ = kInvalidThreadId;
@@ -31,7 +53,7 @@ index 7d0cb57931..10be59ebad 100644
  }
  
 diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc
-index 7ddeb4d16a..b8c73b09c5 100644
+index 7ddeb4d..b8c73b0 100644
 --- a/chromium/content/child/content_child_helpers.cc
 +++ b/chromium/content/child/content_child_helpers.cc
 @@ -25,7 +25,7 @@ namespace content {
diff --git a/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
new file mode 100644
index 00000000..38fa8729
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -0,0 +1,37 @@
+From 0fd704beb18948577e793b73c569dc933c478f2e Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 12 Dec 2017 16:06:14 +0200
+Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
+
+Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403
+Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
+---
+ src/core/api/qtbug-61521.cpp | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
+index 002a1af..8fd2da3 100644
+--- a/src/core/api/qtbug-61521.cpp
++++ b/src/core/api/qtbug-61521.cpp
+@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc);
+ void* __valloc(size_t size)
+     SHIM_ALIAS_SYMBOL(ShimValloc);
+ 
+-SHIM_SYMBOL_VERSION(pvalloc);
+-void* __pvalloc(size_t size)
+-    SHIM_ALIAS_SYMBOL(ShimPvalloc);
+-
+ SHIM_SYMBOL_VERSION(posix_memalign);
+ int __posix_memalign(void** r, size_t a, size_t s)
+     SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
+@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) {
+     return  valloc(size);
+ }
+ 
+-SHIM_HIDDEN void* ShimPvalloc(size_t size) {
+-    return pvalloc(size);
+-}
+-
+ SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
+     return posix_memalign(r,a,s);
+ }
diff --git a/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch b/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch
deleted file mode 100644
index 8b82010c..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-tests-make-accessibility-tests-conditional.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 006f08373cbaa8485311f491ab8e67433c0e9ad6 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <daniel@zonque.org>
-Date: Tue, 24 Oct 2017 15:46:19 +0200
-Subject: [PATCH] tests: make accessibility tests conditional
-
-Only test the accessibility functions if accessibility was enabled in the Qt
-config.
----
- tests/auto/widgets/widgets.pro | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
-index 441eea0f..7bab18f0 100644
---- a/tests/auto/widgets/widgets.pro
-+++ b/tests/auto/widgets/widgets.pro
-@@ -1,7 +1,6 @@
- TEMPLATE = subdirs
- 
- SUBDIRS += \
--    qwebengineaccessibility \
-     qwebenginedefaultsurfaceformat \
-     qwebenginedownloads \
-     qwebenginefaviconmanager \
-@@ -14,6 +13,10 @@ SUBDIRS += \
-     qwebenginesettings \
-     qwebengineview
- 
-+qtConfig(accessibility) {
-+    SUBDIRS += qwebengineaccessibility
-+}
-+
- contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
-     !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
-         SUBDIRS += qwebenginespellcheck
--- 
-2.13.6
-
diff --git a/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
new file mode 100644
index 00000000..cabc598e
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
@@ -0,0 +1,24 @@
+From 59fd9db95db829e51840df09962f7c6baf484246 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
+
+Change-Id: Ifada60f9c72691973612850121f6fb152d70839a
+Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
+---
+ src/core/core_module.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/core_module.pro b/src/core/core_module.pro
+index 2409ccb..e41e5a9 100644
+--- a/src/core/core_module.pro
++++ b/src/core/core_module.pro
+@@ -45,7 +45,7 @@ else: QMAKE_LFLAGS += $$NINJA_LFLAGS
+ POST_TARGETDEPS += $$NINJA_TARGETDEPS
+ 
+ 
+-LIBS_PRIVATE += -L$$api_library_path
++LIBS_PRIVATE += -L$$api_library_path -lexecinfo
+ CONFIG *= no_smart_library_merge
+ osx {
+     LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
index 7a778c22..d6de1c00 100644
--- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
-From d0621f9278ddd04c05b6ab3ef638be65f96f1bd6 Mon Sep 17 00:00:00 2001
+From 2ed7538fb95ce3bb8a5917c648e2361f85b9c67b 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,12 +9,12 @@ 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 5a0564d2f3..8c2dc6491d 100644
+index 9cd5d22..1e70095 100644
 --- a/chromium/base/allocator/allocator_check.cc
 +++ b/chromium/base/allocator/allocator_check.cc
-@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() {
- #if defined(OS_WIN) && defined(ALLOCATOR_SHIM)
-   // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called.
+@@ -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) && defined(USE_TCMALLOC) && \
 +#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
index f1cc205b..652b89ec 100644
--- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,16 +1,16 @@
-From 72a77c994434ecb708b2790ba9efaf1decc02503 Mon Sep 17 00:00:00 2001
+From d42b48975e92cfc4510030315ad8093bece4b7c5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 7 Jul 2017 16:41:23 -0700
 Subject: [PATCH] chromium: musl: Adjust default pthread stack size
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- chromium/base/threading/platform_thread_linux.cc                     | 3 ++-
- chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++--
+ chromium/base/threading/platform_thread_linux.cc              | 3 ++-
+ chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 4 ++--
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
-index 92fbda5ee1..c41579d4ed 100644
+index 8d411ed..4b56cf3 100644
 --- a/chromium/base/threading/platform_thread_linux.cc
 +++ b/chromium/base/threading/platform_thread_linux.cc
 @@ -175,7 +175,8 @@ void TerminateOnThread() {}
@@ -23,25 +23,25 @@ index 92fbda5ee1..c41579d4ed 100644
  #else
    // 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/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
-index 1d164f510a..3358deb256 100644
---- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
-+++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
-@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
+diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
+index 13c3f90..07308e0 100644
+--- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
++++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
+@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() {
  // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
  // correctly for the main thread.
  
--#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if 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 webkit_unit_tests).
-   // If so, a conservative size estimate is returned.
-@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
+@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() {
  }
  
- void* StackFrameDepth::getStackStart() {
--#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
    pthread_attr_t attr;
    int error;
- #if OS(FREEBSD)