academic/scidavis: Updated for version 2.4.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 24 insertions, 33 deletions

diff --git a/academic/scidavis/README b/academic/scidavis/README
index 6e2b3fdfab..2591367f84 100644
--- a/academic/scidavis/README
+++ b/academic/scidavis/README
@@ -10,6 +10,6 @@ SciDAVis started as a fork of QtiPlot.
 Optional dependencies, after installation, are scipy and pygsl (to
 improve python scripting).
 
-Since version 1.23 it is possible to build/use SciDAVis with Python 3
-- just use PYTHON3=yes before executing scidavis.SlackBuild. Default is
-to use python 2 (PYTHON3=no).
+Note:
+I have a #TODO in scidavis.SlackBuild: to avoid using qwtplot3d (qt5
+version) installed in the system
diff --git a/academic/scidavis/scidavis.SlackBuild b/academic/scidavis/scidavis.SlackBuild
index a6d3f7b75a..7800080091 100644
--- a/academic/scidavis/scidavis.SlackBuild
+++ b/academic/scidavis/scidavis.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for SciDAVis
 # Based on the Slackware 14.2 SlackBuild
 #
-# Copyright 2017-2019, Fellype do Nascimento, Campinas - Brazil
+# Copyright 2017-2021, Fellype do Nascimento, Guaratingueta - Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scidavis
-VERSION=${VERSION:-1.26}
+VERSION=${VERSION:-2.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,32 +65,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Correct the manpage path
-sed -i -e 's#share/man#man#' scidavis/scidavis.pro
-
-# Since version 1.23 it is possible to build/use SciDAVis with Python 3 - just use
-# PYTHON3=yes before execute scidavis.SlackBuild. Default is to use python 2 (PYTHON3=no).
-# *** It does not build using Python 3 in Slackware 14.2 or previous because PyQt was not built with
-# Python 3 support. I'm adding this here because I know it will be useful in the future and for the
-# tests currently done in -current
-if [ "${PYTHON3:-no}" = "yes" ]; then
- export PYTHON=python3
-else
- export PYTHON=python2
-fi
+export PYTHON=python3
 
-## For some unknown reason, to build in Slackware we need to run qmake twice in order to get the app icons working properly
-## See https://sourceforge.net/p/scidavis/scidavis-bugs/259/
-qmake
-qmake \
-  CONFIG+="liborigin python" \
-  PRESET=linux_package \
-  QMAKE_CFLAGS+="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  $SPEC
+mkdir build && cd build
+cmake .. -DSEARCH_FOR_UPDATES=OFF \
+  -DDOWNLOAD_LINKS=OFF \
+  -DORIGIN_IMPORT=ON \
+  -DSCRIPTING_PYTHON=ON \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  ..
 
 make
-make install INSTALL_ROOT=$PKG
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -99,6 +85,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/share/scidavis/translations
 install -m 0644 scidavis/translations/*.qm $PKG/usr/share/scidavis/translations
 
+# Move manpage to a more appropriated dir
+mkdir -p $PKG/usr/man/man1/
+mv $PKG/usr/share/man/man1/scidavis.1 $PKG/usr/man/man1/scidavis.1
+rm -rf $PKG/usr/share/man/
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/academic/scidavis/scidavis.info b/academic/scidavis/scidavis.info
index edd2ae5ef6..2e015a53c9 100644
--- a/academic/scidavis/scidavis.info
+++ b/academic/scidavis/scidavis.info
@@ -1,10 +1,10 @@
 PRGNAM="scidavis"
-VERSION="1.26"
+VERSION="2.4.0"
 HOMEPAGE="http://scidavis.sourceforge.net/"
-DOWNLOAD="https://ufpr.dl.sourceforge.net/project/scidavis/SciDAVis/1.26/scidavis-1.26.tar.gz"
-MD5SUM="a3e6158c9607dbbaab193941836259bf"
+DOWNLOAD="https://ufpr.dl.sourceforge.net/project/scidavis/SciDAVis/2/2.4/scidavis-2.4.0.tar.gz"
+MD5SUM="8846e90fb8b75d28c76ba9af2523c189"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="muParser"
+REQUIRES="muParser qwt5 qwtplot3d"
 MAINTAINER="Fellype do Nascimento"
-EMAIL="fellype(at)gmail.com"
+EMAIL="fellype (at) gmail (dot) com"