Changeset 220540 in webkit


Ignore:
Timestamp:
Aug 10, 2017 12:31:53 PM (7 years ago)
Author:
Michael Catanzaro
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 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:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r220532 r220540  
     12017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
     4        https://bugs.webkit.org/show_bug.cgi?id=175426
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * Source/cmake/FindGeoClue2.cmake:
     9
    1102017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
    211

  • trunk/Source/WebCore/ChangeLog

    r220539 r220540  
     12017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
     4        https://bugs.webkit.org/show_bug.cgi?id=175426
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        Also stop using GEOCLUE_LIBRARIES and GEOCLUE_INCLUDE_DIRS, since they are empty. Apparently
     9        we have not actually been using the client library at all this whole time, only the D-Bus
     10        interface.
     11
     12        * PlatformGTK.cmake:
     13
    1142017-08-10  Brady Eidson  <beidson@apple.com>
    215

  • trunk/Source/WebCore/PlatformGTK.cmake

    r220532 r220540  
    203203    ${CAIRO_LIBRARIES}
    204204    ${ENCHANT_LIBRARIES}
    205     ${GEOCLUE_LIBRARIES}
    206205    ${GLIB_GIO_LIBRARIES}
    207206    ${GLIB_GMODULE_LIBRARIES}
    … …  
    230229    ${CAIRO_INCLUDE_DIRS}
    231230    ${ENCHANT_INCLUDE_DIRS}
    232     ${GEOCLUE_INCLUDE_DIRS}
    233231    ${GIO_UNIX_INCLUDE_DIRS}
    234232    ${GLIB_INCLUDE_DIRS}

  • trunk/Source/WebKit/ChangeLog

    r220539 r220540  
     12017-08-10  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        REGRESSION(r220515) [GTK][CMake] Build with ENABLE_GEOLOCATION fails on Debian Jessie
     4        https://bugs.webkit.org/show_bug.cgi?id=175426
     5
     6        Reviewed by Carlos Alberto Lopez Perez.
     7
     8        * PlatformGTK.cmake:
     9
    1102017-08-10  Brady Eidson  <beidson@apple.com>
    211

  • trunk/Source/WebKit/PlatformGTK.cmake

    r220527 r220540  
    810810    ${CAIRO_INCLUDE_DIRS}
    811811    ${ENCHANT_INCLUDE_DIRS}
    812     ${GEOCLUE_INCLUDE_DIRS}
    813812    ${GSTREAMER_INCLUDE_DIRS}
    814813    ${GSTREAMER_PBUTILS_INCLUDE_DIRS}

  • trunk/Source/cmake/FindGeoClue2.cmake

    r220529 r220540  
    33#
    44#  GEOCLUE2_FOUND - system has GeoClue 2.
    5 #  GEOCLUE2_INCLUDE_DIRS - the GeoClue 2. include directories
    6 #  GEOCLUE2_LIBRARIES - link these to use GeoClue 2.
    75#
    86# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
Note: See TracChangeset for help on using the changeset viewer.