diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
18 files changed, 99 insertions, 99 deletions
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 @@ | |||
1 | From b660e83be35d64ebf7961ec9b4d4ea42c4b9f679 Mon Sep 17 00:00:00 2001 | 1 | From a80fc13086a493cc543e29c5d10e976ac7f680d4 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] chromium: Force host toolchain configuration | 4 | Subject: [PATCH] chromium: Force host toolchain configuration |
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
15 | 15 | ||
16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py | 16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py |
17 | index 93c6446f28..0fe7e6737d 100755 | 17 | index 93c6446f28c..0fe7e6737d2 100755 |
18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py | 18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py |
19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py | 19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py |
20 | @@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): | 20 | @@ -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 @@ | |||
1 | From 20b7ef92a1580409aa9ff10cfc16dd6865e451b7 Mon Sep 17 00:00:00 2001 | 1 | From 70c519aa0eb4da6565ad78914a8687b6f5bf1bb8 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 | 3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 |
4 | Subject: [PATCH] chromium: workaround for too long .rps file name | 4 | Subject: [PATCH] chromium: workaround for too long .rps file name |
@@ -18,7 +18,7 @@ Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 | |||
18 | 1 file changed, 9 insertions(+) | 18 | 1 file changed, 9 insertions(+) |
19 | 19 | ||
20 | diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc | 20 | diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc |
21 | index bab07c5d2b..8f889aebc1 100644 | 21 | index bab07c5d2bb..8f889aebc18 100644 |
22 | --- a/chromium/tools/gn/ninja_action_target_writer.cc | 22 | --- a/chromium/tools/gn/ninja_action_target_writer.cc |
23 | +++ b/chromium/tools/gn/ninja_action_target_writer.cc | 23 | +++ b/chromium/tools/gn/ninja_action_target_writer.cc |
24 | @@ -117,9 +117,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { | 24 | @@ -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 @@ | |||
1 | From 4a8e2acea8759c6eafa22d325f6c2e27862404de Mon Sep 17 00:00:00 2001 | 1 | From ad0dd667c3459538149de4479d18c1793af91d43 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 | 3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 |
4 | Subject: [PATCH] chromium: Fix build with gcc8 | 4 | Subject: [PATCH] chromium: Fix build with gcc8 |
@@ -10,7 +10,7 @@ Subject: [PATCH] chromium: Fix build with gcc8 | |||
10 | 3 files changed, 3 insertions(+), 3 deletions(-) | 10 | 3 files changed, 3 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h | 12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h |
13 | index 09f6d285f3..e516a09e49 100644 | 13 | index 09f6d285f3e..e516a09e498 100644 |
14 | --- a/chromium/mojo/public/c/system/buffer.h | 14 | --- a/chromium/mojo/public/c/system/buffer.h |
15 | +++ b/chromium/mojo/public/c/system/buffer.h | 15 | +++ b/chromium/mojo/public/c/system/buffer.h |
16 | @@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags | 16 | @@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags |
@@ -23,7 +23,7 @@ index 09f6d285f3..e516a09e49 100644 | |||
23 | uint32_t struct_size; | 23 | uint32_t struct_size; |
24 | MojoCreateSharedBufferOptionsFlags flags; | 24 | MojoCreateSharedBufferOptionsFlags flags; |
25 | diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h | 25 | diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h |
26 | index 62adbea1ea..76225858ba 100644 | 26 | index 62adbea1ea6..76225858ba8 100644 |
27 | --- a/chromium/mojo/public/c/system/data_pipe.h | 27 | --- a/chromium/mojo/public/c/system/data_pipe.h |
28 | +++ b/chromium/mojo/public/c/system/data_pipe.h | 28 | +++ b/chromium/mojo/public/c/system/data_pipe.h |
29 | @@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = | 29 | @@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = |
@@ -36,7 +36,7 @@ index 62adbea1ea..76225858ba 100644 | |||
36 | MOJO_ALIGNAS(4) uint32_t struct_size; | 36 | MOJO_ALIGNAS(4) uint32_t struct_size; |
37 | MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; | 37 | MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; |
38 | diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h | 38 | diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h |
39 | index f0f69d1025..364a02971e 100644 | 39 | index f0f69d1025f..364a02971e2 100644 |
40 | --- a/chromium/mojo/public/c/system/message_pipe.h | 40 | --- a/chromium/mojo/public/c/system/message_pipe.h |
41 | +++ b/chromium/mojo/public/c/system/message_pipe.h | 41 | +++ b/chromium/mojo/public/c/system/message_pipe.h |
42 | @@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags | 42 | @@ -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 @@ | |||
1 | From 7dbbfa0804a902c18534cf8bdcebc07d26496585 Mon Sep 17 00:00:00 2001 | 1 | From 3931af98b42c87ea474e0e6d0d27753e53d101ca Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 | 3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 |
4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not | 4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not |
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 9 insertions(+) | 12 | 1 file changed, 9 insertions(+) |
13 | 13 | ||
14 | diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c | 14 | diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c |
15 | index 66f68ef138..9284d0d4fc 100644 | 15 | index 66f68ef1387..9284d0d4fc5 100644 |
16 | --- a/chromium/sandbox/linux/suid/sandbox.c | 16 | --- a/chromium/sandbox/linux/suid/sandbox.c |
17 | +++ b/chromium/sandbox/linux/suid/sandbox.c | 17 | +++ b/chromium/sandbox/linux/suid/sandbox.c |
18 | @@ -44,6 +44,15 @@ static bool DropRoot(); | 18 | @@ -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 @@ | |||
1 | From d886de89a3afad81d0b3ac012098d064eb00d8ed Mon Sep 17 00:00:00 2001 | 1 | From 5532d00e7dcec5529b7510386530cc44bf0b094c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | 3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 |
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | 4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux |
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 3 files changed, 5 insertions(+), 4 deletions(-) | 11 | 3 files changed, 5 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc | 13 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc |
14 | index 73a52d6210..4867198a50 100644 | 14 | index 73a52d6210d..4867198a503 100644 |
15 | --- a/chromium/base/process/process_metrics_posix.cc | 15 | --- a/chromium/base/process/process_metrics_posix.cc |
16 | +++ b/chromium/base/process/process_metrics_posix.cc | 16 | +++ b/chromium/base/process/process_metrics_posix.cc |
17 | @@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { | 17 | @@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { |
@@ -32,7 +32,7 @@ index 73a52d6210..4867198a50 100644 | |||
32 | return 0; | 32 | return 0; |
33 | #endif | 33 | #endif |
34 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | 34 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc |
35 | index ffd519133c..0c9131e98e 100644 | 35 | index ffd519133c2..0c9131e98e4 100644 |
36 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | 36 | --- a/chromium/base/trace_event/malloc_dump_provider.cc |
37 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | 37 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc |
38 | @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; | 38 | @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; |
@@ -53,7 +53,7 @@ index ffd519133c..0c9131e98e 100644 | |||
53 | } | 53 | } |
54 | 54 | ||
55 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc | 55 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc |
56 | index 7ddeb4d16a..b8c73b09c5 100644 | 56 | index 7ddeb4d16a9..b8c73b09c5a 100644 |
57 | --- a/chromium/content/child/content_child_helpers.cc | 57 | --- a/chromium/content/child/content_child_helpers.cc |
58 | +++ b/chromium/content/child/content_child_helpers.cc | 58 | +++ b/chromium/content/child/content_child_helpers.cc |
59 | @@ -25,7 +25,7 @@ namespace content { | 59 | @@ -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 @@ | |||
1 | From 58362949631d043f72711b1c990cb71d9206caa0 Mon Sep 17 00:00:00 2001 | 1 | From 87d8eeb36da32940a57ecf9a94c61f7d749e1058 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 | 3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 |
4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t | 4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+) | 9 | 1 file changed, 1 insertion(+) |
10 | 10 | ||
11 | 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 | 11 | 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 |
12 | index b29ec2d29a..91f77dd88d 100644 | 12 | index b29ec2d29a7..91f77dd88d4 100644 |
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
15 | @@ -150,6 +150,7 @@ extern "C" { | 15 | @@ -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 @@ | |||
1 | From ac37250356e2923572e33491198f27117d4afa6a Mon Sep 17 00:00:00 2001 | 1 | From 081561227fb55b9a419632b1f6187d9d7bedd8f9 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 | 3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 |
4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t | 4 | 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> | |||
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
13 | 13 | ||
14 | 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 | 14 | 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 |
15 | index 715c045f66..edc8cf2db7 100644 | 15 | index 715c045f66c..edc8cf2db70 100644 |
16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
18 | @@ -77,7 +77,7 @@ typedef off64_t __off64_t; | 18 | @@ -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 @@ | |||
1 | From d9875480e5ab9b72b6e30ba5154bc90c63fea9fa Mon Sep 17 00:00:00 2001 | 1 | From 0bba2d9a7bbcc97126b1440db71364ff5aa8c5f8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 |
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | 4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | 11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc |
12 | index 9cd5d2207d..1e70095648 100644 | 12 | index 9cd5d2207de..1e700956483 100644 |
13 | --- a/chromium/base/allocator/allocator_check.cc | 13 | --- a/chromium/base/allocator/allocator_check.cc |
14 | +++ b/chromium/base/allocator/allocator_check.cc | 14 | +++ b/chromium/base/allocator/allocator_check.cc |
15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { | 15 | @@ -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 @@ | |||
1 | From e78ef57ef202bcf101a2dadb694ab38f02927151 Mon Sep 17 00:00:00 2001 | 1 | From 922a3f82d7810d23b4f735f5af4574993bde2974 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 |
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | 4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | 12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc |
13 | index 4b7de5e1a3..fe565223f2 100644 | 13 | index 4b7de5e1a32..fe565223f2b 100644 |
14 | --- a/chromium/base/allocator/allocator_shim.cc | 14 | --- a/chromium/base/allocator/allocator_shim.cc |
15 | +++ b/chromium/base/allocator/allocator_shim.cc | 15 | +++ b/chromium/base/allocator/allocator_shim.cc |
16 | @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { | 16 | @@ -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 @@ | |||
1 | From 4c6d3018b3a96e322c74f3998d10c4d28c813e50 Mon Sep 17 00:00:00 2001 | 1 | From c3dddfccc66fdceb730674838e1676febc66587c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 | 3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 |
4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from | 4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc | 12 | diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc |
13 | index 003708d2c8..0fef3148f9 100644 | 13 | index 003708d2c89..0fef3148f9d 100644 |
14 | --- a/chromium/sandbox/linux/seccomp-bpf/trap.cc | 14 | --- a/chromium/sandbox/linux/seccomp-bpf/trap.cc |
15 | +++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc | 15 | +++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc |
16 | @@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { | 16 | @@ -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 @@ | |||
1 | From ff6be9a301b7d831c95fe7b10c34783433abd6df Mon Sep 17 00:00:00 2001 | 1 | From 7638d64991e35b688aa9e1385925bc45f8589246 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 | 3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 |
4 | Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc | 4 | 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> | |||
13 | create mode 100644 chromium/net/dns/resolv_compat.h | 13 | create mode 100644 chromium/net/dns/resolv_compat.h |
14 | 14 | ||
15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc | 15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc |
16 | index f2e66331e3..6fe84dd66a 100644 | 16 | index f2e66331e33..6fe84dd66af 100644 |
17 | --- a/chromium/net/dns/dns_config_service_posix.cc | 17 | --- a/chromium/net/dns/dns_config_service_posix.cc |
18 | +++ b/chromium/net/dns/dns_config_service_posix.cc | 18 | +++ b/chromium/net/dns/dns_config_service_posix.cc |
19 | @@ -27,6 +27,10 @@ | 19 | @@ -27,6 +27,10 @@ |
@@ -28,7 +28,7 @@ index f2e66331e3..6fe84dd66a 100644 | |||
28 | #include "net/dns/dns_config_watcher_mac.h" | 28 | #include "net/dns/dns_config_watcher_mac.h" |
29 | #endif | 29 | #endif |
30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc | 30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc |
31 | index 322c8a5f0f..72ff40dbe1 100644 | 31 | index 322c8a5f0f7..72ff40dbe15 100644 |
32 | --- a/chromium/net/dns/dns_reloader.cc | 32 | --- a/chromium/net/dns/dns_reloader.cc |
33 | +++ b/chromium/net/dns/dns_reloader.cc | 33 | +++ b/chromium/net/dns/dns_reloader.cc |
34 | @@ -9,6 +9,10 @@ | 34 | @@ -9,6 +9,10 @@ |
@@ -44,7 +44,7 @@ index 322c8a5f0f..72ff40dbe1 100644 | |||
44 | #include "base/macros.h" | 44 | #include "base/macros.h" |
45 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h | 45 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h |
46 | new file mode 100644 | 46 | new file mode 100644 |
47 | index 0000000000..4f0e852a19 | 47 | index 00000000000..4f0e852a19d |
48 | --- /dev/null | 48 | --- /dev/null |
49 | +++ b/chromium/net/dns/resolv_compat.h | 49 | +++ b/chromium/net/dns/resolv_compat.h |
50 | @@ -0,0 +1,29 @@ | 50 | @@ -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 @@ | |||
1 | From b836ce7350f40f9f031835f71793788d922452bd Mon Sep 17 00:00:00 2001 | 1 | From 2a49b947ad8e586229411bdd2a00bd496c9e3d0e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 | 3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 |
4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl | 4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl |
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | 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 | 14 | 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 |
15 | index edc8cf2db7..a868b50d30 100644 | 15 | index edc8cf2db70..a868b50d30f 100644 |
16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
18 | @@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, | 18 | @@ -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 @@ | |||
1 | From 90d3755c55e3fbda3a4eba7aec481da4f22e044e Mon Sep 17 00:00:00 2001 | 1 | From 98af1531d71359612bbaa2a8619520ca4b6814bc Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | 3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 |
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | 4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 4 insertions(+), 3 deletions(-) | 10 | 2 files changed, 4 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | 12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc |
13 | index 9917a7b1fd..cb406659b9 100644 | 13 | index 9917a7b1fd6..cb406659b90 100644 |
14 | --- a/chromium/base/threading/platform_thread_linux.cc | 14 | --- a/chromium/base/threading/platform_thread_linux.cc |
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | 15 | +++ b/chromium/base/threading/platform_thread_linux.cc |
16 | @@ -173,7 +173,8 @@ void TerminateOnThread() {} | 16 | @@ -173,7 +173,8 @@ void TerminateOnThread() {} |
@@ -24,7 +24,7 @@ index 9917a7b1fd..cb406659b9 100644 | |||
24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | 24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the |
25 | // default stack size isn't enough for some browser tests. | 25 | // default stack size isn't enough for some browser tests. |
26 | diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 26 | diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
27 | index 13c3f907f8..07308e0835 100644 | 27 | index 13c3f907f8e..07308e08351 100644 |
28 | --- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 28 | --- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
29 | +++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp | 29 | +++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp |
30 | @@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { | 30 | @@ -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 @@ | |||
1 | From 389967c783f65b39663dae273abe703e6d195c4d Mon Sep 17 00:00:00 2001 | 1 | From b9a0991d31f2c88525022690640b5f30a42821b3 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 | 3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 |
4 | Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 | 4 | Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+) | 9 | 1 file changed, 1 insertion(+) |
10 | 10 | ||
11 | diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc | 11 | diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc |
12 | index d6ed5e1f88..b550f895ef 100644 | 12 | index d6ed5e1f889..b550f895ef5 100644 |
13 | --- a/chromium/device/serial/serial_io_handler_posix.cc | 13 | --- a/chromium/device/serial/serial_io_handler_posix.cc |
14 | +++ b/chromium/device/serial/serial_io_handler_posix.cc | 14 | +++ b/chromium/device/serial/serial_io_handler_posix.cc |
15 | @@ -6,6 +6,7 @@ | 15 | @@ -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 @@ | |||
1 | From 851216b2a9a10a9fe924a84693fd2b44fc16f464 Mon Sep 17 00:00:00 2001 | 1 | From db18f880b833041e3151a3dc8541f7d35d43a4b5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 8 Jul 2017 09:08:23 -0700 | 3 | Date: Sat, 8 Jul 2017 09:08:23 -0700 |
4 | Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t | 4 | 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> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | 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 | 11 | 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 |
12 | index 91f77dd88d..bb84a0b305 100644 | 12 | index 91f77dd88d4..bb84a0b3058 100644 |
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
15 | @@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; | 15 | @@ -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 @@ | |||
1 | From cd92f771ac37ae41d7a1abfd6fcc9d50aa7529d8 Mon Sep 17 00:00:00 2001 | 1 | From 3b87874627418a66bb082ba7825849c073b2c19d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 | 3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 |
4 | Subject: [PATCH] Use _fpstate instead of _libc_fpstate on linux | 4 | Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on |
5 | linux | ||
5 | 6 | ||
6 | glibc defines both. musl libc only the former. | 7 | glibc defines both. musl libc only the former. |
7 | 8 | ||
@@ -13,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 3 files changed, 4 insertions(+), 4 deletions(-) | 14 | 3 files changed, 4 insertions(+), 4 deletions(-) |
14 | 15 | ||
15 | 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 | 16 | 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 |
16 | index 052ce37cb4..95b0fb44e1 100644 | 17 | index 052ce37cb44..95b0fb44e12 100644 |
17 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | 18 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc |
18 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | 19 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc |
19 | @@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { | 20 | @@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { |
@@ -35,7 +36,7 @@ index 052ce37cb4..95b0fb44e1 100644 | |||
35 | 36 | ||
36 | out->context_flags = MD_CONTEXT_AMD64_FULL; | 37 | out->context_flags = MD_CONTEXT_AMD64_FULL; |
37 | 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 | 38 | 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 |
38 | index f830618f24..f3dde1f4df 100644 | 39 | index f830618f240..f3dde1f4dff 100644 |
39 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | 40 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h |
40 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | 41 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h |
41 | @@ -50,7 +50,7 @@ struct UContextReader { | 42 | @@ -50,7 +50,7 @@ struct UContextReader { |
@@ -48,7 +49,7 @@ index f830618f24..f3dde1f4df 100644 | |||
48 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | 49 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, |
49 | const struct fpsimd_context* fpregs); | 50 | const struct fpsimd_context* fpregs); |
50 | 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 | 51 | 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 |
51 | index d1dc331215..d1cc5624cd 100644 | 52 | index d1dc331215a..d1cc5624cd4 100644 |
52 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | 53 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h |
53 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | 54 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h |
54 | @@ -48,7 +48,7 @@ class ExceptionHandler; | 55 | @@ -48,7 +48,7 @@ class ExceptionHandler; |
@@ -60,6 +61,3 @@ index d1dc331215..d1cc5624cd 100644 | |||
60 | #endif | 61 | #endif |
61 | 62 | ||
62 | // These entries store a list of memory regions that the client wants included | 63 | // These entries store a list of memory regions that the client wants included |
63 | -- | ||
64 | 2.19.0 | ||
65 | |||
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 @@ | |||
1 | From 986bf2ecd7b450dceff5cb0f3f76fe886b58d884 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Sep 2018 12:59:05 -0700 | ||
4 | Subject: [PATCH] elf_reader.cc: include <sys/reg.h> to get __WORDSIZE on musl | ||
5 | libc | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | chromium/third_party/breakpad/breakpad/configure.ac | 2 +- | ||
10 | .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 5 ++++- | ||
11 | 2 files changed, 5 insertions(+), 2 deletions(-) | ||
12 | |||
13 | Index: 3rdparty/chromium/third_party/breakpad/breakpad/configure.ac | ||
14 | =================================================================== | ||
15 | --- 3rdparty.orig/chromium/third_party/breakpad/breakpad/configure.ac | ||
16 | +++ 3rdparty/chromium/third_party/breakpad/breakpad/configure.ac | ||
17 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, | ||
18 | AC_HEADER_STDC | ||
19 | AC_SYS_LARGEFILE | ||
20 | AX_PTHREAD | ||
21 | -AC_CHECK_HEADERS([a.out.h sys/random.h]) | ||
22 | +AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) | ||
23 | AC_CHECK_FUNCS([arc4random getrandom]) | ||
24 | |||
25 | AX_CXX_COMPILE_STDCXX(11, noext, mandatory) | ||
26 | Index: 3rdparty/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | ||
27 | =================================================================== | ||
28 | --- 3rdparty.orig/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | ||
29 | +++ 3rdparty/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | ||
30 | @@ -29,10 +29,11 @@ | ||
31 | #ifndef _GNU_SOURCE | ||
32 | #define _GNU_SOURCE // needed for pread() | ||
33 | #endif | ||
34 | - | ||
35 | +#include <config.h> | ||
36 | #include <sys/types.h> | ||
37 | #include <sys/stat.h> | ||
38 | #include <sys/mman.h> | ||
39 | +#include <sys/reg.h> | ||
40 | #include <unistd.h> | ||
41 | #include <fcntl.h> | ||
42 | #include <string.h> | ||
43 | Index: 3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | ||
44 | =================================================================== | ||
45 | --- 3rdparty.orig/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | ||
46 | +++ 3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | ||
47 | @@ -33,6 +33,7 @@ | ||
48 | #ifndef COMMON_LINUX_ELF_CORE_DUMP_H_ | ||
49 | #define COMMON_LINUX_ELF_CORE_DUMP_H_ | ||
50 | |||
51 | +#include <sys/reg.h> | ||
52 | #include <elf.h> | ||
53 | #include <link.h> | ||
54 | #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 @@ | |||
1 | From c1a7511a323997411728689078946122d176551b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Sep 2018 12:59:05 -0700 | ||
4 | Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get | ||
5 | __WORDSIZE on musl libc | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | chromium/third_party/breakpad/breakpad/configure.ac | 2 +- | ||
11 | .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 3 ++- | ||
12 | .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 + | ||
13 | 3 files changed, 4 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac | ||
16 | index ec194ddd203..767c2af11ee 100644 | ||
17 | --- a/chromium/third_party/breakpad/breakpad/configure.ac | ||
18 | +++ b/chromium/third_party/breakpad/breakpad/configure.ac | ||
19 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, | ||
20 | AC_HEADER_STDC | ||
21 | AC_SYS_LARGEFILE | ||
22 | AX_PTHREAD | ||
23 | -AC_CHECK_HEADERS([a.out.h sys/random.h]) | ||
24 | +AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) | ||
25 | AC_CHECK_FUNCS([arc4random getrandom]) | ||
26 | |||
27 | AX_CXX_COMPILE_STDCXX(11, noext, mandatory) | ||
28 | 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 | ||
29 | index 4135a51a980..be92b792d3c 100644 | ||
30 | --- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | ||
31 | +++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | ||
32 | @@ -29,10 +29,11 @@ | ||
33 | #ifndef _GNU_SOURCE | ||
34 | #define _GNU_SOURCE // needed for pread() | ||
35 | #endif | ||
36 | - | ||
37 | +#include <config.h> | ||
38 | #include <sys/types.h> | ||
39 | #include <sys/stat.h> | ||
40 | #include <sys/mman.h> | ||
41 | +#include <sys/reg.h> | ||
42 | #include <unistd.h> | ||
43 | #include <fcntl.h> | ||
44 | #include <string.h> | ||
45 | 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 | ||
46 | index d03c7a88d38..28b55ab6300 100644 | ||
47 | --- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | ||
48 | +++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | ||
49 | @@ -33,6 +33,7 @@ | ||
50 | #ifndef COMMON_LINUX_ELF_CORE_DUMP_H_ | ||
51 | #define COMMON_LINUX_ELF_CORE_DUMP_H_ | ||
52 | |||
53 | +#include <sys/reg.h> | ||
54 | #include <elf.h> | ||
55 | #include <link.h> | ||
56 | #include <stddef.h> | ||