Wed Mar 18 00:02:46 2020 UTC ()
geography/viking: Update to 1.8

Viking 1.8 (2020-02-02)
New features since 1.7
* New GeoClue Layer to Track Position from the GeoClue service
** Not available on Windows
* Per Year Track Analysis
* Track Timing Speed Splits Analysis
* Subsecond Timing Precision for Tracks & Waypoints
* Track Area Coverage Feature
* Native Read Support of Zip & bzip2 Files
** This attempts to load supported files found within the compressed file
* Native Basic TCX Read Support
* Embedded (Elevation & Speed) Graphs in the Main Window
* Improved icons for Aggregate and Maps layers
* Scrolling Options for Better Usage with Touchpads
* Right Click Menu Options on the Calendar
* Various Keyboard Enhancements:
** Left & Right arrow keys selects the previous or next trackpoint respectively
** Keypad '+' & Keypad '-' inserts a trackpoint after or before of the current trackpoint
** Menu key opens the track context menu
* SF Features#117: Area Calculation Tool
* Large Basque language translation update
* Many other small fixes - see the ChangeLog for the full details.


(gdt)
diff -r1.107 -r1.108 pkgsrc/geography/viking/Makefile
diff -r1.27 -r1.28 pkgsrc/geography/viking/distinfo
diff -r1.1 -r1.2 pkgsrc/geography/viking/patches/patch-src_gpspoint.c
diff -r1.2 -r1.3 pkgsrc/geography/viking/patches/patch-src_gpx.c
cvs diff -r1.107 -r1.108 pkgsrc/geography/viking/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/viking/Makefile 2020/03/10 22:10:02 1.107
+++ pkgsrc/geography/viking/Makefile 2020/03/18 00:02:46 1.108
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.107 2020/03/10 22:10:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.108 2020/03/18 00:02:46 gdt Exp $
2# 2#
3 3
4VERSION= 1.7 4VERSION= 1.8
5DISTNAME= viking-${VERSION} 5DISTNAME= viking-${VERSION}
6PKGREVISION= 11 
7CATEGORIES= geography 6CATEGORIES= geography
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/ 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10 9
11MAINTAINER= gdt@NetBSD.org 10MAINTAINER= gdt@NetBSD.org
12HOMEPAGE= https://sourceforge.net/projects/viking/ 11HOMEPAGE= https://sourceforge.net/projects/viking/
13COMMENT= Viking manages GPS data, supports OpenStreetMap and geocaching 12COMMENT= Viking manages GPS data, supports OpenStreetMap and geocaching
14 13
15LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
16 15
17# viking says it "will" use c++11, and mapnik (not yet included) needs 16# viking says it "will" use c++11, and mapnik (not yet included) needs
18# c++11. 17# c++11.
19USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
cvs diff -r1.27 -r1.28 pkgsrc/geography/viking/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/viking/distinfo 2019/01/22 15:28:45 1.27
+++ pkgsrc/geography/viking/distinfo 2020/03/18 00:02:46 1.28
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.27 2019/01/22 15:28:45 gdt Exp $ 1$NetBSD: distinfo,v 1.28 2020/03/18 00:02:46 gdt Exp $
2 2
3SHA1 (viking-1.7.tar.bz2) = ac811fd294ac5b73419bda29864923871fbadb53 3SHA1 (viking-1.8.tar.bz2) = 316024914dcdd3ca493555f6454866f6ec4da373
4RMD160 (viking-1.7.tar.bz2) = 7ba2d64f5ccf2511b3271c16ccf4ffda69aa93de 4RMD160 (viking-1.8.tar.bz2) = e134c2834e1e1d34e4273840cc5ec53418e95fc7
5SHA512 (viking-1.7.tar.bz2) = ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600 5SHA512 (viking-1.8.tar.bz2) = 0f30aded65a84c34fde6204b39ed652ece4218dadca76679244dbdfb655513c5f4b7cdc7f82dcb659e852bc88b27d0c9fff29511c5e30e9fbd46a8540b925d91
6Size (viking-1.7.tar.bz2) = 3438343 bytes 6Size (viking-1.8.tar.bz2) = 3878992 bytes
7SHA1 (patch-configure) = d2a6b621c879a1ccbc26d7f915f382f19eec45a3 7SHA1 (patch-configure) = d2a6b621c879a1ccbc26d7f915f382f19eec45a3
8SHA1 (patch-src_gpspoint.c) = 968beffb04fae470665b6b97df7d84e0a6bc6346 8SHA1 (patch-src_gpspoint.c) = 95b07ed2b37a3e05c12042f55c81816245753d04
9SHA1 (patch-src_gpx.c) = 08f3861954c90ee6619c1a9c60a5bf42bf790b74 9SHA1 (patch-src_gpx.c) = 178488c7bd56a0dc199538ce4c0bede534379590
cvs diff -r1.1 -r1.2 pkgsrc/geography/viking/patches/Attic/patch-src_gpspoint.c (expand / switch to unified diff)

--- pkgsrc/geography/viking/patches/Attic/patch-src_gpspoint.c 2019/01/22 15:28:45 1.1
+++ pkgsrc/geography/viking/patches/Attic/patch-src_gpspoint.c 2020/03/18 00:02:46 1.2
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-src_gpspoint.c,v 1.1 2019/01/22 15:28:45 gdt Exp $ 1$NetBSD: patch-src_gpspoint.c,v 1.2 2020/03/18 00:02:46 gdt Exp $
2 2
3Work around a bug in NetBSD. See PR standards/40695. Bug is fixed in 3Work around a bug in NetBSD. See PR standards/40695. Bug is fixed in
4-current but not -5; revisit if the workaround causes problems. 4-current but not -5; revisit if the workaround causes problems.
5While 5 is very old, keep the patch because somebody might be using it 5While 5 is very old, keep the patch because somebody might be using it
6and the pach is not problematic. 6and the pach is not problematic.
7(Not filed upstream because this is a NetBSD bug.) 7(Not filed upstream because this is a NetBSD bug.)
8 8
9--- src/gpspoint.c.orig 2018-12-23 10:48:06.000000000 +0000 9--- src/gpspoint.c.orig 2020-01-30 08:34:43.000000000 +0000
10+++ src/gpspoint.c 10+++ src/gpspoint.c
11@@ -94,8 +94,25 @@ static gdouble line_altitude = VIK_DEFAU 11@@ -79,8 +79,25 @@ static gdouble line_altitude = NAN;
12 static gboolean line_visible = TRUE; 12 static gboolean line_visible = TRUE;
13  13
14 static gboolean line_extended = FALSE; 14 static gboolean line_extended = FALSE;
15+#if defined(__NetBSD__) 15+#if defined(__NetBSD__)
16+#if __GNUC_PREREQ__(3,3) 16+#if __GNUC_PREREQ__(3,3)
17+/* 17+/*
18+ * Work around a bug in NetBSD. See PR standards/40695. Bug is fixed 18+ * Work around a bug in NetBSD. See PR standards/40695. Bug is fixed
19+ * in -current but not -5; revisit if the workaround causes problems. 19+ * in -current but not -5; revisit if the workaround causes problems.
20+ */ 20+ */
21+static gdouble line_speed = __builtin_nanf(""); 21+static gdouble line_speed = __builtin_nanf("");
22+static gdouble line_course = __builtin_nanf(""); 22+static gdouble line_course = __builtin_nanf("");
23+#else /* _GNUC_PREREQ__(3,3) */ 23+#else /* _GNUC_PREREQ__(3,3) */
24+/* 24+/*
25+ * gcc too old for workaround; defer fix to someone else. 25+ * gcc too old for workaround; defer fix to someone else.
26+ */ 26+ */
27+static gdouble line_speed = NAN; 27+static gdouble line_speed = NAN;
28+static gdouble line_course = NAN; 28+static gdouble line_course = NAN;
29+#endif /* _GNUC_PREREQ__(3,3) */ 29+#endif /* _GNUC_PREREQ__(3,3) */
30+#else /* NetBSD */ 30+#else /* NetBSD */
31 static gdouble line_speed = NAN; 31 static gdouble line_speed = NAN;
32 static gdouble line_course = NAN; 32 static gdouble line_course = NAN;
33+#endif /* NetBSD */ 33+#endif /* NetBSD */
34 static gint line_sat = 0; 34 static gint line_sat = 0;
35 static gint line_fix = 0; 35 static gint line_fix = 0;
36 static gdouble line_hdop = VIK_DEFAULT_DOP; 36 static gdouble line_hdop = NAN;
cvs diff -r1.2 -r1.3 pkgsrc/geography/viking/patches/Attic/patch-src_gpx.c (expand / switch to unified diff)

--- pkgsrc/geography/viking/patches/Attic/patch-src_gpx.c 2019/01/22 15:28:45 1.2
+++ pkgsrc/geography/viking/patches/Attic/patch-src_gpx.c 2020/03/18 00:02:46 1.3
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: patch-src_gpx.c,v 1.2 2019/01/22 15:28:45 gdt Exp $ 1$NetBSD: patch-src_gpx.c,v 1.3 2020/03/18 00:02:46 gdt Exp $
2 2
3This is a build fix for SunOS. 3This is a build fix for SunOS.
4\todo Explain why, and if the new __sun way is correct in general. 4\todo Explain why, and if the new __sun way is correct in general.
5\todo File upstream. 5\todo File upstream.
6 6
7--- src/gpx.c.orig 2015-02-03 22:44:42.000000000 +0000 7--- src/gpx.c.orig 2020-01-30 08:34:43.000000000 +0000
8+++ src/gpx.c 8+++ src/gpx.c
9@@ -30,7 +30,11 @@ 9@@ -26,7 +26,12 @@
10 #include "config.h" 10 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
11 #endif 11 *
12  12 */
 13+
13+#if defined(__sun) 14+#if defined(__sun)
14+#define _XOPEN_SOURCE 600 15+#define _XOPEN_SOURCE 600
15+#else 16+#else
16 #define _XOPEN_SOURCE /* glibc2 needs this */ 17 #define _XOPEN_SOURCE /* glibc2 needs this */
17+#endif 18+#endif
18  19
19 #include "gpx.h" 20 #include "gpx.h"
20 #include "viking.h" 21 #include "viking.h"