summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-14 22:32:00 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-14 23:51:38 +0200
commit7eb1bf48e02f7e48c4ff82c0e4274b49246f247d (patch)
tree0c831cb75d1d1b565fd2a3ac174c64253624866c /sci-geosciences
parentx11-misc/qtfm: Fix build with Qt 5.15 (diff)
downloadgentoo-7eb1bf48e02f7e48c4ff82c0e4274b49246f247d.tar.gz
gentoo-7eb1bf48e02f7e48c4ff82c0e4274b49246f247d.tar.bz2
gentoo-7eb1bf48e02f7e48c4ff82c0e4274b49246f247d.zip
sci-geosciences/merkaartor: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/727914 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch29
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild5
2 files changed, 33 insertions, 1 deletions
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
new file mode 100644
index 00000000000..e14cda8b5bd
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.4-qt-5.15.patch
@@ -0,0 +1,29 @@
+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))
+--
+2.27.0
+
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
index e5d0a17a126..360d580f309 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
@@ -39,7 +39,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch ) # bug 621826
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.3-sharedir-pluginsdir.patch # bug 621826
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 727914
+)
DOCS=( AUTHORS CHANGELOG )