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

qtwebengine: refresh the patches to apply

Browse Source 
* 4 musl patches didn't apply at all
* 0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch is
  dropped, because whole chromium/device/serial/serial_io_handler_posix.cc
  was removed in upgrade to 73:
  commit 38a9a29f4f9436cace7f0e7abf9c586057df8a4e
  Author: Allan Sandfeld Jensen <allan.jensen@qt.io>
  Date:   Wed Feb 13 16:23:34 2019 +0100
  Subject: BASELINE: Update Chromium to 73.0.3683.37

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2019-07-16 10:22:32 +00:00
parent c7f8827122
commit c8b3085aa4
23 changed files with 84 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From eb0b90b8809a8d8bd76999056d74d433a6c23184 Mon Sep 17 00:00:00 2001
From 468ed461a955cc1ab3d890178546b79b9d001de9 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
@@ -58,7 +58,7 @@ index dd0d3e32..6312c867 100644
" nm = \"$$which(nm)\" " \
" toolchain_args = { " \
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
index b6bf9cf..ae419b1 100644
index b6bf9cfc..ae419b1a 100644
--- a/src/buildtools/gn.pro
+++ b/src/buildtools/gn.pro
@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
@@ -73,10 +73,10 @@ index b6bf9cf..ae419b1 100644
msvc:!clang_cl: gn_gen_args += --use-lto
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 95b7a4b..db0658e 100644
index fcce4c31..e3384e58 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") {
@@ -117,7 +117,7 @@ contains(QT_ARCH, "mips") {
host_build {
gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"

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

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

6
recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
View File

@@ -1,4 +1,4 @@
From 983ba7f8f80165ade5347544f1e975bd6b67549e Mon Sep 17 00:00:00 2001
From 7b2e6cae9afa28571ccdc2a9224fb86caa88cd29 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,10 +10,10 @@ 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 3b5d37f2..0882d5fd 100644
index 2bfbc65b..7134a5d7 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -51,7 +51,7 @@ linux {
@@ -52,7 +52,7 @@ linux {
POST_TARGETDEPS += $$NINJA_TARGETDEPS

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

@@ -1,4 +1,4 @@
From 0bf810937f9340c19d1a085eed04d4a209c17d23 Mon Sep 17 00:00:00 2001
From f3345ad713ae81e4f914084b089ca7983bb76581 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/0004-chromium-stack-pointer-clobber.patch → recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
View File

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

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

@@ -1,4 +1,4 @@
From 249b99b4b54468b428a156f33e2a72066c82e9c2 Mon Sep 17 00:00:00 2001
From f290da1132af09f4cba13d5e551c75621b623247 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
@@ -6,14 +6,14 @@ 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
index dbf94c9ab6b..6f2eff6f5ef 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -561,13 +561,6 @@ config("compiler") {
@@ -570,13 +570,6 @@ config("compiler") {
}
}
@@ -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") {
@@ -799,8 +792,6 @@ config("compiler_cpu_abi") {
@@ -815,8 +808,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 += [
@@ -813,8 +804,6 @@ config("compiler_cpu_abi") {
@@ -829,8 +820,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" ]
@@ -823,9 +812,6 @@ config("compiler_cpu_abi") {
@@ -839,9 +828,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" ]
@@ -904,10 +890,7 @@ config("compiler_cpu_abi") {
@@ -920,10 +906,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" ]
}
@@ -954,9 +937,6 @@ config("compiler_cpu_abi") {
@@ -970,9 +953,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 += [
@@ -1013,10 +993,7 @@ config("compiler_cpu_abi") {
@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "mips64") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {

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

@@ -1,4 +1,4 @@
From b882013421036a05ea8c909292cc38d05fc29c89 Mon Sep 17 00:00:00 2001
From 3cacf1082e11c8047a42eb74dfa0e34f37995d92 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 05907b481ac..dbc4be143cd 100644
index 458f428b7ce..18b4f23f769 100644
--- a/chromium/third_party/zlib/BUILD.gn
+++ b/chromium/third_party/zlib/BUILD.gn
@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) {

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

@@ -1,7 +1,7 @@
From 058158c568698f79c905c19e5ef32ca714f8223e Mon Sep 17 00:00:00 2001
From 27d1c407b98979445e216c6fd105e78014e928b1 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 1/1] chromium: Do not try to set the guessed values for
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
@@ -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 1c42c49ea4..e919e157d7 100644
index 6f2eff6f5ef..57a950a435a 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -742,15 +742,6 @@ config("compiler_cpu_abi") {
@@ -809,15 +809,6 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl) {
}
@@ -36,6 +36,3 @@ index 1c42c49ea4..e919e157d7 100644
} else if (current_cpu == "arm64") {
if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
}
--
2.21.0

6
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch → recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
View File

@@ -1,4 +1,4 @@
From 2297089fdb32aca352802b1c7b044d0441f54165 Mon Sep 17 00:00:00 2001
From c665cc484556b07aec52fcb1d6851881b646450d 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,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 9 insertions(+)
diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c
index 66f68ef1387..9284d0d4fc5 100644
index 854819bfbb4..a99d32741d0 100644
--- a/chromium/sandbox/linux/suid/sandbox.c
+++ b/chromium/sandbox/linux/suid/sandbox.c
@@ -44,6 +44,15 @@ static bool DropRoot();
@@ -46,6 +46,15 @@ static bool DropRoot();
#define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)

4
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch → recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
View File

@@ -1,4 +1,4 @@
From 80cf8eb756140011f358522378d640587600976a Mon Sep 17 00:00:00 2001
From 136539399b9c3c9d2b52a0f789c045ca215682e2 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
@@ -31,7 +31,7 @@ index a09bbf2c56e..b309f6b694e 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 46fdb3e2146..27936e6b200 100644
index 0077d8b0aec..c69f893f4e9 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;

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

@@ -1,4 +1,4 @@
From 479ba4a1be5e24b1b2292554d5a9cbc519b41759 Mon Sep 17 00:00:00 2001
From 16488c99dd7d8f05cde58ca39df13c4a54c13d4a 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

18
recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch → recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
View File

@@ -1,4 +1,4 @@
From d4869cfc2ab0acdd81926346c1aa4fb067063ad3 Mon Sep 17 00:00:00 2001
From 1f00a9e4b43c742768da46b7580c1d134f5beb37 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
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
index 2f6116fa45c..7486a05a272 100755
index 17415aaf538..59c1b6fb5f6 100644
--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
@@ -60,7 +60,7 @@
@@ -21,10 +21,10 @@ index 2f6116fa45c..7486a05a272 100755
int prot, int flags,
- int fd, __off64_t offset) __THROW {
+ int fd, off64_t offset) __THROW {
return sys_mmap(start, length, prot, flags, fd, offset);
}
@@ -71,7 +71,7 @@ static inline void* do_mmap64(void *start, size_t length,
// The original gperftools uses sys_mmap() here. But, it is not allowed by
// Chromium's sandbox.
return (void*)syscall(SYS_mmap, start, length, prot, flags, fd, offset);
@@ -73,7 +73,7 @@ static inline void* do_mmap64(void *start, size_t length,
static inline void* do_mmap64(void *start, size_t length,
int prot, int flags,
@@ -33,7 +33,7 @@ index 2f6116fa45c..7486a05a272 100755
void *result;
// Try mmap2() unless it's not supported
@@ -142,7 +142,7 @@ static inline void* do_mmap64(void *start, size_t length,
@@ -144,7 +144,7 @@ static inline void* do_mmap64(void *start, size_t length,
extern "C" {
void* mmap64(void *start, size_t length, int prot, int flags,
@@ -42,7 +42,7 @@ index 2f6116fa45c..7486a05a272 100755
ATTRIBUTE_SECTION(malloc_hook);
void* mmap(void *start, size_t length,int prot, int flags,
int fd, off_t offset) __THROW
@@ -157,7 +157,7 @@ extern "C" {
@@ -159,7 +159,7 @@ extern "C" {
}
extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
@@ -51,7 +51,7 @@ index 2f6116fa45c..7486a05a272 100755
MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset);
void *result;
if (!MallocHook::InvokeMmapReplacement(
@@ -168,7 +168,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
@@ -170,7 +170,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
return result;
}

4
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch → recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-linux-glibc-make-the-distinction.patch
View File

@@ -1,4 +1,4 @@
From bc9f2d7094ad59da25d0ca58a170ef4a8e448559 Mon Sep 17 00:00:00 2001
From 1e3a7fcca67a13bc79761d27c8abb5cd3bdb52a7 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,7 +9,7 @@ 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 a17ff217331..9f6175ad1de 100644
index 5fb86467dde..9864858eb67 100644
--- a/chromium/base/allocator/allocator_check.cc
+++ b/chromium/base/allocator/allocator_check.cc
@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {

6
recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch → recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
View File

@@ -1,4 +1,4 @@
From ea19d6ef223ed875c5db4e71167fc7a5349105aa Mon Sep 17 00:00:00 2001
From c67e75a89f9e5216eeb9e351b9a6b864f1d992ab 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,10 +10,10 @@ 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 e919f094c37..414a21d32ad 100644
index 1233ae2a8aa..6f1b3e87224 100644
--- a/chromium/base/allocator/allocator_shim.cc
+++ b/chromium/base/allocator/allocator_shim.cc
@@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) {
@@ -351,7 +351,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.

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

@@ -1,4 +1,4 @@
From 4070d0bee442e479c90f932162c3398c8f9e2328 Mon Sep 17 00:00:00 2001
From 705bb6693c207516b9b96d217f9d417b8360c952 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

10
recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch → recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
View File

@@ -1,4 +1,4 @@
From 399c5fee7c38d80c43211fc75dc4486527097fa2 Mon Sep 17 00:00:00 2001
From f236c935f90cc338c8c8db68c08aa8fc2ca13406 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,11 +13,11 @@ 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 06e9d7969c0..8e18a297a96 100644
index 31c564faeee..222ff65b6e1 100644
--- a/chromium/net/dns/dns_config_service_posix.cc
+++ b/chromium/net/dns/dns_config_service_posix.cc
@@ -27,6 +27,10 @@
#include "net/dns/notify_watcher_mac.h"
@@ -29,6 +29,10 @@
#include "net/dns/public/dns_protocol.h"
#include "net/dns/serial_worker.h"
+#if defined(OS_LINUX) && !defined(__GLIBC__)
@@ -28,7 +28,7 @@ index 06e9d7969c0..8e18a297a96 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 ad96f681ccd..334ff59ad75 100644
index 03e248c9878..9ccda82c7e9 100644
--- a/chromium/net/dns/dns_reloader.cc
+++ b/chromium/net/dns/dns_reloader.cc
@@ -9,6 +9,10 @@

6
recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch → recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch
View File

@@ -1,4 +1,4 @@
From cb81d0f57b4ceb0f3ff0600fb72f4b53360c11f2 Mon Sep 17 00:00:00 2001
From b297eebffe2350a76945191e374f6012d1f0fc16 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
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
index 7486a05a272..610a10b659a 100755
index 59c1b6fb5f6..10f0786d829 100644
--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
@@ -206,7 +206,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
@@ -213,7 +213,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
return result;
}

12
recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch → recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Adjust-default-pthread-stack-size.patch
View File

@@ -1,4 +1,4 @@
From 51a9cff6d78c2a744b6cbf77678aebb8dde7540c Mon Sep 17 00:00:00 2001
From b40a99156402f483f6defb234542f71234ab8ab4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 16:41:23 -0700
Subject: [PATCH] chromium: musl: Adjust default pthread stack size
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
index 190acedf7c5..343e1a8c61d 100644
index 277a7e9338d..2a6e060fa32 100644
--- a/chromium/base/threading/platform_thread_linux.cc
+++ b/chromium/base/threading/platform_thread_linux.cc
@@ -173,7 +173,8 @@ void TerminateOnThread() {}
@@ -186,7 +186,8 @@ void TerminateOnThread() {}
size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
#if !defined(THREAD_SANITIZER)
@@ -24,10 +24,10 @@ index 190acedf7c5..343e1a8c61d 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 10f1c0df11f..8e86a2eb1e9 100644
index 248f93968a6..4bc5ac692af 100644
--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() {
@@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() {
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
// correctly for the main thread.
@@ -36,7 +36,7 @@ index 10f1c0df11f..8e86a2eb1e9 100644
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).
@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() {
@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() {
}
void* GetStackStart() {

22
recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
View File

@@ -1,22 +0,0 @@
From 57200f491a8a103fc6c33d1041cc6d12180b0a24 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 7 Jul 2017 17:15:34 -0700
Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
chromium/device/serial/serial_io_handler_posix.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc
index d6ed5e1f889..b550f895ef5 100644
--- a/chromium/device/serial/serial_io_handler_posix.cc
+++ b/chromium/device/serial/serial_io_handler_posix.cc
@@ -6,6 +6,7 @@
#include <sys/ioctl.h>
#include <termios.h>
+#include <asm-generic/ioctls.h>
#include "base/files/file_util.h"
#include "base/posix/eintr_wrapper.h"

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

@@ -1,4 +1,4 @@
From 40e96bb47b906ba3bd9a8b554124c8c3c6bebf86 Mon Sep 17 00:00:00 2001
From 7def3e9107a6ba742936e038a4dd747613bcf1b6 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
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
index 052ce37cb44..95b0fb44e12 100644
index 6ee6cc1e4cd..a8f9ccc72ac 100644
--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {

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

@@ -1,4 +1,4 @@
From 1cc81d323479a164f5f64033b284658ef9c49e0b Mon Sep 17 00:00:00 2001
From e5c0314a43a30f2cef8bb72560e2cec0ed603e01 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/0018-chromium-musl-pread-pwrite.patch
View File

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

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

@@ -134,8 +134,8 @@ RDEPENDS_${PN}-examples += " \
QT_MODULE_BRANCH_CHROMIUM = "73-based"
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12
# 5.12.meta-qt5.4
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
# 5.13.meta-qt5.1
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
file://0001-Force-host-toolchain-configuration.patch \
@@ -145,28 +145,27 @@ SRC_URI_append_libc-musl = "\
file://0003-musl-link-against-libexecinfo.patch \
"
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based
# 69-based.meta-qt5.4
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based
# 73-based.meta-qt5.1
SRC_URI += " \
file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
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 \
file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
"
SRC_URI_append_libc-musl = "\
file://chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
file://chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
file://chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
file://chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
file://chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
file://chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
file://chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
file://chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
file://chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
file://chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
file://chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \
file://chromium/0006-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
file://chromium/0007-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
file://chromium/0008-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
file://chromium/0009-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
file://chromium/0010-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
file://chromium/0011-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
file://chromium/0012-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
file://chromium/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
file://chromium/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
file://chromium/0015-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \