summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-05-30 11:20:39 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-05-30 11:31:06 +0200
commita97286f1925b40327ab2e35aa468ed3c0902285b (patch)
tree4414f72fba632d1dfca9cdf6ae635530a163351b /app-office/scribus
parentsys-boot/elilo: respect user's OBJCOPY (diff)
downloadgentoo-a97286f1925b40327ab2e35aa468ed3c0902285b.tar.gz
gentoo-a97286f1925b40327ab2e35aa468ed3c0902285b.tar.bz2
gentoo-a97286f1925b40327ab2e35aa468ed3c0902285b.zip
app-office/scribus: Fix build with Qt 5.15
Reported-by: Kobboi <gentoo@lermytte.be> Thanks-to: Dennis Schridde <devurandom@gmx.net> Closes: https://bugs.gentoo.org/726046 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/files/scribus-1.5.5-qt-5.15.patch22
-rw-r--r--app-office/scribus/scribus-1.5.5-r1.ebuild1
2 files changed, 23 insertions, 0 deletions
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
new file mode 100644
index 00000000000..4ece0feb8e4
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
@@ -0,0 +1,22 @@
+From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 29 Mar 2020 10:55:06 +0000
+Subject: [PATCH] #16076: Fix build with Qt 5.15 <heirecka>
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/ui/scresizecursor.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp
+index f2c78e5ae7..85271ed861 100644
+--- a/scribus/ui/scresizecursor.cpp
++++ b/scribus/ui/scresizecursor.cpp
+@@ -12,6 +12,7 @@
+
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QPen>
+ #include <QBrush>
diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild
index 48d5cb285e7..9ba57749729 100644
--- a/app-office/scribus/scribus-1.5.5-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.5-r1.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
"${FILESDIR}"/${P}-poppler-0.83.patch
"${FILESDIR}"/${P}-poppler-0.84.patch
"${FILESDIR}"/${P}-poppler-0.86.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 726046
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${P}-docdir.patch