Date: Wednesday, May 23, 2018 @ 01:58:39 Author: bisson Revision: 327843
upstream update, build against Qt 5.11.0 Modified: googlemaps/trunk/PKGBUILD Deleted: googlemaps/trunk/qt510.patch -------------+ PKGBUILD | 17 +++++------------ qt510.patch | 21 --------------------- 2 files changed, 5 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-23 01:51:36 UTC (rev 327842) +++ PKGBUILD 2018-05-23 01:58:39 UTC (rev 327843) @@ -2,9 +2,9 @@ # Maintainer: Gaetan Bisson <[email protected]> pkgname=googlemaps -pkgver=20171202 -_commit=b8d0b353f26df3d8e8d45b8ef325619f9ba84075 -pkgrel=4 +pkgver=20180405 +_commit=7ce7124b385b2ebac0f72c38b094f436d4fe5c58 +pkgrel=1 pkgdesc='Google Maps plugin for QtLocation' url='https://github.com/vladest/googlemaps' license=('MIT') @@ -11,16 +11,9 @@ arch=('x86_64') makedepends=('git' 'qt5-tools') depends=('qt5-location') -source=("git+https://github.com/vladest/googlemaps#commit=${_commit}"; - 'qt510.patch') -sha256sums=('SKIP' - '69285a7073c26175ae46207d728822b3cc9e8b957d60def07e8007d69fade0d4') +source=("git+https://github.com/vladest/googlemaps#commit=${_commit}";) +sha256sums=('SKIP') -prepare() { - cd "${srcdir}/${pkgname}" - patch -p1 -i ../qt510.patch -} - build() { cd "${srcdir}/${pkgname}" install -d build Deleted: qt510.patch =================================================================== --- qt510.patch 2018-05-23 01:51:36 UTC (rev 327842) +++ qt510.patch 2018-05-23 01:58:39 UTC (rev 327843) @@ -1,21 +0,0 @@ -diff -Naur old/qgeotiledmappingmanagerenginegooglemaps.cpp new/qgeotiledmappingmanagerenginegooglemaps.cpp ---- old/qgeotiledmappingmanagerenginegooglemaps.cpp 2017-12-12 21:10:20.007206707 -1000 -+++ new/qgeotiledmappingmanagerenginegooglemaps.cpp 2017-12-12 21:10:09.380442993 -1000 -@@ -45,11 +45,16 @@ - types << QGeoMapType(QGeoMapType::SatelliteMapDay, tr("Satellite"), tr("Satellite map view in daylight mode"), false, false, 2); - types << QGeoMapType(QGeoMapType::TerrainMap, tr("Terrain"), tr("Terrain map view in daylight mode"), false, false, 3); - types << QGeoMapType(QGeoMapType::HybridMap, tr("Hybrid"), tr("Satellite map view with streets in daylight mode"), false, false, 4); --#else -+#elif QT_VERSION < QT_VERSION_CHECK(5,10,0) - types << QGeoMapType(QGeoMapType::StreetMap, tr("Road Map"), tr("Normal map view in daylight mode"), false, false, 1, "googlemaps"); - types << QGeoMapType(QGeoMapType::SatelliteMapDay, tr("Satellite"), tr("Satellite map view in daylight mode"), false, false, 2, "googlemaps"); - types << QGeoMapType(QGeoMapType::TerrainMap, tr("Terrain"), tr("Terrain map view in daylight mode"), false, false, 3, "googlemaps"); - types << QGeoMapType(QGeoMapType::HybridMap, tr("Hybrid"), tr("Satellite map view with streets in daylight mode"), false, false, 4, "googlemaps"); -+#else -+ types << QGeoMapType(QGeoMapType::StreetMap, tr("Road Map"), tr("Normal map view in daylight mode"), false, false, 1, "googlemaps", capabilities, parameters); -+ types << QGeoMapType(QGeoMapType::SatelliteMapDay, tr("Satellite"), tr("Satellite map view in daylight mode"), false, false, 2, "googlemaps", capabilities, parameters); -+ types << QGeoMapType(QGeoMapType::TerrainMap, tr("Terrain"), tr("Terrain map view in daylight mode"), false, false, 3, "googlemaps", capabilities, parameters); -+ types << QGeoMapType(QGeoMapType::HybridMap, tr("Hybrid"), tr("Satellite map view with streets in daylight mode"), false, false, 4, "googlemaps", capabilities, parameters); - #endif - setSupportedMapTypes(types); -
