[hdf-eos5] 06/10: update patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 25 12:29:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository hdf-eos5.
commit 0f6e820becce13a1b5dbadd23403e331afa2c85b
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Oct 20 08:56:54 2017 +0100
update patch
---
debian/changelog | 2 +
debian/patches/fix-type-errors.patch | 93 ++++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 92179d5..97fb732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ hdf-eos5 (5.1.15.dfsg.1-7) UNRELEASED; urgency=medium
* Standards-Version: 4.1.1; no changes required
* Now at debhelper level 10. Drop unnecessary build-deps on auto*
+ * fix-type-errors.patch: some type errors (hid_t != int) fixed;
+ flagged as errors not warnings now
* Drop build-depends on transitional libhdf5-serial-dev. Closes: #879140
-- Alastair McKinstry <mckinstry at debian.org> Fri, 20 Oct 2017 06:14:43 +0100
diff --git a/debian/patches/fix-type-errors.patch b/debian/patches/fix-type-errors.patch
index b6f2816..e75428b 100644
--- a/debian/patches/fix-type-errors.patch
+++ b/debian/patches/fix-type-errors.patch
@@ -1,3 +1,8 @@
+Description: Fix type errors that now break Debian builds
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2017-10-20
+Forwarded: no
+
Index: hdf-eos5-5.1.15.dfsg.1/src/GDapi.c
===================================================================
--- hdf-eos5-5.1.15.dfsg.1.orig/src/GDapi.c
@@ -11,3 +16,91 @@ Index: hdf-eos5-5.1.15.dfsg.1/src/GDapi.c
/* FORTRAN wrappers */
/* ================ */
+@@ -19990,7 +19990,7 @@ HE5_GDgetextdata(hid_t gridID, char *fie
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static int
+-HE5_GDfldnameinfo(int gridID, const char *fieldname, char *actualname)
++HE5_GDfldnameinfo(hid_t gridID, const char *fieldname, char *actualname)
+ {
+ int nameFlag = FAIL;/* Return value of flag */
+ int length = 0; /* String length */
+Index: hdf-eos5-5.1.15.dfsg.1/include/HE5_HdfEosDef.h
+===================================================================
+--- hdf-eos5-5.1.15.dfsg.1.orig/include/HE5_HdfEosDef.h
++++ hdf-eos5-5.1.15.dfsg.1/include/HE5_HdfEosDef.h
+@@ -789,7 +789,7 @@ long HE5_GDinqdscaleattrs(hid_t grid
+
+ hid_t HE5_GDdefboxregion(hid_t gridID, double cornerlon[], double cornerlat[]);
+ hid_t HE5_GDdefvrtregion(hid_t gridID, hid_t regionID, char *vertObj, double range[]);
+-herr_t HE5_GDdeftimeperiod(hid_t gridID, hid_t periodID, double starttime, double stoptime);
++hid_t HE5_GDdeftimeperiod(hid_t gridID, hid_t periodID, double starttime, double stoptime);
+ herr_t HE5_GDextractregion(hid_t gridID, hid_t regionID, const char *fieldname, void *buffer);
+ hid_t HE5_GDdupregion(hid_t oldregionID);
+ herr_t HE5_GDgetpixels(hid_t gridID, long nLonLat, double lonVal[], double latVal[], long pixRow[], long pixCol[]);
+Index: hdf-eos5-5.1.15.dfsg.1/src/PTapi.c
+===================================================================
+--- hdf-eos5-5.1.15.dfsg.1.orig/src/PTapi.c
++++ hdf-eos5-5.1.15.dfsg.1/src/PTapi.c
+@@ -1896,7 +1896,7 @@ HE5_PTgetlevelname(hid_t pointID, int l
+ | |
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+-int
++hid_t
+ HE5_PTopenlevel(hid_t loc_id, const char *name, void *opdata)
+ {
+ int i = 0;
+Index: hdf-eos5-5.1.15.dfsg.1/src/SWapi.c
+===================================================================
+--- hdf-eos5-5.1.15.dfsg.1.orig/src/SWapi.c
++++ hdf-eos5-5.1.15.dfsg.1/src/SWapi.c
+@@ -90,7 +90,7 @@ HE5_SWfinfo(hid_t swathID, char *fieldty
+ static int
+ HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *fldactualname);
+ static herr_t
+-HE5_SWupdatedim(int swathID, char *dimname, hsize_t dim);
++HE5_SWupdatedim(hid_t swathID, char *dimname, hsize_t dim);
+ static herr_t
+ HE5_SWllmapedidxinfo(hid_t swathID, char *object, long *index0, long *index1);
+
+@@ -4087,7 +4087,7 @@ HE5_SWcompinfo(hid_t swathID, char *fldn
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static int
+-HE5_SWfldnameinfo(int swathID, char *fieldname, char *actualname)
++HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *actualname)
+ {
+ int nameFlag = FAIL;/* Return value of flag */
+ int length = 0; /* String length */
+@@ -4284,7 +4284,7 @@ HE5_SWfldnameinfo(int swathID, char *fie
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static herr_t
+-HE5_SWfinfo(int swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
++HE5_SWfinfo(hid_t swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
+ {
+ herr_t status = FAIL;/* routine return status variable */
+ herr_t statmeta = FAIL;/* EHgetmetavalue return status */
+Index: hdf-eos5-5.1.15.dfsg.1/src/ZAapi.c
+===================================================================
+--- hdf-eos5-5.1.15.dfsg.1.orig/src/ZAapi.c
++++ hdf-eos5-5.1.15.dfsg.1/src/ZAapi.c
+@@ -2948,7 +2948,7 @@ HE5_ZAcompinfo(hid_t zaID, char *fldname
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static int
+-HE5_ZAfldnameinfo(int zaID, char *fieldname, char *actualname)
++HE5_ZAfldnameinfo(hid_t zaID, char *fieldname, char *actualname)
+ {
+ int nameFlag = FAIL;/* Return value of flag */
+ int length = 0; /* String length */
+@@ -3100,7 +3100,7 @@ HE5_ZAfldnameinfo(int zaID, char *fieldn
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static herr_t
+-HE5_ZAfldinfo(int zaID, char *datafield, char *za_name, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
++HE5_ZAfldinfo(hid_t zaID, char *datafield, char *za_name, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
+ {
+ herr_t status = FAIL;/* routine return status variable */
+ herr_t statmeta = FAIL;/* EHgetmetavalue return status */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hdf-eos5.git
More information about the debian-science-commits
mailing list