From edc3e434486c95e7ee8e227def485cc9e068f377 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 21 Jul 2018 18:30:25 +0200
Subject: 20180721.2 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 system/qtfm/qtfm.SlackBuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'system/qtfm/qtfm.SlackBuild')

diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild
index 59cb3c3203..d7a2e4eb1d 100644
--- a/system/qtfm/qtfm.SlackBuild
+++ b/system/qtfm/qtfm.SlackBuild
@@ -23,7 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qtfm
-VERSION=${VERSION:-5.5}
+VERSION=${VERSION:-5.9}
+SRCVER=${SRCVER:-158787}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+unzip $CWD/$SRCVER-$PRGNAM.zip
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,6 +70,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc6.patch
+
 # Set doc path to /usr/doc/$PRGNAM-$VERSION in qtfm.pro
 sed -i "s,usr/share/doc/$PRGNAM,usr/doc/$PRGNAM-$VERSION," qtfm.pro
 
-- 
cgit v1.2.3