Title: [137203] trunk
- Revision
- 137203
- Author
- [email protected]
- Date
- 2012-12-10 13:53:55 -0800 (Mon, 10 Dec 2012)
Log Message
[EFL] Change the minimum required EFL version to 1.6
https://bugs.webkit.org/show_bug.cgi?id=104431
Patch by Laszlo Gombos <[email protected]> on 2012-12-10
Reviewed by Kenneth Rohde Christiansen.
.:
Change the minimum required EFL version to 1.6 from 1.7 to enable
building on Tizen.
The elementary EFL package is only required to build MiniBrowser,
so I moved the required only to the Minibrowser CMake file.
* Source/cmake/OptionsEfl.cmake:
Tools:
Change the minimum required EFL version to 1.6 from 1.7.
The elementary EFL package is only required to build MiniBrowser,
so I moved the required only to the Minibrowser CMake file.
* MiniBrowser/efl/CMakeLists.txt: In addition removed
ENABLE_GLIB_SUPPORT as it is obsolete and it was always set to be on.
Modified Paths
Diff
Modified: trunk/ChangeLog (137202 => 137203)
--- trunk/ChangeLog 2012-12-10 21:40:03 UTC (rev 137202)
+++ trunk/ChangeLog 2012-12-10 21:53:55 UTC (rev 137203)
@@ -1,3 +1,18 @@
+2012-12-10 Laszlo Gombos <[email protected]>
+
+ [EFL] Change the minimum required EFL version to 1.6
+ https://bugs.webkit.org/show_bug.cgi?id=104431
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Change the minimum required EFL version to 1.6 from 1.7 to enable
+ building on Tizen.
+
+ The elementary EFL package is only required to build MiniBrowser,
+ so I moved the required only to the Minibrowser CMake file.
+
+ * Source/cmake/OptionsEfl.cmake:
+
2012-12-10 Alexis Menard <[email protected]>
[CSS3 Backgrounds and Borders] Remove CSS3_BACKGROUND feature flag.
Modified: trunk/Source/cmake/OptionsEfl.cmake (137202 => 137203)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-12-10 21:40:03 UTC (rev 137202)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-12-10 21:53:55 UTC (rev 137203)
@@ -111,17 +111,21 @@
add_definitions(-DHAVE_ECORE_X)
endif ()
-find_package(Eina 1.7 REQUIRED)
-find_package(Evas 1.7 REQUIRED)
-find_package(Ecore 1.7 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS})
-find_package(Edje 1.7 REQUIRED)
-find_package(Eet 1.7 REQUIRED)
-find_package(Eeze 1.7 REQUIRED)
-find_package(Efreet 1.7 REQUIRED)
-find_package(E_DBus 1.7 COMPONENTS EUKit)
+# Allow building the EFL port using EFL version 1.6+ to build on Tizen trunk
+find_package(Eina 1.6 REQUIRED)
+find_package(Evas 1.6 REQUIRED)
+find_package(Ecore 1.6 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS})
+find_package(Edje 1.6 REQUIRED)
+find_package(Eet 1.6 REQUIRED)
+find_package(Eeze 1.6 REQUIRED)
+find_package(Efreet 1.6 REQUIRED)
+find_package(E_DBus 1.6 COMPONENTS EUKit)
-# Elementary is needed to build MiniBrowser
-find_package(Elementary 1.7)
+# Prefer and promote EFL version 1.7+ as the reference configuration
+if ((${EINA_VERSION} STRLESS 1.7) OR (${EVAS_VERSION} STRLESS 1.7) OR (${ECORE_VERSION} STRLESS 1.7) OR (${EDJE_VERSION} STRLESS 1.7) OR
+ (${EET_VERSION} STRLESS 1.7) OR (${EEZE_VERSION} STRLESS 1.7) OR (${EFREET_VERSION} STRLESS 1.7) OR (${E_DBUS_VERSION} STRLESS 1.7))
+ message("Consider updating all EFL libaries to v1.7")
+endif ()
find_package(Freetype 2.4.2 REQUIRED)
find_package(HarfBuzz 0.9.2 REQUIRED)
Modified: trunk/Tools/ChangeLog (137202 => 137203)
--- trunk/Tools/ChangeLog 2012-12-10 21:40:03 UTC (rev 137202)
+++ trunk/Tools/ChangeLog 2012-12-10 21:53:55 UTC (rev 137203)
@@ -1,3 +1,17 @@
+2012-12-10 Laszlo Gombos <[email protected]>
+
+ [EFL] Change the minimum required EFL version to 1.6
+ https://bugs.webkit.org/show_bug.cgi?id=104431
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Change the minimum required EFL version to 1.6 from 1.7.
+ The elementary EFL package is only required to build MiniBrowser,
+ so I moved the required only to the Minibrowser CMake file.
+
+ * MiniBrowser/efl/CMakeLists.txt: In addition removed
+ ENABLE_GLIB_SUPPORT as it is obsolete and it was always set to be on.
+
2012-12-10 Dean Jackson <[email protected]>
Unreviewed. Adding Antoine to the contributor list so his name autocompletes in bugzilla.
Modified: trunk/Tools/MiniBrowser/efl/CMakeLists.txt (137202 => 137203)
--- trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2012-12-10 21:40:03 UTC (rev 137202)
+++ trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2012-12-10 21:53:55 UTC (rev 137203)
@@ -1,5 +1,8 @@
set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/efl")
+# Elementary is needed to build MiniBrowser
+find_package(Elementary 1.6)
+
set(MiniBrowser_SOURCES
${TOOLS_DIR}/EWebLauncher/url_utils.c
${MiniBrowser_DIR}/main.c
@@ -37,6 +40,8 @@
${ELEMENTARY_LIBRARIES}
${EVAS_LIBRARIES}
${FONTCONFIG_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GTHREAD_LIBRARIES}
${LIBSOUP_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
@@ -44,13 +49,6 @@
${SQLITE_LIBRARIES}
)
-if (ENABLE_GLIB_SUPPORT)
- list(APPEND MiniBrowser_LIBRARIES
- ${GLIB_LIBRARIES}
- ${GLIB_GTHREAD_LIBRARIES}
- )
-endif ()
-
add_definitions(-DTHEME_DIR=\"${THEME_BINARY_DIR}\")
include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
