From 6ce7a76ff9a0aa50ce2f30492b92c2d0014c6596 Mon Sep 17 00:00:00 2001
From: Andrew Clemons
Date: Sun, 12 Apr 2020 12:41:58 +1200
Subject: development/tora: Updated for version git5859a97.

Fix building against latest current qt5.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
---
 development/tora/include_unistd.patch | 11 -----------
 development/tora/tora.SlackBuild      | 12 +++++++-----
 development/tora/tora.info            |  6 +++---
 3 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 development/tora/include_unistd.patch

(limited to 'development')

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 e0150dab62..c028726d1f 100644
--- a/development/tora/tora.SlackBuild
+++ b/development/tora/tora.SlackBuild
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tora
-VERSION=${VERSION:-20170725_d9fddb8}
+GITREV=${GITREV:-5859a97cb25f4ead879ac866d1427609602c08e6}
+VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$GITREV
+tar xvf $CWD/$PRGNAM-$GITREV.tar.gz
+cd $PRGNAM-$GITREV
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -91,7 +93,7 @@ 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
+( 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
diff --git a/development/tora/tora.info b/development/tora/tora.info
index c3379d23ba..b99dc10b2b 100644
--- a/development/tora/tora.info
+++ b/development/tora/tora.info
@@ -1,8 +1,8 @@
 PRGNAM="tora"
-VERSION="3.2"
+VERSION="git5859a97"
 HOMEPAGE="http://torasql.com"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/tora-20170725_d9fddb8.tar.xz"
-MD5SUM="0ebe7f9420b719d3062cf6598c9b8fc6"
+DOWNLOAD="https://github.com/tora-tool/tora/archive/5859a97cb25f4ead879ac866d1427609602c08e6/tora-5859a97cb25f4ead879ac866d1427609602c08e6.tar.gz"
+MD5SUM="5e8b1758f68766a494bc5cb2cdc91536"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3