[oe] [meta-qt5][PATCHv2 6/7] qtwebengine: fix build with glibc-2.26

Martin Jansa martin.jansa at gmail.com
Mon Aug 21 21:02:58 UTC 2017


Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 ...qtbug-61521.cpp-use-free-instead-of-cfree.patch | 25 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_git.bb                  |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch

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 0000000..7375ff7
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
@@ -0,0 +1,25 @@
+From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Sun, 20 Aug 2017 20:37:38 +0200
+Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree
+
+* as cfree man says:
+  This  function  should  never  be used.  Use free(3) instead.
+  Starting with version 2.26, it has been removed from glibc.
+---
+ src/core/api/qtbug-61521.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
+index 86d5998e..1dcc4cfa 100644
+--- a/src/core/api/qtbug-61521.cpp
++++ b/src/core/api/qtbug-61521.cpp
+@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
+ }
+ 
+ SHIM_HIDDEN void ShimCFree(void* ptr) {
+-    cfree(ptr);
++    free(ptr);
+ }
+ 
+ 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 2815cb9..cdb4512 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -130,13 +130,14 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
-# 5.9.meta-qt5.2
+# 5.9.meta-qt5.3
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
     file://0003-Include-dependency-to-QCoreApplication-translate.patch \
     file://0004-Force-host-toolchain-configuration.patch \
+    file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \
 "
 
 # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 
-- 
2.14.1




More information about the Openembedded-devel mailing list