diff options
| author | Treeve Jelbert | 2020-08-21 09:40:06 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2020-08-22 08:34:37 +0200 |
| commit | 9ff09dd78483c39d64f35e08c07ba262a70c86e0 (patch) | |
| tree | e0542adf4360a0a1408cca719b69f91fb4469df4 /qt5-qmake | |
| parent | 3b248d816fd9721f043935db4257651aa2deb83e (diff) | |
merkaartor - fix build with qt-5.15
Diffstat (limited to 'qt5-qmake')
| -rw-r--r-- | qt5-qmake/merkaartor/HISTORY | 3 | ||||
| -rwxr-xr-x | qt5-qmake/merkaartor/PRE_BUILD | 3 | ||||
| -rw-r--r-- | qt5-qmake/merkaartor/patches/qt5.15.patch | 26 |
3 files changed, 32 insertions, 0 deletions
diff --git a/qt5-qmake/merkaartor/HISTORY b/qt5-qmake/merkaartor/HISTORY index 0e1df4b612..2c2304d7a6 100644 --- a/qt5-qmake/merkaartor/HISTORY +++ b/qt5-qmake/merkaartor/HISTORY @@ -1,3 +1,6 @@ +2020-08-21 Treeve Jelbert <treeve@sourcemage.org> + * PRE_BUILD patches/*: added - fix for qt-5.15 + 2020-02-17 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.18.4 * PRE_BUILD BUILD CONFIGURE: deleted diff --git a/qt5-qmake/merkaartor/PRE_BUILD b/qt5-qmake/merkaartor/PRE_BUILD new file mode 100755 index 0000000000..922c0ab256 --- /dev/null +++ b/qt5-qmake/merkaartor/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +apply_patch_dir patches diff --git a/qt5-qmake/merkaartor/patches/qt5.15.patch b/qt5-qmake/merkaartor/patches/qt5.15.patch new file mode 100644 index 0000000000..0e403f02b4 --- /dev/null +++ b/qt5-qmake/merkaartor/patches/qt5.15.patch @@ -0,0 +1,26 @@ +From e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 14 Jun 2020 22:19:24 +0200 +Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/Features/Feature.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Features/Feature.h b/src/Features/Feature.h +index 52fd3044..f466a5a9 100644 +--- a/src/Features/Feature.h ++++ b/src/Features/Feature.h +@@ -8,8 +8,10 @@ class Feature; + #include "MapView.h" + #include "FeaturePainter.h" + +-#include <QtCore/QString> + #include <QList> ++#include <QPainter> ++#include <QPainterPath> ++#include <QString> + + #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x)) + #define CAST_NODE(x) (dynamic_cast<Node*>(x)) |