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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2015-05-17 21:55:13 -07:00
committed by Martin Jansa
parent 8525f31981
commit 5ebbfedbc7
2 changed files with 37 additions and 0 deletions

View File

@@ -0,0 +1,36 @@
From 650c6ee8e76bb574d3a1bea09e2494992d8f070e Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
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 <andras.becsi@theqtcompany.com>
---
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<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(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

View File

@@ -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"