diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-18 20:37:21 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 00:57:00 +0000 |
commit | 5b35f89219e5b4a2bc0792d429c93b0bbc9c6898 (patch) | |
tree | 5839082571c4ec1bb824e526c4cfc3ac9f39d10f | |
parent | 808d65c129d283850fa6c1e887dd01f8ee86b64b (diff) |
qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
* in preparation for rebase on 5.12 #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
23 files changed, 111 insertions, 111 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 649c7447..86f37e1a 100644 --- a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 9e88d83104e8d3c5b093e52c9af9829092b79148 Mon Sep 17 00:00:00 2001 +From 7c9b995ee8bc8798e41a14cb8007c06073006e64 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 diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch index 22b266c0..5ae32d59 100644 --- a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch @@ -1,4 +1,4 @@ -From 50ff15028627c8a4cb9556b014291d560197be50 Mon Sep 17 00:00:00 2001 +From 3eaf551ec5f68933c636404945e6404e2508160b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sun, 10 Jun 2018 10:26:17 +0000 Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone 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/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 162ea0bc..a0a850d5 100644 --- a/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,4 +1,4 @@ -From 43aa099ce111fb0352fccefa5e29c8d950a74d59 Mon Sep 17 00:00:00 2001 +From df92af3dd48877c6a58887de563e65279d213a50 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 diff --git a/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch index 9c51812e..489971ae 100644 --- a/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From da533f643ea51f0649b6dfcda874ff6a83845069 Mon Sep 17 00:00:00 2001 +From 0c440d91b394d13188803800b968db28309c1d82 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 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 index d7f55a1b..8bf2140b 100644 --- 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 @@ -1,4 +1,4 @@ -From b660e83be35d64ebf7961ec9b4d4ea42c4b9f679 Mon Sep 17 00:00:00 2001 +From a80fc13086a493cc543e29c5d10e976ac7f680d4 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 @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py -index 93c6446f28..0fe7e6737d 100755 +index 93c6446f28c..0fe7e6737d2 100755 --- a/chromium/tools/gn/bootstrap/bootstrap.py +++ b/chromium/tools/gn/bootstrap/bootstrap.py @@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch index 9d05e546..f80f7b0a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 20b7ef92a1580409aa9ff10cfc16dd6865e451b7 Mon Sep 17 00:00:00 2001 +From 70c519aa0eb4da6565ad78914a8687b6f5bf1bb8 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 @@ -18,7 +18,7 @@ Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 1 file changed, 9 insertions(+) diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc -index bab07c5d2b..8f889aebc1 100644 +index bab07c5d2bb..8f889aebc18 100644 --- a/chromium/tools/gn/ninja_action_target_writer.cc +++ b/chromium/tools/gn/ninja_action_target_writer.cc @@ -117,9 +117,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { 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 index 1ca5a0d2..5323a0f1 100644 --- 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 @@ -1,4 +1,4 @@ -From 4a8e2acea8759c6eafa22d325f6c2e27862404de Mon Sep 17 00:00:00 2001 +From ad0dd667c3459538149de4479d18c1793af91d43 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 @@ -10,7 +10,7 @@ Subject: [PATCH] chromium: Fix build with gcc8 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 09f6d285f3..e516a09e49 100644 +index 09f6d285f3e..e516a09e498 100644 --- a/chromium/mojo/public/c/system/buffer.h +++ b/chromium/mojo/public/c/system/buffer.h @@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags @@ -23,7 +23,7 @@ index 09f6d285f3..e516a09e49 100644 uint32_t struct_size; MojoCreateSharedBufferOptionsFlags flags; diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h -index 62adbea1ea..76225858ba 100644 +index 62adbea1ea6..76225858ba8 100644 --- a/chromium/mojo/public/c/system/data_pipe.h +++ b/chromium/mojo/public/c/system/data_pipe.h @@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = @@ -36,7 +36,7 @@ index 62adbea1ea..76225858ba 100644 MOJO_ALIGNAS(4) uint32_t struct_size; MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h -index f0f69d1025..364a02971e 100644 +index f0f69d1025f..364a02971e2 100644 --- a/chromium/mojo/public/c/system/message_pipe.h +++ b/chromium/mojo/public/c/system/message_pipe.h @@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 77f3f999..7879e99a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From 7dbbfa0804a902c18534cf8bdcebc07d26496585 Mon Sep 17 00:00:00 2001 +From 3931af98b42c87ea474e0e6d0d27753e53d101ca 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,7 +12,7 @@ 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 66f68ef138..9284d0d4fc 100644 +index 66f68ef1387..9284d0d4fc5 100644 --- a/chromium/sandbox/linux/suid/sandbox.c +++ b/chromium/sandbox/linux/suid/sandbox.c @@ -44,6 +44,15 @@ static bool DropRoot(); diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 3396b7f7..68eaf23e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,4 +1,4 @@ -From d886de89a3afad81d0b3ac012098d064eb00d8ed Mon Sep 17 00:00:00 2001 +From 5532d00e7dcec5529b7510386530cc44bf0b094c 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 @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 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 73a52d6210..4867198a50 100644 +index 73a52d6210d..4867198a503 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() { @@ -32,7 +32,7 @@ index 73a52d6210..4867198a50 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 ffd519133c..0c9131e98e 100644 +index ffd519133c2..0c9131e98e4 100644 --- a/chromium/base/trace_event/malloc_dump_provider.cc +++ b/chromium/base/trace_event/malloc_dump_provider.cc @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; @@ -53,7 +53,7 @@ index ffd519133c..0c9131e98e 100644 } diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc -index 7ddeb4d16a..b8c73b09c5 100644 +index 7ddeb4d16a9..b8c73b09c5a 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/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch index 79a18323..1f9af27e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,4 +1,4 @@ -From 58362949631d043f72711b1c990cb71d9206caa0 Mon Sep 17 00:00:00 2001 +From 87d8eeb36da32940a57ecf9a94c61f7d749e1058 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 @@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+) diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index b29ec2d29a..91f77dd88d 100644 +index b29ec2d29a7..91f77dd88d4 100644 --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h @@ -150,6 +150,7 @@ extern "C" { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index ec1a5676..e7dba73b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From ac37250356e2923572e33491198f27117d4afa6a Mon Sep 17 00:00:00 2001 +From 081561227fb55b9a419632b1f6187d9d7bedd8f9 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 715c045f66..edc8cf2db7 100644 +index 715c045f66c..edc8cf2db70 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 @@ -77,7 +77,7 @@ typedef off64_t __off64_t; diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch index ec49539d..c3069593 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From d9875480e5ab9b72b6e30ba5154bc90c63fea9fa Mon Sep 17 00:00:00 2001 +From 0bba2d9a7bbcc97126b1440db71364ff5aa8c5f8 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 9cd5d2207d..1e70095648 100644 +index 9cd5d2207de..1e700956483 100644 --- a/chromium/base/allocator/allocator_check.cc +++ b/chromium/base/allocator/allocator_check.cc @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index f0627f56..009e41fd 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -1,4 +1,4 @@ -From e78ef57ef202bcf101a2dadb694ab38f02927151 Mon Sep 17 00:00:00 2001 +From 922a3f82d7810d23b4f735f5af4574993bde2974 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,7 +10,7 @@ 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 4b7de5e1a3..fe565223f2 100644 +index 4b7de5e1a32..fe565223f2b 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) { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index 2dde67b3..65bf1965 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -1,4 +1,4 @@ -From 4c6d3018b3a96e322c74f3998d10c4d28c813e50 Mon Sep 17 00:00:00 2001 +From c3dddfccc66fdceb730674838e1676febc66587c 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,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 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 003708d2c8..0fef3148f9 100644 +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) { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 63fd9bf3..8582607c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From ff6be9a301b7d831c95fe7b10c34783433abd6df Mon Sep 17 00:00:00 2001 +From 7638d64991e35b688aa9e1385925bc45f8589246 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 f2e66331e3..6fe84dd66a 100644 +index f2e66331e33..6fe84dd66af 100644 --- a/chromium/net/dns/dns_config_service_posix.cc +++ b/chromium/net/dns/dns_config_service_posix.cc @@ -27,6 +27,10 @@ @@ -28,7 +28,7 @@ index f2e66331e3..6fe84dd66a 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 322c8a5f0f..72ff40dbe1 100644 +index 322c8a5f0f7..72ff40dbe15 100644 --- a/chromium/net/dns/dns_reloader.cc +++ b/chromium/net/dns/dns_reloader.cc @@ -9,6 +9,10 @@ @@ -44,7 +44,7 @@ index 322c8a5f0f..72ff40dbe1 100644 #include "base/macros.h" diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h new file mode 100644 -index 0000000000..4f0e852a19 +index 00000000000..4f0e852a19d --- /dev/null +++ b/chromium/net/dns/resolv_compat.h @@ -0,0 +1,29 @@ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch index aa0a9dcd..5db4834b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From b836ce7350f40f9f031835f71793788d922452bd Mon Sep 17 00:00:00 2001 +From 2a49b947ad8e586229411bdd2a00bd496c9e3d0e 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,7 +12,7 @@ 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 edc8cf2db7..a868b50d30 100644 +index edc8cf2db70..a868b50d30f 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 @@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch index 2c91413e..c0750a31 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From 90d3755c55e3fbda3a4eba7aec481da4f22e044e Mon Sep 17 00:00:00 2001 +From 98af1531d71359612bbaa2a8619520ca4b6814bc 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,7 +10,7 @@ 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 9917a7b1fd..cb406659b9 100644 +index 9917a7b1fd6..cb406659b90 100644 --- a/chromium/base/threading/platform_thread_linux.cc +++ b/chromium/base/threading/platform_thread_linux.cc @@ -173,7 +173,8 @@ void TerminateOnThread() {} @@ -24,7 +24,7 @@ index 9917a7b1fd..cb406659b9 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/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp -index 13c3f907f8..07308e0835 100644 +index 13c3f907f8e..07308e08351 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() { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index 9bb01e17..c11a7ce8 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -1,4 +1,4 @@ -From 389967c783f65b39663dae273abe703e6d195c4d Mon Sep 17 00:00:00 2001 +From b9a0991d31f2c88525022690640b5f30a42821b3 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 @@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 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 d6ed5e1f88..b550f895ef 100644 +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 @@ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch index 1ab91150..1ec4dd2b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -1,4 +1,4 @@ -From 851216b2a9a10a9fe924a84693fd2b44fc16f464 Mon Sep 17 00:00:00 2001 +From db18f880b833041e3151a3dc8541f7d35d43a4b5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 8 Jul 2017 09:08:23 -0700 Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t @@ -9,7 +9,7 @@ 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/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h -index 91f77dd88d..bb84a0b305 100644 +index 91f77dd88d4..bb84a0b3058 100644 --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h @@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch index 2be0cb07..12bea67f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch @@ -1,7 +1,8 @@ -From cd92f771ac37ae41d7a1abfd6fcc9d50aa7529d8 Mon Sep 17 00:00:00 2001 +From 3b87874627418a66bb082ba7825849c073b2c19d 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] Use _fpstate instead of _libc_fpstate on linux +Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on + linux glibc defines both. musl libc only the former. @@ -13,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 052ce37cb4..95b0fb44e1 100644 +index 052ce37cb44..95b0fb44e12 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) { @@ -35,7 +36,7 @@ index 052ce37cb4..95b0fb44e1 100644 out->context_flags = MD_CONTEXT_AMD64_FULL; diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index f830618f24..f3dde1f4df 100644 +index f830618f240..f3dde1f4dff 100644 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h @@ -50,7 +50,7 @@ struct UContextReader { @@ -48,7 +49,7 @@ index f830618f24..f3dde1f4df 100644 static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct fpsimd_context* fpregs); diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -index d1dc331215..d1cc5624cd 100644 +index d1dc331215a..d1cc5624cd4 100644 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h @@ -48,7 +48,7 @@ class ExceptionHandler; @@ -60,6 +61,3 @@ index d1dc331215..d1cc5624cd 100644 #endif // These entries store a list of memory regions that the client wants included --- -2.19.0 - diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch deleted file mode 100644 index 6f34473d..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 986bf2ecd7b450dceff5cb0f3f76fe886b58d884 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] elf_reader.cc: include <sys/reg.h> to get __WORDSIZE on musl - libc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - chromium/third_party/breakpad/breakpad/configure.ac | 2 +- - .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -Index: 3rdparty/chromium/third_party/breakpad/breakpad/configure.ac -=================================================================== ---- 3rdparty.orig/chromium/third_party/breakpad/breakpad/configure.ac -+++ 3rdparty/chromium/third_party/breakpad/breakpad/configure.ac -@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, - AC_HEADER_STDC - AC_SYS_LARGEFILE - AX_PTHREAD --AC_CHECK_HEADERS([a.out.h sys/random.h]) -+AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) - AC_CHECK_FUNCS([arc4random getrandom]) - - AX_CXX_COMPILE_STDCXX(11, noext, mandatory) -Index: 3rdparty/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc -=================================================================== ---- 3rdparty.orig/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc -+++ 3rdparty/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc -@@ -29,10 +29,11 @@ - #ifndef _GNU_SOURCE - #define _GNU_SOURCE // needed for pread() - #endif -- -+#include <config.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/mman.h> -+#include <sys/reg.h> - #include <unistd.h> - #include <fcntl.h> - #include <string.h> -Index: 3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h -=================================================================== ---- 3rdparty.orig/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h -+++ 3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h -@@ -33,6 +33,7 @@ - #ifndef COMMON_LINUX_ELF_CORE_DUMP_H_ - #define COMMON_LINUX_ELF_CORE_DUMP_H_ - -+#include <sys/reg.h> - #include <elf.h> - #include <link.h> - #include <stddef.h> diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch new file mode 100644 index 00000000..0ff26e51 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch @@ -0,0 +1,56 @@ +From c1a7511a323997411728689078946122d176551b 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 + __WORDSIZE on musl libc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + chromium/third_party/breakpad/breakpad/configure.ac | 2 +- + .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 3 ++- + .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac +index ec194ddd203..767c2af11ee 100644 +--- a/chromium/third_party/breakpad/breakpad/configure.ac ++++ b/chromium/third_party/breakpad/breakpad/configure.ac +@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, + AC_HEADER_STDC + AC_SYS_LARGEFILE + AX_PTHREAD +-AC_CHECK_HEADERS([a.out.h sys/random.h]) ++AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) + AC_CHECK_FUNCS([arc4random getrandom]) + + AX_CXX_COMPILE_STDCXX(11, noext, mandatory) +diff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc +index 4135a51a980..be92b792d3c 100644 +--- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc ++++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc +@@ -29,10 +29,11 @@ + #ifndef _GNU_SOURCE + #define _GNU_SOURCE // needed for pread() + #endif +- ++#include <config.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/mman.h> ++#include <sys/reg.h> + #include <unistd.h> + #include <fcntl.h> + #include <string.h> +diff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h +index d03c7a88d38..28b55ab6300 100644 +--- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h ++++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h +@@ -33,6 +33,7 @@ + #ifndef COMMON_LINUX_ELF_CORE_DUMP_H_ + #define COMMON_LINUX_ELF_CORE_DUMP_H_ + ++#include <sys/reg.h> + #include <elf.h> + #include <link.h> + #include <stddef.h> diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 57d698da..7b157096 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -137,19 +137,19 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "65-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 -# 5.11.meta-qt5.7 +# 5.11.meta-qt5.8 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ - file://0003-Force-host-toolchain-configuration.patch \ - file://0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ + file://0001-Force-host-toolchain-configuration.patch \ + file://0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ " SRC_URI_append_libc-musl = "\ - file://0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ - file://0006-musl-link-against-libexecinfo.patch \ + file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ + file://0004-musl-link-against-libexecinfo.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/65-based -# 65-based.meta-qt5.6 +# 65-based.meta-qt5.7 SRC_URI += " \ file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ @@ -169,8 +169,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ file://chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ - file://chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch;patchdir=src/3rdparty \ - file://chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.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 \ " SRCREV_qtwebengine = "18412af977d658f243eb5b25b62284924cfa362f" |