4 files changed, 28 insertions, 27 deletions
diff --git a/development/tora/README b/development/tora/README
index e5777babe8..adf276ef8c 100644
--- a/development/tora/README
+++ b/development/tora/README
@@ -5,3 +5,5 @@ any target that can be accessed through Qt's ODBC support.
 
 For Oracle DBMS support, run the script like this,
   ORACLE_HOME=/path/to/oracle/home ./tora.Slackbuild
+
+postgresql is an autodetected dependency.
diff --git a/development/tora/include_unistd.patch b/development/tora/include_unistd.patch
deleted file mode 100644
index be3ca2f88a..0000000000
--- a/development/tora/include_unistd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur tora-2.1.3/src/toextract.h tora-2.1.3patched/src/toextract.h
---- tora-2.1.3/src/toextract.h	2010-02-02 10:25:43.000000000 -0800
-+++ tora-2.1.3patched/src/toextract.h	2012-06-22 21:58:45.026286147 -0700
-@@ -53,6 +53,7 @@
- #include <qvariant.h>
- //Added by qt3to4:
- #include <QString>
-+#include <unistd.h>
- 
- class QWidget;
- class toConnection;
diff --git a/development/tora/tora.SlackBuild b/development/tora/tora.SlackBuild
index 9245687cbb..5d60dc0946 100644
--- a/development/tora/tora.SlackBuild
+++ b/development/tora/tora.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for TOra
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220312 bkw: Modified by SlackBuilds.org: VERSION must be constant,
+# and match VERSION in the .info file.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tora
-VERSION=${VERSION:-2.1.3}
+GITREV=${GITREV:-5859a97cb25f4ead879ac866d1427609602c08e6}
+VERSION=${VERSION:-git5859a97}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,11 +70,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-
-patch -Np1 -i "${CWD}/include_unistd.patch"
+rm -rf $PRGNAM-$GITREV
+tar xvf $CWD/$PRGNAM-$GITREV.tar.gz
+cd $PRGNAM-$GITREV
 
 chown -R root:root .
 find -L . \
@@ -79,12 +88,13 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DWANT_INTERNAL_QSCINTILLA=0 \
+    -DWANT_INTERNAL_QSCINTILLA=1 \
+    -DWANT_INTERNAL_LOKI=1 \
     -DCMAKE_BUILD_TYPE=Release ..
 
   make
   make install DESTDIR=$PKG
-
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -93,8 +103,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/help/images
 mkdir -p $PKG/usr/share/icons/hicolor/{32x32,16x16}/apps
 mkdir -p $PKG/usr/share/applications
 
-( cd $TMP/$PRGNAM-$VERSION
-  cp -a AUTHORS BUGS ChangeLog COPYING* README* TODO NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+( cd $TMP/$PRGNAM-$GITREV
+  cp -a AUTHORS ChangeLog COPYING* README* TODO NEWS $PKG/usr/doc/$PRGNAM-$VERSION
   cp -a src/help/*.html $PKG/usr/doc/$PRGNAM-$VERSION/help
   cp -a src/help/images/*.png $PKG/usr/doc/$PRGNAM-$VERSION/help/images
   cp -a src/icons/tora.xpm $PKG/usr/share/icons/hicolor/32x32/apps
@@ -110,4 +120,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/tora/tora.info b/development/tora/tora.info
index a03ef294b4..b99dc10b2b 100644
--- a/development/tora/tora.info
+++ b/development/tora/tora.info
@@ -1,8 +1,8 @@
 PRGNAM="tora"
-VERSION="2.1.3"
+VERSION="git5859a97"
 HOMEPAGE="http://torasql.com"
-DOWNLOAD="http://sourceforge.net/projects/tora/files/tora/2.1.3/tora-2.1.3.tar.bz2"
-MD5SUM="b3a4b5c827c300e75eea53874634e8a2"
+DOWNLOAD="https://github.com/tora-tool/tora/archive/5859a97cb25f4ead879ac866d1427609602c08e6/tora-5859a97cb25f4ead879ac866d1427609602c08e6.tar.gz"
+MD5SUM="5e8b1758f68766a494bc5cb2cdc91536"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""