Fix hdf5>=1.8 build.

3 files changed, 88 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77a35c5a863c..344e8b9ba32f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -52,6 +52,7 @@ pkgbase = scilab
 	source = scilab-0004-Fix-build-with-ocaml-4.0.4.patch
 	source = scilab-num.patch
 	source = libxml.patch
+	source = hdf5_18_api.patch
 	sha256sums = ae6befb0153fb823fd647f4eb36076f98fd20fed601f7dfa94d8c13e31044964
 	sha256sums = 7b7b5609ee36b6f8d801eeb3899cd62cc889c2038e0e1616b7640f9b8a0424b0
 	sha256sums = 38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd
@@ -59,6 +60,7 @@ pkgbase = scilab
 	sha256sums = 6712c6db2f3ba365d150e1feb1c71bf691f8aa3b45d5a872b05a42f0daf23392
 	sha256sums = 31e757bdb2086e08e2477118fceddcdd50f3c2fcad5c86cf5de8ec06009f34ed
 	sha256sums = c04114c4ef63d76bf898808e90c892de093fcc400a2371c7aa287b76c0c5d041
+	sha256sums = f781c2919a0c14be5deed3a8b8866addd8de1171a06aacb96ef1e19535d0988e
 
 pkgname = scilab
 
diff --git a/PKGBUILD b/PKGBUILD
index c6dcbca3264f..15c527803fb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,6 +31,7 @@ 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"
          )
 sha256sums=('ae6befb0153fb823fd647f4eb36076f98fd20fed601f7dfa94d8c13e31044964'
             '7b7b5609ee36b6f8d801eeb3899cd62cc889c2038e0e1616b7640f9b8a0424b0'
@@ -38,7 +39,8 @@ sha256sums=('ae6befb0153fb823fd647f4eb36076f98fd20fed601f7dfa94d8c13e31044964'
             'a39277cb8cfc3d7929c73ce6d707dc24e3df4b8d8f2d587f075efebda79ff4db'
             '6712c6db2f3ba365d150e1feb1c71bf691f8aa3b45d5a872b05a42f0daf23392'
             '31e757bdb2086e08e2477118fceddcdd50f3c2fcad5c86cf5de8ec06009f34ed'
-            'c04114c4ef63d76bf898808e90c892de093fcc400a2371c7aa287b76c0c5d041')
+            'c04114c4ef63d76bf898808e90c892de093fcc400a2371c7aa287b76c0c5d041'
+            'f781c2919a0c14be5deed3a8b8866addd8de1171a06aacb96ef1e19535d0988e')
 
 prepare(){
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -55,6 +57,8 @@ prepare(){
   patch -p0 < "${srcdir}"/${pkgname}-num.patch
   # libxml
   patch -p1 < "${srcdir}"/libxml.patch
+  # hdf5_18_api
+  patch -p1 < "${srcdir}"/hdf5_18_api.patch
 }
 
 build() {
diff --git a/hdf5_18_api.patch b/hdf5_18_api.patch
new file mode 100644
index 000000000000..a80e29f8a813
--- /dev/null
+++ b/hdf5_18_api.patch
@@ -0,0 +1,81 @@
+diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.am scilab-6.1.0/modules/hdf5/Makefile.am
+--- orig/scilab-6.1.0/modules/hdf5/Makefile.am	2020-02-25 10:59:56.000000000 +0100
++++ scilab-6.1.0/modules/hdf5/Makefile.am	2020-06-16 17:11:11.934227935 +0200
+@@ -103,8 +103,7 @@
+     -DH5Gopen_vers=2 \
+     -DH5Tget_array_dims_vers=2 \
+     -DH5Acreate_vers=2 \
+-    -DH5Rdereference_vers=2 \
+-    -DNO_DEPRECATED_SYMBOLS
++    -DH5Rdereference_vers=2
+ 
+ 
+ libscihdf5_la_CPPFLAGS = \
+diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.in scilab-6.1.0/modules/hdf5/Makefile.in
+--- orig/scilab-6.1.0/modules/hdf5/Makefile.in	2020-02-25 10:59:56.000000000 +0100
++++ scilab-6.1.0/modules/hdf5/Makefile.in	2020-06-16 17:11:23.374128670 +0200
+@@ -788,8 +788,7 @@
+     -DH5Gopen_vers=2 \
+     -DH5Tget_array_dims_vers=2 \
+     -DH5Acreate_vers=2 \
+-    -DH5Rdereference_vers=2 \
+-    -DNO_DEPRECATED_SYMBOLS
++    -DH5Rdereference_vers=2
+ 
+ libscihdf5_la_CPPFLAGS = \
+     -I$(srcdir)/includes/ \
+diff -Naur orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h
+--- orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h	2020-02-25 10:59:56.000000000 +0100
++++ scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h	2020-06-16 17:07:00.129746134 +0200
+@@ -16,14 +16,12 @@
+ #ifndef __HDF5OBJECTS_H__
+ #define __HDF5OBJECTS_H__
+ 
+-#define H5_NO_DEPRECATED_SYMBOLS
+ #undef H5_USE_16_API
++#define H5_USE_18_API
+ 
+-#define H5Eset_auto_vers 2
+ #include <hdf5.h>
+ #include <hdf5_hl.h>
+ 
+-#undef H5_NO_DEPRECATED_SYMBOLS
+ 
+ //#define __HDF5OBJECTS_DEBUG__
+ //#define __HDF5ERROR_PRINT__
+diff -Naur orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp
+--- orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp	2020-02-25 10:59:56.000000000 +0100
++++ scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp	2020-06-16 17:15:08.605507554 +0200
+@@ -13,6 +13,8 @@
+ *
+ */
+ 
++#define H5_USE_18_API
++
+ #include <vector>
+ #include "function.hxx"
+ #include "string.hxx"
+diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c
+--- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c	2020-02-25 10:59:56.000000000 +0100
++++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c	2020-06-16 17:13:05.759906899 +0200
+@@ -13,7 +13,7 @@
+ *
+ */
+ 
+-#define H5_NO_DEPRECATED_SYMBOLS
++#define H5_USE_18_API
+ 
+ #ifndef _MSC_VER
+ #include <sys/time.h>
+diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c
+--- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c	2020-02-25 10:59:56.000000000 +0100
++++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c	2020-06-16 17:13:20.183115080 +0200
+@@ -13,7 +13,7 @@
+ *
+ */
+ 
+-#define H5_NO_DEPRECATED_SYMBOLS
++#define H5_USE_18_API
+ 
+ #ifndef _MSC_VER
+ #include <sys/time.h>