Bump to version 3.2

Also patch several missing includes that upstream code didn't have.
Don't forget to submit the patches for these includes later upstream.

5 files changed, 110 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ca4eab84c5c..1f79566ba080 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,24 @@
 pkgbase = tora
 	pkgdesc = Toolkit for databases with support for MySQL and PostgreSQL
-	pkgver = 2.1.3
-	pkgrel = 4
-	url = http://tora.sourceforge.net
+	pkgver = 3.2
+	pkgrel = 1
+	url = https://github.com/tora-tool/tora
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
-	depends = qscintilla
+	makedepends = boost
+	depends = qscintilla-qt5
+	depends = boost-libs
+	depends = loki-lib
 	options = !libtool
 	options = !emptydirs
-	source = http://downloads.sourceforge.net/tora/tora-2.1.3.tar.gz
-	source = include_unistd.patch
-	md5sums = ea4a75a9daeaf58492413e3f7fe40293
-	md5sums = b621c5aa5ef7106571001a95bc11b07d
+	source = tora-3.2.tar.gz::https://github.com/tora-tool/tora/archive/v3.2.tar.gz
+	source = missing-qbuttongroup.patch
+	source = fix-missing-includes.patch
+	sha1sums = 2619166f023cec248044fc92ea3123031554f159
+	sha1sums = eba1639b5782ce474f43890084f4bba34e72d5dd
+	sha1sums = 1249680803431d36a63dd2fb53d83a47c1bd03db
 
 pkgname = tora
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a5401c5d685d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg/
+src/
+*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 2c8ef029baca..c8fa3020711e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,23 +4,33 @@
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
 pkgname=tora
-pkgver=2.1.3
-pkgrel=4
+pkgver=3.2
+pkgrel=1
 pkgdesc="Toolkit for databases with support for MySQL and PostgreSQL"
 arch=('i686' 'x86_64')
-url="http://tora.sourceforge.net"
+url="https://github.com/tora-tool/tora"
 license=('GPL')
-depends=('qscintilla')
-makedepends=('cmake')
+depends=('qscintilla-qt5' 'boost-libs' 'loki-lib')
+makedepends=('cmake' 'boost')
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-	'include_unistd.patch')
-md5sums=('ea4a75a9daeaf58492413e3f7fe40293'
-         'b621c5aa5ef7106571001a95bc11b07d')
+source=(
+  "${pkgname}-${pkgver}.tar.gz::https://github.com/tora-tool/${pkgname}/archive/v${pkgver}.tar.gz"
+  missing-qbuttongroup.patch
+  fix-missing-includes.patch
+)
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # https://github.com/tora-tool/tora/issues/95#issuecomment-393641305
+  sed -i '/FIND_LIBRARY(QSCINTILLA_LIBRARY/s/qt5scintilla2/qscintilla2_qt5/' cmake/modules/FindQScintilla.cmake
+
+  patch -Np1 -i "${srcdir}/missing-qbuttongroup.patch"
+  patch -Np1 -i "${srcdir}/fix-missing-includes.patch"
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/include_unistd.patch"
   mkdir "${srcdir}/build"
   cd "${srcdir}/build"
   cmake ../${pkgname}-${pkgver} \
@@ -33,3 +43,7 @@ package() {
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
+
+sha1sums=('2619166f023cec248044fc92ea3123031554f159'
+          'eba1639b5782ce474f43890084f4bba34e72d5dd'
+          '1249680803431d36a63dd2fb53d83a47c1bd03db')
diff --git a/fix-missing-includes.patch b/fix-missing-includes.patch
new file mode 100644
index 000000000000..3735370ef8b4
--- /dev/null
+++ b/fix-missing-includes.patch
@@ -0,0 +1,23 @@
+diff -aur tora-3.2/src/editor/tosqltext.h tora-3.2.patched/src/editor/tosqltext.h
+--- tora-3.2/src/editor/tosqltext.h	2017-07-04 14:35:39.000000000 -0700
++++ tora-3.2.patched/src/editor/tosqltext.h	2018-07-10 14:56:35.580009002 -0700
+@@ -45,6 +45,8 @@
+ #include <QtCore/QStringList>
+ #include <QtGui/QKeyEvent>
+ #include <QWidget>
++#include <QAction>
++#include <QMenu>
+ 
+ #include <tuple>
+ 
+diff -aur tora-3.2/src/widgets/tohelp.cpp tora-3.2.patched/src/widgets/tohelp.cpp
+--- tora-3.2/src/widgets/tohelp.cpp	2017-07-04 14:35:39.000000000 -0700
++++ tora-3.2.patched/src/widgets/tohelp.cpp	2018-07-10 14:54:00.790003162 -0700
+@@ -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/missing-qbuttongroup.patch b/missing-qbuttongroup.patch
new file mode 100644
index 000000000000..c2889083573d
--- /dev/null
+++ b/missing-qbuttongroup.patch
@@ -0,0 +1,47 @@
+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"