summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-03-30 20:03:13 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-03-30 20:09:30 +0200
commit07e82fd1fc07bf055c78b81eaa128f8f837da80d (patch)
tree585c53dd21481041c9c532ba7a050c45dc7ea2ff
parentapp-office/lyx: Drop gnome2_icon_savelist (diff)
downloadgentoo-07e82fd1fc07bf055c78b81eaa128f8f837da80d.tar.gz
gentoo-07e82fd1fc07bf055c78b81eaa128f8f837da80d.tar.bz2
gentoo-07e82fd1fc07bf055c78b81eaa128f8f837da80d.zip
app-office/lyx: Fix build with Qt 5.11
Bug: https://bugs.gentoo.org/631798 Package-Manager: Portage-2.3.27, Repoman-2.3.9
-rw-r--r--app-office/lyx/files/lyx-2.3.0-qt-5.11.patch16
-rw-r--r--app-office/lyx/lyx-2.3.0.ebuild5
2 files changed, 20 insertions, 1 deletions
diff --git a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
new file mode 100644
index 00000000000..6f1848142bb
--- /dev/null
+++ b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch
@@ -0,0 +1,16 @@
+--- a/src/frontends/qt4/GuiDocument.cpp 2018-02-25 01:11:18.000000000 +0100
++++ b/src/frontends/qt4/GuiDocument.cpp 2018-03-30 19:45:47.283928297 +0200
+@@ -68,11 +68,12 @@
+ #include "frontends/alert.h"
+
+ #include <QAbstractItemModel>
+-#include <QHeaderView>
++#include <QButtonGroup>
+ #include <QColor>
+ #include <QColorDialog>
+ #include <QCloseEvent>
+ #include <QFontDatabase>
++#include <QHeaderView>
+ #include <QScrollBar>
+ #include <QTextBoundaryFinder>
+ #include <QTextCursor>
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
index a492d69d8b5..ad0929130f0 100644
--- a/app-office/lyx/lyx-2.3.0.ebuild
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -76,7 +76,10 @@ DEPEND="${RDEPEND}
DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-PATCHES=( "${FILESDIR}"/${P}-python.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-python.patch
+ "${FILESDIR}"/${P}-qt-5.11.patch
+)
S="${WORKDIR}/${MY_P}"