[ruby-hdfeos5] 01/02: Add patch to fix FTBFS on 32 bit architectures against HDF5 1.10.
Bas Couwenberg
sebastic at debian.org
Mon Dec 5 17:51:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ruby-hdfeos5.
commit 0f8473b380f401620bd6eaac9d297a24ba847b70
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Dec 3 19:30:43 2016 +0100
Add patch to fix FTBFS on 32 bit architectures against HDF5 1.10.
---
debian/patches/0006-hid_t.patch | 139 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 139 insertions(+)
diff --git a/debian/patches/0006-hid_t.patch b/debian/patches/0006-hid_t.patch
new file mode 100644
index 0000000..1f43d02
--- /dev/null
+++ b/debian/patches/0006-hid_t.patch
@@ -0,0 +1,139 @@
+DescriptioN: Add support for HDF5 1.10.
+ hid_t type changed from 32-bit to a 64-bit value.
+Author: Gilles Filippini <pini at debian.org>
+Bug-Debian: https://bugs.debian.org/846353
+
+--- a/hdfeos5gd_wrap.c
++++ b/hdfeos5gd_wrap.c
+@@ -20,7 +20,7 @@
+ #endif
+
+ extern int check_numbertype(char *);
+-extern int change_numbertype(char *);
++extern hid_t change_numbertype(char *);
+ extern int change_entrycode(char *);
+ extern int change_projcode(char *);
+ extern int change_compmethod(char *);
+@@ -1327,7 +1327,7 @@ hdfeos5_gdinqfields(VALUE mod, VALUE ent
+
+ i_count = (int)o_nflds;
+ rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count);
+- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count);
++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count);
+
+ return rb_ary_new3(4, nflds, fieldlist, rank, ntype);
+ }
+@@ -1905,12 +1905,12 @@ hdfeos5_gdsetextdata(VALUE mod, VALUE fi
+ size = rb_Array(size);
+ }
+ i_filelist = RSTRING_PTR(filelist);
+- i_offset = hdfeos5_obj2clongary(offset);
++ i_offset = hdfeos5_obj2cunsint64ary(offset);
+ i_size = hdfeos5_obj2cunsint64ary(size);
+
+ o_rtn_val = HE5_GDsetextdata(i_gridid, i_filelist, i_offset, i_size);
+ rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
+- hdfeos5_freeclongary(i_offset);
++ hdfeos5_freecunsint64ary(i_offset);
+ hdfeos5_freecunsint64ary(i_size);
+ return rtn_val;
+ }
+@@ -1946,7 +1946,7 @@ hdfeos5_gdgetextdata(VALUE mod, VALUE fi
+
+ namelength = hdfeos5_cintary2obj((int*)o_namelength,o_nfiles,1,&o_nfiles);
+ filelist = hdfeos5_ccharary2obj(o_filelist,o_nfiles,o_nfiles);
+- offset = hdfeos5_clongary2obj(o_offset,o_nfiles,1,&o_nfiles);
++ offset = hdfeos5_cunsint64ary2obj(o_offset,o_nfiles,1,&o_nfiles);
+ size = hdfeos5_cunsint64ary2obj(o_size,o_nfiles,1,&o_nfiles);
+
+ return rb_ary_new3(5,nfiles, namelength, filelist, offset, size);
+--- a/hdfeos5sw_wrap.c
++++ b/hdfeos5sw_wrap.c
+@@ -1098,7 +1098,7 @@ hdfeos5_swinqdatafields(VALUE mod, VALUE
+
+ i_count = (int)o_nflds;
+ rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count);
+- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count);
++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count);
+
+ return rb_ary_new3(4, nflds, fieldlist, rank, ntype);
+ }
+@@ -1139,7 +1139,7 @@ hdfeos5_swinqgeofields(VALUE mod, VALUE
+
+ i_count = (int)o_nflds;
+ rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count);
+- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count);
++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count);
+
+ return rb_ary_new3(4, nflds, fieldlist, rank, ntype);
+ }
+@@ -2685,12 +2685,12 @@ hdfeos5_swsetextdata(VALUE mod, VALUE fi
+ size = rb_Array(size);
+ }
+ i_filelist = RSTRING_PTR(filelist);
+- i_offset = hdfeos5_obj2clongary(offset);
++ i_offset = hdfeos5_obj2cunsint64ary(offset);
+ i_size = hdfeos5_obj2cunsint64ary(size);
+
+ o_rtn_val = HE5_SWsetextdata(i_swathid, i_filelist, i_offset, i_size);
+ rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
+- hdfeos5_freeclongary(i_offset);
++ hdfeos5_freecunsint64ary(i_offset);
+ hdfeos5_freecunsint64ary(i_size);
+ return rtn_val;
+ }
+@@ -2726,7 +2726,7 @@ hdfeos5_swgetextdata(VALUE mod, VALUE fi
+
+ namelength = hdfeos5_cintary2obj((int*)o_namelength,o_rtn_val,1,&o_rtn_val);
+ filelist = hdfeos5_ccharary2obj(o_filelist,o_rtn_val,o_rtn_val);
+- offset = hdfeos5_clongary2obj(o_offset,o_rtn_val,1,&o_rtn_val);
++ offset = hdfeos5_cunsint64ary2obj(o_offset,o_rtn_val,1,&o_rtn_val);
+ size = hdfeos5_cunsint64ary2obj(o_size,o_rtn_val,1,&o_rtn_val);
+
+ return rb_ary_new3(5,rtn_val, namelength, filelist, offset, size);
+--- a/hdfeos5za_wrap.c
++++ b/hdfeos5za_wrap.c
+@@ -785,7 +785,7 @@ hdfeos5_zainquire(VALUE mod, VALUE entry
+
+ i_count = (int)o_nflds;
+ rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count);
+- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count);
++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count);
+
+ return rb_ary_new3(4, nflds, fieldlist, rank, ntype);
+ }
+@@ -1603,12 +1603,12 @@ hdfeos5_zasetextdata(VALUE mod, VALUE fi
+ size = rb_Array(size);
+ }
+ i_filelist = RSTRING_PTR(filelist);
+- i_offset = hdfeos5_obj2clongary(offset);
++ i_offset = hdfeos5_obj2cunsint64ary(offset);
+ i_size = hdfeos5_obj2cunsint64ary(size);
+
+ o_rtn_val = HE5_ZAsetextdata(i_zaid, i_filelist, i_offset, i_size);
+ rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
+- hdfeos5_freeclongary(i_offset);
++ hdfeos5_freecunsint64ary(i_offset);
+ hdfeos5_freecunsint64ary(i_size);
+ return rtn_val;
+ }
+@@ -1644,7 +1644,7 @@ hdfeos5_zagetextdata(VALUE mod, VALUE fi
+
+ namelength = hdfeos5_cintary2obj((int*)o_namelength,o_rtn_val,1,&o_rtn_val);
+ filelist = hdfeos5_ccharary2obj(o_filelist,o_rtn_val,o_rtn_val);
+- offset = hdfeos5_clongary2obj(o_offset,o_rtn_val,1,&o_rtn_val);
++ offset = hdfeos5_cunsint64ary2obj(o_offset,o_rtn_val,1,&o_rtn_val);
+ size = hdfeos5_cunsint64ary2obj(o_size,o_rtn_val,1,&o_rtn_val);
+
+ return rb_ary_new3(5,rtn_val, namelength, filelist, offset, size);
+--- a/hdfeos5_chkdatatype.c
++++ b/hdfeos5_chkdatatype.c
+@@ -156,7 +156,7 @@ check_numbertype(char *numbertype)
+ __FILE__,__LINE__);
+ }
+
+-int
++hid_t
+ change_numbertype(char *numbertype)
+ {
+ if(strcmp(numbertype,"byte")==0) return(H5T_NATIVE_CHAR);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ruby-hdfeos5.git
More information about the Pkg-grass-devel
mailing list