765e304c4b
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
106 lines
2.7 KiB
Diff
106 lines
2.7 KiB
Diff
--- 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);
|