From 3893529051dc2ffb69bf49ba0587a600b6e4bfb2 Mon Sep 17 00:00:00 2001 From: gdt Date: Mon, 22 Mar 2021 00:21:13 +0000 Subject: geography/viking: Update to 1.9 Packaging changes: - Change to gtk3 - Drop workaround for lack of NAN on NetBSD 5 - Drop workaround for XOPEN_SOURCE as upstream no lnoger defines it Viking 1.9 (2021-03-20) New features since 1.8 * GPX 1.1 Support for most common Extensions (inc. Heart Rate, Power, Temperature & Cadence) * GTK3 ** Pinch Zoom support on Touchpads/Touchscreens (not GTK2 build) * Select Tool is now the default with more intuitive behaviour to enable moving the map * [OpenTopoMap](https://opentopomap.org) is the new Map Default * Online Search in Left Hand Pane * Track Statistics in Left Hand Pane * [OSRM](http://project-osrm.org) Routing Support * Log diagnostic Window * DEM Colour options * DEM Server enhanced support (NASA Earthdata login and alternative DEM server configuration) * Ruler uses Great Circle drawing and distance. * Single key Shortcuts support * Improved Track Area Coverage (faster drawing, option to limit years of coverage) * Monthly Statistics Analysis * Native KML Parser enabling support for more KML features * More KML export options * Ability to convert Tracks/Routes to Waypoints and vice versa. * Ability to 'Rotate' Routes/Tracks, i.e. to shift the start/end point of circular routes. * Ability to Reset Preferences and Layer Defaults * Ability to Reset Layers back to the Layer Default. * Enable Filtering on some List Displays (hence a basic internal search). * Support more GPX 1.0 Waypoint fields - the less commonally encountered ones. --- geography/viking/Makefile | 9 ++--- geography/viking/PLIST | 53 ++++++++++++++++++++++++++- geography/viking/distinfo | 12 +++--- geography/viking/patches/patch-src_gpspoint.c | 36 ------------------ geography/viking/patches/patch-src_gpx.c | 21 ----------- 5 files changed, 61 insertions(+), 70 deletions(-) delete mode 100644 geography/viking/patches/patch-src_gpspoint.c delete mode 100644 geography/viking/patches/patch-src_gpx.c (limited to 'geography/viking') diff --git a/geography/viking/Makefile b/geography/viking/Makefile index 47ee77d8280..b0fb69a13a8 100644 --- a/geography/viking/Makefile +++ b/geography/viking/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.115 2021/01/09 19:50:53 gdt Exp $ +# $NetBSD: Makefile,v 1.116 2021/03/22 00:21:13 gdt Exp $ # -VERSION= 1.8 +VERSION= 1.9 DISTNAME= viking-${VERSION} -PKGREVISION= 7 CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/ EXTRACT_SUFX= .tar.bz2 @@ -74,7 +73,7 @@ CONFIGURE_ARGS+= --disable-zip .include "../../security/nettle/buildlink3.mk" # gnome-doc-utils is needed even if not building documentation .include "../../textproc/gnome-doc-utils/buildlink3.mk" +.include "../../textproc/json-glib/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -# \todo Consider gtk3, perhaps as an option. -.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/viking/PLIST b/geography/viking/PLIST index 74b33264b43..ecf002d9e86 100644 --- a/geography/viking/PLIST +++ b/geography/viking/PLIST @@ -1,6 +1,56 @@ -@comment $NetBSD: PLIST,v 1.12 2019/01/22 15:28:45 gdt Exp $ +@comment $NetBSD: PLIST,v 1.13 2021/03/22 00:21:13 gdt Exp $ bin/viking +man/man1/viking.1 share/applications/viking.desktop +share/help/C/viking/attribution.xml +share/help/C/viking/commandline.xml +share/help/C/viking/dem_layer.xml +share/help/C/viking/edit_view_menus.xml +share/help/C/viking/figures/Aggregate_heatmap.png +share/help/C/viking/figures/Aggregate_statistics.png +share/help/C/viking/figures/Aggregate_statistics_years.png +share/help/C/viking/figures/DEM_Example.png +share/help/C/viking/figures/DEM_file_info_dialog.png +share/help/C/viking/figures/Goto_Main_Window.png +share/help/C/viking/figures/LayersTracksList.png +share/help/C/viking/figures/LayersTracksStatistics.png +share/help/C/viking/figures/Maps_download_region_dialog.png +share/help/C/viking/figures/Track_elevation_graph.png +share/help/C/viking/figures/Track_properties.png +share/help/C/viking/figures/Track_statistics.png +share/help/C/viking/figures/Track_time_splits.png +share/help/C/viking/figures/Trackpoint_edit_dialog.png +share/help/C/viking/figures/Viking-OSM-CycleMap-ManyTracks.jpg +share/help/C/viking/figures/Viking-TAC.png +share/help/C/viking/figures/WaypointProperties.png +share/help/C/viking/figures/WaypointsList.png +share/help/C/viking/figures/addtr_18.png +share/help/C/viking/figures/addwp_18.png +share/help/C/viking/figures/customize_toolbar_dialog.png +share/help/C/viking/figures/demdl_18.png +share/help/C/viking/figures/edtr_18.png +share/help/C/viking/figures/edwp_18.png +share/help/C/viking/figures/geomove_18.png +share/help/C/viking/figures/geozoom_18.png +share/help/C/viking/figures/map_tile_info_dialog.png +share/help/C/viking/figures/mapdl_18.png +share/help/C/viking/figures/mover_22.png +share/help/C/viking/figures/properties_degree.png +share/help/C/viking/figures/properties_units.png +share/help/C/viking/figures/route_finder_18.png +share/help/C/viking/figures/ruler_18.png +share/help/C/viking/figures/select_18.png +share/help/C/viking/figures/showpic_18.png +share/help/C/viking/figures/trw_statusbar.png +share/help/C/viking/figures/vik_new_route_18.png +share/help/C/viking/figures/zoom_18.png +share/help/C/viking/figures/zoom_status_popup.png +share/help/C/viking/geoclue_layer.xml +share/help/C/viking/georef_layer.xml +share/help/C/viking/index.docbook +share/help/C/viking/legal.xml +share/help/C/viking/mapnik_rendering_layer.xml +share/help/C/viking/recommends.xml share/icons/hicolor/48x48/apps/viking.png share/locale/ast/LC_MESSAGES/viking.mo share/locale/ca/LC_MESSAGES/viking.mo @@ -41,3 +91,4 @@ share/viking/goto_tools.xml share/viking/latlontz.txt share/viking/maps.xml share/viking/routing.xml +share/viking/unreachable_tiles.txt diff --git a/geography/viking/distinfo b/geography/viking/distinfo index 1115164d7aa..913eac7a227 100644 --- a/geography/viking/distinfo +++ b/geography/viking/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.29 2020/03/21 14:36:22 gdt Exp $ +$NetBSD: distinfo,v 1.30 2021/03/22 00:21:13 gdt Exp $ -SHA1 (viking-1.8.tar.bz2) = 316024914dcdd3ca493555f6454866f6ec4da373 -RMD160 (viking-1.8.tar.bz2) = e134c2834e1e1d34e4273840cc5ec53418e95fc7 -SHA512 (viking-1.8.tar.bz2) = 0f30aded65a84c34fde6204b39ed652ece4218dadca76679244dbdfb655513c5f4b7cdc7f82dcb659e852bc88b27d0c9fff29511c5e30e9fbd46a8540b925d91 -Size (viking-1.8.tar.bz2) = 3878992 bytes +SHA1 (viking-1.9.tar.bz2) = 2126572628daea30e63082603b74f81550105d6c +RMD160 (viking-1.9.tar.bz2) = dfed1e4b07544f2bec8c5ce9b93a3c8fc1df3cd5 +SHA512 (viking-1.9.tar.bz2) = 306bef0b148a67d169420e8806aeb96f58eec88d72c6cbe3061de06ecb096c96cce1b50ed43f463bc2524b34413838269793bd4b39a4d62b3d2e4f01f3ff1b0b +Size (viking-1.9.tar.bz2) = 5165249 bytes SHA1 (patch-configure) = c1a7935c166106e21585c007a07c00dc60349f02 -SHA1 (patch-src_gpspoint.c) = 95b07ed2b37a3e05c12042f55c81816245753d04 -SHA1 (patch-src_gpx.c) = 178488c7bd56a0dc199538ce4c0bede534379590 diff --git a/geography/viking/patches/patch-src_gpspoint.c b/geography/viking/patches/patch-src_gpspoint.c deleted file mode 100644 index cbf110ed53a..00000000000 --- a/geography/viking/patches/patch-src_gpspoint.c +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-src_gpspoint.c,v 1.2 2020/03/18 00:02:46 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 2020-01-30 08:34:43.000000000 +0000 -+++ src/gpspoint.c -@@ -79,8 +79,25 @@ static gdouble line_altitude = NAN; - 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 = NAN; diff --git a/geography/viking/patches/patch-src_gpx.c b/geography/viking/patches/patch-src_gpx.c deleted file mode 100644 index 8bd7d86f292..00000000000 --- a/geography/viking/patches/patch-src_gpx.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_gpx.c,v 1.3 2020/03/18 00:02:46 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. - ---- src/gpx.c.orig 2020-01-30 08:34:43.000000000 +0000 -+++ src/gpx.c -@@ -26,7 +26,12 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -+ -+#if defined(__sun) -+#define _XOPEN_SOURCE 600 -+#else - #define _XOPEN_SOURCE /* glibc2 needs this */ -+#endif - - #include "gpx.h" - #include "viking.h" -- cgit v1.2.3