Skip to content

Commit

Permalink
dev-db/tora: Fix build with Qt 5.11 (missing headers)
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/653650
Package-Manager: Portage-2.3.41, Repoman-2.3.9
  • Loading branch information
a17r committed Jul 2, 2018
1 parent 7250799 commit f9314b9
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 1 deletion.
69 changes: 69 additions & 0 deletions dev-db/tora/files/tora-3.2-qt-5.11.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
From afbff9ec3b93f0e90f02953d1bdd859a0f9a72ab Mon Sep 17 00:00:00 2001
From: ibre5041 <[email protected]>
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 <[email protected]>
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>

5 changes: 4 additions & 1 deletion dev-db/tora/tora-3.2-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
"

PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
PATCHES=(
"${FILESDIR}/${P}-missing-header.patch"
"${FILESDIR}/${P}-qt-5.11.0.patch"
)

src_prepare() {
cmake-utils_src_prepare
Expand Down

0 comments on commit f9314b9

Please sign in to comment.