From e1971ae14fce0b947c9eebd145cb2389c11bdab6 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 10 Sep 2020 00:02:03 -0700 Subject: [PATCH] main/pure-maps: change default map and router providers (MR 1559) The defaults from upstream require API keys to work, these don't. --- main/pure-maps/APKBUILD | 7 +++--- .../change_default_map_router_providers.patch | 25 +++++++++++++++++++ main/pure-maps/pure-maps.post-install | 6 ----- 3 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 main/pure-maps/change_default_map_router_providers.patch delete mode 100644 main/pure-maps/pure-maps.post-install diff --git a/main/pure-maps/APKBUILD b/main/pure-maps/APKBUILD index 7836073f3..7a51b5e91 100644 --- a/main/pure-maps/APKBUILD +++ b/main/pure-maps/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=pure-maps pkgver=1.29.0 -pkgrel=0 +pkgrel=1 _commit_geomag="8eb9a730c8643fb7d63fdee4fd9a195ee8ba4df2" pkgdesc="Maps and navigation" url="https://github.com/rinigus/pure-maps" @@ -29,9 +29,9 @@ makedepends=" qt5-qttools-dev " subpackages="$pkgname-lang" -install="$pkgname.post-install" source="https://github.com/rinigus/pure-maps/archive/$pkgver/pure-maps-$pkgver.tar.gz https://github.com/rinigus/geomag/archive/$_commit_geomag/geomag-$_commit_geomag.tar.gz + change_default_map_router_providers.patch " options="!check" # Requires jsonlint which is not available @@ -60,4 +60,5 @@ package() { } sha512sums="7e4d4ba14071ac410ff8f4b8841fd4822bcac139fc4610b2940fad6306c7c38fc20edb3f6664eb31f1851498b2e4f28dc8fb90eef7065525aa073261f55a24ee pure-maps-1.29.0.tar.gz -13e11b6cb35162315deb86c6c6240a3555760397d7aa88ac9c3348d476e9e9547b03210134119c60790511489e3f2a13afb93a3c77d40b1258c664b6fcc0425c geomag-8eb9a730c8643fb7d63fdee4fd9a195ee8ba4df2.tar.gz" +13e11b6cb35162315deb86c6c6240a3555760397d7aa88ac9c3348d476e9e9547b03210134119c60790511489e3f2a13afb93a3c77d40b1258c664b6fcc0425c geomag-8eb9a730c8643fb7d63fdee4fd9a195ee8ba4df2.tar.gz +ecad0bd2bca1039d641cc90157e8c195aeafccd3369ee1cd5b45b5059ec82a5892f26b9958fc3bed6a77be00e518b64486730e1787eac9597b9b42b528ea7377 change_default_map_router_providers.patch" diff --git a/main/pure-maps/change_default_map_router_providers.patch b/main/pure-maps/change_default_map_router_providers.patch new file mode 100644 index 000000000..334c65cfe --- /dev/null +++ b/main/pure-maps/change_default_map_router_providers.patch @@ -0,0 +1,25 @@ +diff --git a/poor/config.py b/poor/config.py +index 33228c5..81dd7d4 100644 +--- a/poor/config.py ++++ b/poor/config.py +@@ -72,16 +72,16 @@ DEFAULTS = { + "profile": "online", + "profiles": { + "mixed": { +- "basemap": "Mapbox", ++ "basemap": "OpenCycleMap", + "geocoder": "photon", + "guide": "foursquare", +- "router": "stadiamaps" ++ "router": "OSRM" + }, + "online": { +- "basemap": "Mapbox", ++ "basemap": "OpenCycleMap", + "geocoder": "photon", + "guide": "foursquare", +- "router": "stadiamaps" ++ "router": "OSRM" + }, + "offline": { + "basemap": "OSM Scout", diff --git a/main/pure-maps/pure-maps.post-install b/main/pure-maps/pure-maps.post-install deleted file mode 100644 index 2cedbd111..000000000 --- a/main/pure-maps/pure-maps.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -cat <