updpkg: 6.0.0

8 files changed, 214 insertions, 223 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31991d1ff901..eb203eb65d20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Oct 12 13:59:59 UTC 2016
+# Thu Feb 16 13:48:45 UTC 2017
 pkgbase = scilab-git
 	pkgdesc = A scientific software package for numerical computations
-	pkgver = 6.0.0.beta.2.r240.g7703c347
+	pkgver = 6.0.0.beta.2.r789.g97b14661ee1
 	pkgrel = 1
 	url = https://www.scilab.org/
 	arch = i686
@@ -18,11 +18,12 @@ pkgbase = scilab-git
 	depends = arpack
 	depends = fftw
 	depends = eigen
+	depends = hdf5
 	depends = libmatio
 	depends = tk
 	depends = curl
-	depends = hdf5
 	depends = java-runtime>=8
+	depends = apache-lucene>=6
 	depends = beanshell
 	depends = eclipse-ecj
 	depends = java-flexdock>=1.2.4
@@ -44,17 +45,19 @@ pkgbase = scilab-git
 	provides = scilab
 	conflicts = scilab
 	source = git://git.scilab.org/scilab
-	source = scilab-git_strict-jar.patch
-	source = scilab-git_jogl.patch::http://gitweb.scilab.org/?p=scilab.git;a=patch;h=db79126ed25fc254e83f8a96b164cb2dbf0d6204
-	source = scilab-git-hdf5-1.8.10.patch
-	source = scilab-git_LD_LIBRARY_PATH.patch
-	source = scilab-git_java-default-dir.patch
+	source = scilab-jogl-2.3.2.patch
+	source = scilab-LD_LIBRARY_PATH.patch
+	source = scilab-strict-jar.patch
+	source = scilab-lucene-6.patch
+	source = scilab-hdf5-type.patch
+	source = scilab-hdf5-1.8.10.patch
 	sha256sums = SKIP
-	sha256sums = 38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd
-	sha256sums = 7777f0e5fedb3f71f8869a20c448f139501caab17537786db37b999d5c76e618
-	sha256sums = 87e4c7b182755cf557a370820d880aaacfb4be2d3be6255f533668d8e677fd31
+	sha256sums = f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc
 	sha256sums = 37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0
-	sha256sums = a2eb7888bf52862fdba300e113667ad4d3f95512dbf1a99b661eb54b68038948
+	sha256sums = 38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd
+	sha256sums = ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66
+	sha256sums = c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d
+	sha256sums = 2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0
 
 pkgname = scilab-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d211ba2bc0b..fb500a39ae26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,41 @@
-# Maintainer: Victor Dmitriyev <mrvvitek@gmail.com>
+# Maintainer: eolianoe <eolianoe [at] gmail [DoT] com>
+# Contributor: Victor Dmitriyev <mrvvitek@gmail.com>
 
 _pkgname=scilab
 pkgname=scilab-git
-pkgver=6.0.0.beta.2.r240.g7703c347
+pkgver=6.0.0.beta.2.r789.g97b14661ee1
 pkgrel=1
 pkgdesc='A scientific software package for numerical computations'
 arch=('i686' 'x86_64')
 url="https://www.scilab.org/"
 license=('custom:CeCILL' 'BSD')
-makedepends=('apache-ant' 'git' 'ocaml' 'java-environment>=8' 'gcc-fortran')
 depends=('suitesparse>=4.4.1'  'arpack' 'fftw' 'eigen'
-         'libmatio' 'tk' 'curl'
          'hdf5'
+         'libmatio' 'tk' 'curl'
          'java-runtime>=8'
+         'apache-lucene>=6'
          'beanshell' 'eclipse-ecj' 'java-flexdock>=1.2.4' 'fop-hyph'
          'jeuclid-core' 'jgraphx>=2.0.0.1' 'javahelp2'
          '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' 'java-batik>=1.8')
+makedepends=('apache-ant' 'git' 'ocaml' 'java-environment>=8' 'gcc-fortran')
 provides=('scilab')
 conflicts=('scilab')
 source=("git://git.scilab.org/scilab"
-        "${pkgname}_strict-jar.patch"
-        "${pkgname}_jogl.patch::http://gitweb.scilab.org/?p=scilab.git;a=patch;h=db79126ed25fc254e83f8a96b164cb2dbf0d6204"
-        "${pkgname}-hdf5-1.8.10.patch"
-        "${pkgname}_LD_LIBRARY_PATH.patch"
-        "${pkgname}_java-default-dir.patch")
+        "${_pkgname}-jogl-2.3.2.patch"
+        "${_pkgname}-LD_LIBRARY_PATH.patch"
+        "${_pkgname}-strict-jar.patch"
+        "${_pkgname}-lucene-6.patch"
+        "${_pkgname}-hdf5-type.patch"
+        "${_pkgname}-hdf5-1.8.10.patch")
 sha256sums=('SKIP'
-            '38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd'
-            '7777f0e5fedb3f71f8869a20c448f139501caab17537786db37b999d5c76e618'
-            '87e4c7b182755cf557a370820d880aaacfb4be2d3be6255f533668d8e677fd31'
+            'f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc'
             '37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0'
-            'a2eb7888bf52862fdba300e113667ad4d3f95512dbf1a99b661eb54b68038948')
+            '38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd'
+            'ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66'
+            'c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d'
+            '2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}/${_pkgname}"
@@ -42,16 +46,18 @@ pkgver() {
 prepare(){
   cd "${srcdir}/${_pkgname}/${_pkgname}"
 
+  # http://bugzilla.scilab.org/show_bug.cgi?id=14539
+  patch -p1 < "${srcdir}"/${_pkgname}-hdf5-1.8.10.patch
   # https://codereview.scilab.org/#/c/17530/
-  patch -p2 < "${srcdir}"/${pkgname}_jogl.patch
+  patch -p2 < "${srcdir}"/${_pkgname}-jogl-2.3.2.patch
   # Linked to: https://codereview.scilab.org/#/c/18089/
-  patch < "${srcdir}"/${pkgname}_strict-jar.patch
-  # Fix path for Java
-  patch -p1 < "${srcdir}"/${pkgname}_java-default-dir.patch
-  # http://bugzilla.scilab.org/show_bug.cgi?id=14539
-  patch -p1 < "${srcdir}"/${pkgname}-hdf5-1.8.10.patch
+  patch < "${srcdir}"/${_pkgname}-strict-jar.patch
+  # Fix to build with lucene >= 6
+  patch -p0 < "${srcdir}"/${_pkgname}-lucene-6.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
+  patch bin/scilab "${srcdir}"/${_pkgname}-LD_LIBRARY_PATH.patch
 }
 
 build() {
@@ -61,7 +67,6 @@ build() {
     --prefix=/usr \
     --with-gcc \
     --with-gfortran \
-    --with-jdk=/usr/lib/jvm/java-8-openjdk \
     --with-mpi \
     --with-matio \
     --with-umfpack \
@@ -74,7 +79,7 @@ build() {
     --disable-static-system-lib
 
   make
-  make doc
+  #make doc
 }
 
 package() {
diff --git a/scilab-git_LD_LIBRARY_PATH.patch b/scilab-LD_LIBRARY_PATH.patch
index 222dff3b8806..222dff3b8806 100644
--- a/scilab-git_LD_LIBRARY_PATH.patch
+++ b/scilab-LD_LIBRARY_PATH.patch
diff --git a/scilab-git-hdf5-1.8.10.patch b/scilab-hdf5-1.8.10.patch
index f145896b84bc..7fbb0339fe75 100644
--- a/scilab-git-hdf5-1.8.10.patch
+++ b/scilab-hdf5-1.8.10.patch
@@ -1,103 +1,60 @@
-Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c
-===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/c/h5_readDataFromFile.c
-+++ scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c
-@@ -716,7 +716,11 @@ int readCommonPolyMatrix(int _iDatasetId
-         /*
-          * Open the referenced object, get its name and type.
-          */
--        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
-+        obj = H5Rdereference(_iDatasetId,
+--- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp	2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp	2017-02-15 20:08:00.761619371 +0100
+@@ -42,7 +42,11 @@
+     for (int i = 0; i < totalSize; i++)
+     {
+         void * ref = &(((void **)cdata)[i]);
+-        hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++        hid_t obj = H5Rdereference(file,
 +    #if H5_VERSION_GE(1,10,0)
-+                             H5P_DATASET_ACCESS_DEFAULT,
++                                   H5P_DATASET_ACCESS_DEFAULT,
 +    #endif
-+                             H5R_OBJECT, &pData[i]);
-         if (_iComplex)
-         {
-             status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -950,7 +954,11 @@ int readCommonSparseComplexMatrix(int _i
-     }
- 
-     //read Row data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[0]);
-     status = readInteger32Matrix(obj, _piNbItemRow);
-     if (status < 0)
-     {
-@@ -958,7 +966,11 @@ int readCommonSparseComplexMatrix(int _i
-     }
- 
-     //read cols data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[1]);
-     status = readInteger32Matrix(obj, _piColPos);
-     if (status < 0)
-     {
-@@ -966,7 +978,11 @@ int readCommonSparseComplexMatrix(int _i
-     }
- 
-     //read sparse data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
-+    obj = H5Rdereference(_iDatasetId,
-+#if H5_VERSION_GE(1,10,0)
-+                         H5P_DATASET_ACCESS_DEFAULT,
-+#endif
-+                         H5R_OBJECT, &pRef[2]);
- 
-     if (_iComplex)
-     {
-@@ -1017,7 +1033,11 @@ int readBooleanSparseMatrix(int _iDatase
-     }
++                                   datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+         H5O_info_t info;
+         H5Oget_info(obj, &info);
+         H5Oclose(obj);
+@@ -84,7 +88,11 @@
  
-     //read Row data
--    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
-+    obj = H5Rdereference(_iDatasetId,
+     file = getFile().getH5Id();
+     ref = &(((void **)cdata)[0]);
+-    obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++    obj = H5Rdereference(file,
 +#if H5_VERSION_GE(1,10,0)
 +                         H5P_DATASET_ACCESS_DEFAULT,
 +#endif
-+                         H5R_OBJECT, &pRef[0]);
-     status = readInteger32Matrix(obj, _piNbItemRow);
-     if (status < 0)
++                         datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+     if (obj < 0)
      {
-@@ -1027,7 +1047,11 @@ int readBooleanSparseMatrix(int _iDatase
-     if (_iNbItem != 0)
+         throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position."));
+@@ -126,7 +134,11 @@
+     for (int i = 0; i < totalSize; i++)
      {
-         //read cols data
--        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
-+        obj = H5Rdereference(_iDatasetId,
+         void * ref = &(((void **)cdata)[i]);
+-        hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++        hid_t obj = H5Rdereference(file,
 +    #if H5_VERSION_GE(1,10,0)
-+                             H5P_DATASET_ACCESS_DEFAULT,
++                                   H5P_DATASET_ACCESS_DEFAULT,
 +    #endif
-+                             H5R_OBJECT, &pRef[1]);
-         status = readInteger32Matrix(obj, _piColPos);
-         if (status < 0)
-         {
-@@ -1132,7 +1156,11 @@ int getListItemDataset(int _iDatasetId,
- {
-     hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
++                                   datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+         objs[i] = &H5Object::getObject(getParent(), obj);
+     }
  
--    *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
-+    *_piItemDataset = H5Rdereference(_iDatasetId,
+@@ -181,7 +193,11 @@
+     char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize);
+     void ** ref = &(((void **)cdata)[0]);
+     hid_t file = getFile().getH5Id();
+-    hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
++    hid_t obj = H5Rdereference(file,
 +#if H5_VERSION_GE(1,10,0)
-+                                     H5P_DATASET_ACCESS_DEFAULT,
++                               H5P_DATASET_ACCESS_DEFAULT,
 +#endif
-+                                     H5R_OBJECT, &poRef);
- 
-     if (*_piItemDataset == 0)
++                               datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+     if (obj < 0)
      {
-Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-+++ scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
-@@ -471,7 +471,11 @@ int readDoubleMatrix_v1(int _iDatasetId,
+         os << "NULL";
+--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c	2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c	2017-02-15 20:08:00.758286029 +0100
+@@ -474,7 +474,11 @@
          }
  
          //Open the referenced object, get its name and type.
@@ -110,7 +67,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
          readDouble_v1(obj, _iRows, _iCols, _pdblData);
      }
  
-@@ -498,14 +502,22 @@ int readDoubleComplexMatrix_v1(int _iDat
+@@ -501,14 +505,22 @@
      }
  
      //Open the referenced object, get its name and type.
@@ -135,7 +92,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
      status = readDouble_v1(obj, _iRows, _iCols, _pdblImg);
      if (status < 0)
      {
-@@ -831,7 +843,11 @@ int readCommonPolyMatrix_v1(int _iDatase
+@@ -834,7 +846,11 @@
          /*
          * Open the referenced object, get its name and type.
          */
@@ -148,7 +105,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
          if (_iComplex)
          {
              status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
-@@ -1066,7 +1082,11 @@ int readCommonSparseComplexMatrix_v1(int
+@@ -1069,7 +1085,11 @@
      }
  
      //read Row data
@@ -161,7 +118,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
      status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
      if (status < 0)
      {
-@@ -1074,7 +1094,11 @@ int readCommonSparseComplexMatrix_v1(int
+@@ -1077,7 +1097,11 @@
      }
  
      //read cols data
@@ -174,7 +131,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
      status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
      if (status < 0)
      {
-@@ -1082,7 +1106,11 @@ int readCommonSparseComplexMatrix_v1(int
+@@ -1085,7 +1109,11 @@
      }
  
      //read sparse data
@@ -187,7 +144,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
  
      if (_iComplex)
      {
-@@ -1128,7 +1156,11 @@ int readBooleanSparseMatrix_v1(int _iDat
+@@ -1131,7 +1159,11 @@
      }
  
      //read Row data
@@ -200,7 +157,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
      status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
      if (status < 0)
      {
-@@ -1136,7 +1168,11 @@ int readBooleanSparseMatrix_v1(int _iDat
+@@ -1139,7 +1171,11 @@
      }
  
      //read cols data
@@ -213,7 +170,7 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
      status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
      if (status < 0)
      {
-@@ -1235,7 +1271,11 @@ int getListItemDataset_v1(int _iDatasetI
+@@ -1234,7 +1270,11 @@
  {
      hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
  
@@ -226,87 +183,126 @@ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile_v1.c
  
      if (*_piItemDataset == 0)
      {
-Index: scilab-5.5.2/modules/hdf5/src/cpp/H5ReferenceData.cpp
-===================================================================
---- scilab-5.5.2.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp
-+++ scilab-5.5.2/modules/hdf5/src/cpp/H5ReferenceData.cpp
-@@ -39,7 +39,11 @@ const char ** H5ReferenceData::getRefere
-     for (int i = 0; i < totalSize; i++)
-     {
-         void * ref = &(((void **)cdata)[i]);
--        hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+        hid_t obj = H5Rdereference(file,
+--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c	2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c	2017-02-15 20:08:00.758286029 +0100
+@@ -742,7 +742,11 @@
+         /*
+          * Open the referenced object, get its name and type.
+          */
+-        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
++        obj = H5Rdereference(_iDatasetId,
 +    #if H5_VERSION_GE(1,10,0)
-+                                   H5P_DATASET_ACCESS_DEFAULT,
++                             H5P_DATASET_ACCESS_DEFAULT,
 +    #endif
-+                                   datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-         H5O_info_t info;
-         H5Oget_info(obj, &info);
-         H5Oclose(obj);
-@@ -81,7 +85,11 @@ H5Object & H5ReferenceData::getData(cons
++                             H5R_OBJECT, &pData[i]);
+         if (_iComplex)
+         {
+             status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
+@@ -976,7 +980,11 @@
+     }
  
-     file = getFile().getH5Id();
-     ref = &(((void **)cdata)[0]);
--    obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+    obj = H5Rdereference(file,
+     //read Row data
+-    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
++    obj = H5Rdereference(_iDatasetId,
 +#if H5_VERSION_GE(1,10,0)
 +                         H5P_DATASET_ACCESS_DEFAULT,
 +#endif
-+                         datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-     if (obj < 0)
++                         H5R_OBJECT, &pRef[0]);
+     status = readInteger32Matrix(obj, _piNbItemRow);
+     if (status < 0)
      {
-         throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position."));
-@@ -123,7 +131,11 @@ H5Object ** H5ReferenceData::getReferenc
-     for (int i = 0; i < totalSize; i++)
+@@ -984,7 +992,11 @@
+     }
+ 
+     //read cols data
+-    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
++    obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++                         H5P_DATASET_ACCESS_DEFAULT,
++#endif
++                         H5R_OBJECT, &pRef[1]);
+     status = readInteger32Matrix(obj, _piColPos);
+     if (status < 0)
      {
-         void * ref = &(((void **)cdata)[i]);
--        hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+        hid_t obj = H5Rdereference(file,
+@@ -992,7 +1004,11 @@
+     }
+ 
+     //read sparse data
+-    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
++    obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++                         H5P_DATASET_ACCESS_DEFAULT,
++#endif
++                         H5R_OBJECT, &pRef[2]);
+ 
+     if (_iComplex)
+     {
+@@ -1043,7 +1059,11 @@
+     }
+ 
+     //read Row data
+-    obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
++    obj = H5Rdereference(_iDatasetId,
++#if H5_VERSION_GE(1,10,0)
++                         H5P_DATASET_ACCESS_DEFAULT,
++#endif
++                         H5R_OBJECT, &pRef[0]);
+     status = readInteger32Matrix(obj, _piNbItemRow);
+     if (status < 0)
+     {
+@@ -1053,7 +1073,11 @@
+     if (_iNbItem != 0)
+     {
+         //read cols data
+-        obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
++        obj = H5Rdereference(_iDatasetId,
 +    #if H5_VERSION_GE(1,10,0)
-+                                   H5P_DATASET_ACCESS_DEFAULT,
++                             H5P_DATASET_ACCESS_DEFAULT,
 +    #endif
-+                                   datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-         objs[i] = &H5Object::getObject(getParent(), obj);
-     }
++                             H5R_OBJECT, &pRef[1]);
+         status = readInteger32Matrix(obj, _piColPos);
+         if (status < 0)
+         {
+@@ -1154,7 +1178,11 @@
+ {
+     hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
  
-@@ -178,7 +190,11 @@ void H5ReferenceData::printData(std::ost
-     char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize);
-     void ** ref = &(((void **)cdata)[0]);
-     hid_t file = getFile().getH5Id();
--    hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-+    hid_t obj = H5Rdereference(file,
+-    *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
++    *_piItemDataset = H5Rdereference(_iDatasetId,
 +#if H5_VERSION_GE(1,10,0)
-+                               H5P_DATASET_ACCESS_DEFAULT,
++                                     H5P_DATASET_ACCESS_DEFAULT,
 +#endif
-+                               datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
-     if (obj < 0)
++                                     H5R_OBJECT, &poRef);
+ 
+     if (*_piItemDataset == 0)
      {
-         os << "NULL";
---- scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp.old	2016-08-09 16:02:51.829103999 +0200
-+++ scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp	2016-08-09 16:07:48.226497997 +0200
-@@ -638,7 +638,11 @@
+--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp	2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp	2017-02-15 20:11:46.775525827 +0100
+@@ -648,7 +648,11 @@
          //import field
          for (int j = 0; j < refcount; ++j)
          {
+-            int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]);
++            int data = H5Rdereference(refs,
 +#if H5_VERSION_GE(1,10,0)
-+            int data = H5Rdereference(refs, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, &vrefs[j]);
-+#else
-             int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]);
++              H5P_DATASET_ACCESS_DEFAULT,
 +#endif
++              H5R_OBJECT, &vrefs[j]);
              if (data < 0)
              {
                  freeStringMatrix(dfield, fields.data());
---- scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp.old	2016-08-09 16:03:33.795871083 +0200
-+++ scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp	2016-08-09 16:07:48.039830860 +0200
-@@ -706,7 +706,11 @@
+--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp	2017-02-14 12:40:34.000000000 +0100
++++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp	2017-02-15 20:11:36.838833848 +0100
+@@ -735,7 +735,11 @@
              //import field
              for (int j = 0; j < refcount; ++j)
              {
+-                int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]);
++                int data = H5Rdereference(refs,
 +#if H5_VERSION_GE(1,10,0)
-+                int data = H5Rdereference(refs, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, &vrefs[j]);
-+#else
-                 int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]);
++                  H5P_DATASET_ACCESS_DEFAULT,
 +#endif
++                  H5R_OBJECT, &vrefs[j]);
                  if (data < 0)
                  {
                      return false;
diff --git a/scilab-hdf5-type.patch b/scilab-hdf5-type.patch
new file mode 100644
index 000000000000..d2210b95ef0a
--- /dev/null
+++ b/scilab-hdf5-type.patch
@@ -0,0 +1,11 @@
+--- modules/hdf5/src/c/h5_writeDataToFile.c	2017-02-15 19:49:05.972121123 +0100
++++ modules/hdf5/src/c/h5_writeDataToFile.c.new	2017-02-15 19:42:50.787848227 +0100
+@@ -2166,7 +2166,7 @@
+     return dset;
+ }
+ 
+-hid_t writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img)
++int writeDoubleComplexMatrix6(int parent, const char* name, int dims, int* pdims, double* real, double* img)
+ {
+     hid_t space = 0;
+     hid_t dset = 0;
diff --git a/scilab-git_jogl.patch b/scilab-jogl-2.3.2.patch
index da3671d7396a..822656ba342e 100644
--- a/scilab-git_jogl.patch
+++ b/scilab-jogl-2.3.2.patch
@@ -1,42 +1,10 @@
-From db79126ed25fc254e83f8a96b164cb2dbf0d6204 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab-enterprises.com>
-Date: Wed, 2 Dec 2015 15:09:07 +0100
-Subject: [PATCH] Update to JoGL 2.3.2
+commit db79126ed25fc254e83f8a96b164cb2dbf0d6204
+Author: Clément DAVID <clement.david@scilab-enterprises.com>
+Date:   Wed Dec 2 15:09:07 2015 +0100
 
-Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df
----
- scilab/configure                                   |   28 ++++++++++----------
- scilab/configure.ac                                |    6 ++---
- .../src/java/org/scilab/modules/gui/SwingView.java |    8 +++---
- .../scilab/modules/gui/bridge/ScilabBridge.java    |    2 +-
- .../gui/bridge/canvas/SwingScilabCanvas.java       |    4 +--
- .../gui/bridge/canvas/SwingScilabCanvasImpl.java   |   12 ++++-----
- .../java/org/scilab/modules/gui/canvas/Canvas.java |    2 +-
- .../scilab/modules/gui/canvas/ScilabCanvas.java    |    2 +-
- .../modules/gui/canvas/ScilabCanvasBridge.java     |    2 +-
- .../scilab/modules/gui/canvas/SimpleCanvas.java    |    2 +-
- .../scirenderer/scirenderer-libs.properties        |    4 +--
- .../implementation/jogl/JoGLCanvas.java            |   20 +++++++-------
- .../implementation/jogl/JoGLCanvasFactory.java     |    2 +-
- .../implementation/jogl/JoGLCapacity.java          |    2 +-
- .../implementation/jogl/JoGLDrawingTools.java      |    2 +-
- .../implementation/jogl/JoGLParameters.java        |    4 +--
- .../jogl/buffers/JoGLBuffersManager.java           |    2 +-
- .../jogl/buffers/JoGLDataBuffer.java               |    2 +-
- .../jogl/buffers/JoGLElementsBuffer.java           |    2 +-
- .../jogl/buffers/JoGLIndicesBuffer.java            |    2 +-
- .../jogl/clipping/JoGLClippingManager.java         |    2 +-
- .../jogl/clipping/JoGLClippingPlane.java           |    2 +-
- .../jogl/drawer/JoGLShapeDrawer.java               |    2 +-
- .../implementation/jogl/lightning/JoGLLight.java   |    2 +-
- .../jogl/lightning/JoGLLightManager.java           |    2 +-
- .../jogl/picking/GLPickingManager.java             |    2 +-
- .../jogl/picking/JoGLPickingTools.java             |    2 +-
- .../implementation/jogl/renderer/JoGLRenderer.java |    2 +-
- .../jogl/renderer/JoGLRendererManager.java         |    2 +-
- .../jogl/texture/JoGLTextureManager.java           |   10 +++----
- .../implementation/jogl/utils/GLShortCuts.java     |    2 +-
- 31 files changed, 70 insertions(+), 70 deletions(-)
+    Update to JoGL 2.3.2
+    
+    Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df
 
 diff --git a/scilab/configure b/scilab/configure
 index fd385a8..51e5ff2 100755
@@ -586,6 +554,3 @@ index 1d799e9..8a493fb 100644
  
  /**
   *
--- 
-1.7.9.5
-
diff --git a/scilab-lucene-6.patch b/scilab-lucene-6.patch
new file mode 100644
index 000000000000..7054a6876c91
--- /dev/null
+++ b/scilab-lucene-6.patch
@@ -0,0 +1,11 @@
+--- modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java	2017-02-15 19:48:09.065311738 +0100
++++ modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java.new	2017-02-15 19:43:03.057878902 +0100
+@@ -52,7 +52,7 @@
+      */
+     public List<Document> search(String str) {
+         List<Document> found = new ArrayList<>();
+-        try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true)) {
++        try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true, true)) {
+             IndexSearcher searcher = new IndexSearcher(reader);
+ 
+             StandardQueryParser queryParserHelper = new StandardQueryParser();
diff --git a/scilab-git_strict-jar.patch b/scilab-strict-jar.patch
index 805dd8d4ee49..805dd8d4ee49 100644
--- a/scilab-git_strict-jar.patch
+++ b/scilab-strict-jar.patch