| 1 |
commit: a97286f1925b40327ab2e35aa468ed3c0902285b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 30 09:20:39 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 30 09:31:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97286f1 |
| 7 |
|
| 8 |
app-office/scribus: Fix build with Qt 5.15 |
| 9 |
|
| 10 |
Reported-by: Kobboi <gentoo <AT> lermytte.be> |
| 11 |
Thanks-to: Dennis Schridde <devurandom <AT> gmx.net> |
| 12 |
Closes: https://bugs.gentoo.org/726046 |
| 13 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../scribus/files/scribus-1.5.5-qt-5.15.patch | 22 ++++++++++++++++++++++ |
| 17 |
app-office/scribus/scribus-1.5.5-r1.ebuild | 1 + |
| 18 |
2 files changed, 23 insertions(+) |
| 19 |
|
| 20 |
diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..4ece0feb8e4 |
| 23 |
--- /dev/null |
| 24 |
+++ b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch |
| 25 |
@@ -0,0 +1,22 @@ |
| 26 |
+From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Jean Ghali <jghali@×××××××××××.fr> |
| 28 |
+Date: Sun, 29 Mar 2020 10:55:06 +0000 |
| 29 |
+Subject: [PATCH] #16076: Fix build with Qt 5.15 <heirecka> |
| 30 |
+ |
| 31 |
+git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870 |
| 32 |
+--- |
| 33 |
+ scribus/ui/scresizecursor.cpp | 1 + |
| 34 |
+ 1 file changed, 1 insertion(+) |
| 35 |
+ |
| 36 |
+diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp |
| 37 |
+index f2c78e5ae7..85271ed861 100644 |
| 38 |
+--- a/scribus/ui/scresizecursor.cpp |
| 39 |
++++ b/scribus/ui/scresizecursor.cpp |
| 40 |
+@@ -12,6 +12,7 @@ |
| 41 |
+ |
| 42 |
+ #include <QDebug> |
| 43 |
+ #include <QPainter> |
| 44 |
++#include <QPainterPath> |
| 45 |
+ #include <QPixmap> |
| 46 |
+ #include <QPen> |
| 47 |
+ #include <QBrush> |
| 48 |
|
| 49 |
diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild |
| 50 |
index 48d5cb285e7..9ba57749729 100644 |
| 51 |
--- a/app-office/scribus/scribus-1.5.5-r1.ebuild |
| 52 |
+++ b/app-office/scribus/scribus-1.5.5-r1.ebuild |
| 53 |
@@ -76,6 +76,7 @@ PATCHES=( |
| 54 |
"${FILESDIR}"/${P}-poppler-0.83.patch |
| 55 |
"${FILESDIR}"/${P}-poppler-0.84.patch |
| 56 |
"${FILESDIR}"/${P}-poppler-0.86.patch |
| 57 |
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 726046 |
| 58 |
# non(?)-upstreamable |
| 59 |
"${FILESDIR}"/${PN}-1.5.3-fpic.patch |
| 60 |
"${FILESDIR}"/${P}-docdir.patch |
Archives