[meta-qt5][PATCH 1/2] qtwebkit: Backport fix to build with gcc5

[meta-qt5][PATCH 1/2] qtwebkit: Backport fix to build with gcc5

[Khem Raj]

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>
---
 .../qt5/qtwebkit/0004-gcc5-qtbug-44829.patch       | 36 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebkit_5.4.1.bb                   |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch

diff --git a/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch b/recipes-qt/qt5/qtwebkit/0004-gcc5-qtbug-44829.patch
new file mode 100644
index 0000000..81295d1
--- /dev/null
+++ b/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 <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
+
diff --git a/recipes-qt/qt5/qtwebkit_5.4.1.bb b/recipes-qt/qt5/qtwebkit_5.4.1.bb
index 909696b..454e470 100644
--- a/recipes-qt/qt5/qtwebkit_5.4.1.bb
+++ b/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.1.4

[meta-qt5][PATCH 2/2] qt5-opengles2-test: Upgrade to latest tip

[Khem Raj]

Fix dependencies on the way

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-qt/examples/qt5-opengles2-test_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-qt/examples/qt5-opengles2-test_git.bb b/recipes-qt/examples/qt5-opengles2-test_git.bb
index 0756e62..f763912 100644
--- a/recipes-qt/examples/qt5-opengles2-test_git.bb
+++ b/recipes-qt/examples/qt5-opengles2-test_git.bb
@@ -5,15 +5,15 @@ window focus handling and some other game-related features."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/main.cpp;beginline=1;endline=26;md5=93b83ece006c9e76b9fca80c3aecb169"
 
-PV = "1.0.2+gitr${SRCPV}"
+PV = "1.0.4+gitr${SRCPV}"
 
-DEPENDS = "qtbase"
+DEPENDS = "qtbase qtsensors"
 
 # Depends on gles2 enabled and that's not default configuration
 EXCLUDE_FROM_WORLD = "1"
 
 SRC_URI = "git://github.com/thp/qt5-opengles2-test.git"
-SRCREV = "9500c00a7094a881e53afd71146d76d40834df45"
+SRCREV = "3fa3789c28658b6f0bbddc3105f575f1074e87f2"
 S = "${WORKDIR}/git"
 
 inherit qmake5
-- 
2.1.4