summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-08-13 14:10:02 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-17 12:56:21 +0100
commit64b41ca4f3e4b6d475832088c45545fc54b15977 (patch)
treee2570de2bd187af54bbafad5b4c18157946cd707 /meta-efl/recipes-efl
parent153fd8a5a9f0e5bd0803637ff4899273cfcc5768 (diff)
downloadmeta-openembedded-64b41ca4f3e4b6d475832088c45545fc54b15977.tar.gz
webkit-efl: upgrade to 1.11.0
* webkit-efl snapshots are now versioned consistenly with efl bump PE to prevent version going backwards * announcement: http://sourceforge.net/p/enlightenment/mailman/message/32713414/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl')
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl.inc29
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch46
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch30
-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/0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch36
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0003-FEBlendNEON.h-fix-missing-semicolon.patch35
-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/0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch146
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch32
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt166
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb10
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb13
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_svn.bb22
13 files changed, 287 insertions, 421 deletions
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl.inc b/meta-efl/recipes-efl/webkit/webkit-efl.inc
index 44ef9d48f..cf919ece9 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl.inc
+++ b/meta-efl/recipes-efl/webkit/webkit-efl.inc
@@ -1,8 +1,10 @@
1DESCRIPTION = "Webkit browser engine, EFL edition" 1DESCRIPTION = "Webkit browser engine, EFL edition"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+ & LGPL-2.1"
3LIC_FILES_CHKSUM = "file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8bab0b12 \ 3LIC_FILES_CHKSUM = " \
4 file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ 4 file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \
5 file://Source/WebKit/efl/ewk/EWebKit.h;endline=20;md5=55ea170b1582797d2c69712de850f2fa \ 5 file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \
6 file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \
7 file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \
6" 8"
7 9
8# you need harfbuzz with icu enabled, you can add this to your config: 10# you need harfbuzz with icu enabled, you can add this to your config:
@@ -10,18 +12,15 @@ LIC_FILES_CHKSUM = "file://Source/WebKit/LICENSE;md5=4646f90082c40bcf298c285f8ba
10DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \ 12DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
11 libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \ 13 libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
12 libxml2 pango eina ecore evas edje eldbus harfbuzz enchant \ 14 libxml2 pango eina ecore evas edje eldbus harfbuzz enchant \
13 ruby-native" 15 ruby-native elementary"
14 16
17PE = "1"
18
19SRCVER ?= "${PV}"
15SRC_URI = "\ 20SRC_URI = "\
16 ${E_RELEASES}/libs/webkit-efl/webkit-efl-164189.tar.xz \ 21 ${E_RELEASES}/libs/webkit-efl/ewebkit-${SRCVER}.tar.xz \
17 file://0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch \
18 file://0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch \
19 file://0003-Fix-linking-issue.patch \
20" 22"
21SRC_URI[md5sum] = "731513fc042ec8e03840bc1ab6a66771" 23S = "${WORKDIR}/ewebkit"
22SRC_URI[sha256sum] = "660aefd65c0e5c6494eaec30539cda5f40fbdff17f28e7e83d341b245227cccd"
23
24S = "${WORKDIR}/efl-webkit"
25 24
26inherit cmake lib_package pkgconfig perlnative pythonnative 25inherit cmake lib_package pkgconfig perlnative pythonnative
27 26
@@ -60,8 +59,8 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
60LEAD_SONAME = "libewebkit.so" 59LEAD_SONAME = "libewebkit.so"
61PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector" 60PACKAGES =+ "${PN}launcher-dbg ${PN}launcher ${PN}-inspector"
62 61
63FILES_${PN} += "${datadir}/webkit-1.0/theme/default.edj ${datadir}/ewebkit-0/themes/default.edj" 62FILES_${PN} += "${datadir}/ewebkit2-1/themes/default.edj"
64FILES_${PN}-dev += "${libdir}/cmake" 63FILES_${PN}-dev += "${libdir}/cmake"
65FILES_${PN}launcher = "${bindir}/EWebLauncher" 64FILES_${PN}launcher = "${bindir}/EWebLauncher"
66FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher" 65FILES_${PN}launcher-dbg = "${bindir}/.debug/EWebLauncher"
67FILES_${PN}-inspector += "${datadir}/ewebkit-0/inspector" 66FILES_${PN}-inspector += "${datadir}/ewebkit2-1/inspector"
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch
new file mode 100644
index 000000000..19b7bb88d
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch
@@ -0,0 +1,46 @@
1From e6caaf6e80b9c80dc2b860b471a8f05e825f6dfa Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 14 Aug 2014 01:00:21 +0200
4Subject: [PATCH 1/3] OptionsCommon.cmake: don't mix CXX_FLAGS into C_FLAGS
5
6* it was added in https://bugs.webkit.org/show_bug.cgi?id=130261
7* causes build failures in udis86 which explicitly asks for gcc but then
8 gets g++ flags from CMAKE_CXX_FLAGS.
9
10cc1: error: command line option '-fvisibility-inlines-hidden' is valid
11for C++/ObjC++ but not for C [-Werror]
12cc1: error: command line option '-fpermissive' is valid for C++/ObjC++
13but not for C [-Werror]
14cc1: all warnings being treated as errors
15Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/build.make:11182:
16recipe for target
17'Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/disassembler/udis86/udis86.c.o'
18failed
19make[2]: ***
20[Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/disassembler/udis86/udis86.c.o]
21Error 1
22make[2]: *** Waiting for unfinished jobs....
23make[2]: Leaving directory
24'/OE/build/oe-core/tmp-eglibc/work/core2-64-oe-linux/webkit-efl/1_1.10.0+1.11.0-beta1-r0/build'
25
26Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
27---
28 Source/cmake/OptionsCommon.cmake | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
32index e304a99..045c614 100644
33--- a/Source/cmake/OptionsCommon.cmake
34+++ b/Source/cmake/OptionsCommon.cmake
35@@ -25,7 +25,7 @@ endif ()
36 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
37
38 if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
39- set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing")
40+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
41 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-exceptions -fno-strict-aliasing -fno-rtti")
42 endif ()
43
44--
452.1.3
46
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
deleted file mode 100644
index c769c7fbb..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-WebKitHelpers.cmake-Add-Wno-error-cast-align.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b37711ca03ea9410e795f29398069fed9e9c2d30 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 13 Jan 2014 17:21:25 +0100
4Subject: [PATCH 1/3] WebKitHelpers.cmake: Add -Wno-error=cast-align
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 Source/cmake/WebKitHelpers.cmake | 6 +++++-
9 1 file changed, 5 insertions(+), 1 deletion(-)
10
11diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
12index 409931c..345b346 100644
13--- a/Source/cmake/WebKitHelpers.cmake
14+++ b/Source/cmake/WebKitHelpers.cmake
15@@ -44,7 +44,11 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
16
17 # Enable errors on warning
18 if (OPTION_ENABLE_WERROR)
19- set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter ${OLD_COMPILE_FLAGS}")
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+ # uninitialized as build warning in order to support the jsCStack merge. https://bugs.webkit.org/show_bug.cgi?id=127777.
22+ set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=uninitialized ${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}")
25 endif ()
26
27 set_target_properties(${_target} PROPERTIES
28--
291.9.0
30
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
deleted file mode 100644
index 9f005bcd3..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0002-ARMAssembler.h-Don-t-generate-BKPT-and-BLX-for-armv4.patch
+++ /dev/null
@@ -1,80 +0,0 @@
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/0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch
new file mode 100644
index 000000000..9386e703d
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch
@@ -0,0 +1,36 @@
1From de93951f89e851b6689718022eebb4b8b1d14c06 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 13 Jan 2014 17:21:25 +0100
4Subject: [PATCH 2/3] WebKitHelpers.cmake: Add
5 -Wno-error=deprecated-declarations -Wno-error=cast-align
6 -Wno-error=type-limits
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 Source/cmake/WebKitHelpers.cmake | 10 ++++++++++
11 1 file changed, 10 insertions(+)
12
13diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
14index 227b9ee..ae52ef6 100644
15--- a/Source/cmake/WebKitHelpers.cmake
16+++ b/Source/cmake/WebKitHelpers.cmake
17@@ -40,6 +40,16 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
18 # FIXME: When we use -fno-tree-dce to support the jsCStack branch merge, build error occurs due to the uninitialization. Temporarily we set
19 # uninitialized as build warning in order to support the jsCStack merge. https://bugs.webkit.org/show_bug.cgi?id=127777.
20 set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=uninitialized -Wno-error=literal-suffix ${OLD_COMPILE_FLAGS}")
21+ # libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:13:84: error: 'GType soup_proxy_uri_resolver_get_type()' is deprecated (declared at /OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/include/libsoup-2.4/libsoup/soup-proxy-uri-resolver.h:48) [-Werror=deprecated-declarations]
22+ set(OLD_COMPILE_FLAGS "-Wno-error=deprecated-declarations ${OLD_COMPILE_FLAGS}")
23+ # webkit-efl/1_1.10.0+1.11.0-beta1-r0/ewebkit/Source/WTF/wtf/text/StringImpl.h:742:87: error: cast from 'uint8_t* {aka unsigned char*}' to 'WTF::StringImpl**' increases required alignment of target type [-Werror=cast-align]
24+ set(OLD_COMPILE_FLAGS "-Wno-error=cast-align ${OLD_COMPILE_FLAGS}")
25+ # webkit-efl/1_1.10.0+1.11.0-beta1-r0/ewebkit/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:70:16: error: comparison is always false due to limited range of data type [-Werror=type-limits]
26+ set(OLD_COMPILE_FLAGS "-Wno-error=type-limits ${OLD_COMPILE_FLAGS}")
27+ # webkit-efl/1_1.11.0-r0/ewebkit/Source/WebKit2/UIProcess/API/efl/EwkView.cpp:832:5: error: missing initializer for member '_Evas_GL_Config::gles_version' [-Werror=missing-field-initializers]
28+ # this one is new with efl-1.12
29+ set(OLD_COMPILE_FLAGS "-Wno-error=missing-field-initializers ${OLD_COMPILE_FLAGS}")
30+
31 endif ()
32
33 set_target_properties(${_target} PROPERTIES
34--
352.1.3
36
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0003-FEBlendNEON.h-fix-missing-semicolon.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0003-FEBlendNEON.h-fix-missing-semicolon.patch
new file mode 100644
index 000000000..e718ee1c1
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0003-FEBlendNEON.h-fix-missing-semicolon.patch
@@ -0,0 +1,35 @@
1From a076d76b8e8862bd641cd991190e82cfd478cc66 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 20 Aug 2014 00:52:03 +0200
4Subject: [PATCH 3/3] FEBlendNEON.h: fix missing semicolon
5
6* Otherwise fails with:
7In file included from ewebkit/Source/WebCore/platform/graphics/filters/FEBlend.cpp:29:0:
8ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h: In member function 'virtual void WebCore::FEBlend::platformApplySoftware()':
9ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h:130:5: error: expected primary-expression before '}' token
10 }
11 ^
12ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h:130:5: error: return-statement with a value, in function returning 'void' [-fpermissive]
13ewebkit/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h:130:5: error: expected ';' before '}' token
14
15Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16---
17 Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h
21index 1c50765..f4b6f46 100644
22--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h
23+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h
24@@ -126,7 +126,7 @@ void FEBlend::platformApplySoftware()
25
26 if (pixelArrayLength >= 8) {
27 platformApplyNEON(srcPixelArrayA->data(), srcPixelArrayB->data(), dstPixelArray->data(), pixelArrayLength);
28- return
29+ return;
30 }
31 // If there is just one pixel we expand it to two.
32 ASSERT(pixelArrayLength > 0);
33--
342.1.3
35
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
deleted file mode 100644
index ce1c6872d..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0003-Fix-linking-issue.patch
+++ /dev/null
@@ -1,63 +0,0 @@
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/0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch
new file mode 100644
index 000000000..bfa3052b1
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch
@@ -0,0 +1,146 @@
1From baebc004111289ef658c78a42f8332f3dceef41e Mon Sep 17 00:00:00 2001
2From: "ryuan.choi@navercorp.com" <ryuan.choi@navercorp.com>
3Date: Thu, 13 Nov 2014 07:07:16 +0000
4Subject: [PATCH 4/4] Fix the build with EFL 1.12
5 https://bugs.webkit.org/show_bug.cgi?id=138245
6
7Reviewed by Gyuyoung Kim.
8
9Source/WebKit2:
10
11* UIProcess/API/efl/EwkView.cpp:
12First, modified to use Evas_GL raw pointer instead of UniquePtrEfl because
13Evas_GL.h can't be included in UniquePtrEfl.h
14It should be moved into EvasGLContext because WebKit/EFL use only one Evas_GL.
15Second, provided the version of GLES in Evas_GL_Config not to break build with
16EFL 1.12
17(EwkView::EwkView):
18(EwkView::~EwkView):
19(EwkView::displayTimerFired):
20(EwkView::createGLSurface):
21* UIProcess/API/efl/EwkView.h:
22
23Source/WTF:
24
25* wtf/efl/UniquePtrEfl.h:
26Removed Evas_GL.h from UniquePtrEfl.h, which is commonly included, because
27it should not be included with official GL headers.
28
29git-svn-id: http://svn.webkit.org/repository/webkit/trunk@176066 268f45cc-cd09-0410-ab3c-d52691b4dbfc
30---
31 Source/WTF/wtf/efl/UniquePtrEfl.h | 2 --
32 Source/WebKit2/UIProcess/API/efl/EwkView.cpp | 24 ++++++++++++++++--------
33 Source/WebKit2/UIProcess/API/efl/EwkView.h | 3 ++-
34 3 files changed, 18 insertions(+), 11 deletions(-)
35
36diff --git a/Source/WTF/wtf/efl/UniquePtrEfl.h b/Source/WTF/wtf/efl/UniquePtrEfl.h
37index ba0110a..038d3fb 100644
38--- a/Source/WTF/wtf/efl/UniquePtrEfl.h
39+++ b/Source/WTF/wtf/efl/UniquePtrEfl.h
40@@ -33,7 +33,6 @@
41 #include <Ecore_IMF.h>
42 #include <Eina.h>
43 #include <Evas.h>
44-#include <Evas_GL.h>
45
46 namespace WTF {
47
48@@ -51,7 +50,6 @@ using EflUniquePtr = std::unique_ptr<T, EflPtrDeleter<T>>;
49 macro(Eina_Hash, eina_hash_free) \
50 macro(Eina_Module, eina_module_free) \
51 macro(Evas_Object, evas_object_del) \
52- macro(Evas_GL, evas_gl_free)
53
54 #define WTF_DEFINE_EFLPTR_DELETER(typeName, deleterFunc) \
55 template<> struct EflPtrDeleter<typeName> \
56diff --git a/Source/WebKit2/UIProcess/API/efl/EwkView.cpp b/Source/WebKit2/UIProcess/API/efl/EwkView.cpp
57index 50d34ed..6ff3394 100755
58--- a/Source/WebKit2/UIProcess/API/efl/EwkView.cpp
59+++ b/Source/WebKit2/UIProcess/API/efl/EwkView.cpp
60@@ -299,9 +299,11 @@ EwkView::EwkView(WKViewRef view, Evas_Object* evasObject)
61
62 // FIXME: Remove when possible.
63 static_cast<WebViewEfl*>(webView())->setEwkView(this);
64- m_evasGL = EflUniquePtr<Evas_GL>(evas_gl_new(evas_object_evas_get(m_evasObject)));
65+
66+ // FIXME: Consider it to move into EvasGLContext.
67+ m_evasGL = evas_gl_new(evas_object_evas_get(m_evasObject));
68 if (m_evasGL)
69- m_evasGLContext = EvasGLContext::create(m_evasGL.get());
70+ m_evasGLContext = EvasGLContext::create(m_evasGL);
71
72 if (!m_evasGLContext) {
73 WARN("Failed to create Evas_GL, falling back to software mode.");
74@@ -333,6 +335,9 @@ EwkView::~EwkView()
75 {
76 ASSERT(wkPageToEvasObjectMap().get(wkPage()) == m_evasObject);
77 wkPageToEvasObjectMap().remove(wkPage());
78+
79+ if (m_evasGL)
80+ evas_gl_free(m_evasGL);
81 }
82
83 EwkView* EwkView::create(WKViewRef webView, Evas* canvas, Evas_Smart* smart)
84@@ -587,7 +592,7 @@ void EwkView::displayTimerFired(Timer<EwkView>*)
85 return;
86 }
87
88- evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context());
89+ evas_gl_make_current(m_evasGL, m_evasGLSurface->surface(), m_evasGLContext->context());
90
91 WKViewPaintToCurrentGLContext(wkView());
92
93@@ -828,21 +833,24 @@ bool EwkView::createGLSurface()
94 EVAS_GL_DEPTH_BIT_8,
95 EVAS_GL_STENCIL_NONE,
96 EVAS_GL_OPTIONS_NONE,
97- EVAS_GL_MULTISAMPLE_NONE
98+ EVAS_GL_MULTISAMPLE_NONE,
99+#if defined(EVAS_GL_API_VERSION) && EVAS_GL_API_VERSION >= 2
100+ EVAS_GL_GLES_2_X
101+#endif
102 };
103
104 // Recreate to current size: Replaces if non-null, and frees existing surface after (OwnPtr).
105- m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, deviceSize());
106+ m_evasGLSurface = EvasGLSurface::create(m_evasGL, &evasGLConfig, deviceSize());
107 if (!m_evasGLSurface)
108 return false;
109
110 Evas_Native_Surface nativeSurface;
111- evas_gl_native_surface_get(m_evasGL.get(), m_evasGLSurface->surface(), &nativeSurface);
112+ evas_gl_native_surface_get(m_evasGL, m_evasGLSurface->surface(), &nativeSurface);
113 evas_object_image_native_surface_set(smartData()->image, &nativeSurface);
114
115- evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context());
116+ evas_gl_make_current(m_evasGL, m_evasGLSurface->surface(), m_evasGLContext->context());
117
118- Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get());
119+ Evas_GL_API* gl = evas_gl_api_get(m_evasGL);
120
121 WKPoint boundsEnd = WKViewUserViewportToScene(wkView(), WKPointMake(deviceSize().width(), deviceSize().height()));
122 gl->glViewport(0, 0, boundsEnd.x, boundsEnd.y);
123diff --git a/Source/WebKit2/UIProcess/API/efl/EwkView.h b/Source/WebKit2/UIProcess/API/efl/EwkView.h
124index 1c482cf..68dab87 100644
125--- a/Source/WebKit2/UIProcess/API/efl/EwkView.h
126+++ b/Source/WebKit2/UIProcess/API/efl/EwkView.h
127@@ -39,6 +39,7 @@
128 #endif
129
130 typedef struct _cairo_surface cairo_surface_t;
131+typedef struct _Evas_GL Evas_GL;
132
133 namespace WebKit {
134 class ContextMenuClientEfl;
135@@ -241,7 +242,7 @@ private:
136 Evas_Object* m_evasObject;
137 RefPtr<EwkContext> m_context;
138 RefPtr<EwkPageGroup> m_pageGroup;
139- EflUniquePtr<Evas_GL> m_evasGL;
140+ Evas_GL* m_evasGL;
141 std::unique_ptr<WebCore::EvasGLContext> m_evasGLContext;
142 std::unique_ptr<WebCore::EvasGLSurface> m_evasGLSurface;
143 bool m_pendingSurfaceResize;
144--
1452.1.3
146
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch
deleted file mode 100644
index f30987ba3..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From ed7972510df191d9fabe7aff2f688cbc45f0c955 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 20 Jul 2014 10:52:17 +0200
4Subject: [PATCH] WebMemorySamplerLinux: Fix type-limits warning
5
6* otherwise it fails with:
7 webkit-efl/2.3.4+svnr164189-r0/efl-webkit/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:70:16:
8 error: comparison is always false due to limited range of data type [-Werror=type-limits]
9 | if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space.
10 | ^
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
18index 7cb70d4..6bb78d8 100644
19--- a/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
20+++ b/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp
21@@ -67,7 +67,7 @@ static inline String nextToken(FILE* file)
22 unsigned int index = 0;
23 while (index < maxBuffer) {
24 char ch = fgetc(file);
25- if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space.
26+ if (isASCIISpace(ch) && index) // Break on non-initial ASCII space.
27 break;
28 if (!isASCIISpace(ch)) {
29 buffer[index] = ch;
30--
312.0.0
32
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt b/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
deleted file mode 100644
index 8071d61f9..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
+++ /dev/null
@@ -1,166 +0,0 @@
1CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
2PROJECT(WebKit)
3
4# Set a default build type if and only if user did not define one as command
5# line options and he did not give custom CFLAGS or CXXFLAGS. Otherwise, flags
6# from default build type would overwrite user-defined ones.
7IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
8 SET(CMAKE_BUILD_TYPE Release)
9ENDIF ()
10
11# -----------------------------------------------------------------------------
12# Default library type
13# -----------------------------------------------------------------------------
14SET(ENABLE_WEBCORE ON)
15
16IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
17 SET(ENABLE_WEBKIT ON)
18ENDIF ()
19
20SET(ENABLE_TOOLS ON)
21
22SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
23SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
24SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
25SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
26SET(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
27SET(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
28
29SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
30
31SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
32SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
33SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
34SET(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
35SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
36
37SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
38
39SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
40SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
41SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
42
43INCLUDE(WebKitMacros)
44INCLUDE(WebKitFS)
45INCLUDE(WebKitHelpers)
46INCLUDE(WebKitFeatures)
47
48# -----------------------------------------------------------------------------
49# Determine which port will be built
50# -----------------------------------------------------------------------------
51SET(ALL_PORTS Efl WinCE BlackBerry)
52SET(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
53
54LIST(FIND ALL_PORTS ${PORT} RET)
55IF (${RET} EQUAL -1)
56 MESSAGE(FATAL_ERROR "Please choose which WebKit port to build (one of ${ALL_PORTS})")
57ENDIF ()
58
59STRING(TOLOWER ${PORT} WEBKIT_PORT_DIR)
60
61# -----------------------------------------------------------------------------
62# Find common packages (used by all ports)
63# -----------------------------------------------------------------------------
64FIND_PACKAGE(BISON REQUIRED)
65FIND_PACKAGE(FLEX REQUIRED)
66FIND_PACKAGE(Gperf REQUIRED)
67FIND_PACKAGE(Perl REQUIRED)
68FIND_PACKAGE(PythonInterp REQUIRED)
69
70# -----------------------------------------------------------------------------
71# Determine the target processor
72# -----------------------------------------------------------------------------
73STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
74IF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
75 SET(WTF_CPU_ARM 1)
76ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
77 SET(WTF_CPU_MIPS 1)
78ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64)")
79 SET(WTF_CPU_X86_64 1)
80ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
81 SET(WTF_CPU_X86 1)
82ELSE ()
83 MESSAGE(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}'")
84ENDIF ()
85
86# -----------------------------------------------------------------------------
87# Determine the operating system
88# -----------------------------------------------------------------------------
89IF (UNIX)
90 IF (APPLE)
91 SET(WTF_OS_MAC_OS_X 1)
92 ELSE ()
93 SET(WTF_OS_UNIX 1)
94 ENDIF ()
95ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
96 SET(WTF_OS_WINDOWS 1)
97ELSEIF (CMAKE_SYSTEM_NAME MATCHES "QNX")
98 SET(WTF_OS_QNX 1)
99 SET(WTF_OS_UNIX 1)
100ELSE ()
101 MESSAGE(FATAL_ERROR "Unknown OS '${CMAKE_SYSTEM_NAME}'")
102ENDIF ()
103
104# -----------------------------------------------------------------------------
105# Default target names (can be overrriden in Options${PORT}.cmake file)
106# -----------------------------------------------------------------------------
107SET(JSC_EXECUTABLE_NAME JSC)
108SET(WTF_LIBRARY_NAME WTF)
109SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore)
110SET(WebCore_LIBRARY_NAME WebCore)
111SET(WebKit_LIBRARY_NAME WebKit)
112SET(WebKit2_LIBRARY_NAME WebKit2)
113SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
114
115# -----------------------------------------------------------------------------
116# Default library types
117# -----------------------------------------------------------------------------
118OPTION(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
119
120IF (SHARED_CORE)
121 SET(JavaScriptCore_LIBRARY_TYPE SHARED)
122 SET(WebCore_LIBRARY_TYPE SHARED)
123ELSE ()
124 SET(JavaScriptCore_LIBRARY_TYPE STATIC)
125 SET(WebCore_LIBRARY_TYPE STATIC)
126ENDIF ()
127
128SET(WebKit_LIBRARY_TYPE SHARED)
129SET(WebKit2_LIBRARY_TYPE SHARED)
130SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
131
132# -----------------------------------------------------------------------------
133# Port-specific options
134# -----------------------------------------------------------------------------
135INCLUDE(OptionsCommon)
136INCLUDE(Options${PORT})
137
138# -----------------------------------------------------------------------------
139# Enable API unit tests and create a target for the test runner
140# -----------------------------------------------------------------------------
141IF (ENABLE_API_TESTS)
142 ENABLE_TESTING()
143ENDIF ()
144
145# -----------------------------------------------------------------------------
146# Install JavaScript shell
147# -----------------------------------------------------------------------------
148OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")
149
150# -----------------------------------------------------------------------------
151# Define packaging
152# -----------------------------------------------------------------------------
153INCLUDE(WebKitPackaging)
154
155# -----------------------------------------------------------------------------
156# Add module directories
157# -----------------------------------------------------------------------------
158ADD_SUBDIRECTORY(Source)
159
160# -----------------------------------------------------------------------------
161# Add tools
162# -----------------------------------------------------------------------------
163IF (ENABLE_TOOLS)
164 ADD_SUBDIRECTORY(Tools)
165ENDIF ()
166
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb b/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb
new file mode 100644
index 000000000..068c0d977
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb
@@ -0,0 +1,10 @@
1require ${BPN}.inc
2
3SRC_URI += "\
4 file://0001-OptionsCommon.cmake-don-t-mix-CXX_FLAGS-into-C_FLAGS.patch \
5 file://0002-WebKitHelpers.cmake-Add-Wno-error-deprecated-declara.patch \
6 file://0003-FEBlendNEON.h-fix-missing-semicolon.patch \
7 file://0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch \
8"
9SRC_URI[md5sum] = "90fa970ebf8646319d292c2bb5bff5db"
10SRC_URI[sha256sum] = "d8d21e27f4a21cd77c41914548c184ddb98693ba23851aa66c8e51c0be4b90b7"
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
deleted file mode 100644
index 748ecea11..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl_2.3.4+svnr164189.bb
+++ /dev/null
@@ -1,13 +0,0 @@
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 file://0004-WebMemorySamplerLinux-Fix-type-limits-warning.patch \
9"
10SRC_URI[md5sum] = "731513fc042ec8e03840bc1ab6a66771"
11SRC_URI[sha256sum] = "660aefd65c0e5c6494eaec30539cda5f40fbdff17f28e7e83d341b245227cccd"
12
13S = "${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
deleted file mode 100644
index e50139c8d..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1require ${BPN}.inc
2
3SRCREV = "164189"
4PV = "2.3.4+svnr${SRCPV}"
5
6SRCREV_FORMAT = "source"
7
8SRC_URI = "\
9 svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
10 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
11 svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
12 file://CMakeLists.txt \
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 \
16"
17
18S = "${WORKDIR}/src"
19
20do_configure_prepend() {
21 cp ${WORKDIR}/CMakeLists.txt ${S};
22}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 07:36:40 +0000