ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt5: fix build errors with GCC 6

Browse Source 
Fixes #2389
This commit is contained in:
Christian Prochaska 2017-04-11 14:49:32 +02:00 committed by Christian Helmuth
parent d0a53781b9
commit 739acd8b41
4 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/libports/lib/mk/qt5_v8.mk
View File

@ -20,6 +20,8 @@ $(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag:
include $(REP_DIR)/lib/mk/qt5_v8_generated.inc
CC_OPT += -fpermissive
CC_WARN = -Wno-unused-local-typedefs -Wno-maybe-uninitialized
#

2
repos/libports/ports/qt5.hash
View File

@ -1 +1 @@
6932514d67f1ce1ff00421d7b4ee9a1de0b7d6bc
f430ea6c6057b67970e7e014e07b306904c6467c

33
repos/libports/src/lib/qt5/patches/qt5_gcc5.patch Normal file
View File

@ -0,0 +1,33 @@
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: [PATCH] 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/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp
+++ b/qtwebkit/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();

1
repos/libports/src/lib/qt5/patches/series
View File

@ -17,3 +17,4 @@ qt5_openglwindow_example.patch
qt5_qml.patch
qt5_arm.patch
qt5_tools.patch
qt5_gcc5.patch