summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/libxml2/.footprint.i686 (renamed from extra/libxml2/.footprint.i686)0
-rw-r--r--base/libxml2/.footprint.x86_64 (renamed from extra/libxml2/.footprint.x86_64)0
-rw-r--r--base/libxml2/.md5sum.i686 (renamed from extra/libxml2/.md5sum.i686)1
-rw-r--r--base/libxml2/.md5sum.x86_64 (renamed from extra/libxml2/.md5sum.x86_64)1
-rwxr-xr-xbase/libxml2/Pkgfile (renamed from extra/libxml2/Pkgfile)2
-rw-r--r--base/libxml2/largefile64.patch (renamed from extra/libxml2/largefile64.patch)0
-rw-r--r--base/libxml2/shared_library_versionning.patch (renamed from extra/libxml2/shared_library_versionning.patch)0
-rw-r--r--extra/libxml2/zlib.patch32
8 files changed, 0 insertions, 36 deletions
diff --git a/extra/libxml2/.footprint.i686 b/base/libxml2/.footprint.i686
index 31377f99f..31377f99f 100644
--- a/extra/libxml2/.footprint.i686
+++ b/base/libxml2/.footprint.i686
diff --git a/extra/libxml2/.footprint.x86_64 b/base/libxml2/.footprint.x86_64
index 31377f99f..31377f99f 100644
--- a/extra/libxml2/.footprint.x86_64
+++ b/base/libxml2/.footprint.x86_64
diff --git a/extra/libxml2/.md5sum.i686 b/base/libxml2/.md5sum.i686
index 41575035c..282f1f273 100644
--- a/extra/libxml2/.md5sum.i686
+++ b/base/libxml2/.md5sum.i686
@@ -1,4 +1,3 @@
5ad4915665608ebfa5b89f7908467a72 largefile64.patch
8127a65e8c3b08856093099b52599c86 libxml2-2.7.8.tar.gz
84aeb7c6db023eae044e95d9211dba53 shared_library_versionning.patch
-0365d5397164b8739219e56e5ca069d1 zlib.patch
diff --git a/extra/libxml2/.md5sum.x86_64 b/base/libxml2/.md5sum.x86_64
index 41575035c..282f1f273 100644
--- a/extra/libxml2/.md5sum.x86_64
+++ b/base/libxml2/.md5sum.x86_64
@@ -1,4 +1,3 @@
5ad4915665608ebfa5b89f7908467a72 largefile64.patch
8127a65e8c3b08856093099b52599c86 libxml2-2.7.8.tar.gz
84aeb7c6db023eae044e95d9211dba53 shared_library_versionning.patch
-0365d5397164b8739219e56e5ca069d1 zlib.patch
diff --git a/extra/libxml2/Pkgfile b/base/libxml2/Pkgfile
index 4bd62f250..924ed82eb 100755
--- a/extra/libxml2/Pkgfile
+++ b/base/libxml2/Pkgfile
@@ -10,14 +10,12 @@ version=2.7.8
release=2
source=(ftp://xmlsoft.org/libxml2/$name-$version.tar.gz \
largefile64.patch \
- zlib.patch
shared_library_versionning.patch )
build() {
cd $name-$version
patch -Np1 -i $SRC/largefile64.patch
patch -Np1 -i $SRC/shared_library_versionning.patch
-# patch -p1 -i "$SRC/zlib.patch"
autoreconf -fi
./configure --prefix=/usr \
diff --git a/extra/libxml2/largefile64.patch b/base/libxml2/largefile64.patch
index 29be82760..29be82760 100644
--- a/extra/libxml2/largefile64.patch
+++ b/base/libxml2/largefile64.patch
diff --git a/extra/libxml2/shared_library_versionning.patch b/base/libxml2/shared_library_versionning.patch
index a0b62bca9..a0b62bca9 100644
--- a/extra/libxml2/shared_library_versionning.patch
+++ b/base/libxml2/shared_library_versionning.patch
diff --git a/extra/libxml2/zlib.patch b/extra/libxml2/zlib.patch
deleted file mode 100644
index 4bf486d12..000000000
--- a/extra/libxml2/zlib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-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