Title: [171904] trunk
- Revision
- 171904
- Author
- [email protected]
- Date
- 2014-07-31 18:26:16 -0700 (Thu, 31 Jul 2014)
Log Message
[EFL] Add support for building with Geoclue2.
https://bugs.webkit.org/show_bug.cgi?id=135455
Reviewed by Gyuyoung Kim.
.:
* Source/cmake/OptionsEfl.cmake: Add gio-unix if ENABLE_GEOLOCATION
is set.
Source/WebCore:
No new tests required, no new functionality.
* PlatformEfl.cmake: Generate derived sources for Geoclue2Interface
and include gio-unix path.
Modified Paths
Diff
Modified: trunk/ChangeLog (171903 => 171904)
--- trunk/ChangeLog 2014-08-01 01:15:56 UTC (rev 171903)
+++ trunk/ChangeLog 2014-08-01 01:26:16 UTC (rev 171904)
@@ -1,3 +1,13 @@
+2014-07-31 Carlos Alberto Lopez Perez <[email protected]>
+
+ [EFL] Add support for building with Geoclue2.
+ https://bugs.webkit.org/show_bug.cgi?id=135455
+
+ Reviewed by Gyuyoung Kim.
+
+ * Source/cmake/OptionsEfl.cmake: Add gio-unix if ENABLE_GEOLOCATION
+ is set.
+
2014-07-31 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.5.1 release.
Modified: trunk/Source/WebCore/ChangeLog (171903 => 171904)
--- trunk/Source/WebCore/ChangeLog 2014-08-01 01:15:56 UTC (rev 171903)
+++ trunk/Source/WebCore/ChangeLog 2014-08-01 01:26:16 UTC (rev 171904)
@@ -1,3 +1,15 @@
+2014-07-31 Carlos Alberto Lopez Perez <[email protected]>
+
+ [EFL] Add support for building with Geoclue2.
+ https://bugs.webkit.org/show_bug.cgi?id=135455
+
+ Reviewed by Gyuyoung Kim.
+
+ No new tests required, no new functionality.
+
+ * PlatformEfl.cmake: Generate derived sources for Geoclue2Interface
+ and include gio-unix path.
+
2014-07-31 Zalan Bujtas <[email protected]>
Subpixel rendering: Region painting needs to take subpixel accumulation into account.
Modified: trunk/Source/WebCore/PlatformEfl.cmake (171903 => 171904)
--- trunk/Source/WebCore/PlatformEfl.cmake 2014-08-01 01:15:56 UTC (rev 171903)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-08-01 01:26:16 UTC (rev 171904)
@@ -206,6 +206,17 @@
plugins/PluginViewNone.cpp
)
+if (WTF_USE_GEOCLUE2)
+ list(APPEND WebCore_SOURCES
+ ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
+ )
+ execute_process(COMMAND pkg-config --variable dbus_interface geoclue-2.0 OUTPUT_VARIABLE GEOCLUE_DBUS_INTERFACE)
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.h
+ COMMAND gdbus-codegen --interface-prefix org.freedesktop.GeoClue2. --c-namespace Geoclue --generate-c-code ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface ${GEOCLUE_DBUS_INTERFACE}
+ )
+endif ()
+
if (ENABLE_BATTERY_STATUS OR (EFL_REQUIRED_VERSION VERSION_LESS 1.8))
list(APPEND WebCore_INCLUDE_DIRECTORIES ${DBUS_INCLUDE_DIRS})
list(APPEND WebCore_INCLUDE_DIRECTORIES ${E_DBUS_INCLUDE_DIRS})
@@ -272,6 +283,7 @@
${EVAS_INCLUDE_DIRS}
${FREETYPE2_INCLUDE_DIRS}
${GEOCLUE_INCLUDE_DIRS}
+ ${GIO_UNIX_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
Modified: trunk/Source/cmake/OptionsEfl.cmake (171903 => 171904)
--- trunk/Source/cmake/OptionsEfl.cmake 2014-08-01 01:15:56 UTC (rev 171903)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-08-01 01:26:16 UTC (rev 171904)
@@ -19,7 +19,11 @@
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
-find_package(GLIB 2.38.0 REQUIRED COMPONENTS gio gobject gthread)
+set(glib_components gio gobject gthread)
+if (ENABLE_GEOLOCATION)
+ list(APPEND glib_components gio-unix)
+endif ()
+find_package(GLIB 2.38.0 REQUIRED COMPONENTS ${glib_components})
find_package(LibSoup 2.42.0 REQUIRED)
set(WTF_USE_SOUP 1)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
