1 |
commit: 21748f0f132bb3020de50e9a805db41215a5859d |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 2 21:00:14 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 2 21:00:14 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21748f0f |
7 |
|
8 |
dev-db/tora: fix build with USE=oracle |
9 |
|
10 |
Closes: https://bugs.gentoo.org/674874 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
dev-db/tora/files/tora-3.2-missing-header.patch | 21 -------- |
14 |
dev-db/tora/files/tora-3.2-qt-5.11.0.patch | 69 ------------------------- |
15 |
dev-db/tora/files/tora-3.2-qt-includes.patch | 61 ++++++++++++++++++++++ |
16 |
dev-db/tora/tora-3.2-r2.ebuild | 5 +- |
17 |
4 files changed, 62 insertions(+), 94 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/tora/files/tora-3.2-missing-header.patch b/dev-db/tora/files/tora-3.2-missing-header.patch |
20 |
deleted file mode 100644 |
21 |
index 272054b77793..000000000000 |
22 |
--- a/dev-db/tora/files/tora-3.2-missing-header.patch |
23 |
+++ /dev/null |
24 |
@@ -1,21 +0,0 @@ |
25 |
-From 503fb876bd5664b455d234ba21294735a8972c91 Mon Sep 17 00:00:00 2001 |
26 |
-From: Ivan Brezina <ibrezina@××××××××.net> |
27 |
-Date: Wed, 5 Jul 2017 10:07:14 +0200 |
28 |
-Subject: [PATCH] linux fix |
29 |
- |
30 |
---- |
31 |
- src/editor/tosqltext.cpp | 1 + |
32 |
- 1 file changed, 1 insertion(+) |
33 |
- |
34 |
-diff --git a/src/editor/tosqltext.cpp b/src/editor/tosqltext.cpp |
35 |
-index c329daf0..60935c12 100644 |
36 |
---- a/src/editor/tosqltext.cpp |
37 |
-+++ b/src/editor/tosqltext.cpp |
38 |
-@@ -50,6 +50,7 @@ |
39 |
- #include <QToolTip> |
40 |
- #endif |
41 |
- |
42 |
-+#include <QMenu> |
43 |
- #include <QListWidget> |
44 |
- #include <QVBoxLayout> |
45 |
- #include <QApplication> |
46 |
|
47 |
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 |
48 |
deleted file mode 100644 |
49 |
index d9e50eeaf5b8..000000000000 |
50 |
--- a/dev-db/tora/files/tora-3.2-qt-5.11.0.patch |
51 |
+++ /dev/null |
52 |
@@ -1,69 +0,0 @@ |
53 |
-From afbff9ec3b93f0e90f02953d1bdd859a0f9a72ab Mon Sep 17 00:00:00 2001 |
54 |
-From: ibre5041 <ibre5041@××××××××.net> |
55 |
-Date: Wed, 30 May 2018 23:22:05 +0200 |
56 |
-Subject: [PATCH] fix for bug #96 - missing #include <QButtonGroup> |
57 |
- |
58 |
---- |
59 |
- src/tools/tobrowser.cpp | 1 + |
60 |
- src/tools/toscript.cpp | 1 + |
61 |
- src/tools/tosecurity.cpp | 1 + |
62 |
- 3 files changed, 3 insertions(+) |
63 |
- |
64 |
-diff --git a/src/tools/tobrowser.cpp b/src/tools/tobrowser.cpp |
65 |
-index 895be336..69a4c6b6 100644 |
66 |
---- a/src/tools/tobrowser.cpp |
67 |
-+++ b/src/tools/tobrowser.cpp |
68 |
-@@ -65,6 +65,7 @@ |
69 |
- #include <QInputDialog> |
70 |
- #include <QSplitter> |
71 |
- #include <QToolBar> |
72 |
-+#include <QButtonGroup> |
73 |
- |
74 |
- #include "icons/addindex.xpm" |
75 |
- #include "icons/addtable.xpm" |
76 |
-diff --git a/src/tools/toscript.cpp b/src/tools/toscript.cpp |
77 |
-index bc74fc8c..aff26158 100644 |
78 |
---- a/src/tools/toscript.cpp |
79 |
-+++ b/src/tools/toscript.cpp |
80 |
-@@ -56,6 +56,7 @@ |
81 |
- #include <QSplitter> |
82 |
- #include <QtCore/QTextStream> |
83 |
- #include <QToolBar> |
84 |
-+#include <QButtonGroup> |
85 |
- |
86 |
- #include "icons/execute.xpm" |
87 |
- #include "icons/toscript.xpm" |
88 |
-diff --git a/src/tools/tosecurity.cpp b/src/tools/tosecurity.cpp |
89 |
-index 17f5c3b0..b2694928 100644 |
90 |
---- a/src/tools/tosecurity.cpp |
91 |
-+++ b/src/tools/tosecurity.cpp |
92 |
-@@ -46,6 +46,7 @@ |
93 |
- |
94 |
- #include <QSplitter> |
95 |
- #include <QToolBar> |
96 |
-+#include <QButtonGroup> |
97 |
- |
98 |
- #include "icons/addrole.xpm" |
99 |
- #include "icons/adduser.xpm" |
100 |
- |
101 |
-From 1852446c42c36d71b856fe09e1444b52052ca86d Mon Sep 17 00:00:00 2001 |
102 |
-From: Ivan Brezina <ibrezina@××××××××.net> |
103 |
-Date: Wed, 27 Jun 2018 19:11:09 +0200 |
104 |
-Subject: [PATCH] fix for bug #101 |
105 |
- |
106 |
---- |
107 |
- src/widgets/tohelp.cpp | 1 + |
108 |
- 1 file changed, 1 insertion(+) |
109 |
- |
110 |
-diff --git a/src/widgets/tohelp.cpp b/src/widgets/tohelp.cpp |
111 |
-index 69e3c6a1..4ffd6cea 100644 |
112 |
---- a/src/widgets/tohelp.cpp |
113 |
-+++ b/src/widgets/tohelp.cpp |
114 |
-@@ -43,6 +43,7 @@ |
115 |
- #include "core/toconfiguration.h" |
116 |
- #include "ts_log/ts_log_utils.h" |
117 |
- |
118 |
-+#include <QAction> |
119 |
- #include <QMessageBox> |
120 |
- #include <QtCore/QSettings> |
121 |
- |
122 |
|
123 |
diff --git a/dev-db/tora/files/tora-3.2-qt-includes.patch b/dev-db/tora/files/tora-3.2-qt-includes.patch |
124 |
new file mode 100644 |
125 |
index 000000000000..6126cdf71ca9 |
126 |
--- /dev/null |
127 |
+++ b/dev-db/tora/files/tora-3.2-qt-includes.patch |
128 |
@@ -0,0 +1,61 @@ |
129 |
+--- a/src/editor/tosqltext.cpp |
130 |
++++ b/src/editor/tosqltext.cpp |
131 |
+@@ -50,6 +50,7 @@ |
132 |
+ #include <QToolTip> |
133 |
+ #endif |
134 |
+ |
135 |
++#include <QMenu> |
136 |
+ #include <QListWidget> |
137 |
+ #include <QVBoxLayout> |
138 |
+ #include <QApplication> |
139 |
+--- a/src/main/tooraclesetting.cpp |
140 |
++++ b/src/main/tooraclesetting.cpp |
141 |
+@@ -45,6 +45,8 @@ |
142 |
+ #include "core/toqvalue.h" |
143 |
+ #include "core/toquery.h" |
144 |
+ |
145 |
++#include <QtGui/qvalidator.h> |
146 |
++ |
147 |
+ toOracleSetting::toOracleSetting(QWidget *parent) |
148 |
+ : QWidget(parent) |
149 |
+ , toSettingTab("database.html#oracle") |
150 |
+--- a/src/tools/tobrowser.cpp |
151 |
++++ b/src/tools/tobrowser.cpp |
152 |
+@@ -65,6 +65,7 @@ |
153 |
+ #include <QInputDialog> |
154 |
+ #include <QSplitter> |
155 |
+ #include <QToolBar> |
156 |
++#include <QButtonGroup> |
157 |
+ |
158 |
+ #include "icons/addindex.xpm" |
159 |
+ #include "icons/addtable.xpm" |
160 |
+--- a/src/tools/toscript.cpp |
161 |
++++ b/src/tools/toscript.cpp |
162 |
+@@ -56,6 +56,7 @@ |
163 |
+ #include <QSplitter> |
164 |
+ #include <QtCore/QTextStream> |
165 |
+ #include <QToolBar> |
166 |
++#include <QButtonGroup> |
167 |
+ |
168 |
+ #include "icons/execute.xpm" |
169 |
+ #include "icons/toscript.xpm" |
170 |
+--- a/src/tools/tosecurity.cpp |
171 |
++++ b/src/tools/tosecurity.cpp |
172 |
+@@ -46,6 +46,7 @@ |
173 |
+ |
174 |
+ #include <QSplitter> |
175 |
+ #include <QToolBar> |
176 |
++#include <QButtonGroup> |
177 |
+ |
178 |
+ #include "icons/addrole.xpm" |
179 |
+ #include "icons/adduser.xpm" |
180 |
+--- a/src/widgets/tohelp.cpp |
181 |
++++ b/src/widgets/tohelp.cpp |
182 |
+@@ -43,6 +43,7 @@ |
183 |
+ #include "core/toconfiguration.h" |
184 |
+ #include "ts_log/ts_log_utils.h" |
185 |
+ |
186 |
++#include <QAction> |
187 |
+ #include <QMessageBox> |
188 |
+ #include <QtCore/QSettings> |
189 |
+ |
190 |
|
191 |
diff --git a/dev-db/tora/tora-3.2-r2.ebuild b/dev-db/tora/tora-3.2-r2.ebuild |
192 |
index 0e6cac5f8c23..7bd8e475a41e 100644 |
193 |
--- a/dev-db/tora/tora-3.2-r2.ebuild |
194 |
+++ b/dev-db/tora/tora-3.2-r2.ebuild |
195 |
@@ -43,10 +43,7 @@ BDEPEND=" |
196 |
doc? ( app-doc/doxygen ) |
197 |
" |
198 |
|
199 |
-PATCHES=( |
200 |
- "${FILESDIR}"/${P}-missing-header.patch |
201 |
- "${FILESDIR}"/${P}-qt-5.11.0.patch |
202 |
-) |
203 |
+PATCHES=( "${FILESDIR}"/${P}-qt-includes.patch ) |
204 |
|
205 |
src_prepare() { |
206 |
cmake_src_prepare |