summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD41
1 files changed, 18 insertions, 23 deletions
diff --git a/PKGBUILD b/PKGBUILD
index aa0c4f500922..a8cec1fa4db0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Victor Dmitriyev <mrvvitek@gmail.com>
pkgname=scilab
-pkgver=6.0.0
-pkgrel=13
+pkgver=6.0.1
+pkgrel=1
pkgdesc='A scientific software package for numerical computations.'
arch=('i686' 'x86_64')
url='https://www.scilab.org'
@@ -19,28 +19,26 @@ depends=('suitesparse>=4.4.1' 'arpack' 'fftw' 'eigen'
'saxon-he' 'jlatexmath-fop>=1.0.3' 'jrosetta>=1.0.4' 'jgoodies-looks' 'java-qdox'
'java-skinlf' 'java-testng' 'xalan-java' 'docbook-xsl'
'jogl>=2.3.2' 'apache-lucene>=7'
- 'java-batik>=1.8' 'java-xmlgraphics-commons>=2.0')
-makedepends=('java-environment>=8' 'apache-ant' 'ocaml' 'gcc-fortran' )
+ 'java-batik>=1.8' 'java-xmlgraphics-commons>=2.0.1')
+makedepends=('java-environment>=8' 'apache-ant>=1.9.0' 'ocaml-num' 'gcc-fortran' )
source=("${url}/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
"${pkgname}-jogl-2.3.2.patch"
- "${pkgname}-LD_LIBRARY_PATH.patch"
"${pkgname}-strict-jar.patch"
"${pkgname}-lucene.patch"
"${pkgname}-hdf5-type.patch"
"${pkgname}-hdf5-1.8.10.patch"
- "${pkgname}-fix-ocaml-4.0.4.diff"
- "${pkgname}-batik-1.9.patch"
- "${pkgname}-type.patch")
-sha256sums=('b71bde8e397173a713493159a5b559de2e049b493985663418c79b2de0f23137'
+ "${pkgname}-type.patch"
+ "${pkgname}-num.patch"
+ "${pkgname}-0004-Fix-build-with-ocaml-4.0.4.patch")
+sha256sums=('e459dd5a918626567e3513ab106a68bee5a1085a8713020cba214e5d4c075a4f'
'f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc'
- '37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0'
'38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd'
- 'b1fb3e4b08b3c17f267c213d954c704cb95225cf1445cf92892e205a4ca14d76'
+ 'fb27339de4ddd55bf9bb172b0dbf22f67f578a3ca0270924792d728f42b43326'
'c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d'
'2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0'
- '4288f98e34d0351c21b79bfc5b9fddabdee143965420fd3187d133e5d53ee20e'
- 'cc9bde7008ef078af3382e09867700c0f98779b4af39e21bb96e4bf9e020084a'
- '93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd')
+ '93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd'
+ '31e757bdb2086e08e2477118fceddcdd50f3c2fcad5c86cf5de8ec06009f34ed'
+ '682f4056aabdc14b9f20ea4b2369ab759f50cd7bbc6ab6867cfaae14028f7622')
prepare(){
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -49,20 +47,17 @@ prepare(){
patch -p1 < "${srcdir}"/${pkgname}-hdf5-1.8.10.patch
# https://codereview.scilab.org/#/c/17530/
patch -p2 < "${srcdir}"/${pkgname}-jogl-2.3.2.patch
- # Linked to: https://codereview.scilab.org/#/c/18089/
- patch < "${srcdir}"/${pkgname}-strict-jar.patch
# Fix to build with lucene >= 7
patch -p0 < "${srcdir}"/${pkgname}-lucene.patch
+ # Linked to: https://codereview.scilab.org/#/c/18089/
+ patch < "${srcdir}"/${pkgname}-strict-jar.patch
# Fix hdf5 type
patch -p0 < "${srcdir}"/${pkgname}-hdf5-type.patch
- # Fix for LD_LIBRARY_PATH
- patch bin/scilab "${srcdir}"/${pkgname}-LD_LIBRARY_PATH.patch
- # Fix build with ocaml 4.0.4, https://codereview.scilab.org/#/c/19232
- patch -p2 < "${srcdir}"/${pkgname}-fix-ocaml-4.0.4.diff
- # Fix version for batik
- patch -p0 < "${srcdir}"/${pkgname}-batik-1.9.patch
# Fix type
patch -p0 < "${srcdir}"/${pkgname}-type.patch
+ # OCaml
+ patch -p1 < "${srcdir}"/${pkgname}-0004-Fix-build-with-ocaml-4.0.4.patch
+ patch -p0 < "${srcdir}"/${pkgname}-num.patch
}
build() {
@@ -76,7 +71,7 @@ build() {
--with-matio \
--with-umfpack \
--with-fftw \
- --with-modelica \
+ --without-modelica \
--without-emf \
--with-install-help-xml \
--enable-build-help \