Upgrade EFL requirements to 1.8.

Make the needed changes to use EFL 1.8, and correctly request it at
configure time.

Eo is being used now, which is incompatible with EFL 1.7.

Change-Id: I3d1ed95ffaefd6823fe73b348225640a7bac4457
Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>

diff --git a/Source/WTF/wtf/OwnPtrCommon.h b/Source/WTF/wtf/OwnPtrCommon.h
index babb589..361a982 100755 (executable)
--- a/Source/WTF/wtf/OwnPtrCommon.h
+++ b/Source/WTF/wtf/OwnPtrCommon.h
@@ -39,13 +39,14 @@ typedef struct HRGN__* HRGN;
 #endif
 
 #if PLATFORM(EFL)
+typedef struct _Eo_Opaque Eo;
+typedef Eo Ecore_Timer;
+typedef Eo Evas_Object;
 typedef struct _Ecore_Evas Ecore_Evas;
 typedef struct _Ecore_IMF_Context Ecore_IMF_Context;
 typedef struct _Ecore_Pipe Ecore_Pipe;
-typedef struct _Ecore_Timer Ecore_Timer;
 typedef struct _Eina_Hash Eina_Hash;
 typedef struct _Eina_Module Eina_Module;
-typedef struct _Evas_Object Evas_Object;
 #endif
 
 namespace WTF {

diff --git a/Source/WTF/wtf/PlatformEfl.cmake b/Source/WTF/wtf/PlatformEfl.cmake
index 586628d..e6761eb 100755 (executable)
--- a/Source/WTF/wtf/PlatformEfl.cmake
+++ b/Source/WTF/wtf/PlatformEfl.cmake
@@ -26,6 +26,7 @@ LIST(APPEND WTF_LIBRARIES
     ${GLIB_GOBJECT_LIBRARIES}
     ${ICU_LIBRARIES}
     ${ICU_I18N_LIBRARIES}
+    ${EO_LIBRARIES}
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
     ${ECORE_IMF_LIBRARIES}
@@ -40,6 +41,7 @@ LIST(APPEND WTF_LIBRARIES
 )
 
 LIST(APPEND WTF_INCLUDE_DIRECTORIES
+    ${EO_INCLUDE_DIRS}
     ${ECORE_INCLUDE_DIRS}
     ${ECORE_EVAS_INCLUDE_DIRS}
     ${ECORE_IMF_INCLUDE_DIRS}

diff --git a/Source/WTF/wtf/efl/OwnPtrEfl.cpp b/Source/WTF/wtf/efl/OwnPtrEfl.cpp
index 5ec9c4f..c008c1d 100644 (file)
--- a/Source/WTF/wtf/efl/OwnPtrEfl.cpp
+++ b/Source/WTF/wtf/efl/OwnPtrEfl.cpp
@@ -27,6 +27,9 @@
 #include "config.h"
 #include "OwnPtr.h"
 
+#define EFL_BETA_API_SUPPORT
+
+#include <Eo.h>
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_IMF.h>
@@ -41,9 +44,9 @@ void deleteOwnedPtr(Ecore_Evas* ptr)
         ecore_evas_free(ptr);
 }
 
-void deleteOwnedPtr(Evas_Object* ptr)
+void deleteOwnedPtr(Eo* ptr)
 {
-    evas_object_del(ptr);
+    eo_del(ptr);
 }
 
 void deleteOwnedPtr(Ecore_Pipe* ptr)
@@ -64,12 +67,6 @@ void deleteOwnedPtr(Eina_Module* ptr)
         eina_module_free(ptr); // If module wasn't unloaded, eina_module_free() calls eina_module_unload().
 }
 
-void deleteOwnedPtr(Ecore_Timer* ptr)
-{
-    if (ptr)
-        ecore_timer_del(ptr);
-}
-
 void deleteOwnedPtr(Ecore_IMF_Context* ptr)
 {
     if (ptr)

diff --git a/Source/WebCore/platform/Widget.h b/Source/WebCore/platform/Widget.h
index 65f04d9..11e6b2f 100644 (file)
--- a/Source/WebCore/platform/Widget.h
+++ b/Source/WebCore/platform/Widget.h
@@ -78,8 +78,9 @@ typedef wxWindow* PlatformWidget;
 #endif
 
 #if PLATFORM(EFL)
-typedef struct _Evas_Object Evas_Object;
-typedef struct _Evas Evas;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
+typedef Eo Evas;
 typedef struct _Ecore_Evas Ecore_Evas;
 typedef Evas_Object* PlatformWidget;
 #endif

diff --git a/Source/WebCore/platform/efl/EflScreenUtilities.h b/Source/WebCore/platform/efl/EflScreenUtilities.h
index 7257426..b871be5 100644 (file)
--- a/Source/WebCore/platform/efl/EflScreenUtilities.h
+++ b/Source/WebCore/platform/efl/EflScreenUtilities.h
@@ -29,7 +29,8 @@
 typedef unsigned Ecore_X_Window;
 #endif
 
-typedef struct _Evas Evas;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas;
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/efl/RefPtrEfl.h b/Source/WebCore/platform/efl/RefPtrEfl.h
index 4815284..b8de513 100644 (file)
--- a/Source/WebCore/platform/efl/RefPtrEfl.h
+++ b/Source/WebCore/platform/efl/RefPtrEfl.h
@@ -22,7 +22,8 @@
 
 #include <wtf/RefPtr.h>
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WTF {
 

diff --git a/Source/WebCore/platform/efl/RenderThemeEfl.h b/Source/WebCore/platform/efl/RenderThemeEfl.h
index 0f4824f..66de2f1 100644 (file)
--- a/Source/WebCore/platform/efl/RenderThemeEfl.h
+++ b/Source/WebCore/platform/efl/RenderThemeEfl.h
@@ -37,8 +37,9 @@
 
 #include <cairo.h>
 
+typedef struct _Eo_Opaque Eo;
 typedef struct _Ecore_Evas Ecore_Evas;
-typedef struct _Evas_Object Evas_Object;
+typedef Eo Evas_Object;
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/Icon.h b/Source/WebCore/platform/graphics/Icon.h
index b703c71..e55011e 100644 (file)
--- a/Source/WebCore/platform/graphics/Icon.h
+++ b/Source/WebCore/platform/graphics/Icon.h
@@ -36,7 +36,8 @@ typedef struct HICON__* HICON;
 #elif PLATFORM(GTK)
 typedef struct _GdkPixbuf GdkPixbuf;
 #elif PLATFORM(EFL)
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 #elif PLATFORM(CHROMIUM)
 #include "Image.h"
 #include "PlatformIcon.h"

diff --git a/Source/WebCore/platform/graphics/efl/GLContextEfl.h b/Source/WebCore/platform/graphics/efl/GLContextEfl.h
index 915c4ac..d34a446 100755 (executable)
--- a/Source/WebCore/platform/graphics/efl/GLContextEfl.h
+++ b/Source/WebCore/platform/graphics/efl/GLContextEfl.h
@@ -28,7 +28,8 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 class GLContextEfl : public RefCounted<GLContextEfl> {
 public:

diff --git a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
index af38e24..aa1370b 100755 (executable)
--- a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -36,7 +36,8 @@
 #include "NotificationClient.h"
 #endif
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WebCore {
 

diff --git a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
index eaf11d3..788487a 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
@@ -29,7 +29,8 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 typedef struct _Ewk_History_Item Ewk_History_Item;
 typedef struct _Ewk_Intent Ewk_Intent;
 typedef struct _Ewk_Intent_Request Ewk_Intent_Request;

diff --git a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
index f98fc32..1249f81 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
@@ -41,7 +41,8 @@
 #include <wtf/Deque.h>
 #include <wtf/Forward.h>
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 struct Ewk_Should_Insert_Node_Event {
     WebCore::Node* node;

diff --git a/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h b/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
index 68531cc..99b2f7a 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/FrameNetworkingContextEfl.h
@@ -31,7 +31,8 @@
 
 #include "FrameNetworkingContext.h"
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WebCore {
 

diff --git a/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h b/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h
index 8ba7544..9b3699a 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h
+++ b/Source/WebKit/efl/WebCoreSupport/PageClientEfl.h
@@ -23,7 +23,8 @@
 #include "IntRect.h"
 
 typedef struct _Evas_Native_Surface Evas_Native_Surface;
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WebCore {
 class GraphicsContext3D;

diff --git a/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h b/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h
index 5a068ef..ed04821 100644 (file)
--- a/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h
+++ b/Source/WebKit2/UIProcess/API/C/efl/WKAPICastEfl.h
@@ -24,7 +24,8 @@
 #error "Please #include \"WKAPICast.h\" instead of this file directly."
 #endif
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/API/C/efl/WKView.h b/Source/WebKit2/UIProcess/API/C/efl/WKView.h
index dcf01f3..77bbdac 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/C/efl/WKView.h
+++ b/Source/WebKit2/UIProcess/API/C/efl/WKView.h
@@ -22,8 +22,9 @@
 
 #include <WebKit2/WKBase.h>
 
-typedef struct _Evas Evas;
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas;
+typedef Eo Evas_Object;
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_util.h b/Source/WebKit2/UIProcess/API/efl/ewk_util.h
index 09847b5..07cdb40 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_util.h
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_util.h
@@ -20,8 +20,9 @@
 #ifndef ewk_util_h
 #define ewk_util_h
 
-typedef struct _Evas Evas;
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas;
+typedef Eo Evas_Object;
 typedef struct _cairo_surface cairo_surface_t;
 
 Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t* surface);

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h b/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h
index cb8d9d0..a4dcf0f 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h
@@ -27,7 +27,8 @@
 #include "ewk_view_private.h"
 #endif
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 struct Input_Date {
     int year;

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/JavaScriptPopup.h b/Source/WebKit2/UIProcess/API/efl/tizen/JavaScriptPopup.h
index 1c36593..6bb6988 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/JavaScriptPopup.h
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/JavaScriptPopup.h
@@ -21,7 +21,8 @@
 #define JavaScriptPopup_h
 
 #if OS(TIZEN)
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.h b/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.h
index 11049ff..25b180a 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.h
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/OpenPanel.h
@@ -23,7 +23,8 @@
 #define OpenPanel_h
 
 #if OS(TIZEN)
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WebKit {
 

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h
index d4a04bf..3b34efa 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.h
@@ -20,7 +20,8 @@
 #ifndef ewk_popup_picker_h
 #define ewk_popup_picker_h
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 typedef struct _Elm_Object_Item Elm_Object_Item;
 typedef struct _Eina_List Eina_List;
 #if ENABLE(TIZEN_MULTIPLE_SELECT)

diff --git a/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h b/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h
index 4590f21..9885d4c 100755 (executable)
--- a/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h
+++ b/Source/WebKit2/UIProcess/efl/WebPopupMenuProxyEfl.h
@@ -28,7 +28,8 @@
 
 #include "WebPopupMenuProxy.h"
 
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 
 namespace WebCore {
 class IntRect;

diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake
index 7531396..e3dd05f 100644 (file)
--- a/Source/cmake/OptionsTizen.cmake
+++ b/Source/cmake/OptionsTizen.cmake
@@ -436,11 +436,12 @@ IF (USE_MESA)
     SET(WTF_USE_MESA 1)
 ENDIF ()
 
-FIND_PACKAGE(Eina 1.2 REQUIRED)
-FIND_PACKAGE(Evas 1.0 REQUIRED)
-FIND_PACKAGE(Ecore 1.2 COMPONENTS Evas File Input Imf ${ECORE_ADDITIONAL_COMPONENTS})
-FIND_PACKAGE(Edje 1.0 REQUIRED)
-FIND_PACKAGE(Eeze 1.2 REQUIRED)
+FIND_PACKAGE(Eina 1.8 REQUIRED)
+FIND_PACKAGE(Eo 1.8 REQUIRED)
+FIND_PACKAGE(Evas 1.8 REQUIRED)
+FIND_PACKAGE(Ecore 1.8 COMPONENTS Evas File Input Imf ${ECORE_ADDITIONAL_COMPONENTS})
+FIND_PACKAGE(Edje 1.8 REQUIRED)
+FIND_PACKAGE(Eeze 1.8 REQUIRED)
 #FIND_PACKAGE(Efreet 1.0 REQUIRED)
 FIND_PACKAGE(E_DBus 1.1 COMPONENTS EUKit)
 

diff --git a/Tools/DumpRenderTree/efl/CMakeLists.txt b/Tools/DumpRenderTree/efl/CMakeLists.txt
index 7e07e59..7518a69 100755 (executable)
--- a/Tools/DumpRenderTree/efl/CMakeLists.txt
+++ b/Tools/DumpRenderTree/efl/CMakeLists.txt
@@ -46,6 +46,7 @@ SET(DumpRenderTree_LIBRARIES
     ${ECORE_INPUT_LIBRARIES}
     ${EDJE_LIBRARIES}
     ${EINA_LIBRARIES}
+    ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
     ${LIBXML2_LIBRARIES}
@@ -138,6 +139,7 @@ SET(DumpRenderTree_INCLUDE_DIRECTORIES
     ${ECORE_INPUT_INCLUDE_DIRS}
     ${EDJE_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
+    ${EO_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
     ${FONTCONFIG_INCLUDE_DIR}
     ${GLIB_INCLUDE_DIRS}

diff --git a/Tools/EWebLauncher/CMakeLists.txt b/Tools/EWebLauncher/CMakeLists.txt
index 817231d..012b59b 100755 (executable)
--- a/Tools/EWebLauncher/CMakeLists.txt
+++ b/Tools/EWebLauncher/CMakeLists.txt
@@ -15,6 +15,7 @@ SET(EWebLauncher_LIBRARIES
     ${ECORE_X_LIBRARIES}
     ${EDJE_LIBRARIES}
     ${EINA_LIBRARIES}
+    ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
@@ -32,6 +33,7 @@ SET(EWebLauncher_INCLUDE_DIRECTORIES
     ${ECORE_X_INCLUDE_DIRS}
     ${EDJE_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
+    ${EO_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}

diff --git a/Tools/MiniBrowser/efl/CMakeLists.txt b/Tools/MiniBrowser/efl/CMakeLists.txt
index 585362f..95217f2 100755 (executable)
--- a/Tools/MiniBrowser/efl/CMakeLists.txt
+++ b/Tools/MiniBrowser/efl/CMakeLists.txt
@@ -17,6 +17,7 @@ SET(MiniBrowser_INCLUDE_DIRECTORIES
     ${E_DBUS_INCLUDE_DIRS}
     ${EFREET_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
+    ${EO_INCLUDE_DIRS}
     ${ELEMENTARY_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
     ${VConf_INCLUDE_DIRS}
@@ -37,6 +38,7 @@ SET(MiniBrowser_LIBRARIES
     ${ECORE_FILE_LIBRARIES}
     ${EDJE_LIBRARIES}
     ${EINA_LIBRARIES}
+    ${EO_LIBRARIES}
     ${ELEMENTARY_LIBRARIES}
     ${EVAS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}

diff --git a/Tools/MiniBrowser/efl/main.c b/Tools/MiniBrowser/efl/main.c
index 2452fa3..077aab8 100755 (executable)
--- a/Tools/MiniBrowser/efl/main.c
+++ b/Tools/MiniBrowser/efl/main.c
@@ -21,6 +21,7 @@
 #include "url_utils.h"
 #include <Ecore.h>
 #include <Ecore_Evas.h>
+#include <Ecore_Getopt.h>
 #include <Eina.h>
 #include <Elementary.h>
 #include <Evas.h>

diff --git a/Tools/TestWebKitAPI/PlatformEfl.cmake b/Tools/TestWebKitAPI/PlatformEfl.cmake
index d0f8bf2..f9c23d0 100755 (executable)
--- a/Tools/TestWebKitAPI/PlatformEfl.cmake
+++ b/Tools/TestWebKitAPI/PlatformEfl.cmake
@@ -13,6 +13,7 @@ INCLUDE_DIRECTORIES(
     ${WEBKIT2_DIR}/UIProcess/API/C/efl
     ${ECORE_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
+    ${EO_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}

diff --git a/Tools/TestWebKitAPI/PlatformWebView.h b/Tools/TestWebKitAPI/PlatformWebView.h
index 653a17c..a22c745 100644 (file)
--- a/Tools/TestWebKitAPI/PlatformWebView.h
+++ b/Tools/TestWebKitAPI/PlatformWebView.h
@@ -47,7 +47,8 @@ typedef HWND PlatformWindow;
 typedef WKViewRef PlatformWKView;
 typedef GtkWidget *PlatformWindow;
 #elif PLATFORM(EFL)
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 typedef struct _Ecore_Evas Ecore_Evas;
 typedef Evas_Object* PlatformWKView;
 typedef Ecore_Evas* PlatformWindow;

diff --git a/Tools/WebKitTestRunner/PlatformEfl.cmake b/Tools/WebKitTestRunner/PlatformEfl.cmake
index 760488e..1e89f77 100755 (executable)
--- a/Tools/WebKitTestRunner/PlatformEfl.cmake
+++ b/Tools/WebKitTestRunner/PlatformEfl.cmake
@@ -26,6 +26,7 @@ LIST(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${ECORE_INCLUDE_DIRS}
     ${ECORE_EVAS_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
+    ${EO_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
 )
@@ -45,6 +46,7 @@ LIST(APPEND WebKitTestRunner_LIBRARIES
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
     ${EINA_LIBRARIES}
+    ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${WTF_LIBRARY_NAME}

diff --git a/Tools/WebKitTestRunner/PlatformWebView.h b/Tools/WebKitTestRunner/PlatformWebView.h
index ee7743b..18da05f 100644 (file)
--- a/Tools/WebKitTestRunner/PlatformWebView.h
+++ b/Tools/WebKitTestRunner/PlatformWebView.h
@@ -54,7 +54,8 @@ typedef struct _GtkWidget GtkWidget;
 typedef WKViewRef PlatformWKView;
 typedef GtkWidget* PlatformWindow;
 #elif PLATFORM(EFL)
-typedef struct _Evas_Object Evas_Object;
+typedef struct _Eo_Opaque Eo;
+typedef Eo Evas_Object;
 typedef struct _Ecore_Evas Ecore_Evas;
 typedef Evas_Object* PlatformWKView;
 typedef Ecore_Evas* PlatformWindow;

diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec
index 83a45af..2a54ba0 100644 (file)
--- a/packaging/webkit2-efl.spec
+++ b/packaging/webkit2-efl.spec
@@ -16,7 +16,7 @@ Requires(post): /sbin/ldconfig
 Requires(post): xkeyboard-config
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: cmake, edje-bin, embryo-bin, python, bison, flex, gperf, libjpeg-turbo-devel, perl, gettext, ruby
+BuildRequires: cmake, edje-bin, python, bison, flex, gperf, libjpeg-turbo-devel, perl, gettext, ruby
 BuildRequires: gtest-devel
 BuildRequires: pkgconfig(cairo)
 BuildRequires: pkgconfig(capi-network-connection)