REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Aug 2017 19:31:53 +0000 (19:31 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Aug 2017 19:31:53 +0000 (19:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=175426

Reviewed by Carlos Alberto Lopez Perez.

.:

* Source/cmake/FindGeoClue2.cmake:

Source/WebCore:

Also stop using GEOCLUE_LIBRARIES and GEOCLUE_INCLUDE_DIRS, since they are empty. Apparently
we have not actually been using the client library at all this whole time, only the D-Bus
interface.

* PlatformGTK.cmake:

Source/WebKit:

* PlatformGTK.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformGTK.cmake
Source/cmake/FindGeoClue2.cmake

index 81f2a15..0d689dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
 
 2017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
+        https://bugs.webkit.org/show_bug.cgi?id=175426
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * Source/cmake/FindGeoClue2.cmake:
+
+2017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         Remove ENABLE_GAMEPAD_DEPRECATED
         https://bugs.webkit.org/show_bug.cgi?id=175361
 
         Remove ENABLE_GAMEPAD_DEPRECATED
         https://bugs.webkit.org/show_bug.cgi?id=175361
 
index 7815579..38545bb 100644 (file)
@@ -1,3 +1,16 @@
+2017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
+        https://bugs.webkit.org/show_bug.cgi?id=175426
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Also stop using GEOCLUE_LIBRARIES and GEOCLUE_INCLUDE_DIRS, since they are empty. Apparently
+        we have not actually been using the client library at all this whole time, only the D-Bus
+        interface.
+
+        * PlatformGTK.cmake:
+
 2017-08-10  Brady Eidson  <beidson@apple.com>
 
         Add ServiceWorkerJob.
 2017-08-10  Brady Eidson  <beidson@apple.com>
 
         Add ServiceWorkerJob.
index 308323d..c0ac605 100644 (file)
@@ -202,7 +202,6 @@ list(APPEND WebCore_LIBRARIES
     ${ATK_LIBRARIES}
     ${CAIRO_LIBRARIES}
     ${ENCHANT_LIBRARIES}
     ${ATK_LIBRARIES}
     ${CAIRO_LIBRARIES}
     ${ENCHANT_LIBRARIES}
-    ${GEOCLUE_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GMODULE_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GMODULE_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
@@ -229,7 +228,6 @@ list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     ${ATK_INCLUDE_DIRS}
     ${CAIRO_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
     ${ATK_INCLUDE_DIRS}
     ${CAIRO_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
-    ${GEOCLUE_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${LIBSECRET_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${LIBSECRET_INCLUDE_DIRS}
index 2ac0c97..048eb31 100644 (file)
@@ -1,3 +1,12 @@
+2017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
+        https://bugs.webkit.org/show_bug.cgi?id=175426
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * PlatformGTK.cmake:
+
 2017-08-10  Brady Eidson  <beidson@apple.com>
 
         Add ServiceWorkerJob.
 2017-08-10  Brady Eidson  <beidson@apple.com>
 
         Add ServiceWorkerJob.
index 85f91a0..3f3de60 100644 (file)
@@ -809,7 +809,6 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
 list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
     ${CAIRO_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
 list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
     ${CAIRO_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
-    ${GEOCLUE_INCLUDE_DIRS}
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
     ${HARFBUZZ_INCLUDE_DIRS}
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
     ${HARFBUZZ_INCLUDE_DIRS}
index 3143b44..8bb62cb 100644 (file)
@@ -2,8 +2,6 @@
 # Once done, this will define
 #
 #  GEOCLUE2_FOUND - system has GeoClue 2.
 # Once done, this will define
 #
 #  GEOCLUE2_FOUND - system has GeoClue 2.
-#  GEOCLUE2_INCLUDE_DIRS - the GeoClue 2. include directories
-#  GEOCLUE2_LIBRARIES - link these to use GeoClue 2.
 #
 # Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
 # Copyright (C) 2013, 2014 Igalia S.L.
 #
 # Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
 # Copyright (C) 2013, 2014 Igalia S.L.