Date: Wednesday, September 12, 2018 @ 20:48:43 Author: arojas Revision: 379979
archrelease: copy trunk to community-staging-x86_64 Added: viking/repos/community-staging-x86_64/ viking/repos/community-staging-x86_64/PKGBUILD (from rev 379978, viking/trunk/PKGBUILD) viking/repos/community-staging-x86_64/remove-mapquest.patch (from rev 379978, viking/trunk/remove-mapquest.patch) viking/repos/community-staging-x86_64/viking.changelog (from rev 379978, viking/trunk/viking.changelog) -----------------------+ PKGBUILD | 41 +++++++++++++++++++++++++++++++++++ remove-mapquest.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ viking.changelog | 49 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+) Copied: viking/repos/community-staging-x86_64/PKGBUILD (from rev 379978, viking/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-09-12 20:48:43 UTC (rev 379979) @@ -0,0 +1,41 @@ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Nick Østergaard <oe.n...@gmail.com> +# Contributor: Jonny Gerold <jo...@fsk141.com> + +pkgname=viking +pkgver=1.6.2 +pkgrel=6 +pkgdesc="GTK+2 application to manage GPS data" +arch=('x86_64') +url="https://sourceforge.net/projects/viking/" +license=('GPL2') +depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik') +makedepends=('boost' 'gnome-doc-utils' 'intltool') +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 + 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 + + export CXXFLAGS="$CXXFLAGS -I/usr/include/mapnik" + ./configure --prefix=/usr --enable-expedia --enable-geocaches + make +} + +package(){ + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install +} Copied: viking/repos/community-staging-x86_64/remove-mapquest.patch (from rev 379978, viking/trunk/remove-mapquest.patch) =================================================================== --- community-staging-x86_64/remove-mapquest.patch (rev 0) +++ community-staging-x86_64/remove-mapquest.patch 2018-09-12 20:48:43 UTC (rev 379979) @@ -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; Copied: viking/repos/community-staging-x86_64/viking.changelog (from rev 379978, viking/trunk/viking.changelog) =================================================================== --- community-staging-x86_64/viking.changelog (rev 0) +++ community-staging-x86_64/viking.changelog 2018-09-12 20:48:43 UTC (rev 379979) @@ -0,0 +1,49 @@ +2016-04-30 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6.2-3 pacman hooks rebuild + +2015-12-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6.2-1 + +2015-11-25 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6.1-1 + +2015-05-21 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6-3 + * gpsd 3.14 rebuild + +2015-04-26 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6-2 + * boost rebuild + +2015-03-31 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.6-1 + +2014-09-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.5.1-1 + +2014-02-04 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.5-1 + +2013-09-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.4.2-1 + +2013-05-18 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.4.1-1 + +2013-02-24 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.4-1 + +2012-10-02 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.3.2.1-1 + +2012-05-05 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.3.0-1 + +2011-11-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.2.2-1 + +2011-08-28 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.2.1-1 + +2011-06-22 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * viking 1.2-1