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 /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |
parent | 808d65c129d283850fa6c1e887dd01f8ee86b64b (diff) | |
download | meta-qt5-5b35f89219e5b4a2bc0792d429c93b0bbc9c6898.tar.gz |
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>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 { |