summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-14 07:49:03 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-16 09:45:29 +0000
commit682ad61c071a9710e9f9d8a32ab1b5f3c14953d1 (patch)
tree3a0188611c3938ef559efa2b353ceae5e51eb70a /recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
parentfe6dbe144acbcbcbe37f5e9a07a08e414dbce036 (diff)
downloadmeta-qt5-682ad61c071a9710e9f9d8a32ab1b5f3c14953d1.tar.gz
qt: upgrade to 5.9.6
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index f1e633c9..fed2bca5 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From 5e4ef7189876b1e2578f12824ad7b0405768f517 Mon Sep 17 00:00:00 2001 1From 4fce1a91096c8a2180f2126e176904b2a1e3275e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 3 insertions(+), 2 deletions(-) 10 2 files changed, 3 insertions(+), 2 deletions(-)
11 11
12diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 12diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
13index 7d0cb57..10be59e 100644 13index 7d0cb57931..10be59ebad 100644
14--- a/chromium/base/trace_event/malloc_dump_provider.cc 14--- a/chromium/base/trace_event/malloc_dump_provider.cc
15+++ b/chromium/base/trace_event/malloc_dump_provider.cc 15+++ b/chromium/base/trace_event/malloc_dump_provider.cc
16@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} 16@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
@@ -31,7 +31,7 @@ index 7d0cb57..10be59e 100644
31 } 31 }
32 32
33diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc 33diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc
34index 7ddeb4d..b8c73b0 100644 34index 7ddeb4d16a..b8c73b09c5 100644
35--- a/chromium/content/child/content_child_helpers.cc 35--- a/chromium/content/child/content_child_helpers.cc
36+++ b/chromium/content/child/content_child_helpers.cc 36+++ b/chromium/content/child/content_child_helpers.cc
37@@ -25,7 +25,7 @@ namespace content { 37@@ -25,7 +25,7 @@ namespace content {