From d54f2394488ed258b4d3a464e75375f52e9d2568 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 18 Mar 2010 06:58:48 +0100 Subject: [PATCH] libxml2: add patch from FreeBSD for zlib-1.2.4, bumprev. --HG-- extra : convert_revision : 4ab1e1867e5e7b88134d7d7b56275aec9f367070 --- srcpkgs/libxml2/patches/patch-xmlIO.c.patch | 20 ++++++++++++++++++++ srcpkgs/libxml2/template | 6 ++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100755 srcpkgs/libxml2/patches/patch-xmlIO.c.patch diff --git a/srcpkgs/libxml2/patches/patch-xmlIO.c.patch b/srcpkgs/libxml2/patches/patch-xmlIO.c.patch new file mode 100755 index 00000000000..6f765aefc9f --- /dev/null +++ b/srcpkgs/libxml2/patches/patch-xmlIO.c.patch @@ -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 + } diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 9c3b6aebad6..9d086e54865 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,6 +1,7 @@ # Template build file for 'libxml2'. pkgname=libxml2 version=2.7.6 +revision=1 distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Library providing XML and HTML support" @@ -18,6 +19,7 @@ long_desc=" URI library." subpackages="$pkgname-devel $pkgname-python" -Add_dependency full glibc -Add_dependency full zlib +Add_dependency run glibc +Add_dependency run zlib +Add_dependency build zlib-devel Add_dependency build python