From 0dd8aeba7c7253a0092509849c639ee81774e125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 1 Sep 2020 20:15:23 +0200
Subject: [PATCH] merkaartor: fix build w/ qt5-5.15.0 (QPainterPath)

---
 srcpkgs/merkaartor/patches/QPainterPath.patch | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 srcpkgs/merkaartor/patches/QPainterPath.patch

diff --git a/srcpkgs/merkaartor/patches/QPainterPath.patch b/srcpkgs/merkaartor/patches/QPainterPath.patch
new file mode 100644
index 00000000000..e9c9273ebe1
--- /dev/null
+++ b/srcpkgs/merkaartor/patches/QPainterPath.patch
@@ -0,0 +1,106 @@
+--- interfaces/IFeature.h	2019-11-12 15:09:05.000000000 +0100
++++ interfaces/IFeature.h	2020-09-01 19:40:43.284975549 +0200
+@@ -4,10 +4,11 @@
+ #include <QString>
+ #include <QDateTime>
+ #include <QPair>
++#include <QPainter>
++#include <QPainterPath>
+ #include <QMetaType>
+ 
+ #define TECHNICAL_TAGS "created_by#source"
+-class QPainterPath;
+ 
+ class IFeature
+ {
+--- src/Features/Feature.h	2019-11-12 15:09:05.000000000 +0100
++++ src/Features/Feature.h	2020-09-01 19:40:16.524974169 +0200
+@@ -10,6 +10,8 @@
+ 
+ #include <QtCore/QString>
+ #include <QList>
++#include <QPainter>
++#include <QPainterPath>
+ 
+ #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
+ #define CAST_NODE(x) (dynamic_cast<Node*>(x))
+--- src/Features/Relation.h	2019-11-12 15:09:05.000000000 +0100
++++ src/Features/Relation.h	2020-09-01 19:40:02.889973465 +0200
+@@ -4,6 +4,9 @@
+ #include "Document.h"
+ #include "Feature.h"
+ 
++#include <QPainter>
++#include <QPainterPath>
++
+ class MainWindow;
+ class RelationPrivate;
+ class QAbstractTableModel;
+--- src/Features/Way.h	2019-11-12 15:09:05.000000000 +0100
++++ src/Features/Way.h	2020-09-01 19:40:30.309974880 +0200
+@@ -2,6 +2,8 @@
+ #define MERKAARTOR_ROAD_H_
+ 
+ #include <QList>
++#include <QPainter>
++#include <QPainterPath>
+ 
+ #include "Document.h"
+ #include "Feature.h"
+--- src/PaintStyle/FeaturePainter.h	2019-11-12 15:09:05.000000000 +0100
++++ src/PaintStyle/FeaturePainter.h	2020-09-01 19:39:41.450972359 +0200
+@@ -6,6 +6,8 @@
+ #include <QFont>
+ 
+ #include <QList>
++#include <QPainter>
++#include <QPainterPath>
+ #include <QPair>
+ #include <QPointF>
+ 
+@@ -19,8 +21,6 @@
+ class Way;
+ class TagSelector;
+ class Node;
+-class QPainter;
+-class QPainterPath;
+ class QFont;
+ class QDomElement;
+ 
+--- src/PaintStyle/PrimitivePainter.h	2019-11-12 15:09:05.000000000 +0100
++++ src/PaintStyle/PrimitivePainter.h	2020-09-01 19:39:24.565971488 +0200
+@@ -8,6 +8,8 @@
+ #include <QList>
+ #include <QPair>
+ #include <QPointF>
++#include <QPainter>
++#include <QPainterPath>
+ 
+ #include <Painter.h>
+ #include "TagSelector.h"
+@@ -17,8 +19,6 @@
+ class MapView;
+ class IFeature;
+ class TagSelector;
+-class QPainter;
+-class QPainterPath;
+ class QFont;
+ class QDomElement;
+ 
+--- src/common/Painting.h	2019-11-12 15:09:05.000000000 +0100
++++ src/common/Painting.h	2020-09-01 19:38:48.379969621 +0200
+@@ -8,10 +8,10 @@
+ class Way;
+ class Way;
+ 
+-class QPainter;
+-class QPainterPath;
+-class QPolygonF;
+-class QPen;
++#include <QPainter>
++#include <QPainterPath>
++#include <QPolygonF>
++#include <QPen>
+ 
+ //void buildPathFromRoad(Road *R, Projection const &theProjection, QPainterPath &Path, const QRect& clipRect);
+ void buildPolygonFromRoad(Way *R, Projection const &theProjection, QPolygonF &Polygon);