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/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.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/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |