1 |
commit: f9314b954262a261c8a02301101e160c66ff0c5b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 2 15:37:39 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 2 15:56:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9314b95 |
7 |
|
8 |
dev-db/tora: Fix build with Qt 5.11 (missing headers) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/653650 |
11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
12 |
|
13 |
dev-db/tora/files/tora-3.2-qt-5.11.0.patch | 69 ++++++++++++++++++++++++++++++ |
14 |
dev-db/tora/tora-3.2-r1.ebuild | 5 ++- |
15 |
2 files changed, 73 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-db/tora/files/tora-3.2-qt-5.11.0.patch b/dev-db/tora/files/tora-3.2-qt-5.11.0.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..d9e50eeaf5b |
20 |
--- /dev/null |
21 |
+++ b/dev-db/tora/files/tora-3.2-qt-5.11.0.patch |
22 |
@@ -0,0 +1,69 @@ |
23 |
+From afbff9ec3b93f0e90f02953d1bdd859a0f9a72ab Mon Sep 17 00:00:00 2001 |
24 |
+From: ibre5041 <ibre5041@××××××××.net> |
25 |
+Date: Wed, 30 May 2018 23:22:05 +0200 |
26 |
+Subject: [PATCH] fix for bug #96 - missing #include <QButtonGroup> |
27 |
+ |
28 |
+--- |
29 |
+ src/tools/tobrowser.cpp | 1 + |
30 |
+ src/tools/toscript.cpp | 1 + |
31 |
+ src/tools/tosecurity.cpp | 1 + |
32 |
+ 3 files changed, 3 insertions(+) |
33 |
+ |
34 |
+diff --git a/src/tools/tobrowser.cpp b/src/tools/tobrowser.cpp |
35 |
+index 895be336..69a4c6b6 100644 |
36 |
+--- a/src/tools/tobrowser.cpp |
37 |
++++ b/src/tools/tobrowser.cpp |
38 |
+@@ -65,6 +65,7 @@ |
39 |
+ #include <QInputDialog> |
40 |
+ #include <QSplitter> |
41 |
+ #include <QToolBar> |
42 |
++#include <QButtonGroup> |
43 |
+ |
44 |
+ #include "icons/addindex.xpm" |
45 |
+ #include "icons/addtable.xpm" |
46 |
+diff --git a/src/tools/toscript.cpp b/src/tools/toscript.cpp |
47 |
+index bc74fc8c..aff26158 100644 |
48 |
+--- a/src/tools/toscript.cpp |
49 |
++++ b/src/tools/toscript.cpp |
50 |
+@@ -56,6 +56,7 @@ |
51 |
+ #include <QSplitter> |
52 |
+ #include <QtCore/QTextStream> |
53 |
+ #include <QToolBar> |
54 |
++#include <QButtonGroup> |
55 |
+ |
56 |
+ #include "icons/execute.xpm" |
57 |
+ #include "icons/toscript.xpm" |
58 |
+diff --git a/src/tools/tosecurity.cpp b/src/tools/tosecurity.cpp |
59 |
+index 17f5c3b0..b2694928 100644 |
60 |
+--- a/src/tools/tosecurity.cpp |
61 |
++++ b/src/tools/tosecurity.cpp |
62 |
+@@ -46,6 +46,7 @@ |
63 |
+ |
64 |
+ #include <QSplitter> |
65 |
+ #include <QToolBar> |
66 |
++#include <QButtonGroup> |
67 |
+ |
68 |
+ #include "icons/addrole.xpm" |
69 |
+ #include "icons/adduser.xpm" |
70 |
+ |
71 |
+From 1852446c42c36d71b856fe09e1444b52052ca86d Mon Sep 17 00:00:00 2001 |
72 |
+From: Ivan Brezina <ibrezina@××××××××.net> |
73 |
+Date: Wed, 27 Jun 2018 19:11:09 +0200 |
74 |
+Subject: [PATCH] fix for bug #101 |
75 |
+ |
76 |
+--- |
77 |
+ src/widgets/tohelp.cpp | 1 + |
78 |
+ 1 file changed, 1 insertion(+) |
79 |
+ |
80 |
+diff --git a/src/widgets/tohelp.cpp b/src/widgets/tohelp.cpp |
81 |
+index 69e3c6a1..4ffd6cea 100644 |
82 |
+--- a/src/widgets/tohelp.cpp |
83 |
++++ b/src/widgets/tohelp.cpp |
84 |
+@@ -43,6 +43,7 @@ |
85 |
+ #include "core/toconfiguration.h" |
86 |
+ #include "ts_log/ts_log_utils.h" |
87 |
+ |
88 |
++#include <QAction> |
89 |
+ #include <QMessageBox> |
90 |
+ #include <QtCore/QSettings> |
91 |
+ |
92 |
|
93 |
diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r1.ebuild |
94 |
index 38ee149fef9..57c06026bfa 100644 |
95 |
--- a/dev-db/tora/tora-3.2-r1.ebuild |
96 |
+++ b/dev-db/tora/tora-3.2-r1.ebuild |
97 |
@@ -39,7 +39,10 @@ DEPEND="${RDEPEND} |
98 |
doc? ( app-doc/doxygen ) |
99 |
" |
100 |
|
101 |
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" ) |
102 |
+PATCHES=( |
103 |
+ "${FILESDIR}/${P}-missing-header.patch" |
104 |
+ "${FILESDIR}/${P}-qt-5.11.0.patch" |
105 |
+) |
106 |
|
107 |
src_prepare() { |
108 |
cmake-utils_src_prepare |