From 005aebaa26b159d7c4a755c719bf2c5bb2b8d490 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 15 Jul 2018 12:01:56 +0200
Subject: app-office/calligra: Fix build with Qt-5.11

Closes: https://bugs.gentoo.org/661222
Package-Manager: Portage-2.3.41, Repoman-2.3.9
---
 app-office/calligra/calligra-3.1.0-r2.ebuild       |  1 +
 .../files/calligra-3.1.0-stage-qt-5.11.patch       | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch

(limited to 'app-office')

diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 0389b5b7c9d..e2a76aa73c6 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -142,6 +142,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-no-arch-detection.patch
 	"${FILESDIR}"/${P}-doc.patch
 	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-stage-qt-5.11.patch
 )
 
 pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
new file mode 100644
index 00000000000..120864e11d4
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
@@ -0,0 +1,23 @@
+From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 3 Apr 2018 00:31:19 +0200
+Subject: Fix compilation with Qt 5.11 (missing include)
+
+---
+ stage/part/KPrPresentationTool.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
+index ae743da..3007f91 100644
+--- a/stage/part/KPrPresentationTool.cpp
++++ b/stage/part/KPrPresentationTool.cpp
+@@ -32,6 +32,7 @@
+ #include <QDesktopServices>
+ #include <QUrl>
+ #include <QDBusConnection>
++#include <QFrame>
+ 
+ #include <KoShape.h>
+ #include <KoShapeManager.h>
+-- 
+cgit v0.11.2
-- 
cgit v1.2.1