From 108fc6ee438e754f5c0459c5abc50e09a9b7ba17 Mon Sep 17 00:00:00 2001 From: tnut Date: Thu, 17 Feb 2011 21:14:47 +0100 Subject: libxml2, nettoyage du port et passe ds base --- extra/libxml2/.footprint.i686 | 81 -------------------------- extra/libxml2/.footprint.x86_64 | 81 -------------------------- extra/libxml2/.md5sum.i686 | 4 -- extra/libxml2/.md5sum.x86_64 | 4 -- extra/libxml2/Pkgfile | 31 ---------- extra/libxml2/largefile64.patch | 12 ---- extra/libxml2/shared_library_versionning.patch | 21 ------- extra/libxml2/zlib.patch | 32 ---------- 8 files changed, 266 deletions(-) delete mode 100644 extra/libxml2/.footprint.i686 delete mode 100644 extra/libxml2/.footprint.x86_64 delete mode 100644 extra/libxml2/.md5sum.i686 delete mode 100644 extra/libxml2/.md5sum.x86_64 delete mode 100755 extra/libxml2/Pkgfile delete mode 100644 extra/libxml2/largefile64.patch delete mode 100644 extra/libxml2/shared_library_versionning.patch delete mode 100644 extra/libxml2/zlib.patch (limited to 'extra') diff --git a/extra/libxml2/.footprint.i686 b/extra/libxml2/.footprint.i686 deleted file mode 100644 index 31377f99f..000000000 --- a/extra/libxml2/.footprint.i686 +++ /dev/null @@ -1,81 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/xml2-config --rwxr-xr-x root/root usr/bin/xmlcatalog --rwxr-xr-x root/root usr/bin/xmllint -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/libxml2/ -drwxr-xr-x root/root usr/include/libxml2/libxml/ --rw-r--r-- root/root usr/include/libxml2/libxml/DOCBparser.h --rw-r--r-- root/root usr/include/libxml2/libxml/HTMLparser.h --rw-r--r-- root/root usr/include/libxml2/libxml/HTMLtree.h --rw-r--r-- root/root usr/include/libxml2/libxml/SAX.h --rw-r--r-- root/root usr/include/libxml2/libxml/SAX2.h --rw-r--r-- root/root usr/include/libxml2/libxml/c14n.h --rw-r--r-- root/root usr/include/libxml2/libxml/catalog.h --rw-r--r-- root/root usr/include/libxml2/libxml/chvalid.h --rw-r--r-- root/root usr/include/libxml2/libxml/debugXML.h --rw-r--r-- root/root usr/include/libxml2/libxml/dict.h --rw-r--r-- root/root usr/include/libxml2/libxml/encoding.h --rw-r--r-- root/root usr/include/libxml2/libxml/entities.h --rw-r--r-- root/root usr/include/libxml2/libxml/globals.h --rw-r--r-- root/root usr/include/libxml2/libxml/hash.h --rw-r--r-- root/root usr/include/libxml2/libxml/list.h --rw-r--r-- root/root usr/include/libxml2/libxml/nanoftp.h --rw-r--r-- root/root usr/include/libxml2/libxml/nanohttp.h --rw-r--r-- root/root usr/include/libxml2/libxml/parser.h --rw-r--r-- root/root usr/include/libxml2/libxml/parserInternals.h --rw-r--r-- root/root usr/include/libxml2/libxml/pattern.h --rw-r--r-- root/root usr/include/libxml2/libxml/relaxng.h --rw-r--r-- root/root usr/include/libxml2/libxml/schemasInternals.h --rw-r--r-- root/root usr/include/libxml2/libxml/schematron.h --rw-r--r-- root/root usr/include/libxml2/libxml/threads.h --rw-r--r-- root/root usr/include/libxml2/libxml/tree.h --rw-r--r-- root/root usr/include/libxml2/libxml/uri.h --rw-r--r-- root/root usr/include/libxml2/libxml/valid.h --rw-r--r-- root/root usr/include/libxml2/libxml/xinclude.h --rw-r--r-- root/root usr/include/libxml2/libxml/xlink.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlIO.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlautomata.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlerror.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlexports.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlmemory.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlmodule.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlreader.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlregexp.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlsave.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlschemas.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlschemastypes.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlstring.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlunicode.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlversion.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlwriter.h --rw-r--r-- root/root usr/include/libxml2/libxml/xpath.h --rw-r--r-- root/root usr/include/libxml2/libxml/xpathInternals.h --rw-r--r-- root/root usr/include/libxml2/libxml/xpointer.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libxml2.a --rwxr-xr-x root/root usr/lib/libxml2.la -lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.7.8 -lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.7.8 --rwxr-xr-x root/root usr/lib/libxml2.so.2.7.8 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libxml-2.0.pc -drwxr-xr-x root/root usr/lib/python2.7/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/drv_libxml2.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/libxml2.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/libxml2mod.a --rwxr-xr-x root/root usr/lib/python2.7/site-packages/libxml2mod.la --rwxr-xr-x root/root usr/lib/python2.7/site-packages/libxml2mod.so --rw-r--r-- root/root usr/lib/xml2Conf.sh -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/aclocal/ --rw-r--r-- root/root usr/share/aclocal/libxml.m4 -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/xml2-config.1.gz --rw-r--r-- root/root usr/share/man/man1/xmlcatalog.1.gz --rw-r--r-- root/root usr/share/man/man1/xmllint.1.gz -drwxr-xr-x root/root usr/share/man/man3/ --rw-r--r-- root/root usr/share/man/man3/libxml.3.gz diff --git a/extra/libxml2/.footprint.x86_64 b/extra/libxml2/.footprint.x86_64 deleted file mode 100644 index 31377f99f..000000000 --- a/extra/libxml2/.footprint.x86_64 +++ /dev/null @@ -1,81 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/xml2-config --rwxr-xr-x root/root usr/bin/xmlcatalog --rwxr-xr-x root/root usr/bin/xmllint -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/libxml2/ -drwxr-xr-x root/root usr/include/libxml2/libxml/ --rw-r--r-- root/root usr/include/libxml2/libxml/DOCBparser.h --rw-r--r-- root/root usr/include/libxml2/libxml/HTMLparser.h --rw-r--r-- root/root usr/include/libxml2/libxml/HTMLtree.h --rw-r--r-- root/root usr/include/libxml2/libxml/SAX.h --rw-r--r-- root/root usr/include/libxml2/libxml/SAX2.h --rw-r--r-- root/root usr/include/libxml2/libxml/c14n.h --rw-r--r-- root/root usr/include/libxml2/libxml/catalog.h --rw-r--r-- root/root usr/include/libxml2/libxml/chvalid.h --rw-r--r-- root/root usr/include/libxml2/libxml/debugXML.h --rw-r--r-- root/root usr/include/libxml2/libxml/dict.h --rw-r--r-- root/root usr/include/libxml2/libxml/encoding.h --rw-r--r-- root/root usr/include/libxml2/libxml/entities.h --rw-r--r-- root/root usr/include/libxml2/libxml/globals.h --rw-r--r-- root/root usr/include/libxml2/libxml/hash.h --rw-r--r-- root/root usr/include/libxml2/libxml/list.h --rw-r--r-- root/root usr/include/libxml2/libxml/nanoftp.h --rw-r--r-- root/root usr/include/libxml2/libxml/nanohttp.h --rw-r--r-- root/root usr/include/libxml2/libxml/parser.h --rw-r--r-- root/root usr/include/libxml2/libxml/parserInternals.h --rw-r--r-- root/root usr/include/libxml2/libxml/pattern.h --rw-r--r-- root/root usr/include/libxml2/libxml/relaxng.h --rw-r--r-- root/root usr/include/libxml2/libxml/schemasInternals.h --rw-r--r-- root/root usr/include/libxml2/libxml/schematron.h --rw-r--r-- root/root usr/include/libxml2/libxml/threads.h --rw-r--r-- root/root usr/include/libxml2/libxml/tree.h --rw-r--r-- root/root usr/include/libxml2/libxml/uri.h --rw-r--r-- root/root usr/include/libxml2/libxml/valid.h --rw-r--r-- root/root usr/include/libxml2/libxml/xinclude.h --rw-r--r-- root/root usr/include/libxml2/libxml/xlink.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlIO.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlautomata.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlerror.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlexports.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlmemory.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlmodule.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlreader.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlregexp.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlsave.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlschemas.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlschemastypes.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlstring.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlunicode.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlversion.h --rw-r--r-- root/root usr/include/libxml2/libxml/xmlwriter.h --rw-r--r-- root/root usr/include/libxml2/libxml/xpath.h --rw-r--r-- root/root usr/include/libxml2/libxml/xpathInternals.h --rw-r--r-- root/root usr/include/libxml2/libxml/xpointer.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libxml2.a --rwxr-xr-x root/root usr/lib/libxml2.la -lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.7.8 -lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.7.8 --rwxr-xr-x root/root usr/lib/libxml2.so.2.7.8 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libxml-2.0.pc -drwxr-xr-x root/root usr/lib/python2.7/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/drv_libxml2.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/libxml2.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/libxml2mod.a --rwxr-xr-x root/root usr/lib/python2.7/site-packages/libxml2mod.la --rwxr-xr-x root/root usr/lib/python2.7/site-packages/libxml2mod.so --rw-r--r-- root/root usr/lib/xml2Conf.sh -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/aclocal/ --rw-r--r-- root/root usr/share/aclocal/libxml.m4 -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/xml2-config.1.gz --rw-r--r-- root/root usr/share/man/man1/xmlcatalog.1.gz --rw-r--r-- root/root usr/share/man/man1/xmllint.1.gz -drwxr-xr-x root/root usr/share/man/man3/ --rw-r--r-- root/root usr/share/man/man3/libxml.3.gz diff --git a/extra/libxml2/.md5sum.i686 b/extra/libxml2/.md5sum.i686 deleted file mode 100644 index 41575035c..000000000 --- a/extra/libxml2/.md5sum.i686 +++ /dev/null @@ -1,4 +0,0 @@ -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/extra/libxml2/.md5sum.x86_64 deleted file mode 100644 index 41575035c..000000000 --- a/extra/libxml2/.md5sum.x86_64 +++ /dev/null @@ -1,4 +0,0 @@ -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/extra/libxml2/Pkgfile deleted file mode 100755 index 4bd62f250..000000000 --- a/extra/libxml2/Pkgfile +++ /dev/null @@ -1,31 +0,0 @@ -# Description: Librairie pour XML version 2 -# URL: http://xmlsoft.org/ -# Maintainer: NuTyX core team -# Packager: thierryn1 at hispeed dot ch -# Depends on: -# Run on: - -name=libxml2 -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 \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-python=/usr/bin/python2.7 - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/{doc,gtk-doc} -} - diff --git a/extra/libxml2/largefile64.patch b/extra/libxml2/largefile64.patch deleted file mode 100644 index 29be82760..000000000 --- a/extra/libxml2/largefile64.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libxml2-2.6.32.dfsg.orig/libxml.h -+++ libxml2-2.6.32.dfsg/libxml.h -@@ -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/extra/libxml2/shared_library_versionning.patch b/extra/libxml2/shared_library_versionning.patch deleted file mode 100644 index a0b62bca9..000000000 --- a/extra/libxml2/shared_library_versionning.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard -Date: Thu, 04 Nov 2010 20:53:14 +0000 -Subject: Reactivate the shared library versionning script - ---- -diff --git a/configure.in b/configure.in -index 59d0629..a1d2c89 100644 ---- a/configure.in -+++ b/configure.in -@@ -84,7 +84,7 @@ else - esac - fi - AC_SUBST(VERSION_SCRIPT_FLAGS) --AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) -+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) - - dnl - dnl We process the AC_ARG_WITH first so that later we can modify --- -cgit v0.8.3.1 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 -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 -- cgit v1.2.3-70-g09d2