summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-18 16:29:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-28 09:25:17 +0000
commit9988ab36b41abf00cd79f671aa84bbcc4f8e540d (patch)
tree0ebf9714d3e1df5b9776845777ae1d37caf0ce48 /meta/recipes-sato/webkit/webkitgtk
parentcedb02737298735a18b977b33f4ad3c4ed330619 (diff)
downloadpoky-9988ab36b41abf00cd79f671aa84bbcc4f8e540d.tar.gz
webkitgtk: update to 2.10.4
Drop backported patches (which means, all the patches). Replace a few hardcoded dependencies with PACKAGECONFIG entries. Add a PACKAGECONFIG entry for libhyphen. (From OE-Core rev: 3c5485d629e261f27d9c4ad492224a5e376ff0a4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/gcc5.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch b/meta/recipes-sato/webkit/webkitgtk/gcc5.patch
deleted file mode 100644
index 5951a81f34..0000000000
--- a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1JSObject: Create explicit instantiation of putByIndexBeyondVectorLengthWithoutAttributes
2
3Reason for change: newer gcc might optimize away the templates
4and they wont be available for other .cpp files to use as these
5are used in a different .cpp we need to tell compiler to explicitly
6instantiate them.
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Pending
11
12Index: webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp
13===================================================================
14--- webkitgtk-2.8.5.orig/Source/JavaScriptCore/runtime/JSObject.cpp
15+++ webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp
16@@ -1965,6 +1965,10 @@ void JSObject::putByIndexBeyondVectorLen
17 }
18 }
19
20+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
21+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
22+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
23+
24 void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
25 {
26 VM& vm = exec->vm();