pkg/53376: Make geography/qlandkartegt build on NetBSD 8 and update it to 1.8.1

[krille%users.sf.net@localhost]

>Number:         53376
>Category:       pkg
>Synopsis:       Make geography/qlandkartegt build on NetBSD 8 and update it to 1.8.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 16 22:30:00 +0000 2018
>Originator:     Christian Hattemer
>Release:        pkgsrc-current, 2018-06-16
>Organization:
>Environment:
NetBSD webster.lan 8.0_RC1 NetBSD 8.0_RC1 (GENERIC)
>Description:
Make geography/qlandkartegt build on NetBSD 8 and update it to 1.8.1
>How-To-Repeat:

>Fix:
Close PR pkg/49910, it's outdated. I suggest somebody else than the maintainer handles this.

patches/patch-3rdparty_map2gcm_main.cpp and patches/patch-src_CMapTDB.h have been applied upstream and have to be removed.

Add these new files, taken from OpenBSD ports WIP
patches/patch-src_CCanvas.cpp:
$NetBSD$

--- src/CCanvas.cpp.orig        2014-12-08 07:15:44.000000000 +0000
+++ src/CCanvas.cpp
@@ -77,6 +77,7 @@ QBrush CCanvas::brushBackYellow(QColor(0
 #ifdef WIN32
 #define isnan(x) _isnan(x)
 #endif
+using std::isnan;
 
 CCanvas::CCanvas(QWidget * parent)
 : QWidget(parent)


patches/patch-src_CMap3D.cpp:
$NetBSD$

--- src/CMap3D.cpp.orig 2014-08-08 09:53:27.000000000 +0000
+++ src/CMap3D.cpp
@@ -49,6 +49,8 @@
 #define isnan(x) _isnan(x)
 #define isinf(x) (!_finite(x))
 #endif
+using std::isnan;
+using std::isinf;
 
 #define APPERTURE_ANGLE 60.0
 

patches/patch-src_CWptDb.cpp
$NetBSD$

--- src/CWptDB.cpp.orig 2014-08-28 06:34:51.000000000 +0000
+++ src/CWptDB.cpp
@@ -47,6 +47,8 @@ CWptDB * CWptDB::m_self = 0;
 #include <libexif/exif-data.h>
 #include "CDlgImportImages.h"
 
+using std::isnan;
+
 typedef void (*exif_content_foreach_entry_t)(ExifContent *, ExifContentForeachEntryFunc , void *);
 typedef void (*exif_data_unref_t)(ExifData *);
 typedef ExifData* (*exif_data_new_from_file_t)(const char *);


Apply this patch:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/qlandkartegt/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile	29 Apr 2018 21:31:42 -0000	1.50
+++ Makefile	16 Jun 2018 22:02:30 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.50 2018/04/29 21:31:42 adam Exp $
 #
 
-DISTNAME=	qlandkartegt-1.4.2
-PKGREVISION=	30
+DISTNAME=	qlandkartegt-1.8.1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/geography/qlandkartegt/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST	2 Jun 2012 16:34:19 -0000	1.6
+++ PLIST	16 Jun 2018 22:02:30 -0000
@@ -1,7 +1,9 @@
 @comment $NetBSD: PLIST,v 1.6 2012/06/02 16:34:19 drochner Exp $
 bin/cache2gtiff
 bin/map2gcm
+bin/map2jnx
 bin/map2rmap
+bin/map2rmp
 bin/qlandkartegt
 man/man1/qlandkartegt.1
 share/applications/qlandkartegt.desktop
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/geography/qlandkartegt/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	3 Nov 2015 00:08:45 -0000	1.9
+++ distinfo	16 Jun 2018 22:02:30 -0000
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.9 2015/11/03 00:08:45 agc Exp $
 
-SHA1 (qlandkartegt-1.4.2.tar.gz) = 42506faeffe5d6ada0d38861a9f6dce87e1e2211
-RMD160 (qlandkartegt-1.4.2.tar.gz) = 00847079547f81718fcc45c87a6691862b4d1ff8
-SHA512 (qlandkartegt-1.4.2.tar.gz) = 86756f1bf81a65da0c74c5dfb60c20abdd6e905b2b75c725c1e8aa63d2d9de9aad73a90b2ffcde473685a4b4b44de92f9cd6e8d4be854ff3aa55687abcde7626
-Size (qlandkartegt-1.4.2.tar.gz) = 6347471 bytes
-SHA1 (patch-3rdparty_map2gcm_main.cpp) = b0d12e1590cae1ecee1df6b63836c99195d5ed75
+SHA1 (qlandkartegt-1.8.1.tar.gz) = a5b80da85214da968b11426152d6b3d867039ae5
+RMD160 (qlandkartegt-1.8.1.tar.gz) = df5f6f9e3cdf000ba9fc312d56ece7338dacf13e
+Size (qlandkartegt-1.8.1.tar.gz) = 6706349 bytes
 SHA1 (patch-aa) = e81de01cd6227b6b486eeee244c31ee486363d6a
 SHA1 (patch-ab) = 86ca39903638df9aa5dd904cf1d071dd851ca2b7
-SHA1 (patch-src_CMapTDB.h) = b1ffe910fcaf5eac29dc26901177dec87770f04f
+SHA1 (patch-src_CCanvas.cpp) = 974921d63c4a7757107e370fcced6841d7928792
+SHA1 (patch-src_CMap3D.cpp) = 91de5eef869f7344a9e2135e2c1e7da658d300fe
+SHA1 (patch-src_CWptDb.cpp) = d4a712edaeb5fb198a95702b7115827b85bc12f1