| 1 |
commit: 005aebaa26b159d7c4a755c719bf2c5bb2b8d490 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 15 10:01:56 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 15 10:38:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005aebaa |
| 7 |
|
| 8 |
app-office/calligra: Fix build with Qt-5.11 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/661222 |
| 11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 12 |
|
| 13 |
app-office/calligra/calligra-3.1.0-r2.ebuild | 1 + |
| 14 |
.../files/calligra-3.1.0-stage-qt-5.11.patch | 23 ++++++++++++++++++++++ |
| 15 |
2 files changed, 24 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild |
| 18 |
index 0389b5b7c9d..e2a76aa73c6 100644 |
| 19 |
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild |
| 20 |
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild |
| 21 |
@@ -142,6 +142,7 @@ PATCHES=( |
| 22 |
"${FILESDIR}"/${P}-no-arch-detection.patch |
| 23 |
"${FILESDIR}"/${P}-doc.patch |
| 24 |
"${FILESDIR}"/${P}-qt-5.11.patch |
| 25 |
+ "${FILESDIR}"/${P}-stage-qt-5.11.patch |
| 26 |
) |
| 27 |
|
| 28 |
pkg_pretend() { |
| 29 |
|
| 30 |
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 |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..120864e11d4 |
| 33 |
--- /dev/null |
| 34 |
+++ b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch |
| 35 |
@@ -0,0 +1,23 @@ |
| 36 |
+From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 |
| 37 |
+From: David Faure <faure@×××.org> |
| 38 |
+Date: Tue, 3 Apr 2018 00:31:19 +0200 |
| 39 |
+Subject: Fix compilation with Qt 5.11 (missing include) |
| 40 |
+ |
| 41 |
+--- |
| 42 |
+ stage/part/KPrPresentationTool.cpp | 1 + |
| 43 |
+ 1 file changed, 1 insertion(+) |
| 44 |
+ |
| 45 |
+diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp |
| 46 |
+index ae743da..3007f91 100644 |
| 47 |
+--- a/stage/part/KPrPresentationTool.cpp |
| 48 |
++++ b/stage/part/KPrPresentationTool.cpp |
| 49 |
+@@ -32,6 +32,7 @@ |
| 50 |
+ #include <QDesktopServices> |
| 51 |
+ #include <QUrl> |
| 52 |
+ #include <QDBusConnection> |
| 53 |
++#include <QFrame> |
| 54 |
+ |
| 55 |
+ #include <KoShape.h> |
| 56 |
+ #include <KoShapeManager.h> |
| 57 |
+-- |
| 58 |
+cgit v0.11.2 |
Archives