Update to 1.6.2 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.diff -r1.70 -r1.71 pkgsrc/geography/viking/Makefile
(gdt)
@@ -1,47 +1,54 @@ | @@ -1,47 +1,54 @@ | |||
1 | # $NetBSD: Makefile,v 1.70 2016/12/04 05:17:28 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.71 2016/12/30 00:10:02 gdt Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | VERSION= 1.6 | 4 | VERSION= 1.6.2 | |
5 | DISTNAME= viking-${VERSION} | 5 | DISTNAME= viking-${VERSION} | |
6 | PKGREVISION= 6 | |||
7 | CATEGORIES= geography | 6 | CATEGORIES= geography | |
8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/ | 7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}${VERSION}/ | |
9 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
10 | 9 | |||
11 | MAINTAINER= gdt@NetBSD.org | 10 | MAINTAINER= gdt@NetBSD.org | |
12 | HOMEPAGE= http://viking.sourceforge.net/ | 11 | HOMEPAGE= http://viking.sourceforge.net/ | |
13 | COMMENT= Viking manages GPS data, supports OpenStreetMap and geocaching | 12 | COMMENT= Viking manages GPS data, supports OpenStreetMap and geocaching | |
14 | 13 | |||
15 | LICENSE= gnu-gpl-v2 | 14 | LICENSE= gnu-gpl-v2 | |
16 | 15 | |||
16 | # C++11 is now required. | |||
17 | USE_LANGUAGES= c c++ | |||
18 | ||||
17 | GNU_CONFIGURE= yes | 19 | GNU_CONFIGURE= yes | |
18 | 20 | |||
19 | TEST_TARGET= check | 21 | TEST_TARGET= check | |
20 | 22 | |||
21 | CONFIGURE_ARGS+= --disable-magic | 23 | CONFIGURE_ARGS+= --disable-magic | |
22 | 24 | |||
23 | # Perhaps optionize use of gpsd (remove bl3, add this). | 25 | # Perhaps optionize use of gpsd (remove bl3, add this). | |
24 | # CONFIGURE_ARGS+= --disable-realtime-gps-tracking | 26 | # CONFIGURE_ARGS+= --disable-realtime-gps-tracking | |
25 | 27 | |||
26 | CONFIGURE_ARGS+= --disable-mapnik | 28 | CONFIGURE_ARGS+= --disable-mapnik | |
27 | 29 | |||
30 | # Building docs fails because mapnik being optional is not respected. | |||
31 | # For now, just omit docs until we have mapnik. | |||
32 | #CONFIGURE_ARGS+= --enable-gtk-doc | |||
33 | #.include "../../textproc/gtk-doc/buildlink3.mk" | |||
34 | ||||
28 | DEPENDS+= gpsbabel-[0-9]*:../../geography/gpsbabel | 35 | DEPENDS+= gpsbabel-[0-9]*:../../geography/gpsbabel | |
29 | DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser | 36 | DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser | |
30 | REPLACE_PERL= viking-remote | 37 | REPLACE_PERL= viking-remote | |
31 | 38 | |||
32 | USE_TOOLS+= gmake intltool msgfmt pkg-config | 39 | USE_TOOLS+= gmake intltool msgfmt pkg-config | |
33 | 40 | |||
34 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 41 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
35 | 42 | |||
36 | .include "../../databases/sqlite3/buildlink3.mk" | 43 | .include "../../databases/sqlite3/buildlink3.mk" | |
37 | .include "../../devel/gettext-lib/buildlink3.mk" | 44 | .include "../../devel/gettext-lib/buildlink3.mk" | |
38 | .include "../../graphics/libexif/buildlink3.mk" | 45 | .include "../../graphics/libexif/buildlink3.mk" | |
39 | .include "../../graphics/gexiv2/buildlink3.mk" | 46 | .include "../../graphics/gexiv2/buildlink3.mk" | |
40 | .include "../../geography/gpsd/buildlink3.mk" | 47 | .include "../../geography/gpsd/buildlink3.mk" | |
41 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 48 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
42 | .include "../../lang/perl5/buildlink3.mk" | 49 | .include "../../lang/perl5/buildlink3.mk" | |
43 | .include "../../textproc/gnome-doc-utils/buildlink3.mk" | |||
44 | .include "../../mk/omf-scrollkeeper.mk" | 50 | .include "../../mk/omf-scrollkeeper.mk" | |
51 | .include "../../textproc/gnome-doc-utils/buildlink3.mk" | |||
45 | .include "../../www/curl/buildlink3.mk" | 52 | .include "../../www/curl/buildlink3.mk" | |
46 | .include "../../x11/gtk2/buildlink3.mk" | 53 | .include "../../x11/gtk2/buildlink3.mk" | |
47 | .include "../../mk/bsd.pkg.mk" | 54 | .include "../../mk/bsd.pkg.mk" |
@@ -1,78 +1,41 @@ | @@ -1,78 +1,41 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $ | 1 | @comment $NetBSD: PLIST,v 1.11 2016/12/30 00:10:02 gdt Exp $ | |
2 | @comment $NetBSD: PLIST,v 1.10 2015/08/30 19:04:17 gdt Exp $ | |||
3 | bin/viking | 2 | bin/viking | |
4 | share/applications/viking.desktop | 3 | share/applications/viking.desktop | |
5 | share/gnome/help/viking/C/attribution.xml | |||
6 | share/gnome/help/viking/C/commandline.xml | |||
7 | share/gnome/help/viking/C/figures/DEM_file_info_dialog.png | |||
8 | share/gnome/help/viking/C/figures/LayersTracksList.png | |||
9 | share/gnome/help/viking/C/figures/LayersTracksStatistics.png | |||
10 | share/gnome/help/viking/C/figures/Maps_download_region_dialog.png | |||
11 | share/gnome/help/viking/C/figures/Track_elevation_graph.png | |||
12 | share/gnome/help/viking/C/figures/Track_properties.png | |||
13 | share/gnome/help/viking/C/figures/Track_statistics.png | |||
14 | share/gnome/help/viking/C/figures/Trackpoint_edit_dialog.png | |||
15 | share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg | |||
16 | share/gnome/help/viking/C/figures/WaypointsList.png | |||
17 | share/gnome/help/viking/C/figures/addtr_18.png | |||
18 | share/gnome/help/viking/C/figures/addwp_18.png | |||
19 | share/gnome/help/viking/C/figures/customize_toolbar_dialog.png | |||
20 | share/gnome/help/viking/C/figures/demdl_18.png | |||
21 | share/gnome/help/viking/C/figures/edtr_18.png | |||
22 | share/gnome/help/viking/C/figures/edwp_18.png | |||
23 | share/gnome/help/viking/C/figures/geomove_18.png | |||
24 | share/gnome/help/viking/C/figures/geozoom_18.png | |||
25 | share/gnome/help/viking/C/figures/map_tile_info_dialog.png | |||
26 | share/gnome/help/viking/C/figures/mapdl_18.png | |||
27 | share/gnome/help/viking/C/figures/mover_22.png | |||
28 | share/gnome/help/viking/C/figures/properties_degree.png | |||
29 | share/gnome/help/viking/C/figures/properties_units.png | |||
30 | share/gnome/help/viking/C/figures/route_finder_18.png | |||
31 | share/gnome/help/viking/C/figures/ruler_18.png | |||
32 | share/gnome/help/viking/C/figures/select_18.png | |||
33 | share/gnome/help/viking/C/figures/showpic_18.png | |||
34 | share/gnome/help/viking/C/figures/trw_statusbar.png | |||
35 | share/gnome/help/viking/C/figures/vik_new_route_18.png | |||
36 | share/gnome/help/viking/C/figures/zoom_18.png | |||
37 | share/gnome/help/viking/C/figures/zoom_status_popup.png | |||
38 | share/gnome/help/viking/C/georef_layer.xml | |||
39 | share/gnome/help/viking/C/legal.xml | |||
40 | share/gnome/help/viking/C/mapnik_rendering_layer.xml | |||
41 | share/gnome/help/viking/C/recommends.xml | |||
42 | share/gnome/help/viking/C/viking.xml | |||
43 | share/icons/hicolor/48x48/apps/viking.png | 4 | share/icons/hicolor/48x48/apps/viking.png | |
44 | share/locale/ast/LC_MESSAGES/viking.mo | 5 | share/locale/ast/LC_MESSAGES/viking.mo | |
6 | share/locale/ca/LC_MESSAGES/viking.mo | |||
45 | share/locale/cs/LC_MESSAGES/viking.mo | 7 | share/locale/cs/LC_MESSAGES/viking.mo | |
46 | share/locale/da/LC_MESSAGES/viking.mo | 8 | share/locale/da/LC_MESSAGES/viking.mo | |
47 | share/locale/de/LC_MESSAGES/viking.mo | 9 | share/locale/de/LC_MESSAGES/viking.mo | |
48 | share/locale/el/LC_MESSAGES/viking.mo | 10 | share/locale/el/LC_MESSAGES/viking.mo | |
49 | share/locale/en_GB/LC_MESSAGES/viking.mo | 11 | share/locale/en_GB/LC_MESSAGES/viking.mo | |
50 | share/locale/es/LC_MESSAGES/viking.mo | 12 | share/locale/es/LC_MESSAGES/viking.mo | |
51 | share/locale/eu/LC_MESSAGES/viking.mo | 13 | share/locale/eu/LC_MESSAGES/viking.mo | |
52 | share/locale/fi/LC_MESSAGES/viking.mo | 14 | share/locale/fi/LC_MESSAGES/viking.mo | |
53 | share/locale/fr/LC_MESSAGES/viking.mo | 15 | share/locale/fr/LC_MESSAGES/viking.mo | |
54 | share/locale/he/LC_MESSAGES/viking.mo | 16 | share/locale/he/LC_MESSAGES/viking.mo | |
55 | share/locale/hu/LC_MESSAGES/viking.mo | 17 | share/locale/hu/LC_MESSAGES/viking.mo | |
56 | share/locale/id/LC_MESSAGES/viking.mo | 18 | share/locale/id/LC_MESSAGES/viking.mo | |
57 | share/locale/it/LC_MESSAGES/viking.mo | 19 | share/locale/it/LC_MESSAGES/viking.mo | |
58 | share/locale/ja/LC_MESSAGES/viking.mo | 20 | share/locale/ja/LC_MESSAGES/viking.mo | |
59 | share/locale/jv/LC_MESSAGES/viking.mo | 21 | share/locale/jv/LC_MESSAGES/viking.mo | |
60 | share/locale/ko/LC_MESSAGES/viking.mo | 22 | share/locale/ko/LC_MESSAGES/viking.mo | |
61 | share/locale/lt/LC_MESSAGES/viking.mo | 23 | share/locale/lt/LC_MESSAGES/viking.mo | |
62 | share/locale/lv/LC_MESSAGES/viking.mo | 24 | share/locale/lv/LC_MESSAGES/viking.mo | |
63 | share/locale/nb/LC_MESSAGES/viking.mo | 25 | share/locale/nb/LC_MESSAGES/viking.mo | |
64 | share/locale/nl/LC_MESSAGES/viking.mo | 26 | share/locale/nl/LC_MESSAGES/viking.mo | |
65 | share/locale/pl/LC_MESSAGES/viking.mo | 27 | share/locale/pl/LC_MESSAGES/viking.mo | |
66 | share/locale/pt_BR/LC_MESSAGES/viking.mo | 28 | share/locale/pt_BR/LC_MESSAGES/viking.mo | |
67 | share/locale/ru/LC_MESSAGES/viking.mo | 29 | share/locale/ru/LC_MESSAGES/viking.mo | |
68 | share/locale/sk/LC_MESSAGES/viking.mo | 30 | share/locale/sk/LC_MESSAGES/viking.mo | |
69 | share/locale/sl/LC_MESSAGES/viking.mo | 31 | share/locale/sl/LC_MESSAGES/viking.mo | |
70 | share/locale/sv/LC_MESSAGES/viking.mo | 32 | share/locale/sv/LC_MESSAGES/viking.mo | |
33 | share/locale/tr/LC_MESSAGES/viking.mo | |||
71 | share/locale/uk/LC_MESSAGES/viking.mo | 34 | share/locale/uk/LC_MESSAGES/viking.mo | |
72 | share/locale/zh_CN/LC_MESSAGES/viking.mo | 35 | share/locale/zh_CN/LC_MESSAGES/viking.mo | |
73 | share/locale/zh_TW/LC_MESSAGES/viking.mo | 36 | share/locale/zh_TW/LC_MESSAGES/viking.mo | |
74 | share/omf/viking/viking-C.omf | 37 | share/viking/datasources.xml | |
75 | share/viking/external_tools.xml | 38 | share/viking/external_tools.xml | |
76 | share/viking/goto_tools.xml | 39 | share/viking/goto_tools.xml | |
77 | share/viking/latlontz.txt | 40 | share/viking/latlontz.txt | |
78 | share/viking/maps.xml | 41 | share/viking/maps.xml |
@@ -1,8 +1,9 @@ | @@ -1,8 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.25 2015/12/13 20:37:31 wiedi Exp $ | 1 | $NetBSD: distinfo,v 1.26 2016/12/30 00:10:02 gdt Exp $ | |
2 | 2 | |||
3 | SHA1 (viking-1.6.tar.bz2) = 364365dfe23742aef36dfd08fd81560000a18ffe | 3 | SHA1 (viking-1.6.2.tar.bz2) = 362ca955b64c0af0ffb5119d559c1ee7a8ce4c2b | |
4 | RMD160 (viking-1.6.tar.bz2) = b348bf666753adae0344023d7d32e5ae78dc7554 | 4 | RMD160 (viking-1.6.2.tar.bz2) = b17f3e641a76b3c72b9dd77d45082170cb886a3d | |
5 | SHA512 (viking-1.6.tar.bz2) = 7716f5720bcd410fa4a2a89ff87548c82a83132003733e6a3f516c51df99ffed4fa3b19631cec9ccedd27b222188a0f092c28ab9af1cefd8d8137b5801eff042 | 5 | SHA512 (viking-1.6.2.tar.bz2) = 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8 | |
6 | Size (viking-1.6.tar.bz2) = 3060389 bytes | 6 | Size (viking-1.6.2.tar.bz2) = 3324897 bytes | |
7 | SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a | 7 | SHA1 (patch-aa) = c7db1eb5562132c463b9472fd7a1a7e559af8d9a | |
8 | SHA1 (patch-configure) = e80de955f841607d97c45c940db6258ad806123d | |||
8 | SHA1 (patch-src_gpx.c) = bcc13b87f4fbc9d64abdacbab344e7d5a10549cf | 9 | SHA1 (patch-src_gpx.c) = bcc13b87f4fbc9d64abdacbab344e7d5a10549cf |
$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