PR/55592 CVS commit: pkgsrc/geography/merkaartor

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

The following reply was made to PR pkg/55592; it has been noted by GNATS.

From: "Greg Troxel" <gdt%netbsd.org@localhost>
To: gnats-bugs%gnats.NetBSD.org@localhost
Cc: 
Subject: PR/55592 CVS commit: pkgsrc/geography/merkaartor
Date: Wed, 2 Sep 2020 00:24:26 +0000

 Module Name:	pkgsrc
 Committed By:	gdt
 Date:		Wed Sep  2 00:24:26 UTC 2020
 
 Modified Files:
 	pkgsrc/geography/merkaartor: Makefile PLIST distinfo
 	pkgsrc/geography/merkaartor/patches: patch-src_Features_Feature.h
 Removed Files:
 	pkgsrc/geography/merkaartor/patches:
 	    patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp
 	    patch-aa
 	    patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
 	    patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp
 	    patch-src_Features_Node.h patch-src_Features_Way.h
 	    patch-src_ImportExport_ImportCSVDialog.cpp patch-src_Maps_Coord.h
 	    patch-src_Maps_Projection.h
 
 Log Message:
 geography/merkaator: Update to 0.18.4
 
 Update originally by Ben Gergely, with modifications by gdt, from PR
 pkg/55592.
 
 pkgsrc changes:
   - Adjust dependencies to qt5
   - Require gcc6, due to gcc5 lossage with -Wno-registers
 
 Upstream NEWS:
 
   - Support for qt5
   - Lots of bugfixes and minor improvements
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.86 -r1.87 pkgsrc/geography/merkaartor/Makefile
 cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/merkaartor/PLIST
 cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/merkaartor/distinfo
 cvs rdiff -u -r1.1 -r0 \
     pkgsrc/geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp \
     pkgsrc/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp \
     pkgsrc/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp \
     pkgsrc/geography/merkaartor/patches/patch-src_Features_Node.h \
     pkgsrc/geography/merkaartor/patches/patch-src_Features_Way.h \
     pkgsrc/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp \
     pkgsrc/geography/merkaartor/patches/patch-src_Maps_Coord.h \
     pkgsrc/geography/merkaartor/patches/patch-src_Maps_Projection.h
 cvs rdiff -u -r1.4 -r0 pkgsrc/geography/merkaartor/patches/patch-aa
 cvs rdiff -u -r1.1 -r1.2 \
     pkgsrc/geography/merkaartor/patches/patch-src_Features_Feature.h
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.