1 |
commit: 80fbdf3ca74c97e0b1435a178cbf5d7b60ade213 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 17 21:40:45 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 17 22:02:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80fbdf3c |
7 |
|
8 |
app-text/goldendict: Fix build with Qt 5.11 |
9 |
|
10 |
Reported-by: Viacheslav Ostroukh <slava <AT> ostroukh.me> |
11 |
Tested-by: Viktor Levin <viklevin2 <AT> mail.ru> |
12 |
Closes: https://bugs.gentoo.org/662094 |
13 |
Package-Manager: Portage-2.3.46, Repoman-2.3.10 |
14 |
|
15 |
.../files/goldendict-1.5.0-qt-5.11.patch | 56 ++++++++++++++++++++++ |
16 |
app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild | 5 +- |
17 |
2 files changed, 60 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..247ec52931b |
22 |
--- /dev/null |
23 |
+++ b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch |
24 |
@@ -0,0 +1,56 @@ |
25 |
+From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001 |
26 |
+From: Abs62 <ottomann@××××××.ru> |
27 |
+Date: Tue, 10 Apr 2018 18:44:43 +0300 |
28 |
+Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991) |
29 |
+ |
30 |
+--- |
31 |
+ fulltextsearch.hh | 1 + |
32 |
+ initializing.cc | 1 + |
33 |
+ 2 files changed, 2 insertions(+) |
34 |
+ |
35 |
+diff --git a/fulltextsearch.hh b/fulltextsearch.hh |
36 |
+index da7e2943..adf9619f 100644 |
37 |
+--- a/fulltextsearch.hh |
38 |
++++ b/fulltextsearch.hh |
39 |
+@@ -6,6 +6,7 @@ |
40 |
+ #include <QRegExp> |
41 |
+ #include <QAbstractListModel> |
42 |
+ #include <QList> |
43 |
++#include <QAction> |
44 |
+ |
45 |
+ #include "dictionary.hh" |
46 |
+ #include "ui_fulltextsearch.h" |
47 |
+diff --git a/initializing.cc b/initializing.cc |
48 |
+index 0db6909b..59e605d6 100644 |
49 |
+--- a/initializing.cc |
50 |
++++ b/initializing.cc |
51 |
+@@ -1,6 +1,7 @@ |
52 |
+ /* This file is (c) 2008-2012 Konstantin Isakov <ikm@××××××××××.org> |
53 |
+ * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */ |
54 |
+ |
55 |
++#include <QIcon> |
56 |
+ #include "initializing.hh" |
57 |
+ #include <QCloseEvent> |
58 |
+ |
59 |
+From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001 |
60 |
+From: Perfect Gentleman <perfect007gentleman@×××××.com> |
61 |
+Date: Wed, 11 Apr 2018 00:04:12 +0700 |
62 |
+Subject: [PATCH] Update groups_widgets.hh |
63 |
+ |
64 |
+fixes https://github.com/goldendict/goldendict/issues/991 |
65 |
+--- |
66 |
+ groups_widgets.hh | 1 + |
67 |
+ 1 file changed, 1 insertion(+) |
68 |
+ |
69 |
+diff --git a/groups_widgets.hh b/groups_widgets.hh |
70 |
+index ce442fa2..2064e3bb 100644 |
71 |
+--- a/groups_widgets.hh |
72 |
++++ b/groups_widgets.hh |
73 |
+@@ -8,6 +8,7 @@ |
74 |
+ |
75 |
+ #include <vector> |
76 |
+ |
77 |
++#include <QAction> |
78 |
+ #include <QListWidget> |
79 |
+ #include <QSortFilterProxyModel> |
80 |
+ |
81 |
|
82 |
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild |
83 |
index 47c7916defc..e25c25eb062 100644 |
84 |
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild |
85 |
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild |
86 |
@@ -48,7 +48,10 @@ DEPEND="${RDEPEND} |
87 |
virtual/pkgconfig |
88 |
" |
89 |
|
90 |
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" ) |
91 |
+PATCHES=( |
92 |
+ "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" |
93 |
+ "${FILESDIR}/${PN}-1.5.0-qt-5.11.patch" |
94 |
+) |
95 |
|
96 |
S="${WORKDIR}/${PN}-${MY_PV}" |