Attachment 96673 Details for Bug 61999 – Patch

[patch] Patch

bug-61999-20110610094208.patch (text/plain), 5.86 KB, created by Ryuan Choi on 2011-06-09 17:41:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryuan Choi

Created: 2011-06-09 17:41:37 PDT

Size: 5.86 KB

patch

obsolete

>Subversion Revision: 88505
>diff --git a/ChangeLog b/ChangeLog
>index 39658c0c20b0b7f6f27475024a80ff4438c13eda..95ba5e79b11b87038b88fa1f49ecfe41cf5132a7 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2011-06-09  Ryuan Choi  <ryuan.choi@samsung.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [EFL][WK2] Add an option to build WebKit2.
>+        https://bugs.webkit.org/show_bug.cgi?id=61999
>+
>+        * Source/cmake/OptionsEfl.cmake: Set WebKit2_LIBRARY_NAME.
>+
> 2011-06-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
> 
>         Reviewed by Antonio Gomes.
>diff --git a/Source/WebKit2/CMakeListsEfl.txt b/Source/WebKit2/CMakeListsEfl.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..15bded9354c82b61d404fe37abd2805e1c30b28f
>--- /dev/null
>+++ b/Source/WebKit2/CMakeListsEfl.txt
>@@ -0,0 +1,137 @@
>+INCLUDE(WebKitEfl)
>+
>+LIST(APPEND WebKit2_LINK_FLAGS
>+    ${ECORE_X_LDFLAGS}
>+    ${EDJE_LDFLAGS}
>+    ${EFLDEPS_LDFLAGS}
>+    ${EVAS_LDFLAGS}
>+)
>+
>+LIST(APPEND WebKit2_SOURCES
>+    Platform/efl/ModuleEfl.cpp
>+    Platform/efl/RunLoopEfl.cpp
>+    Platform/efl/WorkQueueEfl.cpp
>+
>+    Shared/API/c/cairo/WKGraphicsContextCairo.cpp
>+
>+    Shared/cairo/LayerTreeContextCairo.cpp
>+    Shared/cairo/ShareableBitmapCairo.cpp
>+
>+    Shared/efl/NativeWebKeyboardEventEfl.cpp
>+    Shared/efl/NativeWebWheelEventEfl.cpp
>+    Shared/efl/WebCoreArgumentCodersEfl.cpp
>+
>+    UIProcess/API/efl/PageClientImpl.cpp
>+    UIProcess/API/efl/ewk_view.cpp
>+
>+    UIProcess/efl/BackingStoreEfl.cpp
>+    UIProcess/efl/TextCheckerEfl.cpp
>+    UIProcess/efl/WebContextEfl.cpp
>+    UIProcess/efl/WebInspectorEfl.cpp
>+    UIProcess/efl/WebPageProxyEfl.cpp
>+    UIProcess/efl/WebPreferencesEfl.cpp
>+
>+    UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
>+    UIProcess/Launcher/efl/ThreadLauncherEfl.cpp
>+
>+    UIProcess/Plugins/efl/PluginInfoStoreEfl.cpp
>+    UIProcess/Plugins/efl/PluginProcessProxyEfl.cpp
>+
>+    WebProcess/Cookies/efl/WebCookieManagerEfl.cpp
>+
>+    WebProcess/efl/WebProcessEfl.cpp
>+    WebProcess/efl/WebProcessMainEfl.cpp
>+
>+    WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp
>+
>+    WebProcess/WebCoreSupport/efl/WebContextMenuClientEfl.cpp
>+    WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp
>+    WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
>+    WebProcess/WebCoreSupport/efl/WebEditorClientEfl.cpp
>+    WebProcess/WebCoreSupport/efl/WebPopupMenuEfl.cpp
>+    WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
>+
>+    WebProcess/WebPage/efl/WebInspectorEfl.cpp
>+    WebProcess/WebPage/efl/WebPageEfl.cpp
>+)
>+
>+LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
>+    "${WEBCORE_DIR}/platform/efl"
>+    "${WEBCORE_DIR}/platform/graphics/cairo"
>+    "${WEBKIT2_DIR}/WebProcess/efl"
>+    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
>+    ${Cairo_INCLUDE_DIRS}
>+    ${ECORE_X_INCLUDE_DIRS}
>+    ${EDJE_INCLUDE_DIRS}
>+    ${EFLDEPS_INCLUDE_DIRS}
>+    ${EVAS_INCLUDE_DIRS}
>+    ${LIBXML2_INCLUDE_DIR}
>+    ${LIBXSLT_INCLUDE_DIRS}
>+    ${SQLITE_INCLUDE_DIRS}
>+)
>+
>+LIST(APPEND WebKit2_LIBRARIES
>+    ${Cairo_LIBRARIES}
>+    ${ECORE_X_LIBRARIES}
>+    ${EFLDEPS_LIBRARIES}
>+    ${Freetype_LIBRARIES}
>+    ${LIBXML2_LIBRARIES}
>+    ${SQLITE_LIBRARIES}
>+    ${FONTCONFIG_LIBRARIES}
>+    ${PNG_LIBRARY}
>+    ${JPEG_LIBRARY}
>+    ${CMAKE_DL_LIBS}
>+)
>+
>+LIST (APPEND WebProcess_SOURCES
>+    efl/MainEfl.cpp
>+)
>+
>+LIST (APPEND WebProcess_LIBRARIES
>+    ${Cairo_LIBRARIES}
>+    ${ECORE_X_LIBRARIES}
>+    ${EDJE_LIBRARIES}
>+    ${EFLDEPS_LIBRARIES}
>+    ${EVAS_LIBRARIES}
>+    ${LIBXML2_LIBRARIES}
>+    ${LIBXSLT_LIBRARIES}
>+    ${SQLITE_LIBRARIES}
>+)
>+
>+ADD_CUSTOM_TARGET(forwarding-headerEfl
>+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
>+)
>+SET(ForwardingHeaders_NAME forwarding-headerEfl)
>+
>+IF (WTF_USE_SOUP)
>+    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
>+        "${WEBCORE_DIR}/platform/network/soup"
>+        ${LIBSOUP24_INCLUDE_DIRS}
>+    )
>+    LIST(APPEND WebKit2_LIBRARIES ${LIBSOUP24_LIBRARIES})
>+
>+    ADD_CUSTOM_TARGET(forwarding-headerSoup
>+        COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
>+    )
>+    SET(ForwardingNetworkHeaders_NAME forwarding-headerSoup)
>+ENDIF ()
>+
>+IF (WTF_USE_CURL)
>+    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
>+        "${WEBCORE_DIR}/platform/network/curl"
>+        ${CURL_INCLUDE_DIRS}
>+    )
>+    LIST(APPEND WebKit2_LIBRARIES ${CURL_LIBRARIES})
>+ENDIF ()
>+
>+IF (ENABLE_GLIB_SUPPORT)
>+    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
>+        ${Gdk_INCLUDE_DIRS}
>+        ${Glib_INCLUDE_DIRS}
>+        ${JAVASCRIPTCORE_DIR}/wtf/gobject
>+    )
>+    LIST(APPEND WebKit2_LIBRARIES
>+        ${Glib_LIBRARIES}
>+        ${Gdk_LIBRARIES}
>+    )
>+ENDIF ()
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index c5ac3b1a21dd4a3f8a4f3ec76b40ad770f320426..06840e9e1cb314455a497bef8d84072fa3ddd824 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,14 @@
>+2011-06-09  Ryuan Choi  <ryuan.choi@samsung.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [EFL][WK2] Add an option to build WebKit2.
>+        https://bugs.webkit.org/show_bug.cgi?id=61999
>+
>+        Add build script for WebKit2 on EFL port.
>+
>+        * CMakeListsEfl.txt: Added.
>+
> 2011-06-09  Andreas Kling  <kling@webkit.org>
> 
>         Reviewed by Darin Adler.
>diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
>index 6791552127e53d91abebb344a26ba3da95babccd..ab839be19835f6190461536edf5d9cb289d6cea4 100644
>--- a/Source/cmake/OptionsEfl.cmake
>+++ b/Source/cmake/OptionsEfl.cmake
>@@ -53,6 +53,7 @@ SET(WTF_LIBRARY_NAME wtf_efl)
> SET(JavaScriptCore_LIBRARY_NAME javascriptcore_efl)
> SET(WebCore_LIBRARY_NAME webcore_efl)
> SET(WebKit_LIBRARY_NAME ewebkit)
>+SET(WebKit2_LIBRARY_NAME ewebkit2)
> 
> SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
> ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")

Actions: View | Formatted Diff | Diff

Attachments on bug 61999: 95870 | 96165 | 96174 | 96205 | 96358 | 96369 | 96673 | 96907 | 112311 | 115485 | 120228