From e5b480228a910a2d74f77be496b01dc2a67dc507 Mon Sep 17 00:00:00 2001
From: "Edward W. Koenig" <kingbeowulf@glinuxgalaxy.org>
Date: Tue, 16 Jun 2020 00:52:09 -0700
Subject: academic/scilab: Updated for version 6.1.0

Signed-off-by: Edward W. Koenig <kingbeowulf@glinuxgalaxy.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/scilab/README            |  3 +++
 academic/scilab/scilab.SlackBuild | 13 +++++++------
 academic/scilab/scilab.info       | 12 ++++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'academic')

diff --git a/academic/scilab/README b/academic/scilab/README
index 300aaf1edfbe..8b4353e88458 100644
--- a/academic/scilab/README
+++ b/academic/scilab/README
@@ -11,3 +11,6 @@ to run the updated profile scripts.
 
 If you have issues on upgrading/reinstalling or changing desktop
 environments, try delete/rename $HOME/.Scilab to resolve.
+
+Openjdk8 or jdk are optional. Scilab will use the system-wide installed
+java if found. Otherwise, scilab will use its own internal jre.
\ No newline at end of file
diff --git a/academic/scilab/scilab.SlackBuild b/academic/scilab/scilab.SlackBuild
index dba3c52491ae..56e6904a6707 100644
--- a/academic/scilab/scilab.SlackBuild
+++ b/academic/scilab/scilab.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scilab
-VERSION=${VERSION:-6.0.2}
+VERSION=${VERSION:-6.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,13 +70,14 @@ mv $PKG/opt/$PRGNAM/lib/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}
 mv $PKG/opt/$PRGNAM/share/mime $PKG/usr/share
 mv $PKG/opt/$PRGNAM/share/icons $PKG/usr/share
 
-# Fix an issue reported here:
-#https://www.linuxquestions.org/questions/slackware-14/how-recover-from-damage-from-slackpkg-%27upgrade%27-scilab-4175656261/page3.html#post6009411
-# Slackware's versions should be plenty new enough.
-mv $PKG/opt/$PRGNAM/lib/thirdparty/redist $PKG/opt/$PRGNAM/lib/thirdparty/NONWORKING_redist
+# Remove conflicting libs (esp. for current)
+rm -f $PKG/opt/$PRGNAM/lib/thirdparty/redist/libncurses.so
+rm -f /$PKG/opt/$PRGNAM/lib/thirdparty/redist/libncurses.so.5
+rm -f $PKG/opt/$PRGNAM/lib/thirdparty/redist/libncurses.so.5.7
 
 # fix issues with .desktop files due to upstream bugs
-rm -rf $PKG/opt/$PRGNAM/share/applications
+rm -rf $PKG/opt/$PRGNAM/share/applications 
+mkdir -p $PKG/usr/share/applications
 cp -a $CWD/*.desktop $PKG/usr/share/applications
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/scilab/scilab.info b/academic/scilab/scilab.info
index 2e04b160773a..e86f4dbcb1ee 100644
--- a/academic/scilab/scilab.info
+++ b/academic/scilab/scilab.info
@@ -1,10 +1,10 @@
 PRGNAM="scilab"
-VERSION="6.0.2"
+VERSION="6.1.0"
 HOMEPAGE="http://www.scilab.org"
-DOWNLOAD="http://www.scilab.org/download/6.0.2/scilab-6.0.2.bin.linux-i686.tar.gz"
-MD5SUM="ace129667674a7292511a242fe6b921d"
-DOWNLOAD_x86_64="http://www.scilab.org/download/6.0.2/scilab-6.0.2.bin.linux-x86_64.tar.gz"
-MD5SUM_x86_64="667cb0789c365beab5c2b0a675ffe98d"
-REQUIRES="jdk"
+DOWNLOAD="http://www.scilab.org/download/6.1.0/scilab-6.1.0.bin.linux-i686.tar.gz"
+MD5SUM="dd249770ff4e4c8ef7c7395b1efb713b"
+DOWNLOAD_x86_64="http://www.scilab.org/download/6.1.0/scilab-6.1.0.bin.linux-x86_64.tar.gz"
+MD5SUM_x86_64="dd249770ff4e4c8ef7c7395b1efb713b"
+REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
-- 
cgit v1.2.3