diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-04-29 11:23:25 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-05-10 12:49:06 +0200 |
commit | 72772ba86f43610557d86b2d7af38776213b1aec (patch) | |
tree | 03178ff53826d25297c85a12856e4fd68e32d78f /recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |
parent | c92031e3729d778f0b52d98f6cd6def87139c7b7 (diff) | |
download | meta-qt5-72772ba86f43610557d86b2d7af38776213b1aec.tar.gz |
qtwebengine: lower MODULE_VERSION to 5.15.2
* as we cannot upgrade all modules past 5.15.2 due to license change
and the branches for 5.15.4 not available publicly, but qtwebengine
and the chromium bits which are probably most important for security
fixes are available and hopefully we can use them for non-commercial
use
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-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 new file mode 100644 index 00000000..6bd3e641 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 5047c9dfe57c29f9b39829ba6404bd23df669571 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 | ||
4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl | ||
5 | |||
6 | Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 | ||
7 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
8 | --- | ||
9 | src/core/api/qtbug-61521.cpp | 8 -------- | ||
10 | 1 file changed, 8 deletions(-) | ||
11 | |||
12 | diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp | ||
13 | index 002a1af2..8fd2da36 100644 | ||
14 | --- a/src/core/api/qtbug-61521.cpp | ||
15 | +++ b/src/core/api/qtbug-61521.cpp | ||
16 | @@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); | ||
17 | void* __valloc(size_t size) | ||
18 | SHIM_ALIAS_SYMBOL(ShimValloc); | ||
19 | |||
20 | -SHIM_SYMBOL_VERSION(pvalloc); | ||
21 | -void* __pvalloc(size_t size) | ||
22 | - SHIM_ALIAS_SYMBOL(ShimPvalloc); | ||
23 | - | ||
24 | SHIM_SYMBOL_VERSION(posix_memalign); | ||
25 | int __posix_memalign(void** r, size_t a, size_t s) | ||
26 | SHIM_ALIAS_SYMBOL(ShimPosixMemalign); | ||
27 | @@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { | ||
28 | return valloc(size); | ||
29 | } | ||
30 | |||
31 | -SHIM_HIDDEN void* ShimPvalloc(size_t size) { | ||
32 | - return pvalloc(size); | ||
33 | -} | ||
34 | - | ||
35 | SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { | ||
36 | return posix_memalign(r,a,s); | ||
37 | } | ||