Tomb: updated to 2.6, added a couple of GUIs

diff --git a/Tomb/README b/Tomb/README
index 4b19bc67cf0f8281200d725370e17a71374d5ab5..a456155db7dd9b582c838cefd6b52f08d168b999 100644 (file)
--- a/Tomb/README
+++ b/Tomb/README
@@ -9,6 +9,10 @@ user.
 To install a tool to create keys armored against dictionary attacks, supply
 KDF=yes
 
-To install GTK icon, supply TRAY=yes
+To install GTK tray icon, supply GTK_TRAY=yes
 
-steghide, qrencode are optional dependencies.
+To install Qt tray icon, supply QT_TRAY=yes. This requires qt5.
+
+To install GTK GUI, supply GUI=yes. This requires zenity.
+
+steghide, qrencode, cloakify are optional dependencies.

diff --git a/Tomb/Tomb.SlackBuild b/Tomb/Tomb.SlackBuild
index 9b3f09d0e16ad19cbf7ef8c4441e596392934474..e884b679f38c10dda1db897bf69b3a80c4ca5842 100755 (executable)
--- a/Tomb/Tomb.SlackBuild
+++ b/Tomb/Tomb.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Tomb
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 
@@ -62,7 +62,7 @@ fi
 make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
 
 # Install translations
-cd extras/po
+cd extras/translations
 make install DESTDIR=$PKG PREFIX=/usr
 cd ../..
 
@@ -73,13 +73,30 @@ if [ "${KDF}" == "yes" ]; then
   cd ../..
 fi
 
-if [ "${TRAY}" == "yes" ]; then
+if [ "${GTK_TRAY}" == "yes" ]; then
   cd extras/gtk-tray
   make
   make install DESTDIR=$PKG PREFIX=/usr
   install -Dm755 tomb-gtk-tray $PKG/usr/bin
-  mkdir -p $PKG/doc/$PRGNAM-$VERSION/gtk-tray
-  cp README.md $PKG/doc/$PRGNAM-$VERSION/gtk-tray/
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/gtk-tray
+  cp README.md $PKG/usr/doc/$PRGNAM-$VERSION/gtk-tray/
+  cd ../..
+fi
+
+if [ "${QT_TRAY}" == "yes" ]; then
+  cd extras/qt-tray
+  qmake-qt5
+  make
+  install -Dm755 tomb-qt-tray $PKG/usr/bin
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/qt-tray
+  cp README.txt $PKG/usr/doc/$PRGNAM-$VERSION/qt-tray/
+  cd ../..
+fi
+
+if [ "${GUI}" == "yes" ]; then
+  cd extras/gtomb
+  patch -p1 < ${CWD}/paths.patch
+  install -Dm755 gtomb $PKG/usr/bin
   cd ../..
 fi
 
@@ -91,7 +108,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -aR \
   doc/*.{pdf,txt,org} \
-  AUTHORS.txt ChangeLog.txt COPYING INSTALL.txt KNOWN_BUGS.txt README.txt \
+  AUTHORS.txt ChangeLog.txt COPYING.txt INSTALL.txt KNOWN_BUGS.txt README.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 

diff --git a/Tomb/Tomb.info b/Tomb/Tomb.info
index aef5718e1612b0b04a7678b0471f613f7adda0f6..7c36d5e2f056cb1b68503f5099b555acb36d9c06 100644 (file)
--- a/Tomb/Tomb.info
+++ b/Tomb/Tomb.info
@@ -1,8 +1,8 @@
 PRGNAM="tomb"
-VERSION="2.1.1"
+VERSION="2.6"
 HOMEPAGE="http://www.dyne.org/software/tomb/"
-DOWNLOAD="https://files.dyne.org/tomb/Tomb-2.1.1.tar.gz"
-MD5SUM="ef315fc7dfe09789f100c277a6780b1e"
+DOWNLOAD="https://files.dyne.org/tomb/Tomb-${VERSION}.tar.gz"
+MD5SUM="7c840efa8d578ed79de55fc1a00620a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""

diff --git a/Tomb/paths.patch b/Tomb/paths.patch
new file mode 100644 (file)
index 0000000..9b93322
--- /dev/null
+++ b/Tomb/paths.patch
@@ -0,0 +1,13 @@
+--- a/gtomb    2019-05-30 19:50:02.000000000 +0300
++++ b/gtomb    2019-06-09 17:41:44.766447827 +0300
+@@ -19,8 +19,8 @@
+ # along with this source code. If not, see <http://www.gnu.org/licenses/>.
+ 
+ ver="0.8"
+-TOMBPATH="/usr/local/bin/tomb" # Set this to your tomb executable's path
+-KDFPATH="/usr/local/bin/" # Set this to the path of your KDF binaries (if you're using them)
++TOMBPATH="/usr/bin/tomb" # Set this to your tomb executable's path
++KDFPATH="/usr/bin/" # Set this to the path of your KDF binaries (if you're using them)
+ # The ones below should not need changing
+ HEXENC="$KDFPATH/tomb-kdb-hexencode"
+ GENSALT="$KDFPATH/tomb-kdb-pbkdf2-gensalt"