summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/calligraplan')
-rw-r--r--app-office/calligraplan/calligraplan-3.2.2.ebuild2
-rw-r--r--app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch33
2 files changed, 35 insertions, 0 deletions
diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild b/app-office/calligraplan/calligraplan-3.2.2.ebuild
index a8dc309bb5c0..3287da88dd80 100644
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild
@@ -75,6 +75,8 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 741710
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
new file mode 100644
index 000000000000..fd925ffee689
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
@@ -0,0 +1,33 @@
+From f77fb06dc5d9f7930da9c757d6916f1149dc42bd Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sun, 29 Mar 2020 13:55:53 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+Summary:
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+Test Plan: Builds
+
+Reviewers: #calligra:_3.0, danders
+
+Differential Revision: https://phabricator.kde.org/D28403
+---
+ src/libs/ui/kptganttitemdelegate.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libs/ui/kptganttitemdelegate.cpp b/src/libs/ui/kptganttitemdelegate.cpp
+index 04217da4..d2f3e6d8 100644
+--- a/src/libs/ui/kptganttitemdelegate.cpp
++++ b/src/libs/ui/kptganttitemdelegate.cpp
+@@ -28,6 +28,7 @@
+ #include <QModelIndex>
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLocale>
+
+ #include <KLocalizedString>
+--
+GitLab
+