[gentoo-commits] repo/gentoo:master commit in: app-office/lyx/files/, app-office/lyx/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     07e82fd1fc07bf055c78b81eaa128f8f837da80d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 18:03:13 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 18:09:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e82fd1

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

 app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 ++++++++++++++++
 app-office/lyx/lyx-2.3.0.ebuild              |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

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}"