aboutsummaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch19
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_svn.bb11
2 files changed, 2 insertions, 28 deletions
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch b/meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch
deleted file mode 100644
index 966a977ee4..0000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/revert.r78057.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-see https://bugs.webkit.org/show_bug.cgi?id=50762
-fixed by:
-http://trac.webkit.org/changeset/78047/trunk/Source/WebCore/CMakeLists.txt
-fix reverted by:
-http://trac.webkit.org/changeset/78057/trunk/Source/WebCore/CMakeLists.txt
-
-so revert revert as we care about webkit-efl and don't care about WinCE
-
-Index: Source/WebCore/CMakeLists.txt
-===================================================================
---- Source/WebCore/CMakeLists.txt (revision 78042)
-+++ Source/WebCore/CMakeLists.txt (revision 78047)
-@@ -1157,6 +1157,4 @@
-
- platform/Arena.cpp
-- platform/ContextMenu.cpp
-- platform/ContextMenuItem.cpp
- platform/ContentType.cpp
- platform/CrossThreadCopier.cpp
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index bffded788e..9f02a595e7 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -9,27 +9,20 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
libxml2 pango eina ecore evas edje"
-SRCREV = "79192"
-PV = "1.3.11+svnr${SRCPV}"
+SRCREV = "97724"
+PV = "1.6.1+svnr${SRCPV}"
SRCREV_FORMAT = "source"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;proto=http;subdir=src \
svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http;subdir=src \
- file://revert.r78057.patch \
"
S = "${WORKDIR}/src/Source"
inherit cmake lib_package pkgconfig perlnative
-# Wants to jump too far for THUMB on armv4t
-# in WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)':
-# DocTypeStrings.cpp:(.text._ZN7WebCore18DocTypeStringsHash21doctype_hash_functionEPKcj[WebCore::DocTypeStringsHash::doctype_hash_function(char const*, unsigned int)]+0x12): relocation truncated to fit: R_ARM_THM_CALL against symbol `__gnu_thumb1_case_uhi' defined in .text section in x86_64-linux/usr/armv4t/lib/gcc/arm-oe-linux-gnueabi/4.5.2/libgcc.a(_thumb1_case_uhi.o)
-# the same in WebCore::CSSValueKeywordsHash::value_hash_function(char const*, unsigned int)':
-# WebCore::CSSPropertyNamesHash::propery_hash_function(char const*, unsigned int)':
-# WebCore::ColorDataHash::colordata_hash_function(char const*, unsigned int)':
ARM_INSTRUCTION_SET = "arm"
EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON"