[EFL] Build break with latest EFL libraries.
https://bugs.webkit.org/show_bug.cgi?id=104827
Reviewed by Laszlo Gombos.
.:
The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.
So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.
* Source/cmake/FindEo.cmake: Added.
* Source/cmake/OptionsEfl.cmake:
Modified to check Eo when version of EFL libraries is 1.8.
Source/WebCore:
The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.
So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.
* PlatformEfl.cmake: Includes eo EFL library.
* platform/Widget.h: Modified declaration of Evas and Evas_Object.
In addition, removed unnecessary declaration.
* platform/efl/EflScreenUtilities.h: Modified declaration of Evas.
* platform/efl/RenderThemeEfl.h: Removed unnecessary declaration.
* platform/graphics/Icon.h: Ditto.
* platform/graphics/Image.h: Modified declaration of Evas and Evas_Object.
Source/WebKit:
* PlatformEfl.cmake: Includes eo EFL library.
Source/WebKit/efl:
* WebCoreSupport/ChromeClientEfl.h: Removed unnecessary declaration.
* WebCoreSupport/DumpRenderTreeSupportEfl.h: Ditto.
* WebCoreSupport/EditorClientEfl.h: Ditto.
* WebCoreSupport/FrameNetworkingContextEfl.h: Ditto.
* WebCoreSupport/PageClientEfl.h: Ditto.
Source/WebKit2:
The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.
So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.
* PlatformEfl.cmake: Includes eo EFL library.
* UIProcess/API/C/efl/WKAPICastEfl.h: Modified declaration of Evas_Object.
* UIProcess/API/C/efl/WKView.h: Modified declaration of Evas.
* UIProcess/efl/WebPopupMenuProxyEfl.h: Removed unnecessary declaration.
Source/WTF:
The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.
So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.
* wtf/OwnPtrCommon.h: Modified declaration of Evas_Object and Ecore_Timer.
* wtf/PlatformEfl.cmake: Includes eo EFL library.
* wtf/efl/RefPtrEfl.h: Modified declaration of Evas_Object.
Tools:
The eo EFL package is introduced and evas and ecore use it since 1.8.
While introducing Eo, EFL changed several structures of Evas and Ecore
from own specific class to Eo.
So, this patch adds FindEo and changes declaration of Evas, Evas_Object,
Ecore_Timer to build with latest EFL libraries.
* DumpRenderTree/efl/CMakeLists.txt: Includes eo EFL library.
* EWebLauncher/CMakeLists.txt: Ditto.
* MiniBrowser/efl/CMakeLists.txt: Ditto.
* ImageDiff/PlatformEfl.cmake: Ditto.
* TestWebKitAPI/PlatformEfl.cmake: Ditto.
* TestWebKitAPI/PlatformWebView.h: Modified declaration of Evas_Object.
* WebKitTestRunner/InjectedBundle/TestRunner.h: Modified declaration of Ecore_Timer.
* WebKitTestRunner/PlatformEfl.cmake: Includes eo EFL library.
* WebKitTestRunner/PlatformWebView.h: Modified declaration of Evas_Object.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index 546e004..c57c28e 100644
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -181,6 +181,7 @@
${EDJE_INCLUDE_DIRS}
${EFREET_INCLUDE_DIRS}
${EINA_INCLUDE_DIRS}
+ ${EO_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${HARFBUZZ_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
@@ -205,6 +206,7 @@
${EDJE_LIBRARIES}
${EFREET_LIBRARIES}
${EINA_LIBRARIES}
+ ${EO_LIBRARIES}
${EVAS_LIBRARIES}
${Freetype_LIBRARIES}
${HARFBUZZ_LIBRARIES}
