summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2017-05-31 17:15:25 +0200
committer Matteo Bernardini2018-06-09 09:30:53 +0200
commitc54ec03a0f6e9c8e639dbe6988f191c8bb31f25d (patch)
tree4cca8d419e2d764546af653d354fd50943201b8e
parent81c344443219574587ae3d6bccb8f19c1bd346af (diff)
downloadold.slackbuilds-qtfm.tar.gz
system/qtfm: Updated for version 5.9, patched for gcc >= 6.x.qtfm
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--system/qtfm/gcc6.patch12
-rw-r--r--system/qtfm/qtfm.SlackBuild11
-rw-r--r--system/qtfm/qtfm.info8
3 files changed, 23 insertions, 8 deletions
diff --git a/system/qtfm/gcc6.patch b/system/qtfm/gcc6.patch
new file mode 100644
index 0000000000..166ef0a79e
--- /dev/null
+++ b/system/qtfm/gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur qtfm.orig/src/mymodel.cpp qtfm/src/mymodel.cpp
+--- qtfm.orig/src/mymodel.cpp 2013-05-25 19:25:38.000000000 +0200
++++ qtfm/src/mymodel.cpp 2017-05-31 17:12:54.877169485 +0200
+@@ -220,7 +220,7 @@
+
+ if(item) return item->absoluteFilePath();
+
+- return false;
++ return "";
+ }
+
+ //---------------------------------------------------------------------------------------
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
diff --git a/system/qtfm/qtfm.info b/system/qtfm/qtfm.info
index f47835683e..e209d2cb6c 100644
--- a/system/qtfm/qtfm.info
+++ b/system/qtfm/qtfm.info
@@ -1,8 +1,8 @@
PRGNAM="qtfm"
-VERSION="5.5"
-HOMEPAGE="http://www.qtfm.org/"
-DOWNLOAD="http://www.qtfm.org/qtfm-5.5.tar.gz"
-MD5SUM="cc1d930503bf0dedc824d6f2abdda719"
+VERSION="5.9"
+HOMEPAGE="http://www.qtfm.org"
+DOWNLOAD="https://dl.opendesktop.org/api/files/download/id/1466643163/158787-qtfm.zip"
+MD5SUM="1a94bd7fbe99e87f530dc9bc1d7a8c45"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""