Some adjustments

2 files changed, 31 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f79566ba080..a195c55c4064 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
 pkgbase = tora
-	pkgdesc = Toolkit for databases with support for MySQL and PostgreSQL
+	pkgdesc = SQL IDE for Oracle, MySQL and PostgreSQL dbs
 	pkgver = 3.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/tora-tool/tora
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = boost
 	depends = qscintilla-qt5
-	depends = boost-libs
-	depends = loki-lib
 	options = !libtool
 	options = !emptydirs
 	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
+	sha256sums = a1055250e5cce668fec10ba67d05c338a1401edf8621193ade4789e3b1c58b15
+	sha256sums = 57d37715984bf10bb357bcbddcd7de00e8f6bb5ec5d66f99dd2a3367232a5863
+	sha256sums = fbdaf36124e17df20dee1925d9557db1848643f8c0503f59021ba0c3216ff11b
 
 pkgname = tora
 
diff --git a/PKGBUILD b/PKGBUILD
index c8fa3020711e..62cfac9405a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,49 @@
-# Maintainer:
+# Maintainer:  Anton Kudelin <kudelin at protonmail dot com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
+
 pkgname=tora
 pkgver=3.2
-pkgrel=1
-pkgdesc="Toolkit for databases with support for MySQL and PostgreSQL"
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc="SQL IDE for Oracle, MySQL and PostgreSQL dbs"
+arch=('x86_64')
 url="https://github.com/tora-tool/tora"
 license=('GPL')
-depends=('qscintilla-qt5' 'boost-libs' 'loki-lib')
+depends=('qscintilla-qt5')
 makedepends=('cmake' 'boost')
 options=('!libtool' '!emptydirs')
-source=(
-  "${pkgname}-${pkgver}.tar.gz::https://github.com/tora-tool/${pkgname}/archive/v${pkgver}.tar.gz"
-  missing-qbuttongroup.patch
-  fix-missing-includes.patch
-)
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        missing-qbuttongroup.patch
+        fix-missing-includes.patch)
+sha256sums=('a1055250e5cce668fec10ba67d05c338a1401edf8621193ade4789e3b1c58b15'
+            '57d37715984bf10bb357bcbddcd7de00e8f6bb5ec5d66f99dd2a3367232a5863'
+            'fbdaf36124e17df20dee1925d9557db1848643f8c0503f59021ba0c3216ff11b')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  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"
+  
+  patch -Np1 -i "$srcdir/missing-qbuttongroup.patch"
+  patch -Np1 -i "$srcdir/fix-missing-includes.patch"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir "${srcdir}/build"
-  cd "${srcdir}/build"
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir "$srcdir/build"
+  cd "$srcdir/build"
+  cmake ../$pkgname-$pkgver \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DQSCINTILLA_INCLUDE_DIR=/usr/include/qt \
+        -DWANT_INTERNAL_LOKI=ON
   make
 }
 
 package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
 }
-
-sha1sums=('2619166f023cec248044fc92ea3123031554f159'
-          'eba1639b5782ce474f43890084f4bba34e72d5dd'
-          '1249680803431d36a63dd2fb53d83a47c1bd03db')