dev-db/tora: fix build with USE=oracle

Closes: https://bugs.gentoo.org/674874
Signed-off-by: David Seifert <soap@gentoo.org>

4 files changed, 62 insertions, 94 deletions

diff --git a/dev-db/tora/files/tora-3.2-missing-header.patch b/dev-db/tora/files/tora-3.2-missing-header.patch
deleted file mode 100644
index 272054b77793..000000000000
--- a/dev-db/tora/files/tora-3.2-missing-header.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 503fb876bd5664b455d234ba21294735a8972c91 Mon Sep 17 00:00:00 2001
-From: Ivan Brezina <ibrezina@ibrezina.net>
-Date: Wed, 5 Jul 2017 10:07:14 +0200
-Subject: [PATCH] linux fix
-
----
- src/editor/tosqltext.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/editor/tosqltext.cpp b/src/editor/tosqltext.cpp
-index c329daf0..60935c12 100644
---- a/src/editor/tosqltext.cpp
-+++ b/src/editor/tosqltext.cpp
-@@ -50,6 +50,7 @@
- #include <QToolTip>
- #endif
- 
-+#include <QMenu>
- #include <QListWidget>
- #include <QVBoxLayout>
- #include <QApplication>
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
deleted file mode 100644
index d9e50eeaf5b8..000000000000
--- a/dev-db/tora/files/tora-3.2-qt-5.11.0.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From afbff9ec3b93f0e90f02953d1bdd859a0f9a72ab Mon Sep 17 00:00:00 2001
-From: ibre5041 <ibre5041@ibrezina.net>
-Date: Wed, 30 May 2018 23:22:05 +0200
-Subject: [PATCH] fix for bug #96 - missing #include <QButtonGroup>
-
----
- src/tools/tobrowser.cpp  | 1 +
- src/tools/toscript.cpp   | 1 +
- src/tools/tosecurity.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/src/tools/tobrowser.cpp b/src/tools/tobrowser.cpp
-index 895be336..69a4c6b6 100644
---- a/src/tools/tobrowser.cpp
-+++ b/src/tools/tobrowser.cpp
-@@ -65,6 +65,7 @@
- #include <QInputDialog>
- #include <QSplitter>
- #include <QToolBar>
-+#include <QButtonGroup>
- 
- #include "icons/addindex.xpm"
- #include "icons/addtable.xpm"
-diff --git a/src/tools/toscript.cpp b/src/tools/toscript.cpp
-index bc74fc8c..aff26158 100644
---- a/src/tools/toscript.cpp
-+++ b/src/tools/toscript.cpp
-@@ -56,6 +56,7 @@
- #include <QSplitter>
- #include <QtCore/QTextStream>
- #include <QToolBar>
-+#include <QButtonGroup>
- 
- #include "icons/execute.xpm"
- #include "icons/toscript.xpm"
-diff --git a/src/tools/tosecurity.cpp b/src/tools/tosecurity.cpp
-index 17f5c3b0..b2694928 100644
---- a/src/tools/tosecurity.cpp
-+++ b/src/tools/tosecurity.cpp
-@@ -46,6 +46,7 @@
- 
- #include <QSplitter>
- #include <QToolBar>
-+#include <QButtonGroup>
- 
- #include "icons/addrole.xpm"
- #include "icons/adduser.xpm"
-
-From 1852446c42c36d71b856fe09e1444b52052ca86d Mon Sep 17 00:00:00 2001
-From: Ivan Brezina <ibrezina@ibrezina.net>
-Date: Wed, 27 Jun 2018 19:11:09 +0200
-Subject: [PATCH] fix for bug #101
-
----
- src/widgets/tohelp.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/tohelp.cpp b/src/widgets/tohelp.cpp
-index 69e3c6a1..4ffd6cea 100644
---- a/src/widgets/tohelp.cpp
-+++ b/src/widgets/tohelp.cpp
-@@ -43,6 +43,7 @@
- #include "core/toconfiguration.h"
- #include "ts_log/ts_log_utils.h"
- 
-+#include <QAction>
- #include <QMessageBox>
- #include <QtCore/QSettings>
- 
diff --git a/dev-db/tora/files/tora-3.2-qt-includes.patch b/dev-db/tora/files/tora-3.2-qt-includes.patch
new file mode 100644
index 000000000000..6126cdf71ca9
--- /dev/null
+++ b/dev-db/tora/files/tora-3.2-qt-includes.patch
@@ -0,0 +1,61 @@
+--- a/src/editor/tosqltext.cpp
++++ b/src/editor/tosqltext.cpp
+@@ -50,6 +50,7 @@
+ #include <QToolTip>
+ #endif
+ 
++#include <QMenu>
+ #include <QListWidget>
+ #include <QVBoxLayout>
+ #include <QApplication>
+--- a/src/main/tooraclesetting.cpp
++++ b/src/main/tooraclesetting.cpp
+@@ -45,6 +45,8 @@
+ #include "core/toqvalue.h"
+ #include "core/toquery.h"
+ 
++#include <QtGui/qvalidator.h>
++
+ toOracleSetting::toOracleSetting(QWidget *parent)
+     : QWidget(parent)
+     , toSettingTab("database.html#oracle")
+--- a/src/tools/tobrowser.cpp
++++ b/src/tools/tobrowser.cpp
+@@ -65,6 +65,7 @@
+ #include <QInputDialog>
+ #include <QSplitter>
+ #include <QToolBar>
++#include <QButtonGroup>
+ 
+ #include "icons/addindex.xpm"
+ #include "icons/addtable.xpm"
+--- a/src/tools/toscript.cpp
++++ b/src/tools/toscript.cpp
+@@ -56,6 +56,7 @@
+ #include <QSplitter>
+ #include <QtCore/QTextStream>
+ #include <QToolBar>
++#include <QButtonGroup>
+ 
+ #include "icons/execute.xpm"
+ #include "icons/toscript.xpm"
+--- a/src/tools/tosecurity.cpp
++++ b/src/tools/tosecurity.cpp
+@@ -46,6 +46,7 @@
+ 
+ #include <QSplitter>
+ #include <QToolBar>
++#include <QButtonGroup>
+ 
+ #include "icons/addrole.xpm"
+ #include "icons/adduser.xpm"
+--- a/src/widgets/tohelp.cpp
++++ b/src/widgets/tohelp.cpp
+@@ -43,6 +43,7 @@
+ #include "core/toconfiguration.h"
+ #include "ts_log/ts_log_utils.h"
+ 
++#include <QAction>
+ #include <QMessageBox>
+ #include <QtCore/QSettings>
+ 
diff --git a/dev-db/tora/tora-3.2-r2.ebuild b/dev-db/tora/tora-3.2-r2.ebuild
index 0e6cac5f8c23..7bd8e475a41e 100644
--- a/dev-db/tora/tora-3.2-r2.ebuild
+++ b/dev-db/tora/tora-3.2-r2.ebuild
@@ -43,10 +43,7 @@ BDEPEND="
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-qt-5.11.0.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-qt-includes.patch )
 
 src_prepare() {
 	cmake_src_prepare