diff options
| author | Fellype do Nascimento <fellype(at)gmail.com> | 2018-06-08 23:30:51 +0100 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2018-06-08 23:30:51 +0100 |
| commit | 31e3deb9e27779a38800afe16c7d0b9fd4f7e96f (patch) | |
| tree | 9fa9cf7128b22d2b1ea10f09b2497f78e5d8373e /academic/scidavis/scidavis.SlackBuild | |
| parent | 077bd4c446b6d6c329054430f353c256a0d66bfb (diff) | |
academic/scidavis: Updated for version 1.23.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'academic/scidavis/scidavis.SlackBuild')
| -rw-r--r-- | academic/scidavis/scidavis.SlackBuild | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/academic/scidavis/scidavis.SlackBuild b/academic/scidavis/scidavis.SlackBuild index 17883a6a205cf..eb2f44118da0d 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, Fellype do Nascimento, Campinas - Brazil +# Copyright 2017-2018, Fellype do Nascimento, Campinas - Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=scidavis -VERSION=${VERSION:-1.22} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.23} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -66,18 +66,26 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Correct the manpage path -sed -i -e 's#share/man/man1/scidavis.1#man/man1#' scidavis/scidavis.pro +sed -i -e 's#share/man#man#' scidavis/scidavis.pro # Correction needed in order to find qwtplot3d in its default path grep -rl "qwtplot3d/" libscidavis/src/ | xargs sed -i "s:<qwtplot3d/:<:" -# Patch to fix crashes using integration in python scripts -# See https://sourceforge.net/p/scidavis/scidavis-bugs/320/ -patch -p1 < $CWD/integration_with_python_crash_bug_320.patch libscidavis/src/PythonScript.cpp - -# Patch to fix crashes when integration is performed with less points than required by interpolation method -# See https://sourceforge.net/p/scidavis/scidavis-bugs/321/ -patch -p1 < $CWD/crash_integration_with_too_few_points_bug_321.patch libscidavis/src/Integration.cpp +# Patch to fix issues when SciPy is installed. Without this there may be a +# problem when running python scripts due to differences between SciPy versions +# higher or lower than 1.0.0 +patch -p1 < $CWD/fix_issue_with_scipy_vesions.patch scidavis/scidavisrc.py + +# 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 ## 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/ |