From 7dd5967a48b5c0fefed7c20fca6d7a23d1d6c28d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 17 May 2015 21:55:13 -0700 Subject: [PATCH] qtwebkit: Backport fix to build with gcc5 This is already committed upstream to 5.4 branch may be next minor upgrade will get it but until then we need it (From meta-qt5 rev: 5ebbfedbc72452d2de18ce1557a36f3ba8b1175f) Signed-off-by: Khem Raj Signed-off-by: Mauro Carvalho Chehab --- .../qt5/qtwebkit/0004-gcc5-qtbug-44829.patch | 36 ++++++++++++++++++++++ meta-qt5/recipes-qt/qt5/qtwebkit_5.4.1.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-qt5/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch diff --git a/meta-qt5/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch b/meta-qt5/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch new file mode 100644 index 0000000..81295d1 --- /dev/null +++ b/meta-qt5/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch @@ -0,0 +1,36 @@ +From 650c6ee8e76bb574d3a1bea09e2494992d8f070e Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Fri, 6 Mar 2015 11:20:13 +0100 +Subject: Fix g++ 5.0 build + +A non-inline template needs to be explicitly instantiated if used +outside the object where it is declared. + +Patch suggested by Khem Raj. + +Task-number: QTBUG-44829 +Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792 +Reviewed-by: Andras Becsi +--- + Source/JavaScriptCore/runtime/JSObject.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp +index 5637e20..bd55919 100644 +--- a/Source/JavaScriptCore/runtime/JSObject.cpp ++++ b/Source/JavaScriptCore/runtime/JSObject.cpp +@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un + } + } + ++// Used in JSArray.cpp so we must instantiate explicit ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++ + void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) + { + VM& vm = exec->vm(); +-- +cgit v0.11.0 + diff --git a/meta-qt5/recipes-qt/qt5/qtwebkit_5.4.1.bb b/meta-qt5/recipes-qt/qt5/qtwebkit_5.4.1.bb index 909696b..454e470 100644 --- a/meta-qt5/recipes-qt/qt5/qtwebkit_5.4.1.bb +++ b/meta-qt5/recipes-qt/qt5/qtwebkit_5.4.1.bb @@ -3,6 +3,7 @@ require ${PN}.inc SRC_URI += "\ file://0003-Fix-building-with-glib-2.43.patch \ + file://0004-gcc5-qtbug-44829.patch \ " SRC_URI[md5sum] = "186627b1ea5b614811fbd0cfa9b4d073" -- 2.7.4