aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-06-01 20:02:52 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-03 14:32:02 +0200
commit17ace92714bccf64d0d9fcefaabe3067f59fdf0a (patch)
treef1879e75e87ce21661699c57971fd9ec4a284a32
parent2cab9ba0d4d72496633b92b67ac1a63f605c5ada (diff)
downloadmeta-openembedded-17ace92714bccf64d0d9fcefaabe3067f59fdf0a.tar.gz
webkit-efl: Fix build with gcc-4.8
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch43
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_svn.bb3
2 files changed, 45 insertions, 1 deletions
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
new file mode 100644
index 0000000000..f553663048
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0001-ewk-include-Element.h-for-hasTagName-function.patch
@@ -0,0 +1,43 @@
+From 3de7c4633751c3e55152d4e2429dfcc0f69a1de3 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 1 Jun 2013 19:23:54 +0200
+Subject: [PATCH] ewk: include Element.h for hasTagName function
+
+* ewebkit build fails like gtk in http://trac.webkit.org/changeset/72745
+ | ../../../lib/libwebcore_efl.so.0.1.0: undefined reference to `WebCore::Node::hasTagName(WebCore::QualifiedName const&) const'
+ | collect2: error: ld returned 1 exit status
+ | make[2]: *** [bin/DumpRenderTree] Error 1
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ Source/WebKit/efl/ewk/ewk_frame.cpp | 1 +
+ Source/WebKit/efl/ewk/ewk_view.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
+index fd1ffd2..c86601a 100644
+--- a/Source/WebKit/efl/ewk/ewk_frame.cpp
++++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
+@@ -32,6 +32,7 @@
+ #include "FocusController.h"
+ #include "FrameLoaderClientEfl.h"
+ #include "FrameView.h"
++#include "Element.h"
+ #include "HTMLCollection.h"
+ #include "HTMLHeadElement.h"
+ #include "HTMLImageElement.h"
+diff --git a/Source/WebKit/efl/ewk/ewk_view.cpp b/Source/WebKit/efl/ewk/ewk_view.cpp
+index 9798e94..7a5da60 100644
+--- a/Source/WebKit/efl/ewk/ewk_view.cpp
++++ b/Source/WebKit/efl/ewk/ewk_view.cpp
+@@ -36,6 +36,7 @@
+ #include "FocusController.h"
+ #include "FrameLoaderClientEfl.h"
+ #include "FrameView.h"
++#include "Element.h"
+ #include "GraphicsContext.h"
+ #include "HTMLElement.h"
+ #include "HTMLInputElement.h"
+--
+1.8.2.1
+
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 33100c2a1f..cf6fba76b8 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -12,7 +12,7 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
# 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2
SRCREV = "120144"
PV = "1.9.3+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
SRCREV_FORMAT = "source"
@@ -20,6 +20,7 @@ SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
+ file://0001-ewk-include-Element.h-for-hasTagName-function.patch \
file://CMakeLists.txt \
file://bison-2.6.patch \
"