[arch-commits] Commit in viking/trunk (PKGBUILD remove-mapquest.patch)

[Balló György]

    Date: Saturday, July 1, 2017 @ 10:03:30
  Author: bgyorgy
Revision: 241999

upgpkg: viking 1.6.2-5

Remove discontinued mapquest service

Added:
  viking/trunk/remove-mapquest.patch
Modified:
  viking/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   15 ++++++++++--
 remove-mapquest.patch |   56 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-01 09:47:25 UTC (rev 241998)
+++ PKGBUILD	2017-07-01 10:03:30 UTC (rev 241999)
@@ -5,7 +5,7 @@
 
 pkgname=viking
 pkgver=1.6.2
-pkgrel=4
+pkgrel=5
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64')
 url="https://sourceforge.net/projects/viking/"
@@ -15,9 +15,18 @@
 optdepends=('gpsbabel: import and export GPS tracks from various formats')
 options=('!emptydirs')
 changelog=$pkgname.changelog
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('dfe223b1cd3a1fed3616a70e732321db9013c89df3fd6e1ad0f733a1bb067826')
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+        remove-mapquest.patch)
+sha256sums=('dfe223b1cd3a1fed3616a70e732321db9013c89df3fd6e1ad0f733a1bb067826'
+            '07d78e7b86a494a3bb3e0389e4a8b42fc2f916aaa66e5b06fc9146ebfa932dc5')
 
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  # Remove discontinued mapquest service
+  patch -Np1 -i "${srcdir}"/remove-mapquest.patch
+}
+
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
 

Added: remove-mapquest.patch
===================================================================
--- remove-mapquest.patch	                        (rev 0)
+++ remove-mapquest.patch	2017-07-01 10:03:30 UTC (rev 241999)
@@ -0,0 +1,56 @@
+diff -Naur viking-1.6.2.orig/src/map_ids.h viking-1.6.2/src/map_ids.h
+--- viking-1.6.2.orig/src/map_ids.h	2015-11-10 22:01:35.000000000 +0100
++++ viking-1.6.2/src/map_ids.h	2017-07-01 11:25:32.496994499 +0200
+@@ -35,7 +35,6 @@
+ #define MAP_ID_OSM_MAPNIK 13
+ #define MAP_ID_BLUE_MARBLE 15
+ #define MAP_ID_OSM_CYCLE 17
+-#define MAP_ID_MAPQUEST_OSM 19
+ #define MAP_ID_OSM_TRANSPORT 20
+ #define MAP_ID_OSM_ON_DISK 21
+ #define MAP_ID_OSM_HUMANITARIAN 22
+diff -Naur viking-1.6.2.orig/src/osm.c viking-1.6.2/src/osm.c
+--- viking-1.6.2.orig/src/osm.c	2015-11-10 22:01:35.000000000 +0100
++++ viking-1.6.2/src/osm.c	2017-07-01 11:26:25.051880940 +0200
+@@ -89,21 +89,6 @@
+                                 "license", "CC-BY-SA",
+                                 "license-url", "http://www.openstreetmap.org/copyright",
+                                 NULL));
+-  VikMapSource *mapquest_type =
+-    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
+-                                "id", MAP_ID_MAPQUEST_OSM,
+-                                "name", "OSM-MapQuest",
+-                                "label", "OpenStreetMap (MapQuest)",
+-                                "hostname", "otile1.mqcdn.com",
+-                                "url", "/tiles/1.0.0/osm/%d/%d/%d.png",
+-                                "check-file-server-time", TRUE,
+-                                "use-etag", FALSE,
+-                                "zoom-min", 0,
+-                                "zoom-max", 19,
+-                                "copyright", "Tiles Courtesy of MapQuest © OpenStreetMap contributors",
+-                                "license", "MapQuest Specific",
+-                                "license-url", "http://developer.mapquest.com/web/info/terms-of-use",
+-                                NULL));
+   VikMapSource *hot_type =
+     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
+                                 "id", MAP_ID_OSM_HUMANITARIAN,
+@@ -152,7 +137,6 @@
+                                 "is-osm-meta-tiles", TRUE,
+                                 NULL));
+ 
+-  maps_layer_register_map_source (mapquest_type);
+   maps_layer_register_map_source (mapnik_type);
+   maps_layer_register_map_source (cycle_type);
+   maps_layer_register_map_source (transport_type);
+diff -Naur viking-1.6.2.orig/src/vikmapslayer.c viking-1.6.2/src/vikmapslayer.c
+--- viking-1.6.2.orig/src/vikmapslayer.c	2015-12-21 12:44:57.000000000 +0100
++++ viking-1.6.2/src/vikmapslayer.c	2017-07-01 11:25:52.947597509 +0200
+@@ -127,7 +127,7 @@
+  { 0, 255, 3, 0 }, /* alpha */
+ };
+ 
+-static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_MAPQUEST_OSM ); }
++static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_OSM_MAPNIK ); }
+ static VikLayerParamData directory_default ( void )
+ {
+   VikLayerParamData data;