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.

1 files changed, 24 insertions, 10 deletions

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')