CVS commit: pkgsrc/geography/viking

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Jan 22 15:28:45 UTC 2019

Modified Files:
        pkgsrc/geography/viking: Makefile PLIST distinfo
        pkgsrc/geography/viking/patches: patch-configure patch-src_gpx.c
Added Files:
        pkgsrc/geography/viking/patches: patch-src_gpspoint.c
Removed Files:
        pkgsrc/geography/viking/patches: patch-aa

Log Message:
viking: Update to 1.7

packaging changes:

  - remove patch fragment applied upstream
  - add a request to clarify and upstream the sun patch
  - update comments about why things are or are not included.  Add a
    note to consider gtk3.
  - disable geoclue, oauth, and zip, pending decision on defaults and
    options (magic and mapnik remain disabled)
  - remove perl dependencies, apparently no longer preesent upstream
  - depend on libbzip2
  - depend on png (was already indirect)
  - depend on nettle (MD5 for thumbnail cache)

upstream changes:

== New features since 1.6.2 ==
* KMZ Map File Support
* Apply Button for Layer Properties
* Support More GPX Fields
* Updated Default Map: Mapbox Outdoors
* GeoClue Support for Automatic Location
* Faster GPX File Loading
* Waypoint / EXIF GPS Image Direction Support
* Support More Garmin Waypoint Symbols
* Support Garmin Device GPX Point Limits
* Windows GPSD Client
* Support 'External' GPX File Layers in .vik Files
* Usage of HTTPS addresses
* Support OAuth for OSM
* Support High Resolution Displays
* Track+Route Split+Join Tools
* Calculation of Eddington Number
* Calendar Display
* Can Select a Result from the Online Search Results
* Reproducible Builds
* 64bit Windows Build only
* Travis Build + CI
* Consistent Licensing of GPL2+
* Many Internal Improvements + Fixes

(bug fixes)


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/geography/viking/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/geography/viking/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/geography/viking/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/geography/viking/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/viking/patches/patch-configure \
    pkgsrc/geography/viking/patches/patch-src_gpx.c
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/viking/patches/patch-src_gpspoint.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/viking/Makefile
diff -u pkgsrc/geography/viking/Makefile:1.95 pkgsrc/geography/viking/Makefile:1.96
--- pkgsrc/geography/viking/Makefile:1.95       Thu Dec 13 19:51:58 2018
+++ pkgsrc/geography/viking/Makefile    Tue Jan 22 15:28:45 2019
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2018/12/13 19:51:58 adam Exp $
+# $NetBSD: Makefile,v 1.96 2019/01/22 15:28:45 gdt Exp $
 #
 
-VERSION=               1.6.2
+VERSION=               1.7
 DISTNAME=              viking-${VERSION}
-PKGREVISION=           22
 CATEGORIES=            geography
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/
 EXTRACT_SUFX=          .tar.bz2
@@ -14,46 +13,67 @@ COMMENT=            Viking manages GPS data, suppo
 
 LICENSE=               gnu-gpl-v2
 
-# C++11 is now required.
+# viking says it "will" use c++11, and mapnik (not yet included) needs
+# c++11.
 USE_LANGUAGES=         c c++
 
+USE_TOOLS+=            gmake intltool msgfmt pkg-config
+
 GNU_CONFIGURE=         yes
 
 TEST_TARGET=           check
 
+# For each option, "\todo RESOLVE" means: Decide to make default, or
+# to turn off, or to make an option, and explain why.
+
+# \todo RESOLVE
+CONFIGURE_ARGS+=       --disable-geoclue
+
+# \todo RESOLVE
 CONFIGURE_ARGS+=       --disable-magic
 
+# \todo RESOLVE
+CONFIGURE_ARGS+=       --disable-mapnik
+# \todo README says icu is required.  However, it seems to be
+# dependency of mapnik, not necessarily actually used by viking.
+
+# \todo RESOLVE
+CONFIGURE_ARGS+=       --disable-oauth
+
+# \todo RESOLVE
+CONFIGURE_ARGS+=       --disable-zip
+#.include "../../archivers/libzip/buildlink3.mk"
+
 # Perhaps optionize use of gpsd (remove bl3, add this).
 # CONFIGURE_ARGS+=     --disable-realtime-gps-tracking
 
-CONFIGURE_ARGS+=       --disable-mapnik
-
-# Building docs fails because mapnik being optional is not respected.
-# For now, just omit docs until we have mapnik.
+# Building docs fails with a unicode error.
+# old: Building docs fails because mapnik being optional is not respected.
+# \todo Resolve.
 #CONFIGURE_ARGS+=      --enable-gtk-doc
 #.include "../../textproc/gtk-doc/buildlink3.mk"
 
-# According to upstream, gpsbabel is merely recommended.  gpsbabel is
-# about to depend on qt5, and will thus become very large.  Users can
-# install it and use it at runtime, so don't depend on it.
+# According to upstream, gpsbabel is merely recommended.  gpsbabel
+# depends on qt, and is thus really large.  Users can install it and
+# use it at runtime, so don't depend on it at build time.
 #DEPENDS+=             gpsbabel-[0-9]*:../../geography/gpsbabel
 
-DEPENDS+=              p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-REPLACE_PERL=          viking-remote
-
-USE_TOOLS+=            gmake intltool msgfmt pkg-config
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/gexiv2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../geography/gpsd/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+# Avoids internal MD5, and betterintegration with thumbmail cache.
+.include "../../security/nettle/buildlink3.mk"
+# gnome-doc-utils is needed even if not building documentation
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+# \todo Consider gtk3, perhaps as an option.
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/viking/PLIST
diff -u pkgsrc/geography/viking/PLIST:1.11 pkgsrc/geography/viking/PLIST:1.12
--- pkgsrc/geography/viking/PLIST:1.11  Fri Dec 30 00:10:02 2016
+++ pkgsrc/geography/viking/PLIST       Tue Jan 22 15:28:45 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/12/30 00:10:02 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/01/22 15:28:45 gdt Exp $
 bin/viking
 share/applications/viking.desktop
 share/icons/hicolor/48x48/apps/viking.png
@@ -20,6 +20,7 @@ share/locale/it/LC_MESSAGES/viking.mo
 share/locale/ja/LC_MESSAGES/viking.mo
 share/locale/jv/LC_MESSAGES/viking.mo
 share/locale/ko/LC_MESSAGES/viking.mo
+share/locale/ku/LC_MESSAGES/viking.mo
 share/locale/lt/LC_MESSAGES/viking.mo
 share/locale/lv/LC_MESSAGES/viking.mo
 share/locale/nb/LC_MESSAGES/viking.mo
@@ -39,3 +40,4 @@ share/viking/external_tools.xml
 share/viking/goto_tools.xml
 share/viking/latlontz.txt
 share/viking/maps.xml
+share/viking/routing.xml

Index: pkgsrc/geography/viking/distinfo
diff -u pkgsrc/geography/viking/distinfo:1.26 pkgsrc/geography/viking/distinfo:1.27
--- pkgsrc/geography/viking/distinfo:1.26       Fri Dec 30 00:10:02 2016
+++ pkgsrc/geography/viking/distinfo    Tue Jan 22 15:28:45 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2016/12/30 00:10:02 gdt Exp $
+$NetBSD: distinfo,v 1.27 2019/01/22 15:28:45 gdt Exp $
 
-SHA1 (viking-1.6.2.tar.bz2) = 362ca955b64c0af0ffb5119d559c1ee7a8ce4c2b
-RMD160 (viking-1.6.2.tar.bz2) = b17f3e641a76b3c72b9dd77d45082170cb886a3d
-SHA512 (viking-1.6.2.tar.bz2) = 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
-Size (viking-1.6.2.tar.bz2) = 3324897 bytes
-SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a
-SHA1 (patch-configure) = e80de955f841607d97c45c940db6258ad806123d
-SHA1 (patch-src_gpx.c) = bcc13b87f4fbc9d64abdacbab344e7d5a10549cf
+SHA1 (viking-1.7.tar.bz2) = ac811fd294ac5b73419bda29864923871fbadb53
+RMD160 (viking-1.7.tar.bz2) = 7ba2d64f5ccf2511b3271c16ccf4ffda69aa93de
+SHA512 (viking-1.7.tar.bz2) = ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600
+Size (viking-1.7.tar.bz2) = 3438343 bytes
+SHA1 (patch-configure) = d2a6b621c879a1ccbc26d7f915f382f19eec45a3
+SHA1 (patch-src_gpspoint.c) = 968beffb04fae470665b6b97df7d84e0a6bc6346
+SHA1 (patch-src_gpx.c) = 08f3861954c90ee6619c1a9c60a5bf42bf790b74

Index: pkgsrc/geography/viking/patches/patch-configure
diff -u pkgsrc/geography/viking/patches/patch-configure:1.1 pkgsrc/geography/viking/patches/patch-configure:1.2
--- pkgsrc/geography/viking/patches/patch-configure:1.1 Fri Dec 30 00:10:03 2016
+++ pkgsrc/geography/viking/patches/patch-configure     Tue Jan 22 15:28:45 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2016/12/30 00:10:03 gdt Exp $
+$NetBSD: patch-configure,v 1.2 2019/01/22 15:28:45 gdt Exp $
 
 Remediate bashisms.  I believe this has been reported upstream, but
 that should be verified with upstream head.
 
---- configure.orig     2015-11-24 22:18:34.000000000 +0000
+--- configure.orig     2019-01-21 20:16:51.000000000 +0000
 +++ configure
-@@ -8585,7 +8585,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -8763,7 +8763,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
  if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
        INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
  else
@@ -14,12 +14,3 @@ that should be verified with upstream he
  fi
        INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
        INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -12428,7 +12428,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
-- if test "x$XP" != "x" && test -r "$DB2MAN_XSL" && test "${HAVE_SCROLLKEEPER}" == "yes" ; then
-+ if test "x$XP" != "x" && test -r "$DB2MAN_XSL" && test "${HAVE_SCROLLKEEPER}" = "yes" ; then
-   GEN_MANPAGES_TRUE=
-   GEN_MANPAGES_FALSE='#'
- else
Index: pkgsrc/geography/viking/patches/patch-src_gpx.c
diff -u pkgsrc/geography/viking/patches/patch-src_gpx.c:1.1 pkgsrc/geography/viking/patches/patch-src_gpx.c:1.2
--- pkgsrc/geography/viking/patches/patch-src_gpx.c:1.1 Sun Dec 13 20:37:31 2015
+++ pkgsrc/geography/viking/patches/patch-src_gpx.c     Tue Jan 22 15:28:45 2019
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_gpx.c,v 1.1 2015/12/13 20:37:31 wiedi Exp $
+$NetBSD: patch-src_gpx.c,v 1.2 2019/01/22 15:28:45 gdt Exp $
+
+This is a build fix for SunOS.
+\todo Explain why, and if the new __sun way is correct in general.
+\todo File upstream.
 
-Fix SunOS
 --- src/gpx.c.orig     2015-02-03 22:44:42.000000000 +0000
 +++ src/gpx.c
 @@ -30,7 +30,11 @@

Added files:

Index: pkgsrc/geography/viking/patches/patch-src_gpspoint.c
diff -u /dev/null pkgsrc/geography/viking/patches/patch-src_gpspoint.c:1.1
--- /dev/null   Tue Jan 22 15:28:45 2019
+++ pkgsrc/geography/viking/patches/patch-src_gpspoint.c        Tue Jan 22 15:28:45 2019
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_gpspoint.c,v 1.1 2019/01/22 15:28:45 gdt Exp $
+
+Work around a bug in NetBSD.  See PR standards/40695.  Bug is fixed in
+-current but not -5; revisit if the workaround causes problems.
+While 5 is very old, keep the patch because somebody might be using it
+and the pach is not problematic.
+(Not filed upstream because this is a NetBSD bug.)
+
+--- src/gpspoint.c.orig        2018-12-23 10:48:06.000000000 +0000
++++ src/gpspoint.c
+@@ -94,8 +94,25 @@ static gdouble line_altitude = VIK_DEFAU
+ static gboolean line_visible = TRUE;
+ 
+ static gboolean line_extended = FALSE;
++#if defined(__NetBSD__)
++#if __GNUC_PREREQ__(3,3)
++/*
++ * Work around a bug in NetBSD.  See PR standards/40695.  Bug is fixed
++ * in -current but not -5; revisit if the workaround causes problems.
++ */
++static gdouble line_speed = __builtin_nanf("");
++static gdouble line_course = __builtin_nanf("");
++#else /* _GNUC_PREREQ__(3,3) */
++/*
++ * gcc too old for workaround; defer fix to someone else.
++ */
++static gdouble line_speed = NAN;
++static gdouble line_course = NAN;
++#endif /* _GNUC_PREREQ__(3,3) */
++#else /* NetBSD */
+ static gdouble line_speed = NAN;
+ static gdouble line_course = NAN;
++#endif /* NetBSD */
+ static gint line_sat = 0;
+ static gint line_fix = 0;
+ static gdouble line_hdop = VIK_DEFAULT_DOP;