Pop version to v6.1.1

3 files changed, 19 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f9f046259cf..63d09f8d476c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scilab
 	pkgdesc = A scientific software package for numerical computations.
-	pkgver = 6.1.0
-	pkgrel = 5
+	pkgver = 6.1.1
+	pkgrel = 1
 	url = https://www.scilab.org
 	arch = i686
 	arch = x86_64
@@ -45,7 +45,7 @@ pkgbase = scilab
 	depends = apache-lucene>=7
 	depends = java-batik>=1.8
 	depends = java-xmlgraphics-commons>=2.0.1
-	source = https://www.scilab.org/download/6.1.0/scilab-6.1.0-src.tar.gz
+	source = https://www.scilab.org/download/6.1.1/scilab-6.1.1-src.tar.gz
 	source = scilab-jogl-2.3.2.patch
 	source = scilab-strict-jar.patch
 	source = scilab-LD_LIBRARY_PATH.patch
@@ -53,14 +53,13 @@ pkgbase = scilab
 	source = scilab-num.patch
 	source = libxml.patch
 	source = hdf5_18_api.patch
-	sha256sums = ae6befb0153fb823fd647f4eb36076f98fd20fed601f7dfa94d8c13e31044964
+	sha256sums = e51347638bd385c276c930785a1f9f079ae7eaa78c62a0eca1dc7e6142434207
 	sha256sums = 7b7b5609ee36b6f8d801eeb3899cd62cc889c2038e0e1616b7640f9b8a0424b0
 	sha256sums = 38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd
 	sha256sums = a39277cb8cfc3d7929c73ce6d707dc24e3df4b8d8f2d587f075efebda79ff4db
 	sha256sums = 6712c6db2f3ba365d150e1feb1c71bf691f8aa3b45d5a872b05a42f0daf23392
-	sha256sums = 31e757bdb2086e08e2477118fceddcdd50f3c2fcad5c86cf5de8ec06009f34ed
+	sha256sums = 79c5f32bc2142f9861491787e8ee86d0b75f148141b176bae394ea360b8944d7
 	sha256sums = c04114c4ef63d76bf898808e90c892de093fcc400a2371c7aa287b76c0c5d041
 	sha256sums = f781c2919a0c14be5deed3a8b8866addd8de1171a06aacb96ef1e19535d0988e
 
 pkgname = scilab
-
diff --git a/PKGBUILD b/PKGBUILD
index e4e21958547a..69e5d0009384 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,13 @@
+#!/hint/bash
 # Maintainer: Felix Golatofski <contact@xdfr.de>
 # Contributor: eolianoe <eolianoe [at] gmail [DoT] com>
 # Contributor: Kurnevsky Evgeny <kurnevsky@gmail.com>
 # Contributor: Victor Dmitriyev <mrvvitek@gmail.com>
+# Contributor : bartus <scilab-aur@bartus.33mail.com>
 
 pkgname=scilab
-pkgver=6.1.0
-pkgrel=5
+pkgver=6.1.1
+pkgrel=1
 pkgdesc='A scientific software package for numerical computations.'
 arch=('i686' 'x86_64')
 url='https://www.scilab.org'
@@ -31,14 +33,14 @@ source=("${url}/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
         "${pkgname}-0004-Fix-build-with-ocaml-4.0.4.patch"
         "${pkgname}-num.patch"
         "libxml.patch"
-	"hdf5_18_api.patch"
+        "hdf5_18_api.patch"
          )
-sha256sums=('ae6befb0153fb823fd647f4eb36076f98fd20fed601f7dfa94d8c13e31044964'
+sha256sums=('e51347638bd385c276c930785a1f9f079ae7eaa78c62a0eca1dc7e6142434207'
             '7b7b5609ee36b6f8d801eeb3899cd62cc889c2038e0e1616b7640f9b8a0424b0'
             '38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd'
             'a39277cb8cfc3d7929c73ce6d707dc24e3df4b8d8f2d587f075efebda79ff4db'
             '6712c6db2f3ba365d150e1feb1c71bf691f8aa3b45d5a872b05a42f0daf23392'
-            '31e757bdb2086e08e2477118fceddcdd50f3c2fcad5c86cf5de8ec06009f34ed'
+            '79c5f32bc2142f9861491787e8ee86d0b75f148141b176bae394ea360b8944d7'
             'c04114c4ef63d76bf898808e90c892de093fcc400a2371c7aa287b76c0c5d041'
             'f781c2919a0c14be5deed3a8b8866addd8de1171a06aacb96ef1e19535d0988e')
 
@@ -93,8 +95,8 @@ package(){
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" install-data install-html
 
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING-BSD" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-BSD"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -Dm644 COPYING-BSD "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-BSD"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/scilab-num.patch b/scilab-num.patch
index ad793c1293cd..d02a2eb8c368 100644
--- a/scilab-num.patch
+++ b/scilab-num.patch
@@ -1,15 +1,17 @@
 --- modules/scicos/Makefile.in.orig	2018-02-22 20:48:50.382685100 +0100
 +++ modules/scicos/Makefile.in	2018-02-21 23:01:04.547956702 +0100
-@@ -794,10 +794,10 @@
+@@ -794,12 +794,12 @@
  NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
 -OCAMLC = @OCAMLC@
 +OCAMLC = ocamlfind @OCAMLC@ -package num
+ OCAMLCFLAGS = @OCAMLCFLAGS@
  OCAMLDEP = @OCAMLDEP@
  OCAMLLEX = @OCAMLLEX@
 -OCAMLOPT = @OCAMLOPT@
 +OCAMLOPT = ocamlfind @OCAMLOPT@ -package num
+ OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
  OCAMLYACC = @OCAMLYACC@
  OPENMPI_CC = @OPENMPI_CC@
  OPENMPI_CFLAGS = @OPENMPI_CFLAGS@