diff options
| -rw-r--r-- | academic/scidavis/README | 8 | ||||
| -rw-r--r-- | academic/scidavis/scidavis.SlackBuild | 36 | ||||
| -rw-r--r-- | academic/scidavis/scidavis.info | 12 |
3 files changed, 38 insertions, 18 deletions
diff --git a/academic/scidavis/README b/academic/scidavis/README index 2591367f84cc5..3f0de3cf1c7a2 100644 --- a/academic/scidavis/README +++ b/academic/scidavis/README @@ -7,9 +7,5 @@ features such as scriptability and extensibility. SciDAVis started as a fork of QtiPlot. -Optional dependencies, after installation, are scipy and pygsl (to -improve python scripting). - -Note: -I have a #TODO in scidavis.SlackBuild: to avoid using qwtplot3d (qt5 -version) installed in the system +Optional dependencies at runtime are scipy and pygsl (to improve +python scripting) diff --git a/academic/scidavis/scidavis.SlackBuild b/academic/scidavis/scidavis.SlackBuild index 62e21593e3a4c..b82649a8e7c8e 100644 --- a/academic/scidavis/scidavis.SlackBuild +++ b/academic/scidavis/scidavis.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=scidavis -VERSION=${VERSION:-2.4.0} +VERSION=${VERSION:-2.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -53,13 +53,16 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SPEC="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - SPEC="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - SPEC="-spec linux-g++-64" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -68,6 +71,18 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION + +rmdir 3rdparty/qwt5-qt5/ +rmdir 3rdparty/qwtplot3d/ +rmdir 3rdparty/liborigin/ + +tar xvf $CWD/qwt5-qt5-f7519200f102676fb04fb7bd0be555e0a419d378.tar.gz -C 3rdparty/ +mv 3rdparty/qwt5-qt5-f7519200f102676fb04fb7bd0be555e0a419d378 3rdparty/qwt5-qt5 +tar xvf $CWD/qwtplot3d-b2655743d30ed3185f3c0e2626b33a1d29655216.tar.gz -C 3rdparty/ +mv 3rdparty/qwtplot3d-b2655743d30ed3185f3c0e2626b33a1d29655216 3rdparty/qwtplot3d +tar xvf $CWD/liborigin-a92f26f28e531f64684b66a2731dd617bea3cb45.tar.gz -C 3rdparty/ +mv 3rdparty/liborigin-a92f26f28e531f64684b66a2731dd617bea3cb45 3rdparty/liborigin + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -75,6 +90,14 @@ 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 {} \; +# Set the correct python paths - code based on scidavis.spec for Fedora by Alexander Ploumistos +sed -i "s:set(PYTHON_SCRIPTDIR etc:set(PYTHON_SCRIPTDIR lib$LIBDIRSUFFIX/python3.9/site-packages/scidavis:" scidavis/CMakeLists.txt +sed -i "s:FILES scidavisrc.py \${CMAKE_CURRENT_BINARY_DIR}/\$<CONFIG>/scidavisrc.pyc DESTINATION:FILES scidavisrc.py DESTINATION:" scidavis/CMakeLists.txt +sed -i "s:FILES scidavisrc.py \${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION:FILES scidavisrc.py DESTINATION:" scidavis/CMakeLists.txt +sed -i "s:FILES scidavisUtil.py DESTINATION share/scidavis:FILES scidavisUtil.py DESTINATION \${PYTHON_SCRIPTDIR}:" scidavis/CMakeLists.txt +sed -i "s:PYTHON_CONFIG_PATH=\"\${CMAKE_INSTALL_PREFIX}/etc\":PYTHON_CONFIG_PATH=\"/usr/lib$LIBDIRSUFFIX/python3.9/site-packages/scidavis\":" libscidavis/CMakeLists.txt +sed -i "s:PYTHON_UTIL_PATH=\"\${CMAKE_INSTALL_PREFIX}/share/scidavis\":PYTHON_UTIL_PATH=\"/usr/lib$LIBDIRSUFFIX/python3.9/site-packages/scidavis\":" libscidavis/CMakeLists.txt + export PYTHON=python3 mkdir build && cd build @@ -91,10 +114,6 @@ 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 -## Sometimes 'make install' fails to install the translation files -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 @@ -104,7 +123,6 @@ 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cp -a $PKG/usr/share/doc/scidavis/*.* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -rf $PKG/usr/share/doc diff --git a/academic/scidavis/scidavis.info b/academic/scidavis/scidavis.info index 3292d8115457b..7904927c3f02f 100644 --- a/academic/scidavis/scidavis.info +++ b/academic/scidavis/scidavis.info @@ -1,8 +1,14 @@ PRGNAM="scidavis" -VERSION="2.4.0" +VERSION="2.9.0" HOMEPAGE="http://scidavis.sourceforge.net/" -DOWNLOAD="https://ufpr.dl.sourceforge.net/project/scidavis/SciDAVis/2/2.4/scidavis-2.4.0.tar.gz" -MD5SUM="8846e90fb8b75d28c76ba9af2523c189" +DOWNLOAD="https://github.com/SciDAVis/scidavis/archive/2.9.0/scidavis-2.9.0.tar.gz \ + https://github.com/SciDAVis/qwt5-qt5/archive/f751920/qwt5-qt5-f7519200f102676fb04fb7bd0be555e0a419d378.tar.gz \ + https://github.com/SciDAVis/qwtplot3d/archive/b265574/qwtplot3d-b2655743d30ed3185f3c0e2626b33a1d29655216.tar.gz \ + https://github.com/SciDAVis/liborigin/archive/a92f26f/liborigin-a92f26f28e531f64684b66a2731dd617bea3cb45.tar.gz" +MD5SUM="fc80267e26c4ba75490d7baa9dfdf93f \ + da7c360266e318948919ab2ddc8a2c4b \ + aefa1c98e1a0df67418304b66d810b3d \ + 8baa9dffeacc1fedeb94ffa8d35eae2c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="muParser" |