From d43adb623dffc82f7db894cb2eda15c4e48bb7ed Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 21 Mar 2010 12:50:04 +0000 Subject: [PATCH] - updated to 2.7.7 - require zlib 1.2.4-3 for LFS support Changed files: crossmingw32-libxml2.spec -> 1.10 libxml2-largefile.patch -> 1.1 libxml2-zlib.patch -> 1.2 --- crossmingw32-libxml2.spec | 16 +++++++--------- libxml2-largefile.patch | 12 ++++++++++++ libxml2-zlib.patch | 32 -------------------------------- 3 files changed, 19 insertions(+), 41 deletions(-) create mode 100644 libxml2-largefile.patch delete mode 100644 libxml2-zlib.patch diff --git a/crossmingw32-libxml2.spec b/crossmingw32-libxml2.spec index bf315de..3fe6998 100644 --- a/crossmingw32-libxml2.spec +++ b/crossmingw32-libxml2.spec @@ -2,26 +2,25 @@ Summary: libXML library - cross Mingw32 version Summary(pl.UTF-8): Biblioteka libXML wersja 2 - wersja skrośna dla Mingw32 Name: crossmingw32-%{realname} -Version: 2.7.6 +Version: 2.7.7 Release: 1 License: MIT Group: Development/Libraries #Source0: http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/%{name}-%{version}.tar.bz2 Source0: ftp://xmlsoft.org/libxml2/%{realname}-%{version}.tar.gz -# Source0-md5: 7740a8ec23878a2f50120e1faa2730f2 +# Source0-md5: 9abc9959823ca9ff904f1fbcf21df066 Patch0: %{realname}-amfix.patch Patch1: %{realname}-man_fixes.patch Patch2: %{realname}-open.gz.patch -#Patch3: %{realname}-largefile.patch -Patch4: %{realname}-zlib.patch +Patch3: %{realname}-largefile.patch URL: http://xmlsoft.org/ BuildRequires: autoconf >= 2.2 BuildRequires: automake >= 1.4 BuildRequires: crossmingw32-gcc -BuildRequires: crossmingw32-zlib +BuildRequires: crossmingw32-zlib >= 1.2.4-3 BuildRequires: libtool >= 1:1.4.2-9 BuildRequires: sed >= 4.0 -Requires: crossmingw32-zlib >= 1.2.3.3 +Requires: crossmingw32-zlib >= 1.2.4-3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define no_install_post_strip 1 @@ -64,7 +63,7 @@ Statyczna biblioteka libxml2 (wersja skrośna mingw32). Summary: DLL libxml2 library for Windows Summary(pl.UTF-8): Biblioteka DLL libxml2 dla Windows Group: Applications/Emulators -Requires: crossmingw32-zlib-dll +Requires: crossmingw32-zlib-dll >= 1.2.4-3 Requires: wine %description dll @@ -78,8 +77,7 @@ Biblioteka DLL libxml2 dla Windows. %patch0 -p1 %patch1 -p1 %patch2 -p1 -#patch3 -p1 -%patch4 -p1 +%patch3 -p1 %build %{__libtoolize} diff --git a/libxml2-largefile.patch b/libxml2-largefile.patch new file mode 100644 index 0000000..4cbf71d --- /dev/null +++ b/libxml2-largefile.patch @@ -0,0 +1,12 @@ +--- libxml2-2.7.6/libxml.h~ 2009-09-24 17:31:59.000000000 +0200 ++++ libxml2-2.7.6/libxml.h 2009-10-10 18:57:55.681981813 +0200 +@@ -13,6 +13,9 @@ + #ifndef _LARGEFILE_SOURCE + #define _LARGEFILE_SOURCE + #endif ++#ifndef _LARGEFILE64_SOURCE ++#define _LARGEFILE64_SOURCE ++#endif + #ifndef _FILE_OFFSET_BITS + #define _FILE_OFFSET_BITS 64 + #endif diff --git a/libxml2-zlib.patch b/libxml2-zlib.patch deleted file mode 100644 index 4bf486d..0000000 --- a/libxml2-zlib.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001 -From: Mark Adler -Date: Tue, 19 Jan 2010 15:28:48 +0000 -Subject: libxml violates the zlib interface and crashes - -* xmlIO.c: remove an abuse of zlib API and use a clean interface - available in zlib >= 1.2.3 ---- -diff --git a/xmlIO.c b/xmlIO.c -index c03ac43..8fc00e3 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { - #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 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { - gzrewind(context); - } - } -+#endif - } - #endif - } --- -cgit v0.8.3.1 -- 2.43.0