summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-04-29 23:05:11 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2012-07-30 23:41:53 +0200
commit9542e2d61a2857887a61b84bc972ab4b59c585f2 (patch)
tree65a3666015c91ec2c8c14c81d8c5acf6fe7fbd91 /meta-efl/recipes-efl
parent7e42a01229ce1928d42b3ccf9b2365a576424729 (diff)
downloadmeta-openembedded-9542e2d61a2857887a61b84bc972ab4b59c585f2.tar.gz
webkit-efl: upgrade to 1.9.3
* some revisions are broken for armv4t, see my comment at https://bugs.webkit.org/show_bug.cgi?id=80354 * and newer then this need developement snapshot of glib/glib-networking/libsoup-2.4 https://bugs.webkit.org/show_bug.cgi?id=91626 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/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch76
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch28
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt38
-rw-r--r--meta-efl/recipes-efl/webkit/webkit-efl_svn.bb11
4 files changed, 27 insertions, 126 deletions
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch
deleted file mode 100644
index dcd3a4672..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1From 3dfc99730b99472d642f19b825fb9794e32a05c4 Mon Sep 17 00:00:00 2001
2From: "rakuco@webkit.org"
3 <rakuco@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
4Date: Tue, 10 Apr 2012 22:59:04 +0000
5Subject: [PATCH] [CMake] Do not pass -P to the preprocessor when running
6 make_names.pl.
7 https://bugs.webkit.org/show_bug.cgi?id=83225
8
9Reviewed by Rob Buis.
10
11This is necessary to make CMake-based ports build with the
12recently-released GCC 4.7.0, whose preprocessor seems to ignore
13empty lines when -P is passed to it. Such behavior breaks
14make_names.pl (in fact, InFilesParser.pm), which expects an empty
15line to separate common and specific sections in .in files.
16
17A fix for this same problem has been supposedly done in r84123,
18but as the CMake-based ports always pass --preprocessor to the
19Perl tools the fix never reached us.
20
21The idea is to define CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS
22for (!MSVC && !QNX) and use it in the macros which call
23make_names.pl.
24
25* Source/cmake/OptionsCommon.cmake:
26* Source/cmake/WebKitMacros.cmake:
27
28git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113786 268f45cc-cd09-0410-ab3c-d52691b4dbfc
29---
30 ChangeLog | 24 ++++++++++++++++++++++++
31 Source/cmake/OptionsCommon.cmake | 7 +++++++
32 Source/cmake/WebKitMacros.cmake | 2 +-
33 3 files changed, 32 insertions(+), 1 deletions(-)
34
35diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
36index 11581e6..37cb4a8 100644
37--- a/Source/cmake/OptionsCommon.cmake
38+++ b/Source/cmake/OptionsCommon.cmake
39@@ -5,14 +5,21 @@ IF (WTF_OS_UNIX)
40 ADD_DEFINITIONS(-DXP_UNIX)
41 ENDIF (WTF_OS_UNIX)
42
43+# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0. Since this
44+# version, -P does not output empty lines, which currently breaks make_names.pl in
45+# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
46+# the reader.
47 IF (MSVC)
48 # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only.
49 GET_FILENAME_COMPONENT(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME)
50 SET(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP")
51+ SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
52 ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX)
53 SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++")
54+ SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
55 ELSE ()
56 SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
57+ SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++")
58 ENDIF ()
59
60 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
61diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
62index 3abe342..4e7ca9f 100644
63--- a/Source/cmake/WebKitMacros.cmake
64+++ b/Source/cmake/WebKitMacros.cmake
65@@ -89,7 +89,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs)
66 ADD_CUSTOM_COMMAND(
67 OUTPUT ${_outputfiles}
68 DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
69- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
70+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
71 VERBATIM)
72 ENDMACRO ()
73
74--
751.7.7
76
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch
deleted file mode 100644
index 6958b9e6a..000000000
--- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 079acc344dc12818d8b56bf80a42065d8429f7ef Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 14 Feb 2012 09:56:53 +0100
4Subject: [PATCH] JavaScriptCore: add EINA_LIBRARIES to shell build for Efl
5
6* needed for libwtf_efl
7* otherwise fails with ../wtf/libwtf_efl.so.0.1.0: error: undefined reference to 'eina_module_free'
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 Source/JavaScriptCore/shell/PlatformEfl.cmake | 1 +
12 1 files changed, 1 insertions(+), 0 deletions(-)
13
14diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake
15index c35af2d..ef3f437 100644
16--- a/Source/JavaScriptCore/shell/PlatformEfl.cmake
17+++ b/Source/JavaScriptCore/shell/PlatformEfl.cmake
18@@ -1,6 +1,7 @@
19 LIST(APPEND JSC_LIBRARIES
20 ${Glib_LIBRARIES}
21 ${ECORE_LIBRARIES}
22+ ${EINA_LIBRARIES}
23 ${CMAKE_DL_LIBS}
24 )
25
26--
271.7.8.4
28
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt b/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
index c13086747..8071d61f9 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/CMakeLists.txt
@@ -11,19 +11,15 @@ ENDIF ()
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# Default library type 12# Default library type
13# ----------------------------------------------------------------------------- 13# -----------------------------------------------------------------------------
14SET(ENABLE_WEBCORE On) 14SET(ENABLE_WEBCORE ON)
15 15
16IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2) 16IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
17 SET(ENABLE_WEBKIT On) 17 SET(ENABLE_WEBKIT ON)
18ENDIF () 18ENDIF ()
19 19
20OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore") 20SET(ENABLE_TOOLS ON)
21IF (ONLY_BUILD_JAVASCRIPTCORE)
22 SET(ENABLE_WEBCORE Off)
23 SET(ENABLE_WEBKIT Off)
24 SET(ENABLE_WEBKIT2 Off)
25ENDIF ()
26 21
22SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
27SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore") 23SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
28SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore") 24SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
29SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit") 25SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
@@ -35,10 +31,15 @@ SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
35SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources") 31SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
36SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore") 32SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
37SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore") 33SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
34SET(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
38SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2") 35SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
39 36
40SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") 37SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
41 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
42INCLUDE(WebKitMacros) 43INCLUDE(WebKitMacros)
43INCLUDE(WebKitFS) 44INCLUDE(WebKitFS)
44INCLUDE(WebKitHelpers) 45INCLUDE(WebKitHelpers)
@@ -109,24 +110,24 @@ SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore)
109SET(WebCore_LIBRARY_NAME WebCore) 110SET(WebCore_LIBRARY_NAME WebCore)
110SET(WebKit_LIBRARY_NAME WebKit) 111SET(WebKit_LIBRARY_NAME WebKit)
111SET(WebKit2_LIBRARY_NAME WebKit2) 112SET(WebKit2_LIBRARY_NAME WebKit2)
113SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
112 114
113# ----------------------------------------------------------------------------- 115# -----------------------------------------------------------------------------
114# Default library types 116# Default library types
115# ----------------------------------------------------------------------------- 117# -----------------------------------------------------------------------------
116OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries") 118OPTION(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
117 119
118IF (SHARED_CORE) 120IF (SHARED_CORE)
119 SET(WTF_LIBRARY_TYPE SHARED)
120 SET(JavaScriptCore_LIBRARY_TYPE SHARED) 121 SET(JavaScriptCore_LIBRARY_TYPE SHARED)
121 SET(WebCore_LIBRARY_TYPE SHARED) 122 SET(WebCore_LIBRARY_TYPE SHARED)
122ELSE () 123ELSE ()
123 SET(WTF_LIBRARY_TYPE STATIC)
124 SET(JavaScriptCore_LIBRARY_TYPE STATIC) 124 SET(JavaScriptCore_LIBRARY_TYPE STATIC)
125 SET(WebCore_LIBRARY_TYPE STATIC) 125 SET(WebCore_LIBRARY_TYPE STATIC)
126ENDIF () 126ENDIF ()
127 127
128SET(WebKit_LIBRARY_TYPE SHARED) 128SET(WebKit_LIBRARY_TYPE SHARED)
129SET(WebKit2_LIBRARY_TYPE SHARED) 129SET(WebKit2_LIBRARY_TYPE SHARED)
130SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
130 131
131# ----------------------------------------------------------------------------- 132# -----------------------------------------------------------------------------
132# Port-specific options 133# Port-specific options
@@ -135,6 +136,13 @@ INCLUDE(OptionsCommon)
135INCLUDE(Options${PORT}) 136INCLUDE(Options${PORT})
136 137
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# -----------------------------------------------------------------------------
138# Install JavaScript shell 146# Install JavaScript shell
139# ----------------------------------------------------------------------------- 147# -----------------------------------------------------------------------------
140OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell") 148OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")
@@ -152,9 +160,7 @@ ADD_SUBDIRECTORY(Source)
152# ----------------------------------------------------------------------------- 160# -----------------------------------------------------------------------------
153# Add tools 161# Add tools
154# ----------------------------------------------------------------------------- 162# -----------------------------------------------------------------------------
155ADD_SUBDIRECTORY(Tools) 163IF (ENABLE_TOOLS)
164 ADD_SUBDIRECTORY(Tools)
165ENDIF ()
156 166
157# -----------------------------------------------------------------------------
158# Prints a summary of all enabled/disabled features
159# -----------------------------------------------------------------------------
160WEBKIT_PRINT_FEATURES()
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 7719212b4..7a7b9bd4e 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -9,9 +9,10 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
9 libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \ 9 libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
10 libxml2 pango eina ecore evas edje" 10 libxml2 pango eina ecore evas edje"
11 11
12SRCREV = "105069" 12# 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2
13PV = "1.7.3+svnr${SRCPV}" 13SRCREV = "120144"
14PR = "r3" 14PV = "1.9.3+svnr${SRCPV}"
15PR = "r1"
15 16
16SRCREV_FORMAT = "source" 17SRCREV_FORMAT = "source"
17 18
@@ -19,8 +20,6 @@ SRC_URI = "\
19 svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \ 20 svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
20 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \ 21 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
21 svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \ 22 svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
22 file://0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch \
23 file://0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch \
24 file://CMakeLists.txt \ 23 file://CMakeLists.txt \
25" 24"
26 25
@@ -34,7 +33,7 @@ inherit cmake lib_package pkgconfig perlnative pythonnative
34 33
35ARM_INSTRUCTION_SET = "arm" 34ARM_INSTRUCTION_SET = "arm"
36 35
37EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON" 36EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=On -DENABLE_DRAG_SUPPORT=On"
38 37
39LEAD_SONAME = "libewebkit.so" 38LEAD_SONAME = "libewebkit.so"
40PACKAGES =+ "${PN}launcher-dbg ${PN}launcher" 39PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"