summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl.inc (renamed from meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb)31
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch27
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch25
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch58
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch80
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch63
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch558
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch15
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb12
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_svn.bb35
10 files changed, 199 insertions, 705 deletions
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb b/meta-efl/recipes-efl/webkit/webkit-efl.inc
index 879ff1f23..44ef9d48f 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.2+svnr159807.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl.inc
@@ -13,15 +13,15 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
13 ruby-native" 13 ruby-native"
14 14
15SRC_URI = "\ 15SRC_URI = "\
16 ${E_RELEASES}/libs/webkit-efl/webkit-efl-159807.tar.xz \ 16 ${E_RELEASES}/libs/webkit-efl/webkit-efl-164189.tar.xz \
17 file://gcc-4.8.2.fix.patch \
18 file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \ 17 file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
19 file://0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch \ 18 file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
19 file://0003-Fix-linking-issue.patch \
20" 20"
21SRC_URI[md5sum] = "3e1377d976460dd14db0dd3cd39b8e48" 21SRC_URI[md5sum] = "731513fc042ec8e03840bc1ab6a66771"
22SRC_URI[sha256sum] = "a99531299e41ba4671b32bbf46c3efc4d65960c9c87949a87f76e622c284f178" 22SRC_URI[sha256sum] = "660aefd65c0e5c6494eaec30539cda5f40fbdff17f28e7e83d341b245227cccd"
23 23
24S = "${WORKDIR}/${BPN}" 24S = "${WORKDIR}/efl-webkit"
25 25
26inherit cmake lib_package pkgconfig perlnative pythonnative 26inherit cmake lib_package pkgconfig perlnative pythonnative
27 27
@@ -37,6 +37,25 @@ EXTRA_OECMAKE = " \
37 -DENABLE_ACCESSIBILITY=Off \ 37 -DENABLE_ACCESSIBILITY=Off \
38 -DENABLE_BATTERY_STATUS=Off \ 38 -DENABLE_BATTERY_STATUS=Off \
39" 39"
40# generated ASM code isn't compatible with armv[45]
41# it was removed from macro assembler in upstream commit 121885
42# https://bugs.webkit.org/show_bug.cgi?id=90198
43EXTRA_OECMAKE_append_armv4 = " -DENABLE_LLINT=Off -DENABLE_JIT=Off -DENABLE_DFG_JIT=Off -DENABLE_FTL_JIT=Off"
44EXTRA_OECMAKE_append_armv5 = " -DENABLE_LLINT=Off -DENABLE_JIT=Off -DENABLE_DFG_JIT=Off -DENABLE_FTL_JIT=Off"
45
46# hack it in OptionsEfl.cmake because that overrules -DENABLE_LLINT=Off
47do_configure_prepend_armv4() {
48 sed -i 's/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT OFF)/g' ${S}/Source/cmake/OptionsEfl.cmake
49}
50do_configure_prepend_armv5() {
51 sed -i 's/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)/WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT OFF)/g' ${S}/Source/cmake/OptionsEfl.cmake
52}
53
54# and disabled LLINT currently isn't supported, so restrict to armv7a and x86*
55COMPATIBLE_MACHINE = "(-)"
56COMPATIBLE_MACHINE_i586 = "(.*)"
57COMPATIBLE_MACHINE_x86-64 = "(.*)"
58COMPATIBLE_MACHINE_armv7a = "(.*)"
40 59
41LEAD_SONAME = "libewebkit.so" 60LEAD_SONAME = "libewebkit.so"
42PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector" 61PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector"
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
deleted file mode 100644
index 003a1d17a..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ButterflyInlines.h-remove-indexingHeader-preCapacity.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 5b9bbf9c056e3690e2872cc74a8962ec6a21a020 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 13 Jan 2014 19:00:46 +0100
4Subject: [PATCH] ButterflyInlines.h: remove
5 !indexingHeader()->preCapacity(oldStructure)
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 Source/JavaScriptCore/runtime/ButterflyInlines.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/Source/JavaScriptCore/runtime/ButterflyInlines.h b/Source/JavaScriptCore/runtime/ButterflyInlines.h
13index f5439bb..d5c828f 100644
14--- a/Source/JavaScriptCore/runtime/ButterflyInlines.h
15+++ b/Source/JavaScriptCore/runtime/ButterflyInlines.h
16@@ -128,7 +128,7 @@ inline Butterfly* Butterfly::growArrayRight(
17 bool hadIndexingHeader, size_t oldIndexingPayloadSizeInBytes,
18 size_t newIndexingPayloadSizeInBytes)
19 {
20- ASSERT_UNUSED(oldStructure, !indexingHeader()->preCapacity(oldStructure));
21+// ASSERT_UNUSED(oldStructure, !indexingHeader()->preCapacity(oldStructure));
22 ASSERT_UNUSED(oldStructure, hadIndexingHeader == oldStructure->hasIndexingHeader(intendedOwner));
23 void* theBase = base(0, propertyCapacity);
24 size_t oldSize = totalSize(0, propertyCapacity, hadIndexingHeader, oldIndexingPayloadSizeInBytes);
25--
261.8.5.2
27
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
index 5df0f8ad0..864b9c914 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
@@ -1,29 +1,30 @@
1From bfabbcab5dc4fe29bc91bbfbd9c9a404a3e2538b Mon Sep 17 00:00:00 2001 1From b37711ca03ea9410e795f29398069fed9e9c2d30 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 13 Jan 2014 17:21:25 +0100 3Date: Mon, 13 Jan 2014 17:21:25 +0100
4Subject: [PATCH] WebKitHelpers.cmake: Add -Wno-error=cast-align 4Subject: [PATCH 1/3] WebKitHelpers.cmake: Add -Wno-error=cast-align
5 5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7--- 7---
8 Source/cmake/WebKitHelpers.cmake | 3 ++- 8 Source/cmake/WebKitHelpers.cmake | 6 +++++-
9 1 file changed, 2 insertions(+), 1 deletion(-) 9 1 file changed, 5 insertions(+), 1 deletion(-)
10 10
11diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake 11diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
12index 1e51ebc..d813117 100644 12index 409931c..345b346 100644
13--- a/Source/cmake/WebKitHelpers.cmake 13--- a/Source/cmake/WebKitHelpers.cmake
14+++ b/Source/cmake/WebKitHelpers.cmake 14+++ b/Source/cmake/WebKitHelpers.cmake
15@@ -42,7 +42,10 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target) 15@@ -44,7 +44,11 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
16 16
17 # Enable errors on warning 17 # Enable errors on warning
18 if (OPTION_ENABLE_WERROR) 18 if (OPTION_ENABLE_WERROR)
19- set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter ${OLD_COMPILE_FLAGS}") 19- set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter ${OLD_COMPILE_FLAGS}")
20+ # /OE/build/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/WebCore/platform/graphics/GlyphPage.h: In member function 'void WebCore::OpenTypeVerticalData::substituteWithVerticalGlyphs(const WebCore::SimpleFontData*, WebCore::GlyphPage*, unsigned int, unsigned int) const': /OE/build/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/WebCore/platform/graphics/GlyphPage.h:120:30: error: array subscript is above array bounds [-Werror=array-bounds] 20+ # FIXME: When we use -fno-tree-dce to support the jsCStack branch merge, build error occurs due to the uninitialization. Temporarily we set
21+ # | /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:13:50: error: 'GType soup_proxy_uri_resolver_get_type()' is deprecated (declared at /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:48) [-Werror=deprecated-declarations] 21+ # uninitialized as build warning in order to support the jsCStack merge. https://bugs.webkit.org/show_bug.cgi?id=127777.
22+ # | /OE/build/shr-core/tmp-eglibc/work/cortexa8-vfp-neon-oe-linux-gnueabi/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp:120:133: error: cast from 'uint8_t* {aka unsigned char*}' to 'JSC::IntegralTypedArrayAdaptor<short int, JSC::GenericTypedArrayView<JSC::Int16Adaptor>, JSC::JSGenericTypedArrayView<JSC::Int16Adaptor>, (JSC::TypedArrayType)4u>::Type* {aka short int*}' increases required alignment of target type [-Werror=cast-align] 22+ set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=uninitialized ${OLD_COMPILE_FLAGS}")
23+ set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=array-bounds -Wno-error=deprecated-declarations -Wno-error=cast-align ${OLD_COMPILE_FLAGS}") 23+ # | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/webkit-efl/2.3.2+svnr159807-r0/webkit-efl/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp:161:104: error: cast from 'uint8_t* {aka unsigned char*}' to 'JSC::FloatTypedArrayAdaptor<double, JSC::GenericTypedArrayView<JSC::Float64Adaptor>, JSC::JSGenericTypedArrayView<JSC::Float64Adaptor>, (JSC::TypedArrayType)9u>::Type* {aka double*}' increases required alignment of target type [-Werror=cast-align]
24+ set(OLD_COMPILE_FLAGS "-Wno-error=cast-align -Wno-error=array-bounds -Wno-error=deprecated-declarations ${OLD_COMPILE_FLAGS}")
24 endif () 25 endif ()
25 26
26 # Disable C++0x compat warnings for GCC >= 4.6.0 until we build 27 set_target_properties(${_target} PROPERTIES
27-- 28--
281.8.5.2 291.9.0
29 30
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch
deleted file mode 100644
index 153097b0e..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From a5a5eeb10b56ad1f98899a02281ea825e3cd1202 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 1 Jun 2013 19:23:54 +0200
4Subject: [PATCH] ewk: include Element.h for hasTagName function
5
6* ewebkit build fails like gtk in http://trac.webkit.org/changeset/72745
7 | ../../../lib/libwebcore_efl.so.0.1.0: undefined reference to `WebCore::Node::hasTagName(WebCore::QualifiedName const&) const'
8 | collect2: error: ld returned 1 exit status
9 | make[2]: *** [bin/DumpRenderTree] Error 1
10* SDL port has similar issue:
11 https://bugs.webkit.org/show_bug.cgi?id=88536
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 Source/WebCore/css/CSSStyleSheet.cpp | 1 +
16 Source/WebKit/efl/ewk/ewk_frame.cpp | 1 +
17 Source/WebKit/efl/ewk/ewk_view.cpp | 1 +
18 3 files changed, 3 insertions(+)
19
20diff --git a/Source/WebCore/css/CSSStyleSheet.cpp b/Source/WebCore/css/CSSStyleSheet.cpp
21index 00b2d91..1d03c2e 100644
22--- a/Source/WebCore/css/CSSStyleSheet.cpp
23+++ b/Source/WebCore/css/CSSStyleSheet.cpp
24@@ -29,6 +29,7 @@
25 #include "CSSStyleRule.h"
26 #include "CachedCSSStyleSheet.h"
27 #include "Document.h"
28+#include "Element.h"
29 #include "ExceptionCode.h"
30 #include "HTMLNames.h"
31 #include "MediaList.h"
32diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
33index fd1ffd2..c86601a 100644
34--- a/Source/WebKit/efl/ewk/ewk_frame.cpp
35+++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
36@@ -32,6 +32,7 @@
37 #include "FocusController.h"
38 #include "FrameLoaderClientEfl.h"
39 #include "FrameView.h"
40+#include "Element.h"
41 #include "HTMLCollection.h"
42 #include "HTMLHeadElement.h"
43 #include "HTMLImageElement.h"
44diff --git a/Source/WebKit/efl/ewk/ewk_view.cpp b/Source/WebKit/efl/ewk/ewk_view.cpp
45index 9798e94..7a5da60 100644
46--- a/Source/WebKit/efl/ewk/ewk_view.cpp
47+++ b/Source/WebKit/efl/ewk/ewk_view.cpp
48@@ -36,6 +36,7 @@
49 #include "FocusController.h"
50 #include "FrameLoaderClientEfl.h"
51 #include "FrameView.h"
52+#include "Element.h"
53 #include "GraphicsContext.h"
54 #include "HTMLElement.h"
55 #include "HTMLInputElement.h"
56--
571.8.2.1
58
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch
new file mode 100644
index 000000000..9f005bcd3
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch
@@ -0,0 +1,80 @@
1From e284e92da00011e55d8f79383034e0c9c1a8a106 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 27 Feb 2014 13:40:43 +0100
4Subject: [PATCH 2/3] ARMAssembler.h: Don't generate BKPT and BLX for armv4*
5
6* I haven't tested it in runtime yet, but it's better than to wait for asm failure later:
7 {standard input}: Assembler messages:
8 {standard input}:35: Error: selected processor does not support ARM mode `bkpt #0'
9 {standard input}:62: Error: selected processor does not support ARM mode `blx llint_throw_stack_overflow_error'
10 ...
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 Source/JavaScriptCore/assembler/ARMAssembler.h | 19 +++++++++++++++++++
15 1 file changed, 19 insertions(+)
16
17diff --git a/Source/JavaScriptCore/assembler/ARMAssembler.h b/Source/JavaScriptCore/assembler/ARMAssembler.h
18index 087d31c..1b40ded 100644
19--- a/Source/JavaScriptCore/assembler/ARMAssembler.h
20+++ b/Source/JavaScriptCore/assembler/ARMAssembler.h
21@@ -211,7 +211,9 @@ namespace JSC {
22 LDMIA = 0x08b00000,
23 B = 0x0a000000,
24 BL = 0x0b000000,
25+#if WTF_ARM_ARCH_AT_LEAST(5)
26 BX = 0x012fff10,
27+#endif
28 VMOV_VFP64 = 0x0c400a10,
29 VMOV_ARM64 = 0x0c500a10,
30 VMOV_VFP32 = 0x0e000a10,
31@@ -223,8 +225,10 @@ namespace JSC {
32 VCVT_F64_F32 = 0x0eb70ac0,
33 VMRS_APSR = 0x0ef1fa10,
34 CLZ = 0x016f0f10,
35+#if WTF_ARM_ARCH_AT_LEAST(5)
36 BKPT = 0xe1200070,
37 BLX = 0x012fff30,
38+#endif
39 #if WTF_ARM_ARCH_AT_LEAST(7)
40 MOVW = 0x03000000,
41 MOVT = 0x03400000,
42@@ -689,7 +693,11 @@ namespace JSC {
43
44 void bkpt(ARMWord value)
45 {
46+#if WTF_ARM_ARCH_AT_LEAST(5)
47 m_buffer.putInt(BKPT | ((value & 0xff0) << 4) | (value & 0xf));
48+#else
49+ // BKPT is available in ARMv5T and above, skip it here
50+#endif
51 }
52
53 void nop()
54@@ -704,12 +712,23 @@ namespace JSC {
55
56 void bx(int rm, Condition cc = AL)
57 {
58+#if WTF_ARM_ARCH_AT_LEAST(5)
59 emitInstruction(toARMWord(cc) | BX, 0, 0, RM(rm));
60+#else
61+ // BX is available in ARMv5T and above.
62+ emitInstruction(toARMWord(cc) | MOV, ARMRegisters::pc, ARMRegisters::lr, 0);
63+#endif
64 }
65
66 AssemblerLabel blx(int rm, Condition cc = AL)
67 {
68+#if WTF_ARM_ARCH_AT_LEAST(5)
69 emitInstruction(toARMWord(cc) | BLX, 0, 0, RM(rm));
70+#else
71+ // BLX is available in ARMv5T and above.
72+ emitInstruction(toARMWord(cc) | MOV, ARMRegisters::lr, ARMRegisters::pc, 0);
73+ emitInstruction(toARMWord(cc) | MOV, ARMRegisters::pc, RM(rm), 0);
74+#endif
75 return m_buffer.label();
76 }
77
78--
791.9.0
80
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch
new file mode 100644
index 000000000..ce1c6872d
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch
@@ -0,0 +1,63 @@
1From 09088da56f3de17ab1cc537627cda6bf808eaf4c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 27 Feb 2014 14:17:29 +0100
4Subject: [PATCH 3/3] Fix linking issue
5
6* inline function is sometimes not included soon enough
7
8 Partialy taken from:
9 https://bugs.webkit.org/show_bug.cgi?id=124152
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 Source/JavaScriptCore/llint/LLIntEntrypoint.cpp | 3 +++
14 Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp | 3 +++
15 Source/JavaScriptCore/runtime/SymbolTable.cpp | 4 ++++
16 3 files changed, 10 insertions(+)
17
18diff --git a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
19index 5d91be6..73cba31 100644
20--- a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
21+++ b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
22@@ -31,6 +31,9 @@
23 #include "CodeBlock.h"
24 #include "JITCode.h"
25 #include "JSObject.h"
26+#include "JSCellInlines.h"
27+#include "JSDestructibleObject.h"
28+#include "SlotVisitorInlines.h"
29 #include "LLIntThunks.h"
30 #include "LowLevelInterpreter.h"
31 #include "MaxFrameExtentForSlowPathCall.h"
32diff --git a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
33index d0583fc..4be5ec3 100644
34--- a/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
35+++ b/Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp
36@@ -25,6 +25,9 @@
37
38 #include "config.h"
39 #include "FunctionExecutableDump.h"
40+#include "JSCellInlines.h"
41+#include "JSDestructibleObject.h"
42+#include "SlotVisitorInlines.h"
43
44 #include "CodeBlock.h"
45
46diff --git a/Source/JavaScriptCore/runtime/SymbolTable.cpp b/Source/JavaScriptCore/runtime/SymbolTable.cpp
47index 6eb0239..21450df 100644
48--- a/Source/JavaScriptCore/runtime/SymbolTable.cpp
49+++ b/Source/JavaScriptCore/runtime/SymbolTable.cpp
50@@ -33,6 +33,10 @@
51 #include "JSCInlines.h"
52 #include "SlotVisitorInlines.h"
53
54+#include "JSCellInlines.h"
55+#include "JSDestructibleObject.h"
56+#include "SlotVisitorInlines.h"
57+
58 namespace JSC {
59
60 const ClassInfo SymbolTable::s_info = { "SymbolTable", 0, 0, 0, CREATE_METHOD_TABLE(SymbolTable) };
61--
621.9.0
63
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch b/meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch
deleted file mode 100644
index d4aa67421..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/bison-2.6.patch
+++ /dev/null
@@ -1,558 +0,0 @@
1Upstream-Status: Backport
2http://trac.webkit.org/changeset/124099
3
4Subversion Revision: 123651
5diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
6index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
7--- a/Source/WebCore/css/CSSGrammar.y
8+++ b/Source/WebCore/css/CSSGrammar.y
9@@ -53,14 +53,13 @@ using namespace HTMLNames;
10 #define YYMAXDEPTH 10000
11 #define YYDEBUG 0
12
13-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
14-#define YYPARSE_PARAM parser
15-#define YYLEX_PARAM parser
16-
17 %}
18
19 %pure_parser
20
21+%parse-param { CSSParser* parser }
22+%lex-param { CSSParser* parser }
23+
24 %union {
25 bool boolean;
26 char character;
27@@ -89,7 +88,7 @@ using namespace HTMLNames;
28
29 %{
30
31-static inline int cssyyerror(const char*)
32+static inline int cssyyerror(void*, const char*)
33 {
34 return 1;
35 }
36diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
37index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
38--- a/Source/WebCore/css/CSSParser.cpp
39+++ b/Source/WebCore/css/CSSParser.cpp
40@@ -114,7 +114,7 @@
41 extern int cssyydebug;
42 #endif
43
44-extern int cssyyparse(void* parser);
45+extern int cssyyparse(WebCore::CSSParser*);
46
47 using namespace std;
48 using namespace WTF;
49diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
50index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
51--- a/Source/WebCore/xml/XPathGrammar.y
52+++ b/Source/WebCore/xml/XPathGrammar.y
53@@ -34,6 +34,7 @@
54 #include "XPathParser.h"
55 #include "XPathPath.h"
56 #include "XPathPredicate.h"
57+#include "XPathStep.h"
58 #include "XPathVariableReference.h"
59 #include <wtf/FastMalloc.h>
60
61@@ -44,8 +45,6 @@
62 #define YYLTYPE_IS_TRIVIAL 1
63 #define YYDEBUG 0
64 #define YYMAXDEPTH 10000
65-#define YYPARSE_PARAM parserParameter
66-#define PARSER static_cast<Parser*>(parserParameter)
67
68 using namespace WebCore;
69 using namespace XPath;
70@@ -53,6 +52,7 @@ using namespace XPath;
71 %}
72
73 %pure_parser
74+%parse-param { WebCore::XPath::Parser* parser }
75
76 %union
77 {
78@@ -71,7 +71,7 @@ using namespace XPath;
79 %{
80
81 static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
82-static void xpathyyerror(const char*) { }
83+static void xpathyyerror(void*, const char*) { }
84
85 %}
86
87@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
88 Expr:
89 OrExpr
90 {
91- PARSER->m_topExpr = $1;
92+ parser->m_topExpr = $1;
93 }
94 ;
95
96@@ -138,7 +138,7 @@ AbsoluteLocationPath:
97 '/'
98 {
99 $$ = new LocationPath;
100- PARSER->registerParseNode($$);
101+ parser->registerParseNode($$);
102 }
103 |
104 '/' RelativeLocationPath
105@@ -150,7 +150,7 @@ AbsoluteLocationPath:
106 {
107 $$ = $2;
108 $$->insertFirstStep($1);
109- PARSER->unregisterParseNode($1);
110+ parser->unregisterParseNode($1);
111 }
112 ;
113
114@@ -159,22 +159,22 @@ RelativeLocationPath:
115 {
116 $$ = new LocationPath;
117 $$->appendStep($1);
118- PARSER->unregisterParseNode($1);
119- PARSER->registerParseNode($$);
120+ parser->unregisterParseNode($1);
121+ parser->registerParseNode($$);
122 }
123 |
124 RelativeLocationPath '/' Step
125 {
126 $$->appendStep($3);
127- PARSER->unregisterParseNode($3);
128+ parser->unregisterParseNode($3);
129 }
130 |
131 RelativeLocationPath DescendantOrSelf Step
132 {
133 $$->appendStep($2);
134 $$->appendStep($3);
135- PARSER->unregisterParseNode($2);
136- PARSER->unregisterParseNode($3);
137+ parser->unregisterParseNode($2);
138+ parser->unregisterParseNode($3);
139 }
140 ;
141
142@@ -183,58 +183,58 @@ Step:
143 {
144 if ($2) {
145 $$ = new Step(Step::ChildAxis, *$1, *$2);
146- PARSER->deletePredicateVector($2);
147+ parser->deletePredicateVector($2);
148 } else
149 $$ = new Step(Step::ChildAxis, *$1);
150- PARSER->deleteNodeTest($1);
151- PARSER->registerParseNode($$);
152+ parser->deleteNodeTest($1);
153+ parser->registerParseNode($$);
154 }
155 |
156 NAMETEST OptionalPredicateList
157 {
158 String localName;
159 String namespaceURI;
160- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
161- PARSER->m_gotNamespaceError = true;
162+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
163+ parser->m_gotNamespaceError = true;
164 YYABORT;
165 }
166
167 if ($2) {
168 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
169- PARSER->deletePredicateVector($2);
170+ parser->deletePredicateVector($2);
171 } else
172 $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
173- PARSER->deleteString($1);
174- PARSER->registerParseNode($$);
175+ parser->deleteString($1);
176+ parser->registerParseNode($$);
177 }
178 |
179 AxisSpecifier NodeTest OptionalPredicateList
180 {
181 if ($3) {
182 $$ = new Step($1, *$2, *$3);
183- PARSER->deletePredicateVector($3);
184+ parser->deletePredicateVector($3);
185 } else
186 $$ = new Step($1, *$2);
187- PARSER->deleteNodeTest($2);
188- PARSER->registerParseNode($$);
189+ parser->deleteNodeTest($2);
190+ parser->registerParseNode($$);
191 }
192 |
193 AxisSpecifier NAMETEST OptionalPredicateList
194 {
195 String localName;
196 String namespaceURI;
197- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
198- PARSER->m_gotNamespaceError = true;
199+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
200+ parser->m_gotNamespaceError = true;
201 YYABORT;
202 }
203
204 if ($3) {
205 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
206- PARSER->deletePredicateVector($3);
207+ parser->deletePredicateVector($3);
208 } else
209 $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
210- PARSER->deleteString($2);
211- PARSER->registerParseNode($$);
212+ parser->deleteString($2);
213+ parser->registerParseNode($$);
214 }
215 |
216 AbbreviatedStep
217@@ -259,23 +259,23 @@ NodeTest:
218 else if (*$1 == "comment")
219 $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
220
221- PARSER->deleteString($1);
222- PARSER->registerNodeTest($$);
223+ parser->deleteString($1);
224+ parser->registerNodeTest($$);
225 }
226 |
227 PI '(' ')'
228 {
229 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
230- PARSER->deleteString($1);
231- PARSER->registerNodeTest($$);
232+ parser->deleteString($1);
233+ parser->registerNodeTest($$);
234 }
235 |
236 PI '(' LITERAL ')'
237 {
238 $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
239- PARSER->deleteString($1);
240- PARSER->deleteString($3);
241- PARSER->registerNodeTest($$);
242+ parser->deleteString($1);
243+ parser->deleteString($3);
244+ parser->registerNodeTest($$);
245 }
246 ;
247
248@@ -293,14 +293,14 @@ PredicateList:
249 {
250 $$ = new Vector<Predicate*>;
251 $$->append(new Predicate($1));
252- PARSER->unregisterParseNode($1);
253- PARSER->registerPredicateVector($$);
254+ parser->unregisterParseNode($1);
255+ parser->registerPredicateVector($$);
256 }
257 |
258 PredicateList Predicate
259 {
260 $$->append(new Predicate($2));
261- PARSER->unregisterParseNode($2);
262+ parser->unregisterParseNode($2);
263 }
264 ;
265
266@@ -315,7 +315,7 @@ DescendantOrSelf:
267 SLASHSLASH
268 {
269 $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
270- PARSER->registerParseNode($$);
271+ parser->registerParseNode($$);
272 }
273 ;
274
275@@ -323,13 +323,13 @@ AbbreviatedStep:
276 '.'
277 {
278 $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
279- PARSER->registerParseNode($$);
280+ parser->registerParseNode($$);
281 }
282 |
283 DOTDOT
284 {
285 $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
286- PARSER->registerParseNode($$);
287+ parser->registerParseNode($$);
288 }
289 ;
290
291@@ -337,8 +337,8 @@ PrimaryExpr:
292 VARIABLEREFERENCE
293 {
294 $$ = new VariableReference(*$1);
295- PARSER->deleteString($1);
296- PARSER->registerParseNode($$);
297+ parser->deleteString($1);
298+ parser->registerParseNode($$);
299 }
300 |
301 '(' Expr ')'
302@@ -349,15 +349,15 @@ PrimaryExpr:
303 LITERAL
304 {
305 $$ = new StringExpression(*$1);
306- PARSER->deleteString($1);
307- PARSER->registerParseNode($$);
308+ parser->deleteString($1);
309+ parser->registerParseNode($$);
310 }
311 |
312 NUMBER
313 {
314 $$ = new Number($1->toDouble());
315- PARSER->deleteString($1);
316- PARSER->registerParseNode($$);
317+ parser->deleteString($1);
318+ parser->registerParseNode($$);
319 }
320 |
321 FunctionCall
322@@ -369,8 +369,8 @@ FunctionCall:
323 $$ = createFunction(*$1);
324 if (!$$)
325 YYABORT;
326- PARSER->deleteString($1);
327- PARSER->registerParseNode($$);
328+ parser->deleteString($1);
329+ parser->registerParseNode($$);
330 }
331 |
332 FUNCTIONNAME '(' ArgumentList ')'
333@@ -378,9 +378,9 @@ FunctionCall:
334 $$ = createFunction(*$1, *$3);
335 if (!$$)
336 YYABORT;
337- PARSER->deleteString($1);
338- PARSER->deleteExpressionVector($3);
339- PARSER->registerParseNode($$);
340+ parser->deleteString($1);
341+ parser->deleteExpressionVector($3);
342+ parser->registerParseNode($$);
343 }
344 ;
345
346@@ -389,14 +389,14 @@ ArgumentList:
347 {
348 $$ = new Vector<Expression*>;
349 $$->append($1);
350- PARSER->unregisterParseNode($1);
351- PARSER->registerExpressionVector($$);
352+ parser->unregisterParseNode($1);
353+ parser->registerExpressionVector($$);
354 }
355 |
356 ArgumentList ',' Argument
357 {
358 $$->append($3);
359- PARSER->unregisterParseNode($3);
360+ parser->unregisterParseNode($3);
361 }
362 ;
363
364@@ -412,9 +412,9 @@ UnionExpr:
365 $$ = new Union;
366 $$->addSubExpression($1);
367 $$->addSubExpression($3);
368- PARSER->unregisterParseNode($1);
369- PARSER->unregisterParseNode($3);
370- PARSER->registerParseNode($$);
371+ parser->unregisterParseNode($1);
372+ parser->unregisterParseNode($3);
373+ parser->registerParseNode($$);
374 }
375 ;
376
377@@ -430,9 +430,9 @@ PathExpr:
378 {
379 $3->setAbsolute(true);
380 $$ = new Path(static_cast<Filter*>($1), $3);
381- PARSER->unregisterParseNode($1);
382- PARSER->unregisterParseNode($3);
383- PARSER->registerParseNode($$);
384+ parser->unregisterParseNode($1);
385+ parser->unregisterParseNode($3);
386+ parser->registerParseNode($$);
387 }
388 |
389 FilterExpr DescendantOrSelf RelativeLocationPath
390@@ -440,10 +440,10 @@ PathExpr:
391 $3->insertFirstStep($2);
392 $3->setAbsolute(true);
393 $$ = new Path(static_cast<Filter*>($1), $3);
394- PARSER->unregisterParseNode($1);
395- PARSER->unregisterParseNode($2);
396- PARSER->unregisterParseNode($3);
397- PARSER->registerParseNode($$);
398+ parser->unregisterParseNode($1);
399+ parser->unregisterParseNode($2);
400+ parser->unregisterParseNode($3);
401+ parser->registerParseNode($$);
402 }
403 ;
404
405@@ -453,9 +453,9 @@ FilterExpr:
406 PrimaryExpr PredicateList
407 {
408 $$ = new Filter($1, *$2);
409- PARSER->unregisterParseNode($1);
410- PARSER->deletePredicateVector($2);
411- PARSER->registerParseNode($$);
412+ parser->unregisterParseNode($1);
413+ parser->deletePredicateVector($2);
414+ parser->registerParseNode($$);
415 }
416 ;
417
418@@ -465,9 +465,9 @@ OrExpr:
419 OrExpr OR AndExpr
420 {
421 $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
422- PARSER->unregisterParseNode($1);
423- PARSER->unregisterParseNode($3);
424- PARSER->registerParseNode($$);
425+ parser->unregisterParseNode($1);
426+ parser->unregisterParseNode($3);
427+ parser->registerParseNode($$);
428 }
429 ;
430
431@@ -477,9 +477,9 @@ AndExpr:
432 AndExpr AND EqualityExpr
433 {
434 $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
435- PARSER->unregisterParseNode($1);
436- PARSER->unregisterParseNode($3);
437- PARSER->registerParseNode($$);
438+ parser->unregisterParseNode($1);
439+ parser->unregisterParseNode($3);
440+ parser->registerParseNode($$);
441 }
442 ;
443
444@@ -489,9 +489,9 @@ EqualityExpr:
445 EqualityExpr EQOP RelationalExpr
446 {
447 $$ = new EqTestOp($2, $1, $3);
448- PARSER->unregisterParseNode($1);
449- PARSER->unregisterParseNode($3);
450- PARSER->registerParseNode($$);
451+ parser->unregisterParseNode($1);
452+ parser->unregisterParseNode($3);
453+ parser->registerParseNode($$);
454 }
455 ;
456
457@@ -501,9 +501,9 @@ RelationalExpr:
458 RelationalExpr RELOP AdditiveExpr
459 {
460 $$ = new EqTestOp($2, $1, $3);
461- PARSER->unregisterParseNode($1);
462- PARSER->unregisterParseNode($3);
463- PARSER->registerParseNode($$);
464+ parser->unregisterParseNode($1);
465+ parser->unregisterParseNode($3);
466+ parser->registerParseNode($$);
467 }
468 ;
469
470@@ -513,17 +513,17 @@ AdditiveExpr:
471 AdditiveExpr PLUS MultiplicativeExpr
472 {
473 $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
474- PARSER->unregisterParseNode($1);
475- PARSER->unregisterParseNode($3);
476- PARSER->registerParseNode($$);
477+ parser->unregisterParseNode($1);
478+ parser->unregisterParseNode($3);
479+ parser->registerParseNode($$);
480 }
481 |
482 AdditiveExpr MINUS MultiplicativeExpr
483 {
484 $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
485- PARSER->unregisterParseNode($1);
486- PARSER->unregisterParseNode($3);
487- PARSER->registerParseNode($$);
488+ parser->unregisterParseNode($1);
489+ parser->unregisterParseNode($3);
490+ parser->registerParseNode($$);
491 }
492 ;
493
494@@ -533,9 +533,9 @@ MultiplicativeExpr:
495 MultiplicativeExpr MULOP UnaryExpr
496 {
497 $$ = new NumericOp($2, $1, $3);
498- PARSER->unregisterParseNode($1);
499- PARSER->unregisterParseNode($3);
500- PARSER->registerParseNode($$);
501+ parser->unregisterParseNode($1);
502+ parser->unregisterParseNode($3);
503+ parser->registerParseNode($$);
504 }
505 ;
506
507@@ -546,8 +546,8 @@ UnaryExpr:
508 {
509 $$ = new Negative;
510 $$->addSubExpression($2);
511- PARSER->unregisterParseNode($2);
512- PARSER->registerParseNode($$);
513+ parser->unregisterParseNode($2);
514+ parser->registerParseNode($$);
515 }
516 ;
517
518diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
519index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
520--- a/Source/WebCore/xml/XPathParser.cpp
521+++ b/Source/WebCore/xml/XPathParser.cpp
522@@ -32,24 +32,21 @@
523 #include "XPathEvaluator.h"
524 #include "XPathException.h"
525 #include "XPathNSResolver.h"
526+#include "XPathPath.h"
527 #include "XPathStep.h"
528 #include <wtf/StdLibExtras.h>
529 #include <wtf/text/StringHash.h>
530
531-int xpathyyparse(void*);
532-
533+using namespace WebCore;
534 using namespace WTF;
535 using namespace Unicode;
536+using namespace XPath;
537
538-namespace WebCore {
539-namespace XPath {
540-
541-class LocationPath;
542-
543-#include "XPathGrammar.h"
544+extern int xpathyyparse(WebCore::XPath::Parser*);
545+#include "XPathGrammar.h"
546
547 Parser* Parser::currentParser = 0;
548-
549+
550 enum XMLCat { NameStart, NameCont, NotPartOfName };
551
552 typedef HashMap<String, Step::Axis> AxisNamesMap;
553@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
554 delete t;
555 }
556
557-}
558-}
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch b/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch
deleted file mode 100644
index 635c1cb1f..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/gcc-4.8.2.fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport http://trac.webkit.org/changeset/160834
2
3Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
4
5Index: a/Source/WTF/wtf/dtoa/double-conversion.cc
6===================================================================
7--- a/Source/WTF/wtf/dtoa/double-conversion.cc (revision 160833)
8+++ b/Source/WTF/wtf/dtoa/double-conversion.cc (revision 160834)
9@@ -447,5 +447,5 @@
10 const int kBufferSize = kMaxSignificantDigits + 10;
11 char buffer[kBufferSize]; // NOLINT: size is known at compile time.
12- int buffer_pos = 0;
13+ unsigned buffer_pos = 0;
14
15 // Exponent will be adjusted if insignificant digits of the integer part
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
new file mode 100644
index 000000000..65418ca9a
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
@@ -0,0 +1,12 @@
1require ${BPN}.inc
2
3SRC_URI = "\
4 ${E_RELEASES}/libs/webkit-efl/webkit-efl-164189.tar.xz \
5 file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
6 file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
7 file://0003-Fix-linking-issue.patch \
8"
9SRC_URI[md5sum] = "731513fc042ec8e03840bc1ab6a66771"
10SRC_URI[sha256sum] = "660aefd65c0e5c6494eaec30539cda5f40fbdff17f28e7e83d341b245227cccd"
11
12S = "${WORKDIR}/efl-webkit"
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 617c056d9..e50139c8d 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -1,18 +1,7 @@
1SUMMARY = "Webkit browser engine, EFL edition" 1require ${BPN}.inc
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \
4 file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \
5 file://Source/WebKit/efl/ewk/EWebKit.h;endline=20;md5=55ea170b1582797d2c69712de850f2fa \
6"
7
8DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
9 libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
10 libxml2 pango eina ecore evas edje edbus gstreamer gst-plugins-base"
11 2
12# 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2 3SRCREV = "164189"
13SRCREV = "120144" 4PV = "2.3.4+svnr${SRCPV}"
14PV = "1.9.3+svnr${SRCPV}"
15PR = "r3"
16 5
17SRCREV_FORMAT = "source" 6SRCREV_FORMAT = "source"
18 7
@@ -20,9 +9,10 @@ SRC_URI = "\
20 svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \ 9 svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
21 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \ 10 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
22 svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \ 11 svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
23 file://0001-ewk-include-Element.h-for-hasTagName-function.patch \
24 file://CMakeLists.txt \ 12 file://CMakeLists.txt \
25 file://bison-2.6.patch \ 13 file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
14 file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
15 file://0003-Fix-linking-issue.patch \
26" 16"
27 17
28S = "${WORKDIR}/src" 18S = "${WORKDIR}/src"
@@ -30,16 +20,3 @@ S = "${WORKDIR}/src"
30do_configure_prepend() { 20do_configure_prepend() {
31 cp ${WORKDIR}/CMakeLists.txt ${S}; 21 cp ${WORKDIR}/CMakeLists.txt ${S};
32} 22}
33
34inherit cmake lib_package pkgconfig perlnative pythonnative
35
36ARM_INSTRUCTION_SET = "arm"
37
38EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=On -DENABLE_DRAG_SUPPORT=On"
39
40LEAD_SONAME = "libewebkit.so"
41PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
42
43FILES_${PN} += "${datadir}/webkit-1.0/theme/default.edj ${datadir}/ewebkit-0/themes/default.edj"
44FILES_${PN}launcher = "${bindir}/EWebLauncher"
45FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 11:19:50 +0000