[hdf4] 06/09: Refresh patches

Johan Van de Wauw johanvdw-guest at moszumanska.debian.org
Tue Mar 3 10:25:39 UTC 2015


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

johanvdw-guest pushed a commit to branch experimental
in repository hdf4.

commit 76870f2b0f3de9ff5b364a0f198714ba7a648c83
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Mon Mar 2 22:06:25 2015 +0100

    Refresh patches
---
 debian/patches/hdfi.h                | 18 +++++++-----------
 debian/patches/install-examples.diff | 20 ++++++++++----------
 debian/patches/kfreebsd              | 12 ++++--------
 debian/patches/ppc64el.diff          | 18 ++++++------------
 debian/patches/ppc64el.patch         | 10 ++++------
 5 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/debian/patches/hdfi.h b/debian/patches/hdfi.h
index dad58ce..842a8e6 100644
--- a/debian/patches/hdfi.h
+++ b/debian/patches/hdfi.h
@@ -1,5 +1,3 @@
-Index: b/hdf/src/hdfi.h
-===================================================================
 --- a/hdf/src/hdfi.h
 +++ b/hdf/src/hdfi.h
 @@ -48,6 +48,7 @@
@@ -31,7 +29,7 @@ Index: b/hdf/src/hdfi.h
  
  /* I/O library constants */
  #define UNIXUNBUFIO 1
-@@ -288,7 +296,7 @@
+@@ -288,7 +296,7 @@ typedef int               hdf_pint_t;
  
  #endif /* IBM6000 */
  
@@ -40,7 +38,7 @@ Index: b/hdf/src/hdfi.h
  
  #ifndef HP9000
  #define HP9000
-@@ -347,6 +355,10 @@
+@@ -347,6 +355,10 @@ typedef int               hdf_pint_t;
  /*  what each does */
  #define JMEMSYS         MEM_ANSI
  
@@ -51,7 +49,7 @@ Index: b/hdf/src/hdfi.h
  #endif /* HP9000 */
  
  
-@@ -666,6 +678,410 @@
+@@ -666,6 +678,410 @@ typedef int               hdf_pint_t;
  #endif /* !(defined(__APPLE__)) */
  
  /*-----------------------------------------------------*/
@@ -462,7 +460,7 @@ Index: b/hdf/src/hdfi.h
  #if defined(NEXT) || defined(NeXT)
  
  #ifndef NEXT
-@@ -928,7 +1344,11 @@
+@@ -928,7 +1344,11 @@ Please check your Makefile.
  
  #include <sys/file.h>               /* for unbuffered i/o stuff */
  #include <sys/stat.h>
@@ -475,7 +473,7 @@ Index: b/hdf/src/hdfi.h
  typedef void              VOID;
  typedef void              *VOIDP;
  typedef char              *_fcd;
-@@ -952,6 +1372,11 @@
+@@ -952,6 +1372,11 @@ typedef long              hdf_pint_t;
  #define _fcdtocp(desc) (desc)
  #define FILELIB UNIXBUFIO
  
@@ -487,7 +485,7 @@ Index: b/hdf/src/hdfi.h
  /* JPEG #define's - Look in the JPEG docs before changing - (Q) */
  
  /* Determine the memory manager we are going to use. Valid values are: */
-@@ -1097,6 +1522,8 @@
+@@ -1097,6 +1522,8 @@ typedef long              hdf_pint_t;
  #define _fcdtocp(desc) (desc)
  #define FILELIB UNIXBUFIO
  
@@ -496,7 +494,7 @@ Index: b/hdf/src/hdfi.h
  /* JPEG #define's - Look in the JPEG docs before changing - (Q) */
  
  /* Determine the memory manager we are going to use. Valid values are: */
-@@ -1111,6 +1538,66 @@
+@@ -1111,6 +1538,66 @@ typedef long              hdf_pint_t;
  
  #endif /* IA64 */
  
@@ -563,8 +561,6 @@ Index: b/hdf/src/hdfi.h
  #ifndef GOT_MACHINE
  No machine type has been defined.  Your Makefile needs to have someing like
  -DSUN or -DUNICOS in order for the HDF internal structures to be defined
-Index: b/hdf/src/hconv.h
-===================================================================
 --- a/hdf/src/hconv.h
 +++ b/hdf/src/hconv.h
 @@ -59,7 +59,7 @@
diff --git a/debian/patches/install-examples.diff b/debian/patches/install-examples.diff
index e33dd76..a77a246 100644
--- a/debian/patches/install-examples.diff
+++ b/debian/patches/install-examples.diff
@@ -1,6 +1,6 @@
 --- a/config/examples.am
 +++ b/config/examples.am
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
  CLEANFILES=$(EXAMPLE_PROG)
  
  # How to create EXAMPLEDIR if it doesn't already exist
@@ -9,7 +9,7 @@
  	mkdir -p $@
  
  # Install and uninstall rules.  We install the source files, not the
-@@ -54,27 +54,27 @@
+@@ -54,27 +54,27 @@ install-data-local:
  uninstall-local:
  	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
  
@@ -46,7 +46,7 @@
  
 --- a/hdf/examples/Makefile.in
 +++ b/hdf/examples/Makefile.in
-@@ -559,7 +559,7 @@
+@@ -1151,7 +1151,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
  AN_read_annotation: $(srcdir)/AN_read_annotation.c
  
  # How to create EXAMPLEDIR if it doesn't already exist
@@ -55,7 +55,7 @@
  	mkdir -p $@
  
  # Install and uninstall rules.  We install the source files, not the
-@@ -569,27 +569,27 @@
+@@ -1161,27 +1161,27 @@ install-data-local:
  uninstall-local:
  	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
  
@@ -92,7 +92,7 @@
  
 --- a/hdf/fortran/examples/Makefile.in
 +++ b/hdf/fortran/examples/Makefile.in
-@@ -551,7 +551,7 @@
+@@ -1108,7 +1108,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
  AN_read_annotation: $(srcdir)/AN_read_annotation.f
  
  # How to create EXAMPLEDIR if it doesn't already exist
@@ -101,7 +101,7 @@
  	mkdir -p $@
  
  # Install and uninstall rules.  We install the source files, not the
-@@ -561,27 +561,27 @@
+@@ -1118,27 +1118,27 @@ install-data-local:
  uninstall-local:
  	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
  
@@ -138,7 +138,7 @@
  
 --- a/mfhdf/examples/Makefile.in
 +++ b/mfhdf/examples/Makefile.in
-@@ -523,7 +523,7 @@
+@@ -1024,7 +1024,7 @@ get_attr: $(srcdir)/SD_get_attr.c
  chunking_example: $(srcdir)/SD_chunking_example.c
  
  # How to create EXAMPLEDIR if it doesn't already exist
@@ -147,7 +147,7 @@
  	mkdir -p $@
  
  # Install and uninstall rules.  We install the source files, not the
-@@ -533,27 +533,27 @@
+@@ -1034,27 +1034,27 @@ install-data-local:
  uninstall-local:
  	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
  
@@ -184,7 +184,7 @@
  
 --- a/mfhdf/fortran/examples/Makefile.in
 +++ b/mfhdf/fortran/examples/Makefile.in
-@@ -524,7 +524,7 @@
+@@ -1025,7 +1025,7 @@ SD_compress_sds: $(srcdir)/SD_compress_s
  SD_chunking_example: $(srcdir)/SD_chunking_example.f
  
  # How to create EXAMPLEDIR if it doesn't already exist
@@ -193,7 +193,7 @@
  	mkdir -p $@
  
  # Install and uninstall rules.  We install the source files, not the
-@@ -534,27 +534,27 @@
+@@ -1035,27 +1035,27 @@ install-data-local:
  uninstall-local:
  	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
  
diff --git a/debian/patches/kfreebsd b/debian/patches/kfreebsd
index 4982b20..48774b3 100644
--- a/debian/patches/kfreebsd
+++ b/debian/patches/kfreebsd
@@ -1,8 +1,6 @@
-Index: b/configure.ac
-===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -801,7 +801,7 @@
+@@ -805,7 +805,7 @@ AC_CHECK_FUNCS([fork system vfork wait])
  ## These header files should probably be generated by autoconf instead
  ## of being copied depending upon the host.
  case "$host" in
@@ -11,11 +9,9 @@ Index: b/configure.ac
    *-freebsd*)           BAR="fbsd"        ;;
    *-ibm-aix*)           BAR="aix"         ;;
    sparc64-*-solaris2*)  BAR="solaris64"   ;;
-Index: b/hdf/src/hdfi.h
-===================================================================
---- a/hdf/src/hdfi.h	2014-09-13 23:09:17.689485898 +0200
-+++ b/hdf/src/hdfi.h	2014-09-13 23:10:32.453487107 +0200
-@@ -1392,7 +1392,7 @@
+--- a/hdf/src/hdfi.h
++++ b/hdf/src/hdfi.h
+@@ -1392,7 +1392,7 @@ typedef long              hdf_pint_t;
  /*-----------------------------------------------------*/
  #endif /*power PC 5 64 */
  /* Linux 64 */
diff --git a/debian/patches/ppc64el.diff b/debian/patches/ppc64el.diff
index b27af79..057152f 100644
--- a/debian/patches/ppc64el.diff
+++ b/debian/patches/ppc64el.diff
@@ -1,8 +1,6 @@
-Index: b/configure
-===================================================================
 --- a/configure
 +++ b/configure
-@@ -8648,7 +8648,10 @@
+@@ -8815,7 +8815,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_i386"
  	    ;;
@@ -14,7 +12,7 @@ Index: b/configure
  	    LD="${LD-ld} -m elf32ppclinux"
  	    ;;
  	  s390x-*linux*)
-@@ -8667,7 +8670,10 @@
+@@ -8834,7 +8837,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_x86_64"
  	    ;;
@@ -26,11 +24,9 @@ Index: b/configure
  	    LD="${LD-ld} -m elf64ppc"
  	    ;;
  	  s390*-*linux*|s390*-*tpf*)
-Index: b/aclocal.m4
-===================================================================
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -2300,7 +2300,10 @@
+@@ -2503,7 +2503,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_i386"
  	    ;;
@@ -42,7 +38,7 @@ Index: b/aclocal.m4
  	    LD="${LD-ld} -m elf32ppclinux"
  	    ;;
  	  s390x-*linux*)
-@@ -2319,7 +2322,10 @@
+@@ -2522,7 +2525,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_x86_64"
  	    ;;
@@ -54,11 +50,9 @@ Index: b/aclocal.m4
  	    LD="${LD-ld} -m elf64ppc"
  	    ;;
  	  s390*-*linux*|s390*-*tpf*)
-Index: b/m4/libtool.m4
-===================================================================
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
-@@ -1326,7 +1326,10 @@
+@@ -1326,7 +1326,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_i386"
  	    ;;
@@ -70,7 +64,7 @@ Index: b/m4/libtool.m4
  	    LD="${LD-ld} -m elf32ppclinux"
  	    ;;
  	  s390x-*linux*)
-@@ -1345,7 +1348,10 @@
+@@ -1345,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_x86_64"
  	    ;;
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index 0020989..be9c342 100644
--- a/debian/patches/ppc64el.patch
+++ b/debian/patches/ppc64el.patch
@@ -1,8 +1,6 @@
-Index: libhdf4-4.2.10/HDF4/mfhdf/libsrc/xdrposix.c
-===================================================================
---- libhdf4-4.2.10.orig/HDF4/mfhdf/libsrc/xdrposix.c	2014-10-05 20:35:40.000000000 +0000
-+++ libhdf4-4.2.10/HDF4/mfhdf/libsrc/xdrposix.c	2014-10-08 16:30:11.170013021 +0000
-@@ -431,7 +431,7 @@
+--- a/mfhdf/libsrc/xdrposix.c
++++ b/mfhdf/libsrc/xdrposix.c
+@@ -435,7 +435,7 @@ xdrposix_getlong(xdrs, lp)
  #endif
  {
      unsigned char *up = (unsigned char *)lp ;
@@ -11,7 +9,7 @@ Index: libhdf4-4.2.10/HDF4/mfhdf/libsrc/xdrposix.c
      *lp = 0 ;
      up += (sizeof(long) - 4) ;
  #endif
-@@ -458,7 +458,7 @@
+@@ -462,7 +462,7 @@ xdrposix_putlong(xdrs, lp)
      netlong mycopy = htonl(*lp);
      up = (unsigned char *)&mycopy;
  #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git



More information about the Pkg-grass-devel mailing list