diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2016-12-19 10:29:31 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2016-12-19 10:29:31 +0200 |
commit | 660ee64f50a01eafa7a95665b825a79900eee9b7 (patch) | |
tree | affa5868ee590a638bd54a0c31da947d45dda0cf /recipes/libxml2 | |
parent | 0aa6bf6a78828a5c2f474dfac44d9067fc657a7c (diff) |
libxml2: Update to 2.9.4
Diffstat (limited to 'recipes/libxml2')
-rw-r--r-- | recipes/libxml2/0004-Fix-build-without-lzma.patch | 63 | ||||
-rw-r--r-- | recipes/libxml2/0005-configure.ac-Don-t-overwrite-LDFLAGS.patch | 25 |
2 files changed, 0 insertions, 88 deletions
diff --git a/recipes/libxml2/0004-Fix-build-without-lzma.patch b/recipes/libxml2/0004-Fix-build-without-lzma.patch deleted file mode 100644 index e2945b6f..00000000 --- a/recipes/libxml2/0004-Fix-build-without-lzma.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 732ef56b0b1315f2cfa7ae8fe1181309ce95e87d Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Tue, 28 Jan 2014 11:44:22 +0100 -Subject: [PATCH 4/5] Fix build without lzma - ---- - xmlIO.c | 6 +++--- - xzlib.c | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xmlIO.c b/xmlIO.c -index e628ab0..a1a927e 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -35,7 +35,7 @@ - #ifdef HAVE_ZLIB_H - #include <zlib.h> - #endif --#ifdef HAVE_LZMA_H -+#ifdef HAVE_LIBLZMA - #include <lzma.h> - #endif - -@@ -1334,7 +1334,7 @@ xmlGzfileClose (void * context) { - } - #endif /* HAVE_ZLIB_H */ - --#ifdef HAVE_LZMA_H -+#ifdef HAVE_LIBLZMA - /************************************************************************ - * * - * I/O for compressed file accesses * -@@ -2328,7 +2328,7 @@ xmlRegisterDefaultInputCallbacks(void) { - xmlRegisterInputCallbacks(xmlGzfileMatch, xmlGzfileOpen, - xmlGzfileRead, xmlGzfileClose); - #endif /* HAVE_ZLIB_H */ --#ifdef HAVE_LZMA_H -+#ifdef HAVE_LIBLZMA - xmlRegisterInputCallbacks(xmlXzfileMatch, xmlXzfileOpen, - xmlXzfileRead, xmlXzfileClose); - #endif /* HAVE_ZLIB_H */ -diff --git a/xzlib.c b/xzlib.c -index 0dcb9f4..1cf0c57 100644 ---- a/xzlib.c -+++ b/xzlib.c -@@ -8,7 +8,7 @@ - */ - #define IN_LIBXML - #include "libxml.h" --#ifdef HAVE_LZMA_H -+#ifdef HAVE_LIBLZMA - - #include <string.h> - #ifdef HAVE_ERRNO_H -@@ -795,4 +795,4 @@ __libxml2_xzclose(xzFile file) - xmlFree(state); - return ret ? ret : LZMA_OK; - } --#endif /* HAVE_LZMA_H */ -+#endif /* HAVE_LIBLZMA */ --- -2.1.0 - diff --git a/recipes/libxml2/0005-configure.ac-Don-t-overwrite-LDFLAGS.patch b/recipes/libxml2/0005-configure.ac-Don-t-overwrite-LDFLAGS.patch deleted file mode 100644 index 11ffe79c..00000000 --- a/recipes/libxml2/0005-configure.ac-Don-t-overwrite-LDFLAGS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2676c2425e918d0c25e2ebf1ddf7980dc0d43d3c Mon Sep 17 00:00:00 2001 -From: Edward Hervey <bilboed@bilboed.com> -Date: Fri, 13 Feb 2015 13:05:05 +0100 -Subject: [PATCH 5/5] configure.ac: Don't overwrite LDFLAGS - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e5dbc15..080134f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -392,7 +392,7 @@ if test "$with_zlib" = "no"; then - else - AC_CHECK_HEADERS(zlib.h, - [SAVE_LDFLAGS="${LDFLAGS}" -- LDFLAGS="-L${Z_DIR}/lib" -+ LDFLAGS="${LDFLAGS} -L${Z_DIR}/lib" - AC_CHECK_LIB(z, gzread,[ - AC_DEFINE([HAVE_LIBZ], [1], [Have compression library]) - WITH_ZLIB=1 --- -2.1.0 - |