From 9a2ba1902e345a90bc386e81f73600a5704e2b56 Mon Sep 17 00:00:00 2001 From: gdt Date: Fri, 30 Dec 2016 00:10:02 +0000 Subject: Update to 1.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream no longer builds documentation by default. Don't enable it, because then the build fails because it assumes mapnik is present. Note that C++11 is now required by upstream, at least if mapnik is included. For now, just add C++ to languages. Add patch to remediate new bashisms. Viking 1.6.2 (2015-12-21) Bug Fix Release * Don't remove project name if one decides not to delete all layers. * Fix routes not saved in GPX when tracks are made invisible. * SF Bugs#103: Fix TrackWaypoint layer items may not be displayed when pasted * Enable Catalan and Turkish translations. * Restore opening of JPG files. * SF Bugs#127: Fix initial display of Waypoint sort order. * Fix map layer widget sensitivity dependent on map type. Viking 1.6.1 (2015-11-24) Bug Fix Release + updated translations * Several fixes and many code improvements from Coverity scans * Fix heap-buffer-overflows * Mapnik3 support. ** C++ standard required is now C++11 * Reactivate building of the reference documentation * SF Bugs#126: Fix crash in gdk_rgb_convert_0888 due to using deallocated memory. * SF Bugs#121: Fix crash when invalidating previously acquired tiles. * SF Bugs#123: Fix bzip2 decompression on Windows. * SF Bugs#122: Fix memory cache confusion with multiple "On Disk OSM Tile Format" maps * SF Bugs#120: Fix Track drawing bug across the 180th Meridian. * Red Hat Bugzilla – Bug 1210403: Only download and process one Bing attribution list. * Fix Geocaches acquiring with latest geo-* software * Import latest Launchpad translation updates * Many other small fixes - see the ChangeLog for the full details. --- geography/viking/Makefile | 15 ++++++++--- geography/viking/PLIST | 45 +++----------------------------- geography/viking/distinfo | 11 ++++---- geography/viking/patches/patch-configure | 25 ++++++++++++++++++ 4 files changed, 46 insertions(+), 50 deletions(-) create mode 100644 geography/viking/patches/patch-configure (limited to 'geography') diff --git a/geography/viking/Makefile b/geography/viking/Makefile index 2acd2d713a5..9de4539e98d 100644 --- a/geography/viking/Makefile +++ b/geography/viking/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2016/12/04 05:17:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.71 2016/12/30 00:10:02 gdt Exp $ # -VERSION= 1.6 +VERSION= 1.6.2 DISTNAME= viking-${VERSION} -PKGREVISION= 6 CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/ EXTRACT_SUFX= .tar.bz2 @@ -14,6 +13,9 @@ COMMENT= Viking manages GPS data, supports OpenStreetMap and geocaching LICENSE= gnu-gpl-v2 +# C++11 is now required. +USE_LANGUAGES= c c++ + GNU_CONFIGURE= yes TEST_TARGET= check @@ -25,6 +27,11 @@ CONFIGURE_ARGS+= --disable-magic CONFIGURE_ARGS+= --disable-mapnik +# Building docs fails because mapnik being optional is not respected. +# For now, just omit docs until we have mapnik. +#CONFIGURE_ARGS+= --enable-gtk-doc +#.include "../../textproc/gtk-doc/buildlink3.mk" + DEPENDS+= gpsbabel-[0-9]*:../../geography/gpsbabel DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser REPLACE_PERL= viking-remote @@ -40,8 +47,8 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config .include "../../geography/gpsd/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" -.include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" +.include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/viking/PLIST b/geography/viking/PLIST index b8baa94a864..8705b1c7684 100644 --- a/geography/viking/PLIST +++ b/geography/viking/PLIST @@ -1,47 +1,9 @@ -@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $ -@comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $ +@comment $NetBSD: PLIST,v 1.11 2016/12/30 00:10:02 gdt Exp $ bin/viking share/applications/viking.desktop -share/gnome/help/viking/C/attribution.xml -share/gnome/help/viking/C/commandline.xml -share/gnome/help/viking/C/figures/DEM_file_info_dialog.png -share/gnome/help/viking/C/figures/LayersTracksList.png -share/gnome/help/viking/C/figures/LayersTracksStatistics.png -share/gnome/help/viking/C/figures/Maps_download_region_dialog.png -share/gnome/help/viking/C/figures/Track_elevation_graph.png -share/gnome/help/viking/C/figures/Track_properties.png -share/gnome/help/viking/C/figures/Track_statistics.png -share/gnome/help/viking/C/figures/Trackpoint_edit_dialog.png -share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg -share/gnome/help/viking/C/figures/WaypointsList.png -share/gnome/help/viking/C/figures/addtr_18.png -share/gnome/help/viking/C/figures/addwp_18.png -share/gnome/help/viking/C/figures/customize_toolbar_dialog.png -share/gnome/help/viking/C/figures/demdl_18.png -share/gnome/help/viking/C/figures/edtr_18.png -share/gnome/help/viking/C/figures/edwp_18.png -share/gnome/help/viking/C/figures/geomove_18.png -share/gnome/help/viking/C/figures/geozoom_18.png -share/gnome/help/viking/C/figures/map_tile_info_dialog.png -share/gnome/help/viking/C/figures/mapdl_18.png -share/gnome/help/viking/C/figures/mover_22.png -share/gnome/help/viking/C/figures/properties_degree.png -share/gnome/help/viking/C/figures/properties_units.png -share/gnome/help/viking/C/figures/route_finder_18.png -share/gnome/help/viking/C/figures/ruler_18.png -share/gnome/help/viking/C/figures/select_18.png -share/gnome/help/viking/C/figures/showpic_18.png -share/gnome/help/viking/C/figures/trw_statusbar.png -share/gnome/help/viking/C/figures/vik_new_route_18.png -share/gnome/help/viking/C/figures/zoom_18.png -share/gnome/help/viking/C/figures/zoom_status_popup.png -share/gnome/help/viking/C/georef_layer.xml -share/gnome/help/viking/C/legal.xml -share/gnome/help/viking/C/mapnik_rendering_layer.xml -share/gnome/help/viking/C/recommends.xml -share/gnome/help/viking/C/viking.xml share/icons/hicolor/48x48/apps/viking.png share/locale/ast/LC_MESSAGES/viking.mo +share/locale/ca/LC_MESSAGES/viking.mo share/locale/cs/LC_MESSAGES/viking.mo share/locale/da/LC_MESSAGES/viking.mo share/locale/de/LC_MESSAGES/viking.mo @@ -68,10 +30,11 @@ share/locale/ru/LC_MESSAGES/viking.mo share/locale/sk/LC_MESSAGES/viking.mo share/locale/sl/LC_MESSAGES/viking.mo share/locale/sv/LC_MESSAGES/viking.mo +share/locale/tr/LC_MESSAGES/viking.mo share/locale/uk/LC_MESSAGES/viking.mo share/locale/zh_CN/LC_MESSAGES/viking.mo share/locale/zh_TW/LC_MESSAGES/viking.mo -share/omf/viking/viking-C.omf +share/viking/datasources.xml share/viking/external_tools.xml share/viking/goto_tools.xml share/viking/latlontz.txt diff --git a/geography/viking/distinfo b/geography/viking/distinfo index e5db406320a..d2294713e5a 100644 --- a/geography/viking/distinfo +++ b/geography/viking/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.25 2015/12/13 20:37:31 wiedi Exp $ +$NetBSD: distinfo,v 1.26 2016/12/30 00:10:02 gdt Exp $ -SHA1 (viking-1.6.tar.bz2) = 364365dfe23742aef36dfd08fd81560000a18ffe -RMD160 (viking-1.6.tar.bz2) = b348bf666753adae0344023d7d32e5ae78dc7554 -SHA512 (viking-1.6.tar.bz2) = 7716f5720bcd410fa4a2a89ff87548c82a83132003733e6a3f516c51df99ffed4fa3b19631cec9ccedd27b222188a0f092c28ab9af1cefd8d8137b5801eff042 -Size (viking-1.6.tar.bz2) = 3060389 bytes +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 diff --git a/geography/viking/patches/patch-configure b/geography/viking/patches/patch-configure new file mode 100644 index 00000000000..b9d50c85109 --- /dev/null +++ b/geography/viking/patches/patch-configure @@ -0,0 +1,25 @@ +$NetBSD: patch-configure,v 1.1 2016/12/30 00:10:03 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 +@@ -8585,7 +8585,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 +- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.not-random && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' + 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 -- cgit v1.2.3