jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merkaartor: update to 0.19.0.

Browse source
This commit is contained in:
John 2021-09-21 09:47:38 +02:00
parent a610ea8441
commit bf7e9a2f8e
2 changed files with 3 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
srcpkgs/merkaartor/patches/QPainterPath.patch
View file

@ -1,106 +0,0 @@
--- a/interfaces/IFeature.h 2019-11-12 15:09:05.000000000 +0100
+++ b/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
{
--- a/src/Features/Feature.h 2019-11-12 15:09:05.000000000 +0100
+++ b/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))
--- a/src/Features/Relation.h 2019-11-12 15:09:05.000000000 +0100
+++ b/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;
--- a/src/Features/Way.h 2019-11-12 15:09:05.000000000 +0100
+++ b/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"
--- a/src/PaintStyle/FeaturePainter.h 2019-11-12 15:09:05.000000000 +0100
+++ b/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;
--- a/src/PaintStyle/PrimitivePainter.h 2019-11-12 15:09:05.000000000 +0100
+++ b/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;
--- a/src/common/Painting.h 2019-11-12 15:09:05.000000000 +0100
+++ b/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);

6
srcpkgs/merkaartor/template
View file

@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.18.4
revision=2
version=0.19.0
revision=1
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
@ -12,6 +12,6 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="http://merkaartor.be"
distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz"
checksum=16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a
checksum=f538d1eb380005cbd5d047070b276da59c58bb7ff47218e20a080b893d0ba457
CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"