diff options
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 268bea1d..cce66017 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -13,17 +13,12 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" | 14 | DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" |
15 | 15 | ||
16 | SRC_URI += " \ | ||
17 | file://0001-Make-mapbox-gl-build-configurable.patch \ | ||
18 | " | ||
19 | |||
20 | PACKAGECONFIG ??= "" | 16 | PACKAGECONFIG ??= "" |
21 | # older geoclue 0.12.99 is needed | 17 | # older geoclue 0.12.99 is needed |
22 | PACKAGECONFIG[geoclue] = ",,geoclue" | 18 | PACKAGECONFIG[geoclue] = ",,geoclue" |
23 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" | 19 | PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" |
24 | PACKAGECONFIG[mapboxgl] = "" | 20 | PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" |
25 | 21 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}" | ||
27 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
28 | 23 | ||
29 | # The same issue as in qtbase: | 24 | # The same issue as in qtbase: |
@@ -34,7 +29,7 @@ SRC_URI += " \ | |||
34 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 29 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
35 | " | 30 | " |
36 | 31 | ||
37 | SRCREV_qtlocation = "d22e6d09f1607e694694d2ae5b2f447605a8782e" | 32 | SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718" |
38 | SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" | 33 | SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" |
39 | 34 | ||
40 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 35 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |