fix type

3 files changed, 22 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85b9f009d25d..43d58ca03187 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Mar 29 10:00:19 UTC 2017
+# Tue Apr 25 11:29:24 UTC 2017
 pkgbase = scilab
 	pkgdesc = A scientific software package for numerical computations.
 	pkgver = 6.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.scilab.org
 	arch = i686
 	arch = x86_64
@@ -51,6 +51,7 @@ pkgbase = scilab
 	source = scilab-hdf5-type.patch
 	source = scilab-hdf5-1.8.10.patch
 	source = scilab-fix-ocaml-4.0.4.diff
+	source = scilab-type.patch
 	sha256sums = b71bde8e397173a713493159a5b559de2e049b493985663418c79b2de0f23137
 	sha256sums = f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc
 	sha256sums = 37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0
@@ -59,6 +60,7 @@ pkgbase = scilab
 	sha256sums = c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d
 	sha256sums = 2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0
 	sha256sums = 4288f98e34d0351c21b79bfc5b9fddabdee143965420fd3187d133e5d53ee20e
+	sha256sums = 93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd
 
 pkgname = scilab
 
diff --git a/PKGBUILD b/PKGBUILD
index 3654cfcf9a21..dd1b1237ab1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=scilab
 pkgver=6.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A scientific software package for numerical computations.'
 arch=('i686' 'x86_64')
 url='https://www.scilab.org'
@@ -27,7 +27,8 @@ source=("${url}/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
         "${pkgname}-lucene-6.patch"
         "${pkgname}-hdf5-type.patch"
         "${pkgname}-hdf5-1.8.10.patch"
-        "${pkgname}-fix-ocaml-4.0.4.diff")
+        "${pkgname}-fix-ocaml-4.0.4.diff"
+        "${pkgname}-type.patch")
 sha256sums=('b71bde8e397173a713493159a5b559de2e049b493985663418c79b2de0f23137'
             'f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc'
             '37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0'
@@ -35,7 +36,8 @@ sha256sums=('b71bde8e397173a713493159a5b559de2e049b493985663418c79b2de0f23137'
             'ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66'
             'c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d'
             '2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0'
-            '4288f98e34d0351c21b79bfc5b9fddabdee143965420fd3187d133e5d53ee20e')
+            '4288f98e34d0351c21b79bfc5b9fddabdee143965420fd3187d133e5d53ee20e'
+            '93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd')
 
 prepare(){
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -54,6 +56,8 @@ prepare(){
   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 type
+  patch -p0 < "${srcdir}"/${pkgname}-type.patch
 }
 
 build() {
diff --git a/scilab-type.patch b/scilab-type.patch
new file mode 100644
index 000000000000..638269b590fd
--- /dev/null
+++ b/scilab-type.patch
@@ -0,0 +1,11 @@
+--- modules/io/src/cpp/loadlib.cpp.orig	2017-04-25 12:11:39.191706462 +0200
++++ modules/io/src/cpp/loadlib.cpp	2017-04-25 12:10:11.554798125 +0200
+@@ -38,7 +38,7 @@
+ {
+     types::Library* lib = NULL;
+ 
+-    wchar_t* pwstXML = pathconvertW(_wstXML.data(), FALSE, FALSE, AUTO_STYLE);
++    wchar_t* pwstXML = pathconvertW(_wstXML.data(), (BOOL) FALSE, (BOOL) FALSE, AUTO_STYLE);
+     wchar_t* pwstPathLib = expandPathVariableW(pwstXML);
+ 
+     bool expanded = true;