t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-16 20:21:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtwebengine: update patches for latest 5.15 revision

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2020-03-13 12:12:45 +01:00
parent 6cce9817bd
commit 9a645b029a
29 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
View File

@@ -1,4 +1,4 @@
From 743559f433bc1becb23241c55e44865d3aaad39b Mon Sep 17 00:00:00 2001
From 86e142dfa4f2f0461b7f6b45452695ac17a09a94 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
@@ -19,10 +19,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
index add563f2..f64da99d 100644
index 2aa345c2..a55dc128 100644
--- a/src/buildtools/config/linux.pri
+++ b/src/buildtools/config/linux.pri
@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
@@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") {
host_build {
gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"

2
recipes-qt/qt5/qtwebengine/0002-Remove-ninja-version-test-for-now-it-fails-for-ninja.patch
View File

@@ -1,4 +1,4 @@
From c5c5465810c9e98b7eec3e1c017bcec14db182af Mon Sep 17 00:00:00 2001
From 64aa17e9baa2dac2db74c9bd996526d100168b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 8 Mar 2020 10:51:48 +0100
Subject: [PATCH] Remove ninja version test for now - it fails for ninja >=

2
recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
View File

@@ -1,4 +1,4 @@
From 3d04a8aecf15c81039344227bb06314b114722b3 Mon Sep 17 00:00:00 2001
From 76cab33f8ab2596793844846340fe35e121e2881 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

2
recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch
View File

@@ -1,4 +1,4 @@
From 6832bca7b7bd9e984434e7563827023c68ba1b85 Mon Sep 17 00:00:00 2001
From 0cacc8e4063464269a561b7331f87f317983f366 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

2
recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
View File

@@ -1,4 +1,4 @@
From 4d5fc056dffee86927b158428b44087064f70182 Mon Sep 17 00:00:00 2001
From 731a737808672ececec3ce182a8060aa9e1a9419 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 12 Nov 2019 19:53:59 -0800
Subject: [PATCH] mkspecs: Allow builds with libc != glibc

2
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
View File

@@ -1,4 +1,4 @@
From c1908023ef99835e90e97c226eb877529501a199 Mon Sep 17 00:00:00 2001
From 81d0ea1de0997fc517f3d80d28aa300cb669ba0b 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

2
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
View File

@@ -1,4 +1,4 @@
From 25822f417240f38c302562f89a29c8e67fc84648 Mon Sep 17 00:00:00 2001
From e1ee87667769a11f00b3c085cac09497702f3651 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

18
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
View File

@@ -1,4 +1,4 @@
From a7112509e81a1dfff6c266f34f33a11f58a8468e Mon Sep 17 00:00:00 2001
From 114296ba7b2c66583e5ee6b84e4db3759d4fd1dc 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 be485fd89b9..7179df05451 100644
index ab47e2b98f8..f5ac335af90 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
@@ -774,8 +774,6 @@ config("compiler_cpu_abi") {
}
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index be485fd89b9..7179df05451 100644
}
if (!is_nacl) {
cflags += [
@@ -787,8 +785,6 @@ config("compiler_cpu_abi") {
@@ -788,8 +786,6 @@ config("compiler_cpu_abi") {
}
} else if (current_cpu == "arm64") {
if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index be485fd89b9..7179df05451 100644
}
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
@@ -797,9 +793,6 @@ config("compiler_cpu_abi") {
@@ -798,9 +794,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mipsel-linux-android" ]
ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index be485fd89b9..7179df05451 100644
}
} else {
cflags += [ "-EL" ]
@@ -878,10 +871,7 @@ config("compiler_cpu_abi") {
@@ -879,10 +872,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 be485fd89b9..7179df05451 100644
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
}
@@ -928,9 +918,6 @@ config("compiler_cpu_abi") {
@@ -929,9 +919,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mips64el-linux-android" ]
ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index be485fd89b9..7179df05451 100644
}
} else {
cflags += [
@@ -987,10 +974,7 @@ config("compiler_cpu_abi") {
@@ -988,10 +975,7 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "mips64") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index be485fd89b9..7179df05451 100644
cflags += [
"-EB",
"-mabi=64",
@@ -1169,13 +1153,6 @@ config("compiler_deterministic") {
@@ -1160,13 +1144,6 @@ config("compiler_deterministic") {
}
}
}

4
recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
View File

@@ -1,4 +1,4 @@
From c5d6db08e5fa01410faa9a673de7e4903a541b28 Mon Sep 17 00:00:00 2001
From d524e295abdeb429551309ea990932a32462f366 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,7 +15,7 @@ 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 29dda54ac20..6870dbb9f08 100644
index cd9fed01e5a..42070dd80fa 100644
--- a/chromium/third_party/zlib/BUILD.gn
+++ b/chromium/third_party/zlib/BUILD.gn
@@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) {

6
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
View File

@@ -1,4 +1,4 @@
From 250429a19e0f122ccb55755f201c2ae144f26dd1 Mon Sep 17 00:00:00 2001
From 0859cc8991fe48f9f5494c9b521004997310eb65 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
@@ -17,10 +17,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 7179df05451..884c9714bbb 100644
index f5ac335af90..70b352f1ed1 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -774,15 +774,6 @@ config("compiler_cpu_abi") {
@@ -775,15 +775,6 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl) {
}

8
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
View File

@@ -1,4 +1,4 @@
From abaafda209061911defd5cddf9e6a93b3e8f8c98 Mon Sep 17 00:00:00 2001
From 5f57c7ccb0f0e97ec0b33105e91e7148d4a3aa4e 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,10 +28,10 @@ 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 b59506dcd6d..b8f22c948c0 100644
index 7322807095f..0d6f981e895 100644
--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) {
@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
}
SI F from_half(U16 h) {
@@ -46,7 +46,7 @@ index b59506dcd6d..b8f22c948c0 100644
return _mm256_cvtph_ps(h);
#else
@@ -995,14 +989,7 @@ SI F from_half(U16 h) {
@@ -1009,14 +1003,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {

2
recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
View File

@@ -1,4 +1,4 @@
From 10c1d6b749eecbb640ba62e0edba6d6dccdf265e Mon Sep 17 00:00:00 2001
From 22d5a82de35f0699c69bf4514fa3474507ab0dad 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

4
recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
View File

@@ -1,4 +1,4 @@
From c7e20f2ba5481731ce0390c9faa77fc54c81093b Mon Sep 17 00:00:00 2001
From 7b5dd7fb568f5b78588a3de3e35c28d05dc31e7e 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
@@ -17,7 +17,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
index 5684f4121be..10f6357e6b5 100644
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(

2
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
View File

@@ -1,4 +1,4 @@
From 8cc4b2045abbcb67202fe6981b435a522bf4cf52 Mon Sep 17 00:00:00 2001
From 3af6cfed27629fe8ee4225cb92eb9c0fd9a6fcb1 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

2
recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
View File

@@ -1,4 +1,4 @@
From abcad90090911493da6e811ecab3b586147365dd Mon Sep 17 00:00:00 2001
From d341659ba0ef414e54b0e652413df45ae8c74886 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

2
recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
View File

@@ -1,4 +1,4 @@
From 80fc8ce7651528223256f3f07aa561e5300e972a Mon Sep 17 00:00:00 2001
From 9ee241422fec3450d383e5d5b276293374d9680f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 14:01:12 -0700
Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not

12
recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
View File

@@ -1,4 +1,4 @@
From 650ffdd77fb2d0ecce142617ec95eefb894e0ada Mon Sep 17 00:00:00 2001
From 83839a5abef1ea5edf947ce7343a6b19c131f789 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,17 +10,17 @@ 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 5763432aa4f..ff00b7307c0 100644
index 044bd8d244f..cec43e1d59b 100644
--- a/chromium/base/process/process_metrics_posix.cc
+++ b/chromium/base/process/process_metrics_posix.cc
@@ -109,14 +109,14 @@ size_t ProcessMetrics::GetMallocUsage() {
@@ -110,14 +110,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)
#if BUILDFLAG(USE_TCMALLOC)
return minfo.uordblks;
#else
return minfo.hblkhd + minfo.arena;
@@ -31,7 +31,7 @@ index 5763432aa4f..ff00b7307c0 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 0077d8b0aec..c69f893f4e9 100644
index 7e42cfc20bb..4e24fc711ad 100644
--- a/chromium/base/trace_event/malloc_dump_provider.cc
+++ b/chromium/base/trace_event/malloc_dump_provider.cc
@@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
@@ -42,7 +42,7 @@ index 0077d8b0aec..c69f893f4e9 100644
{
base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
if (!emit_metrics_on_memory_dump_)
@@ -172,6 +173,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
@@ -175,6 +176,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
MemoryAllocatorDump::kUnitsBytes,
resident_size - allocated_objects_size);
}

2
recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch
View File

@@ -1,4 +1,4 @@
From 4281b7c9e55be142de0ef84a387af6080a8632e5 Mon Sep 17 00:00:00 2001
From 1ca90b97e7c547eae2ff8d3e9b11f70fcf451ef4 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

2
recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
View File

@@ -1,4 +1,4 @@
From 3fc723c5953ede1019e88f373eb8a42f34dfd093 Mon Sep 17 00:00:00 2001
From 44f0d85afb733d2bb1d1ac2ca79e1bf200201c14 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

8
recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch
View File

@@ -1,4 +1,4 @@
From fdf8296efde5c21e2a89045d18194caa619b4528 Mon Sep 17 00:00:00 2001
From 30c93cab167ac356cd5340fadd207ba938733e39 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 5fb86467dde..9864858eb67 100644
index 5ea77ef2d27..85343a13905 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) && defined(USE_TCMALLOC) && \
+#elif defined(__GLIBC__) && defined(USE_TCMALLOC) && \
-#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \
+#elif defined(__GLIBC__) && 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.

10
recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
View File

@@ -1,4 +1,4 @@
From 03e4bb54c5f92d94d6e13b2d09a46890b8373673 Mon Sep 17 00:00:00 2001
From 74f7bd4fec4df85e52dea61e13ca931303fc402d 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
@@ -10,15 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
index e6838ebda84..7296cc9ed81 100644
index ef42d5ad67f..626e4c996a5 100644
--- a/chromium/base/allocator/allocator_shim.cc
+++ b/chromium/base/allocator/allocator_shim.cc
@@ -351,7 +351,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
@@ -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 defined(USE_TCMALLOC)
+#if defined(USE_TCMALLOC) && defined(__GLIBC__)
-#if BUILDFLAG(USE_TCMALLOC)
+#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__)
#include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
#endif

2
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
View File

@@ -1,4 +1,4 @@
From e88b6611ad9509cdcd2585716c06aaf33639cd73 Mon Sep 17 00:00:00 2001
From 339f04c1d1df929c23d5e53b3e97315501c5099e 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

6
recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
View File

@@ -1,4 +1,4 @@
From 33742ab35ff2fd89d193f460abe77c6eebb8f309 Mon Sep 17 00:00:00 2001
From 2fc67ea089a25aa035248fb7658f3a2c8e1226d9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 15:27:50 -0700
Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
create mode 100644 chromium/net/dns/resolv_compat.h
diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc
index ee2d5721425..bcb83b07f6e 100644
index 2e0f06b0c1e..aaafef77d79 100644
--- a/chromium/net/dns/dns_config_service_posix.cc
+++ b/chromium/net/dns/dns_config_service_posix.cc
@@ -29,6 +29,10 @@
@@ -28,7 +28,7 @@ index ee2d5721425..bcb83b07f6e 100644
#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 03e248c9878..9ccda82c7e9 100644
index 1c014a65019..2670a827aa5 100644
--- a/chromium/net/dns/dns_reloader.cc
+++ b/chromium/net/dns/dns_reloader.cc
@@ -9,6 +9,10 @@

2
recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch
View File

@@ -1,4 +1,4 @@
From 11cbedc4c13b6710b5b45fc4e442f091ed26814c Mon Sep 17 00:00:00 2001
From d111154075589604e2039cd25f89a48eea4603cd 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

2
recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch
View File

@@ -1,4 +1,4 @@
From 6a33d68b3a84cacf18ef3789c620760284f5da0c Mon Sep 17 00:00:00 2001
From 879870c763dd4e3687f5799fb81e4f7d791c28c3 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

2
recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
View File

@@ -1,4 +1,4 @@
From 3f194cc5cd691a5e9e8bc5d4a2cb3f88db24db7c Mon Sep 17 00:00:00 2001
From 79a5e4b69c9884703998ca5c7f73968ede7dd33c 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

2
recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
View File

@@ -1,4 +1,4 @@
From 913b4eec582640ec29e5de307ce56ea3bf57a3f3 Mon Sep 17 00:00:00 2001
From 2382e6f9d3141779ae292d766df452d5858413ca 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

2
recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-pread-pwrite.patch
View File

@@ -1,4 +1,4 @@
From d147db9dbf0f6831af445ab15ad230964a4fb080 Mon Sep 17 00:00:00 2001
From 79de79e8e4cf1f146a3205659136415b33c6ebb8 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

8
recipes-qt/qt5/qtwebengine_git.bb
View File

@@ -157,8 +157,8 @@ SRC_URI_append_libc-musl = "\
file://0005-mkspecs-Allow-builds-with-libc-glibc.patch \
"
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/77-based
# 77-based.meta-qt5.2
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/79-based
# 79-based.meta-qt5.1
SRC_URI += " \
file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
@@ -190,8 +190,8 @@ SRC_URI_append_libc-musl = "\
file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
"
SRCREV_qtwebengine = "d9349a299f66fb154ad24f410451872a7ca253fb"
SRCREV_chromium = "5b79320c01316f29510df90f7c6b508b9f72b8a4"
SRCREV_qtwebengine = "71c3f0a1f8decdd6ba43afb79fa23ee2dc8c743e"
SRCREV_chromium = "4ea2213507a2317fef895a1ab473f9a2729d74af"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"