[nexus] 05/07: New patch hdf5-1.10-support.patch to fix incorrect type for HDF5 handles: should be hid_t instead of int

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository nexus.

commit c1a08cd5503ab6df36a1085465d43e759577ec60
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 11 09:19:18 2017 +0200

    New patch hdf5-1.10-support.patch to fix incorrect type for HDF5 handles: should be hid_t instead of int
---
 debian/changelog                       |   6 ++
 debian/patches/hdf5-1.10-support.patch | 111 +++++++++++++++++++++++++++++++++
 debian/patches/series                  |   1 +
 3 files changed, 118 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e5c9eaa..0928878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 nexus (4.3.2-svn1921-5) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Andreas Tille ]
   * Take over package into Debian Science team
   * Fix wrong Priority: extra -> optional
 
+  [ Gilles Filippini ]
+  * New patch hdf5-1.10-support.patch to fix incorrect type for HDF5
+    handles: should be hid_t instead of int (closes: #861736)
+
  -- Andreas Tille <tille at debian.org>  Thu, 11 May 2017 09:14:17 +0200
 
 nexus (4.3.2-svn1921-4) unstable; urgency=medium
diff --git a/debian/patches/hdf5-1.10-support.patch b/debian/patches/hdf5-1.10-support.patch
new file mode 100644
index 0000000..e496327
--- /dev/null
+++ b/debian/patches/hdf5-1.10-support.patch
@@ -0,0 +1,111 @@
+Description: HDF5 1.10.x uses 64 bit handles. They're not int anymore.
+Author: Gilles Filippini <pini at debian.org>
+Bug-Debian: https://bugs.debian.org/861736
+Index: nexus-4.3.2-svn1921/src/napi5.c
+===================================================================
+--- nexus-4.3.2-svn1921.orig/src/napi5.c
++++ nexus-4.3.2-svn1921/src/napi5.c
+@@ -54,12 +54,12 @@ extern  void *NXpData;
+           hsize_t iCurrentIDX;
+         } iStack5[NXMAXSTACK];
+         struct iStack5 iAtt5;
+-        int iFID;
+-        int iCurrentG;
+-        int iCurrentD;
+-        int iCurrentS;
+-        int iCurrentT;
+-        int iCurrentA;
++        hid_t iFID;
++        hid_t iCurrentG;
++        hid_t iCurrentD;
++        hid_t iCurrentS;
++        hid_t iCurrentT;
++        hid_t iCurrentA;
+         int iNX;
+         int iNXID;
+         int iStackPtr;
+@@ -434,7 +434,7 @@ NXstatus  NX5open(CONSTCHAR *filename, N
+   NXstatus  NX5makegroup (NXhandle fid, CONSTCHAR *name, CONSTCHAR *nxclass) 
+   {
+     pNexusFile5 pFile;
+-    herr_t iRet;
++    hid_t iRet;
+     hid_t iVID;
+     hid_t attr1,aid1, aid2;
+     char pBuffer[1024] = "";
+@@ -487,7 +487,7 @@ NXstatus  NX5open(CONSTCHAR *filename, N
+ 
+     pNexusFile5 pFile;
+     hid_t attr1, atype;
+-    herr_t iRet;
++    hid_t iRet;
+     char pBuffer[1024];
+     char data[128];
+           
+@@ -654,7 +654,7 @@ static hid_t nxToHDF5Type(int datatype)
+ 					  int compress_type, int64_t chunk_size[])
+   {
+       hid_t datatype1, dataspace, iNew;
+-      herr_t iRet;
++      hid_t iRet;
+       hid_t type, cparms = -1;
+       pNexusFile5 pFile;
+       char pBuffer[256];
+@@ -992,8 +992,8 @@ static hid_t nxToHDF5Type(int datatype)
+     return NX_OK;
+   }
+ /*------------------------------------------------------------------*/
+-static int getAttVID(pNexusFile5 pFile){
+-  int vid;
++static hid_t getAttVID(pNexusFile5 pFile){
++  hid_t vid;
+      if(pFile->iCurrentG == 0 && pFile->iCurrentD == 0){
+        /* global attribute */
+        vid = H5Gopen(pFile->iFID,"/", H5P_DEFAULT);
+@@ -1007,7 +1007,7 @@ static int getAttVID(pNexusFile5 pFile){
+      return vid;
+ }
+ /*---------------------------------------------------------------*/
+-static void killAttVID(pNexusFile5 pFile, int vid){
++static void killAttVID(pNexusFile5 pFile, hid_t vid){
+   if(pFile->iCurrentG == 0 && pFile->iCurrentD == 0){
+     H5Gclose(vid);
+   }
+@@ -1021,8 +1021,8 @@ static void killAttVID(pNexusFile5 pFile
+     pNexusFile5 pFile;
+     hid_t  attr1, aid1, aid2;
+     hid_t type;
+-    herr_t iRet;
+-    int vid;  
++    hid_t iRet;
++    hid_t vid;  
+ 
+     pFile = NXI5assert (fid);
+ 
+@@ -2028,7 +2028,7 @@ static int countObjectsInGroup(hid_t loc
+      int iPType,rank;
+      char *iname = NULL, *vlen_str = NULL; 
+      hsize_t idx, intern_idx=-1;
+-     int vid;
++     hid_t vid;
+      H5O_info_t oinfo;
+ 
+      pFile = NXI5assert (fileid);
+@@ -2105,7 +2105,7 @@ static int countObjectsInGroup(hid_t loc
+ 			 void *data, int* datalen, int* iType)
+    {
+      pNexusFile5 pFile;
+-     int iNew, vid;
++     hid_t iNew, vid;
+      herr_t iRet;
+      hid_t type, atype = -1;
+      char pBuffer[256];
+@@ -2157,7 +2157,7 @@ static int countObjectsInGroup(hid_t loc
+    {
+      pNexusFile5 pFile;
+      hid_t idx;
+-     int vid;
++     hid_t vid;
+      H5O_info_t oinfo;
+     
+      pFile = NXI5assert (fid);
diff --git a/debian/patches/series b/debian/patches/series
index c1c1bf4..ad793ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-these-days-nexus-without-hdf5-is-considered-broken.patch
 fix-hdf5-1-10-detection.patch
+hdf5-1.10-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nexus.git