webkit-efl: bump SRCREV and add patch for scrolling issue

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

4 files changed, 60 insertions, 9 deletions

diff --git a/recipes/webkit/webkit-efl/CMakeLists.txt b/recipes/webkit/webkit-efl/CMakeLists.txt
index 99b63830b9..ca8dcf908d 100644
--- a/recipes/webkit/webkit-efl/CMakeLists.txt
+++ b/recipes/webkit/webkit-efl/CMakeLists.txt
@@ -1,7 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(WebKit)
 
-IF (NOT CMAKE_BUILD_TYPE)
+# Set a default build type if and only if user did not define one as command
+# line options and he did not give custom CFLAGS or CXXFLAGS. Otherwise, flags
+# from default build type would overwrite user-defined ones.
+IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
     SET(CMAKE_BUILD_TYPE Release)
 ENDIF ()
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@@ -9,10 +12,11 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
+SET(WEBKITTOOLS_DIR "${CMAKE_SOURCE_DIR}/WebKitTools")
 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 
 INCLUDE(WebKitMacros)
-INCLUDE(WebKitGenerators)
+INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)
 INCLUDE(WebKitFeatures)
 
@@ -34,11 +38,12 @@ FIND_PACKAGE(PythonInterp REQUIRED)
 # -----------------------------------------------------------------------------
 # Determine the target processor
 # -----------------------------------------------------------------------------
-IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+IF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
     SET(WTF_CPU_ARM 1)
-ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)")
+ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)")
     SET(WTF_CPU_X86_64 1)
-ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
+ELSEIF (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
     SET(WTF_CPU_X86 1)
 ELSE ()
     MESSAGE(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}'")
@@ -104,6 +109,11 @@ ADD_SUBDIRECTORY(WebCore)
 ADD_SUBDIRECTORY(WebKit)
 
 # -----------------------------------------------------------------------------
+# Add test browser if exists
+# -----------------------------------------------------------------------------
+INCLUDE_IF_EXISTS(${WEBKITTOOLS_DIR}/CMakeLists${PORT}.txt)
+
+# -----------------------------------------------------------------------------
 # Set compiler flags for all targets
 # -----------------------------------------------------------------------------
 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME})
diff --git a/recipes/webkit/webkit-efl/bug.50752.patch b/recipes/webkit/webkit-efl/bug.50752.patch
new file mode 100644
index 0000000000..2d65f2ea7f
--- /dev/null
+++ b/recipes/webkit/webkit-efl/bug.50752.patch
@@ -0,0 +1,37 @@
+https://bugs.webkit.org/show_bug.cgi?id=46258
+
+diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
+index cfb2f1189e4071cdca7027e81b6fda178ee32490..5ce726ec72fcb530fe0d96e77a4e8fc4b8a8c537 100644
+--- a/WebKit/efl/ChangeLog
++++ b/WebKit/efl/ChangeLog
+@@ -1,3 +1,17 @@
++2010-12-09  Alex Bredariol Grilo  <abgrilo@profusion.mobi>
++
++        Reviewed by NOBODY (OOPS!).
++
++        [EFL] Fix scroll operation in WebKit-EFL
++        https://bugs.webkit.org/show_bug.cgi?id=50752
++
++        Add the _ewk_view_scroll_add call in WebKit-EFL scroll function. This
++        call was wrongly removed in previous commit and performs the scroll
++        operation on the page.
++
++        * ewk/ewk_view.cpp:
++        (ewk_view_scroll):
++
+ 2010-12-03  Alex Bredariol Grilo  <abgrilo@profusion.mobi>
+ 
+         Reviewed by Andreas Kling.
+diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
+index 5147b6d9b7ce518deb8e1b864fe773c1931db42e..d1731e74173b53decd18610657ea4eb97f903397 100644
+--- a/WebKit/efl/ewk/ewk_view.cpp
++++ b/WebKit/efl/ewk/ewk_view.cpp
+@@ -4075,6 +4075,8 @@ void ewk_view_scroll(Evas_Object* o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx
+     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
+     EINA_SAFETY_ON_TRUE_RETURN(!dx && !dy);
+ 
++    _ewk_view_scroll_add(priv, dx, dy, sx, sy, sw, sh, main_frame);
++
+     _ewk_view_smart_changed(sd);
+ }
+ 
diff --git a/recipes/webkit/webkit-efl/cmakeconfig.h.cmake b/recipes/webkit/webkit-efl/cmakeconfig.h.cmake
index 14f7a80698..b16b985e32 100644
--- a/recipes/webkit/webkit-efl/cmakeconfig.h.cmake
+++ b/recipes/webkit/webkit-efl/cmakeconfig.h.cmake
@@ -2,7 +2,7 @@
 #define CMAKECONFIG_H
 
 #define ENABLE_AS_IMAGE @ENABLE_AS_IMAGE_VALUE@
-#define ENABLE_BLOB_SLICE @ENABLE_BLOB_SLICE_VALUE@
+#define ENABLE_BLOB @ENABLE_BLOB_VALUE@
 #define ENABLE_CHANNEL_MESSAGING @ENABLE_CHANNEL_MESSAGING_VALUE@
 #define ENABLE_DATABASE @ENABLE_DATABASE_VALUE@
 #define ENABLE_DATAGRID @ENABLE_DATAGRID_VALUE@
@@ -11,18 +11,19 @@
 #define ENABLE_EVENTSOURCE @ENABLE_EVENTSOURCE_VALUE@
 #define ENABLE_FAST_MOBILE_SCROLLING @ENABLE_FAST_MOBILE_SCROLLING_VALUE@
 #define ENABLE_FILTERS @ENABLE_FILTERS_VALUE@
+#define ENABLE_FTPDIR @ENABLE_FTPDIR_VALUE@
 #define ENABLE_GEOLOCATION @ENABLE_GEOLOCATION_VALUE@
 #define ENABLE_GLIB_SUPPORT @ENABLE_GLIB_SUPPORT_VALUE@
 #define ENABLE_ICONDATABASE @ENABLE_ICONDATABASE_VALUE@
+#define ENABLE_INSPECTOR @ENABLE_INSPECTOR_VALUE@
 #define ENABLE_JAVASCRIPT_DEBUGGER @ENABLE_JAVASCRIPT_DEBUGGER_VALUE@
 #define ENABLE_JIT @ENABLE_JIT_VALUE@
 #define ENABLE_MATHML @ENABLE_MATHML_VALUE@
+#define ENABLE_NETSCAPE_PLUGIN_API @ENABLE_NETSCAPE_PLUGIN_API_VALUE@
 #define ENABLE_NOTIFICATIONS @ENABLE_NOTIFICATIONS_VALUE@
 #define ENABLE_OFFLINE_WEB_APPLICATIONS @ENABLE_OFFLINE_WEB_APPLICATIONS_VALUE@
 #define ENABLE_ORIENTATION_EVENTS @ENABLE_ORIENTATION_EVENTS_VALUE@
 #define ENABLE_PROGRESS_TAG @ENABLE_PROGRESS_TAG_VALUE@
-#define ENABLE_RUBY @ENABLE_RUBY_VALUE@
-#define ENABLE_SANDBOX @ENABLE_SANDBOX_VALUE@
 #define ENABLE_SHARED_WORKERS @ENABLE_SHARED_WORKERS_VALUE@
 #define ENABLE_SVG @ENABLE_SVG_VALUE@
 #define ENABLE_SVG_ANIMATION @ENABLE_SVG_ANIMATION_VALUE@
diff --git a/recipes/webkit/webkit-efl_svn.bb b/recipes/webkit/webkit-efl_svn.bb
index cdb753c62d..da93d78824 100644
--- a/recipes/webkit/webkit-efl_svn.bb
+++ b/recipes/webkit/webkit-efl_svn.bb
@@ -4,7 +4,9 @@ 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 = "72648"
+# newer revisions are blocked by
+# https://bugs.webkit.org/show_bug.cgi?id=50762
+SRCREV = "73534"
 PV = "1.3.4+svnr${SRCPV}"
 PR = "r1"
 
@@ -18,6 +20,7 @@ SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=cmake;proto=http;subdir=src \
+  file://bug.50752.patch \
   file://cmakeconfig.h.cmake \
   file://CMakeLists.txt \
  "