libgsf/libgsf-1.14.19.patch

   1 --- misc/libgsf-1.14.19/configure       2010-09-25 18:53:55.000000000 +0200
   2 +++ misc/build/libgsf-1.14.19/configure 2011-03-03 12:42:21.000000000 +0100
   3 @@ -11475,7 +11475,7 @@
   4
   5
   6
   7 -
   8 +if false; then
   9  case "$am__api_version" in
  10      1.01234)
  11         as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
  12 @@ -11650,7 +11650,7 @@
  13
  14
  15
  16 -
  17 +fi
  18
  19
  20
  21 @@ -11963,7 +11963,7 @@
  22     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
  23  $as_echo "$IT_PERL_VERSION" >&6; }
  24  fi
  25 -if test "x" != "xno-xml"; then
  26 +if test "xno-xml" != "xno-xml"; then
  27     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
  28  $as_echo_n "checking for XML::Parser... " >&6; }
  29     if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
  30 @@ -12846,7 +12846,7 @@
  31  fi
  32
  33  fi
  34 -if test -n "$PKG_CONFIG"; then
  35 +if test "$PKG_CONFIG" != "no" ; then
  36         _pkg_min_version=0.9.0
  37         { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
  38  $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
  39 --- misc/libgsf-1.14.19/gsf/gsf-infile-zip.c
  40 +++ misc/build/libgsf-1.14.19/gsf/gsf-infile-zip.c
  41 @@ -30,6 +30,10 @@
  42
  43  #include <string.h>
  44  #include <zlib.h>
  45 +
  46 +#if defined(Z_PREFIX) && defined(crc32)
  47 +#undef crc32
  48 +#endif
  49
  50  #undef G_LOG_DOMAIN
  51  #define G_LOG_DOMAIN "libgsf:zip"
  52
  53 --- misc/libgsf-1.14.19/gsf/gsf-outfile-zip.c
  54 +++ misc/build/libgsf-1.14.19/gsf/gsf-outfile-zip.c
  55 @@ -29,6 +29,11 @@
  56  #include <string.h>
  57  #include <time.h>
  58  #include <zlib.h>
  59 +
  60 +#if defined(Z_PREFIX) && defined(crc32)
  61 +#define CRC32_WAS_DEFINED_AS_Z_CRC32
  62 +#undef crc32
  63 +#endif
  64
  65  #undef G_LOG_DOMAIN
  66  #define G_LOG_DOMAIN "libgsf:zip"
  67 @@ -345,7 +345,11 @@
  68         zip_header_write (zip);
  69         zip->writing = TRUE;
  70         zip->root->writing = TRUE;
  71 +#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
  72 +       dirent->crc32 = z_crc32 (0L, Z_NULL, 0);
  73 +#else
  74         dirent->crc32 = crc32 (0L, Z_NULL, 0);
  75 +#endif
  76         if (zip->compression_method == GSF_ZIP_DEFLATED) {
  77                 if (!zip->stream) {
  78                         zip->stream = g_new0 (z_stream, 1);
  79 @@ -544,7 +544,11 @@
  80                         return FALSE;
  81                 dirent->csize += num_bytes;
  82         }
  83 +#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
  84 +       dirent->crc32 = z_crc32 (dirent->crc32, data, num_bytes);
  85 +#else
  86         dirent->crc32 = crc32 (dirent->crc32, data, num_bytes);
  87 +#endif
  88         dirent->usize += num_bytes;
  89
  90         return TRUE;