diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-20 00:55:29 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-20 00:56:00 +0100 |
| commit | 41e75c83ad5a6f8298b3029a2ff751393435c5a3 (patch) | |
| tree | 9829bc8b68fc5f76278d528abece75f57f575c4a /app-office | |
| parent | app-office/kexi: Fix build with Qt 5.11 (diff) | |
| download | gentoo-41e75c83ad5a6f8298b3029a2ff751393435c5a3.tar.gz gentoo-41e75c83ad5a6f8298b3029a2ff751393435c5a3.tar.bz2 gentoo-41e75c83ad5a6f8298b3029a2ff751393435c5a3.zip | |
app-office/scribus: Fix build with Qt 5.11
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/scribus/files/scribus-1.5.3-qt-5.11.patch | 59 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.5.3-r1.ebuild | 1 |
2 files changed, 60 insertions, 0 deletions
diff --git a/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch new file mode 100644 index 000000000000..d46a9cfcf60a --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch @@ -0,0 +1,59 @@ +From ed5bb7e205e10a2855b2f55d6de9d5702f81633f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Mon, 19 Mar 2018 23:52:49 +0100 +Subject: [PATCH] Fix build with Qt 5.11 (missing headers) + +--- + .../plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp | 3 ++- + scribus/plugins/tools/lenseffects/lensdialog.cpp | 1 + + scribus/sclistboxpixmap.h | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp +index 3f0d916b7..645aec8d1 100644 +--- a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp ++++ b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp +@@ -26,8 +26,9 @@ for which a new license (GPL+exception) is in place. + + #include "meshdistortiondialog.h" + +-#include <QPainterPath> + #include <QGraphicsItem> ++#include <QPainterPath> ++#include <QStyleOptionGraphicsItem> + + #include "commonstrings.h" + #include "fpointarray.h" +diff --git a/scribus/plugins/tools/lenseffects/lensdialog.cpp b/scribus/plugins/tools/lenseffects/lensdialog.cpp +index cfabc4091..bed8305dc 100644 +--- a/scribus/plugins/tools/lenseffects/lensdialog.cpp ++++ b/scribus/plugins/tools/lenseffects/lensdialog.cpp +@@ -27,6 +27,7 @@ for which a new license (GPL+exception) is in place. + #include "lensdialog.h" + #include <cmath> + #include <QRadialGradient> ++#include <QStyleOptionGraphicsItem> + #include "iconmanager.h" + #include "selection.h" + #include "sccolorengine.h" +diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h +index a067b7912..ebdae272c 100644 +--- a/scribus/sclistboxpixmap.h ++++ b/scribus/sclistboxpixmap.h +@@ -9,11 +9,13 @@ for which a new license (GPL+exception) is in place. + + #include <memory> + ++#include <QAbstractItemDelegate> + #include <QApplication> + #include <QDebug> + #include <QPainter> + #include <QPixmap> + #include <QScopedPointer> ++#include <QStyleOptionMenuItem> + #include <QVariant> + + #include "scguardedptr.h" +-- +2.16.2 + diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild index b65910862d8b..12d674025929 100644 --- a/app-office/scribus/scribus-1.5.3-r1.ebuild +++ b/app-office/scribus/scribus-1.5.3-r1.ebuild @@ -97,6 +97,7 @@ PATCHES=( "${FILESDIR}"/${P}-cmake-openssl.patch "${FILESDIR}"/${P}-poppler-0.58.patch "${FILESDIR}"/${P}-x86-fpic.patch + "${FILESDIR}"/${P}-qt-5.11.patch ) src_prepare() { |