[packages/hdf] - adjust xdr_long arg type on non-LP64 archs

qboosh qboosh at pld-linux.org
Thu Dec 19 19:22:28 CET 2024


commit 06ea745b2fb50e1f76d218f6ca281e2b6cd20688
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Dec 19 19:02:39 2024 +0100

    - adjust xdr_long arg type on non-LP64 archs

 hdf-types.patch | 11 +++++++++++
 hdf.spec        |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/hdf.spec b/hdf.spec
index 43b29a4..37ce21c 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -20,6 +20,7 @@ Source0:	https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF4
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5:	607df78cacc131b37dfdb443e61e789a
 Patch0:		%{name}-shared.patch
+Patch1:		%{name}-types.patch
 Patch3:		%{name}-szip.patch
 Patch5:		%{name}-opt.patch
 URL:		https://www.hdfgroup.org/solutions/hdf4/
@@ -142,6 +143,7 @@ Dokumentacja javadoc do interfejsu HDF do Javy (JHI).
 %prep
 %setup -q -n %{name}-%{origver}
 %patch -P0 -p1
+%patch -P1 -p1
 %patch -P3 -p1
 %patch -P5 -p1
 
diff --git a/hdf-types.patch b/hdf-types.patch
new file mode 100644
index 0000000..5449592
--- /dev/null
+++ b/hdf-types.patch
@@ -0,0 +1,11 @@
+--- hdf-4.2.16-2/mfhdf/libsrc/putget.c.orig	2023-02-06 15:13:34.000000000 +0100
++++ hdf-4.2.16-2/mfhdf/libsrc/putget.c	2024-12-19 18:01:49.998654094 +0100
+@@ -593,7 +593,7 @@ xdr_NCv1data(XDR *xdrs, u_long where, nc
+ #ifdef H4_HAVE_LP64
+             return (xdr_int(xdrs, (nclong *)values));
+ #else
+-            return (xdr_long(xdrs, (nclong *)values));
++            return (xdr_long(xdrs, (long *)values));
+ #endif
+         case NC_FLOAT:
+             return (xdr_float(xdrs, (float *)values));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hdf.git/commitdiff/06ea745b2fb50e1f76d218f6ca281e2b6cd20688



More information about the pld-cvs-commit mailing list