summaryrefslogtreecommitdiffstats
path: root/academic
diff options
context:
space:
mode:
author Fellype do Nascimento <fellype(at)gmail.com>2017-06-23 17:46:18 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2017-06-24 08:32:27 +0700
commitc74ac33f6e3c707bac7c936ad056be29d541cdfa (patch)
treedb2ce20e00691cd7b26ab7d2e233b801ba0f2d52 /academic
parent70d98387cbd5783db9aa30839b5c62e09f5512de (diff)
downloadslackbuilds-c74ac33f6e3c707bac7c936ad056be29d541cdfa.tar.gz
slackbuilds-c74ac33f6e3c707bac7c936ad056be29d541cdfa.tar.xz
academic/scidavis: Updated for version 1.18.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'academic')
-rw-r--r--academic/scidavis/correction_to_use_qwt5.patch15
-rw-r--r--academic/scidavis/scidavis.SlackBuild10
-rw-r--r--academic/scidavis/scidavis.info6
3 files changed, 6 insertions, 25 deletions
diff --git a/academic/scidavis/correction_to_use_qwt5.patch b/academic/scidavis/correction_to_use_qwt5.patch
deleted file mode 100644
index 3706a382e3..0000000000
--- a/academic/scidavis/correction_to_use_qwt5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- config.pri 2016-07-28 22:17:44.000000000 -0300
-+++ config.pri.new 2016-12-12 16:43:50.000000000 -0200
-@@ -280,12 +280,8 @@
-
- exists(/usr/include/qwt5) {
- INCLUDEPATH += /usr/include/qwt5
-- exists(/usr/lib*/libqwt5.*) {
- LIBS += -lqwt5
- } else {
-- LIBS += -lqwt
-- }
-- } else {
- INCLUDEPATH += /usr/include/qwt$${qwtsuff}
- LIBS += -lqwt$${qwtsuff}
- }
diff --git a/academic/scidavis/scidavis.SlackBuild b/academic/scidavis/scidavis.SlackBuild
index 583fbe32b3..890e30e531 100644
--- a/academic/scidavis/scidavis.SlackBuild
+++ b/academic/scidavis/scidavis.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=scidavis
-VERSION=${VERSION:-1.17}
+VERSION=${VERSION:-1.18}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -68,14 +68,10 @@ find -L . \
# Correction needed in order to find qwtplot3d in its default path
grep -rl "qwtplot3d/" libscidavis/src/ | xargs sed -i "s:<qwtplot3d/:<:"
-# Correction needed in order to re-enable desktop integration
+# Correction needed in order to install system icons and desktop integration rightly
cat $CWD/desktop_integration.txt >> scidavis/basic.pri
-## Applying a patch in the config.pri file in order to build with the correct path for qwt5
-## See https://sourceforge.net/p/scidavis/scidavis-bugs/291/
-patch -p1 < $CWD/correction_to_use_qwt5.patch config.pri
-
-## For some unknown reason, to build in Slackware we need to run qmake twice in order to get icons working properly
+## 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 \
diff --git a/academic/scidavis/scidavis.info b/academic/scidavis/scidavis.info
index 0bffe32b2a..0822ae6523 100644
--- a/academic/scidavis/scidavis.info
+++ b/academic/scidavis/scidavis.info
@@ -1,8 +1,8 @@
PRGNAM="scidavis"
-VERSION="1.17"
+VERSION="1.18"
HOMEPAGE="http://scidavis.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/scidavis/SciDAVis/1.17/scidavis-1.17.tar.gz"
-MD5SUM="4d5356c64bf103e4c1dd06f8a35b8a50"
+DOWNLOAD="https://downloads.sourceforge.net/project/scidavis/SciDAVis/1.18/scidavis-1.18.tar.gz"
+MD5SUM="3479b7805517630a9b5aeb6254adb9ed"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="muParser qwt5 qwtplot3d"