libxml2: add patch from FreeBSD for zlib-1.2.4, bumprev.

--HG--
extra : convert_revision : 4ab1e1867e5e7b88134d7d7b56275aec9f367070
This commit is contained in:
Juan RP 2010-03-18 06:58:48 +01:00
parent d29cb492e2
commit d54f239448
2 changed files with 24 additions and 2 deletions

View file

@ -0,0 +1,20 @@
--- ./xmlIO.c.orig 2009-09-24 08:32:00.000000000 -0700
+++ ./xmlIO.c 2010-03-17 12:35:00.957293884 -0700
@@ -2518,6 +2518,9 @@
#ifdef HAVE_ZLIB_H
if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
(strcmp(URI, "-") != 0)) {
+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230
+ ret->compressed = !gzdirect(context);
+#else
if (((z_stream *)context)->avail_in > 4) {
char *cptr, buff4[4];
cptr = (char *) ((z_stream *)context)->next_in;
@@ -2529,6 +2532,7 @@
gzrewind(context);
}
}
+#endif
}
#endif
}

View file

@ -1,6 +1,7 @@
# Template build file for 'libxml2'. # Template build file for 'libxml2'.
pkgname=libxml2 pkgname=libxml2
version=2.7.6 version=2.7.6
revision=1
distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz"
build_style=gnu_configure build_style=gnu_configure
short_desc="Library providing XML and HTML support" short_desc="Library providing XML and HTML support"
@ -18,6 +19,7 @@ long_desc="
URI library." URI library."
subpackages="$pkgname-devel $pkgname-python" subpackages="$pkgname-devel $pkgname-python"
Add_dependency full glibc Add_dependency run glibc
Add_dependency full zlib Add_dependency run zlib
Add_dependency build zlib-devel
Add_dependency build python Add_dependency build python