diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 22:42:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-22 17:33:41 +0200 |
| commit | b7ae79a05430b4e2e6eecfef8aa2105c3b5e856d (patch) | |
| tree | 77a4459396f674de12dd8b51bd1687f6ed95ea4a | |
| parent | 9c7507ef155d9c248b6d9b12349c52fa1410e482 (diff) | |
| download | meta-qt5-b7ae79a05430b4e2e6eecfef8aa2105c3b5e856d.tar.gz | |
qtwebengine: fix build with glibc-2.26
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch | 25 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch new file mode 100644 index 00000000..7375ff72 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Sun, 20 Aug 2017 20:37:38 +0200 | ||
| 4 | Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree | ||
| 5 | |||
| 6 | * as cfree man says: | ||
| 7 | This function should never be used. Use free(3) instead. | ||
| 8 | Starting with version 2.26, it has been removed from glibc. | ||
| 9 | --- | ||
| 10 | src/core/api/qtbug-61521.cpp | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp | ||
| 14 | index 86d5998e..1dcc4cfa 100644 | ||
| 15 | --- a/src/core/api/qtbug-61521.cpp | ||
| 16 | +++ b/src/core/api/qtbug-61521.cpp | ||
| 17 | @@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { | ||
| 18 | } | ||
| 19 | |||
| 20 | SHIM_HIDDEN void ShimCFree(void* ptr) { | ||
| 21 | - cfree(ptr); | ||
| 22 | + free(ptr); | ||
| 23 | } | ||
| 24 | |||
| 25 | SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 2815cb9b..cdb4512f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -130,13 +130,14 @@ RDEPENDS_${PN}-examples += " \ | |||
| 130 | QT_MODULE_BRANCH_CHROMIUM = "56-based" | 130 | QT_MODULE_BRANCH_CHROMIUM = "56-based" |
| 131 | 131 | ||
| 132 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 | 132 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 |
| 133 | # 5.9.meta-qt5.2 | 133 | # 5.9.meta-qt5.3 |
| 134 | SRC_URI += " \ | 134 | SRC_URI += " \ |
| 135 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 135 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
| 136 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 136 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
| 137 | file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ | 137 | file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ |
| 138 | file://0003-Include-dependency-to-QCoreApplication-translate.patch \ | 138 | file://0003-Include-dependency-to-QCoreApplication-translate.patch \ |
| 139 | file://0004-Force-host-toolchain-configuration.patch \ | 139 | file://0004-Force-host-toolchain-configuration.patch \ |
| 140 | file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \ | ||
| 140 | " | 141 | " |
| 141 | 142 | ||
| 142 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based | 143 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based |
