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

10 files changed, 6 insertions, 224 deletions

diff --git a/geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp b/geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp
deleted file mode 100644
index f2bdd53d5bf..00000000000
--- a/geography/merkaartor/patches/patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-3rdparty_qtsingleapplication-2.6__1-opensource_src_qtlocalpeer.cpp,v 1.1 2013/05/25 23:43:25 joerg Exp $
-
---- 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp.orig	2013-05-25 19:14:26.000000000 +0000
-+++ 3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
-@@ -59,6 +59,8 @@ static PProcessIdToSessionId pProcessIdT
- #include <time.h>
- #endif
- 
-+#include <unistd.h>
-+
- namespace QtLP_Private {
- #include "qtlockedfile.cpp"
- #if defined(Q_OS_WIN)
diff --git a/geography/merkaartor/patches/patch-aa b/geography/merkaartor/patches/patch-aa
deleted file mode 100644
index f2efc1a8365..00000000000
--- a/geography/merkaartor/patches/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2011/04/12 17:14:53 drochner Exp $
-
---- src/GPS/qgpsdevice.cpp.orig	2011-02-10 12:00:35.000000000 +0000
-+++ src/GPS/qgpsdevice.cpp
-@@ -959,10 +959,9 @@ void QGPSDDevice::run()
- //    exec();
-     QEventLoop l;
- 
--    Server = new gpsmm();
-     errno = 0;
--    gpsdata = Server->open(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
--    if (!gpsdata) {
-+    Server = new gpsmm(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
-+    if (!Server) {
- #ifndef Q_OS_WIN32
-         QString msg( (errno<0) ? gps_errstr(errno) : strerror(errno) );
- #else
-@@ -978,7 +977,7 @@ void QGPSDDevice::run()
- 
-     forever {
- #if GPSD_API_MAJOR_VERSION > 3
--        if (Server->waiting())
-+        if (Server->waiting(0))
- #endif
-             onDataAvailable();
-         l.processEvents();
-@@ -994,7 +993,7 @@ void QGPSDDevice::onDataAvailable()
-        if (!gpsdata)
-            return;
-     #else
--       if ( Server->waiting() )
-+       if ( Server->waiting(0) )
-            {
-            errno = 0;
-            gpsdata = Server->read();
-@@ -1026,14 +1025,22 @@ void QGPSDDevice::onDataAvailable()
-     setFixStatus(StatusActive);
-     setLatitude(gpsdata->fix.latitude);
-     setLongitude(gpsdata->fix.longitude);
-+    if (gpsdata->fix.latitude < 0)
-+	setLatCardinal(CardinalSouth);
-+    else
-+	setLatCardinal(CardinalNorth);
-+    if (gpsdata->fix.longitude < 0)
-+	setLongCardinal(CardinalWest);
-+    else
-+	setLongCardinal(CardinalEast);
-     double Alt = gpsdata->fix.altitude;
--    if (!__isnan(Alt))
-+    if (!std::isnan(Alt))
-         setAltitude(Alt);
-     double Speed = gpsdata->fix.speed;
--    if (!__isnan(Speed))
-+    if (!std::isnan(Speed))
-         setSpeed(Speed);
-     double Heading = gpsdata->fix.track;
--    if (!__isnan(Heading))
-+    if (!std::isnan(Heading))
-         setHeading(Heading);
-     if (gpsdata->fix.time)
-         cur_datetime = QDateTime::fromTime_t(gpsdata->fix.time);
diff --git a/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
deleted file mode 100644
index a7dcde790d2..00000000000
--- a/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_builtin-ggl_ggl_algorithms_overlay_get__intersection__points.hpp,v 1.1 2013/02/26 11:15:19 joerg Exp $
-
---- include/builtin-ggl/ggl/algorithms/overlay/get_intersection_points.hpp.orig	2011-02-10 12:00:35.000000000 +0000
-+++ include/builtin-ggl/ggl/algorithms/overlay/get_intersection_points.hpp
-@@ -94,8 +94,8 @@ struct relate
-                     >
-             >::relate(s1, s2);
- 
--        ip_type& is = result.get<0>();
--        policies::relate::direction_type & dir = result.get<1>();
-+        ip_type& is = get<0>(result);
-+        policies::relate::direction_type & dir = get<1>(result);
- 
-         for (int i = 0; i < is.count; i++)
-         {
diff --git a/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp b/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp
deleted file mode 100644
index 3edce1b5687..00000000000
--- a/geography/merkaartor/patches/patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp,v 1.1 2013/02/26 11:15:19 joerg Exp $
-
---- include/builtin-ggl/ggl/geometries/adapted/tuple.hpp.orig	2011-02-10 12:00:35.000000000 +0000
-+++ include/builtin-ggl/ggl/geometries/adapted/tuple.hpp
-@@ -39,13 +39,13 @@ struct access<boost::tuple<T, T> >
-     template <int I>
-     static inline T get(const boost::tuple<T, T>& p)
-     {
--        return p.get<I>();
-+        return get<I>(p);
-     }
- 
-     template <int I>
-     static inline void set(boost::tuple<T, T>& p, const T& value)
-     {
--        p.get<I>() = value;
-+        get<I>(p) = value;
-     }
- };
- 
-@@ -71,13 +71,13 @@ struct access<boost::tuple<T, T, T> >
-     template <int I>
-     static inline T get(const boost::tuple<T, T, T>& p)
-     {
--        return p.get<I>();
-+        return get<I>(p);
-     }
- 
-     template <int I>
-     static inline void set(boost::tuple<T, T, T>& p, const T& value)
-     {
--        p.get<I>() = value;
-+        get<I>(p) = value;
-     }
- };
- 
diff --git a/geography/merkaartor/patches/patch-src_Features_Feature.h b/geography/merkaartor/patches/patch-src_Features_Feature.h
index 5f509e0b1cf..5f12ade28e9 100644
--- a/geography/merkaartor/patches/patch-src_Features_Feature.h
+++ b/geography/merkaartor/patches/patch-src_Features_Feature.h
@@ -1,32 +1,13 @@
-$NetBSD: patch-src_Features_Feature.h,v 1.1 2013/02/26 11:15:19 joerg Exp $
+$NetBSD: patch-src_Features_Feature.h,v 1.2 2020/09/02 00:24:26 gdt Exp $
 
 --- src/Features/Feature.h.orig	2011-02-10 12:00:35.000000000 +0000
 +++ src/Features/Feature.h
-@@ -9,6 +9,14 @@
+@@ -10,6 +10,7 @@ class Feature;
+
  #include <QtCore/QString>
  #include <QList>
- 
-+class Feature;
-+
-+namespace boost
-+{
-+    void intrusive_ptr_add_ref(Feature * p);
-+    void intrusive_ptr_release(Feature * p);
-+}
-+
- #include <boost/intrusive_ptr.hpp>
++#include <QPainterPath>
  
  #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
-@@ -79,12 +87,6 @@ class RenderPriority
-         int theLayer;
- };
- 
--namespace boost
--{
--    void intrusive_ptr_add_ref(Feature * p);
--    void intrusive_ptr_release(Feature * p);
--}
--
- /// Used to store objects of the map
- class Feature : public IFeature
- {
+ #define CAST_NODE(x) (dynamic_cast<Node*>(x))
+
diff --git a/geography/merkaartor/patches/patch-src_Features_Node.h b/geography/merkaartor/patches/patch-src_Features_Node.h
deleted file mode 100644
index 5c5d1e1ee32..00000000000
--- a/geography/merkaartor/patches/patch-src_Features_Node.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_Features_Node.h,v 1.1 2013/02/26 11:15:19 joerg Exp $
-
---- src/Features/Node.h.orig	2013-02-25 22:41:59.000000000 +0000
-+++ src/Features/Node.h
-@@ -12,7 +12,7 @@
- #include <QtCore/QDateTime>
- #include <QtXml>
- 
--#ifndef _MOBILE
-+#if !defined(_MOBILE) && !defined(Q_MOC_RUN)
- #include <ggl/ggl.hpp>
- #include <ggl/geometries/register/point.hpp>
- #endif
diff --git a/geography/merkaartor/patches/patch-src_Features_Way.h b/geography/merkaartor/patches/patch-src_Features_Way.h
deleted file mode 100644
index 2c9873eb7df..00000000000
--- a/geography/merkaartor/patches/patch-src_Features_Way.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_Features_Way.h,v 1.1 2013/02/26 11:15:19 joerg Exp $
-
---- src/Features/Way.h.orig	2013-02-25 22:42:09.000000000 +0000
-+++ src/Features/Way.h
-@@ -8,7 +8,7 @@
- #include "Layer.h"
- #include "OsbLayer.h"
- 
--#ifndef _MOBILE
-+#if !defined(_MOBILE) && !defined(Q_MOC_RUN)
- #include <ggl/ggl.hpp>
- #endif
- 
diff --git a/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp b/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp
deleted file mode 100644
index f29d3e6e80f..00000000000
--- a/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_ImportExport_ImportCSVDialog.cpp,v 1.1 2013/08/27 15:51:27 joerg Exp $
-
---- src/ImportExport/ImportCSVDialog.cpp.orig	2013-08-27 15:03:55.000000000 +0000
-+++ src/ImportExport/ImportCSVDialog.cpp
-@@ -518,7 +518,7 @@ void ImportCSVDialog::on_btSave_clicked(
-     if (tDelim == "\t")
-         tDelim = "tab";
-     root.setAttribute("delimiter", tDelim);
--    root.setAttribute("header", ui->cbHasHeader->isChecked() ? "true" : false);
-+    root.setAttribute("header", ui->cbHasHeader->isChecked() ? "true" : "false");
-     root.setAttribute("from", QString::number(ui->sbFrom->value()));
-     root.setAttribute("to", QString::number(ui->sbTo->value()));
- 
diff --git a/geography/merkaartor/patches/patch-src_Maps_Coord.h b/geography/merkaartor/patches/patch-src_Maps_Coord.h
deleted file mode 100644
index f2add943158..00000000000
--- a/geography/merkaartor/patches/patch-src_Maps_Coord.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_Maps_Coord.h,v 1.1 2013/02/26 11:15:19 joerg Exp $
-
---- src/Maps/Coord.h.orig	2013-02-25 22:20:17.000000000 +0000
-+++ src/Maps/Coord.h
-@@ -127,7 +127,7 @@ class Coord
- uint qHash(const Coord &c);
- 
- 
--#ifndef _MOBILE
-+#if !defined(_MOBILE) && !defined(Q_MOC_RUN)
- #include <ggl/ggl.hpp>
- #include <ggl/geometries/register/point.hpp>
- 
-@@ -312,7 +312,7 @@ class CoordBox
- 
- Q_DECLARE_METATYPE( CoordBox );
- 
--#ifndef _MOBILE
-+#if !defined(_MOBILE) && !defined(Q_MOC_RUN)
- #include <ggl/geometries/register/box.hpp>
- 
- GEOMETRY_REGISTER_BOX(CoordBox, Coord, BottomLeft, TopRight)
diff --git a/geography/merkaartor/patches/patch-src_Maps_Projection.h b/geography/merkaartor/patches/patch-src_Maps_Projection.h
deleted file mode 100644
index 86f5c542a67..00000000000
--- a/geography/merkaartor/patches/patch-src_Maps_Projection.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_Maps_Projection.h,v 1.1 2013/02/26 11:15:19 joerg Exp $
-
---- src/Maps/Projection.h.orig	2013-02-25 22:35:30.000000000 +0000
-+++ src/Maps/Projection.h
-@@ -6,7 +6,7 @@
- 
- #include <QPointF>
- 
--#ifndef _MOBILE
-+#if !defined(_MOBILE) && !defined(Q_MOC_RUN)
- 
- #include "Preferences/MerkaartorPreferences.h"
-