multimedia/xvst: Updated for version 2.5.2

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

4 files changed, 19 insertions, 28 deletions

diff --git a/multimedia/xvst/qtlocalpeer.patch b/multimedia/xvst/qtlocalpeer.patch
deleted file mode 100644
index cdd0ee3fa5..0000000000
--- a/multimedia/xvst/qtlocalpeer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xVideoServiceThief-2.5.1/src/qtsingleapplication/src/qtlocalpeer.cpp.old	2016-01-06 01:14:10.288327384 +0700
-+++ xVideoServiceThief-2.5.1/src/qtsingleapplication/src/qtlocalpeer.cpp	2016-01-06 01:14:29.371336089 +0700
-@@ -41,6 +41,7 @@
- #include "qtlocalpeer.h"
- #include <QCoreApplication>
- #include <QTime>
-+#include <QDataStream>
- 
- #if defined(Q_OS_WIN)
- #include <QLibrary>
diff --git a/multimedia/xvst/slack-desc b/multimedia/xvst/slack-desc
index 26f83d48ca..31a8ef7e0b 100644
--- a/multimedia/xvst/slack-desc
+++ b/multimedia/xvst/slack-desc
@@ -13,7 +13,7 @@ xvst: clips from a lot of video websites. xVideoServiceThief also provides
 xvst: you the ability to convert each video in most popular formats: AVI,
 xvst: MPEG1, MPEG2, WMV, MP4, 3GP, MP3 file formats.
 xvst:
-xvst: Homepage: http://xviservicethief.sourceforge.net/
+xvst: Homepage: https://www.xvideothief.com/
 xvst:
 xvst:
 xvst:
diff --git a/multimedia/xvst/xvst.SlackBuild b/multimedia/xvst/xvst.SlackBuild
index 8dea0f53ef..4497714f9a 100644
--- a/multimedia/xvst/xvst.SlackBuild
+++ b/multimedia/xvst/xvst.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xvst
 
-# Copyright 2010-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2010-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,13 @@
 
 PRGNAM=xvst
 SRCNAM=xVideoServiceThief
-VERSION=${VERSION:-2.5.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,14 +41,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -57,19 +61,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Patches from getdeb.net.
 for i in $CWD/patches/*;do patch -p1 < $i;done
 # remove exeutable bit from *.js files.
-find . -name "*\.js" -exec chmod -x '{}' \;
+find . -name "*\.js" -exec chmod 0644 '{}' \;
 # Change file from DOS to Unix, change path for plugins and language files
 # and make translations.
 sed -i 's/\r//g' "how to compile.txt"
@@ -77,9 +81,6 @@ sed -i "s|getApplicationPath()\ +\ \"|\"/usr/share/$PRGNAM|g" src/options.cpp
 lrelease-qt5 resources/translations/*.ts
 rm -f resources/translations/template_for_new_translations.qm
 
-# Patch for Qt 5.5.1
-patch -p1 < $CWD/qtlocalpeer.patch
-
 qmake-qt5 -set build_mode dynamic_build
 qmake-qt5 PREFIX=/usr QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCLAGS" \
   -o Makefile xVideoServiceThief.pro
diff --git a/multimedia/xvst/xvst.info b/multimedia/xvst/xvst.info
index 62536d0c86..85c5f0b241 100644
--- a/multimedia/xvst/xvst.info
+++ b/multimedia/xvst/xvst.info
@@ -1,8 +1,8 @@
 PRGNAM="xvst"
-VERSION="2.5.1"
-HOMEPAGE="http://xviservicethief.sourceforge.net/"
-DOWNLOAD="https://github.com/xVST/xVideoServiceThief/archive/2.5.1.tar.gz"
-MD5SUM="917d32b75585eec0e0ff5245253f33ed"
+VERSION="2.5.2"
+HOMEPAGE="https://www.xvideothief.com/"
+DOWNLOAD="https://github.com/xVST/xVideoServiceThief/archive/2.5.2/xVideoServiceThief-2.5.2.tar.gz"
+MD5SUM="0146a258bd5c582f539c9ac7f6342949"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg qt5-webkit"