[arch-commits] Commit in googlemaps/trunk (PKGBUILD qt510.patch)

[Gaëtan Bisson]

    Date: Wednesday, December 13, 2017 @ 07:16:44
  Author: bisson
Revision: 274168

fix build with qt-5.10

Added:
  googlemaps/trunk/qt510.patch
Modified:
  googlemaps/trunk/PKGBUILD

-------------+
 PKGBUILD    |   13 ++++++++++---
 qt510.patch |   21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-13 07:16:04 UTC (rev 274167)
+++ PKGBUILD	2017-12-13 07:16:44 UTC (rev 274168)
@@ -4,7 +4,7 @@
 pkgname=googlemaps
 pkgver=20171202
 _commit=b8d0b353f26df3d8e8d45b8ef325619f9ba84075
-pkgrel=1
+pkgrel=2
 pkgdesc='Google Maps plugin for QtLocation'
 url='https://github.com/vladest/googlemaps'
 license=('MIT')
@@ -11,9 +11,16 @@
 arch=('x86_64')
 makedepends=('git' 'qt5-tools')
 depends=('qt5-location')
-source=("git+https://github.com/vladest/googlemaps#commit=${_commit}")
-sha256sums=('SKIP')
+source=("git+https://github.com/vladest/googlemaps#commit=${_commit}"
+        'qt510.patch')
+sha256sums=('SKIP'
+            '69285a7073c26175ae46207d728822b3cc9e8b957d60def07e8007d69fade0d4')
 
+prepare() {
+	cd "${srcdir}/${pkgname}"
+	patch -p1 -i ../qt510.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}"
 	install -d build

Added: qt510.patch
===================================================================
--- qt510.patch	                        (rev 0)
+++ qt510.patch	2017-12-13 07:16:44 UTC (rev 274168)
@@ -0,0 +1,21 @@
+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);
+