| 1 |
commit: 07e82fd1fc07bf055c78b81eaa128f8f837da80d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 30 18:03:13 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 30 18:09:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e82fd1 |
| 7 |
|
| 8 |
app-office/lyx: Fix build with Qt 5.11 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/631798 |
| 11 |
Package-Manager: Portage-2.3.27, Repoman-2.3.9 |
| 12 |
|
| 13 |
app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 ++++++++++++++++ |
| 14 |
app-office/lyx/lyx-2.3.0.ebuild | 5 ++++- |
| 15 |
2 files changed, 20 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..6f1848142bb |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch |
| 22 |
@@ -0,0 +1,16 @@ |
| 23 |
+--- a/src/frontends/qt4/GuiDocument.cpp 2018-02-25 01:11:18.000000000 +0100 |
| 24 |
++++ b/src/frontends/qt4/GuiDocument.cpp 2018-03-30 19:45:47.283928297 +0200 |
| 25 |
+@@ -68,11 +68,12 @@ |
| 26 |
+ #include "frontends/alert.h" |
| 27 |
+ |
| 28 |
+ #include <QAbstractItemModel> |
| 29 |
+-#include <QHeaderView> |
| 30 |
++#include <QButtonGroup> |
| 31 |
+ #include <QColor> |
| 32 |
+ #include <QColorDialog> |
| 33 |
+ #include <QCloseEvent> |
| 34 |
+ #include <QFontDatabase> |
| 35 |
++#include <QHeaderView> |
| 36 |
+ #include <QScrollBar> |
| 37 |
+ #include <QTextBoundaryFinder> |
| 38 |
+ #include <QTextCursor> |
| 39 |
|
| 40 |
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild |
| 41 |
index a492d69d8b5..ad0929130f0 100644 |
| 42 |
--- a/app-office/lyx/lyx-2.3.0.ebuild |
| 43 |
+++ b/app-office/lyx/lyx-2.3.0.ebuild |
| 44 |
@@ -76,7 +76,10 @@ DEPEND="${RDEPEND} |
| 45 |
|
| 46 |
DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) |
| 47 |
|
| 48 |
-PATCHES=( "${FILESDIR}"/${P}-python.patch ) |
| 49 |
+PATCHES=( |
| 50 |
+ "${FILESDIR}"/${P}-python.patch |
| 51 |
+ "${FILESDIR}"/${P}-qt-5.11.patch |
| 52 |
+) |
| 53 |
|
| 54 |
S="${WORKDIR}/${MY_P}" |
Archives