Title: [220529] trunk
Revision
220529
Author
clo...@igalia.com
Date
2017-08-10 09:33:31 -0700 (Thu, 10 Aug 2017)

Log Message

REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
https://bugs.webkit.org/show_bug.cgi?id=175426

Reviewed by Carlos Garcia Campos.

.:

Fix the pkg-config file name.
We really require geoclue-2.0 and not libgeoclue-2.0.

* Source/cmake/FindGeoClue2.cmake:

Tools:

* gtk/install-dependencies: libgeoclue-dev packages not really needed on Debian/Ubuntu.

Modified Paths

Diff

Modified: trunk/ChangeLog (220528 => 220529)


--- trunk/ChangeLog	2017-08-10 15:44:39 UTC (rev 220528)
+++ trunk/ChangeLog	2017-08-10 16:33:31 UTC (rev 220529)
@@ -1,3 +1,15 @@
+2017-08-10  Carlos Alberto Lopez Perez  <clo...@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 Garcia Campos.
+
+        Fix the pkg-config file name.
+        We really require geoclue-2.0 and not libgeoclue-2.0.
+
+        * Source/cmake/FindGeoClue2.cmake:
+
 2017-08-09  Michael Catanzaro  <mcatanz...@igalia.com>
 
         [GTK] Remove support for geoclue1

Modified: trunk/Source/cmake/FindGeoClue2.cmake (220528 => 220529)


--- trunk/Source/cmake/FindGeoClue2.cmake	2017-08-10 15:44:39 UTC (rev 220528)
+++ trunk/Source/cmake/FindGeoClue2.cmake	2017-08-10 16:33:31 UTC (rev 220529)
@@ -31,7 +31,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 find_package(PkgConfig)
-pkg_check_modules(GEOCLUE2 libgeoclue-2.0)
+pkg_check_modules(GEOCLUE2 geoclue-2.0)
 
 set(VERSION_OK FALSE)
 if (GEOCLUE2_VERSION)

Modified: trunk/Tools/ChangeLog (220528 => 220529)


--- trunk/Tools/ChangeLog	2017-08-10 15:44:39 UTC (rev 220528)
+++ trunk/Tools/ChangeLog	2017-08-10 16:33:31 UTC (rev 220529)
@@ -1,3 +1,12 @@
+2017-08-10  Carlos Alberto Lopez Perez  <clo...@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 Garcia Campos.
+
+        * gtk/install-dependencies: libgeoclue-dev packages not really needed on Debian/Ubuntu.
+
 2017-08-10  Ms2ger  <ms2...@igalia.com>
 
         Add Ms2ger as contributor.

Modified: trunk/Tools/gtk/install-dependencies (220528 => 220529)


--- trunk/Tools/gtk/install-dependencies	2017-08-10 15:44:39 UTC (rev 220528)
+++ trunk/Tools/gtk/install-dependencies	2017-08-10 16:33:31 UTC (rev 220529)
@@ -109,7 +109,6 @@
         libfaad-dev \
         libffi-dev \
         $(aptIfElse libgcrypt20-dev libgcrypt11-dev) \
-        $(aptIfElse libgeoclue-2-dev libgeoclue-dev) \
         libgirepository1.0-dev \
         libgl1-mesa-dev \
         libgl1-mesa-glx \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to