From 13539cacfbef88ab156bf033cea50c6fe62b8d3a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 20 May 2010 21:14:33 +0200 Subject: [PATCH] libxml2: update to 2.7.7. --- srcpkgs/libxml2/libxml2-devel.template | 4 ++-- srcpkgs/libxml2/libxml2-python.template | 2 -- srcpkgs/libxml2/patches/patch-xmlIO.c.patch | 20 -------------------- srcpkgs/libxml2/template | 5 ++--- 4 files changed, 4 insertions(+), 27 deletions(-) delete mode 100755 srcpkgs/libxml2/patches/patch-xmlIO.c.patch diff --git a/srcpkgs/libxml2/libxml2-devel.template b/srcpkgs/libxml2/libxml2-devel.template index 7bbfcd7ac66..8e11cc1ea31 100644 --- a/srcpkgs/libxml2/libxml2-devel.template +++ b/srcpkgs/libxml2/libxml2-devel.template @@ -5,12 +5,12 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +Add_dependency run zlib-devel Add_dependency run libxml2 do_install() { - mkdir -p ${DESTDIR}/usr/bin - mkdir -p ${DESTDIR}/usr/lib + mkdir -p ${DESTDIR}/usr/{bin,lib} mkdir -p ${DESTDIR}/usr/share/doc mkdir -p ${DESTDIR}/usr/share/man/man1 diff --git a/srcpkgs/libxml2/libxml2-python.template b/srcpkgs/libxml2/libxml2-python.template index 25094e3b71d..9a7c93471d6 100644 --- a/srcpkgs/libxml2/libxml2-python.template +++ b/srcpkgs/libxml2/libxml2-python.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains ${sourcepkg} python related files." -revision=1 - Add_dependency run glibc Add_dependency run python Add_dependency run libxml2 diff --git a/srcpkgs/libxml2/patches/patch-xmlIO.c.patch b/srcpkgs/libxml2/patches/patch-xmlIO.c.patch deleted file mode 100755 index 6f765aefc9f..00000000000 --- a/srcpkgs/libxml2/patches/patch-xmlIO.c.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./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 9d086e54865..2171fa660dd 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,12 +1,11 @@ # Template build file for 'libxml2'. pkgname=libxml2 -version=2.7.6 -revision=1 +version=2.7.7 distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Library providing XML and HTML support" maintainer="Juan RP " -checksum=238c4f0203c012e5776522640c0fb3ac532c4064981c1ce3e74c00b75501d761 +checksum=af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68 long_desc=" This library allows to manipulate XML files. It includes support to read, modify and write XML and HTML files. There is DTDs support