libxml2: Rebuild.
This commit is contained in:
Alexpux
@@ -1,20 +0,0 @@
|
||||
--- libxml2-2.9.0/threads.c.orig 2013-03-31 15:26:36 +0400
|
||||
+++ libxml2-2.9.0/threads.c 2013-03-31 15:27:37 +0400
|
||||
@@ -994,11 +994,16 @@
|
||||
*/
|
||||
#ifdef HAVE_PTHREAD_H
|
||||
#elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
|
||||
+/* First prototype, then definition - to placate GCC */
|
||||
#if defined(LIBXML_STATIC_FOR_DLL)
|
||||
BOOL XMLCALL
|
||||
-xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
+xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved);
|
||||
+BOOL XMLCALL
|
||||
+xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved)
|
||||
#else
|
||||
BOOL WINAPI
|
||||
+DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
|
||||
+BOOL WINAPI
|
||||
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
#endif
|
||||
{
|
||||
@@ -4,11 +4,14 @@
|
||||
_realname=libxml2
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=2.9.2
|
||||
pkgrel=2
|
||||
pkgrel=4
|
||||
arch=('any')
|
||||
groups=("${MINGW_PACKAGE_PREFIX}")
|
||||
pkgdesc="XML parsing library, version 2 (mingw-w64)"
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-gettext" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-xz")
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
|
||||
"${MINGW_PACKAGE_PREFIX}-gettext"
|
||||
"${MINGW_PACKAGE_PREFIX}-xz"
|
||||
"${MINGW_PACKAGE_PREFIX}-zlib")
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-python2")
|
||||
options=('strip' 'staticlibs')
|
||||
license=(MIT)
|
||||
@@ -16,11 +19,7 @@ url="http://www.xmlsoft.org/"
|
||||
install=${_realname}-${CARCH}.install
|
||||
source=("http://xmlsoft.org/sources/libxml2-${pkgver}.tar.gz"
|
||||
"mingw32-libxml2-static-build-compile-fix.patch"
|
||||
"libxml2-2.8.0_rc1-winnt.patch"
|
||||
"libxml2-2.9.0-largefile.patch"
|
||||
"libxml2-2.9.0-man_fixes.patch"
|
||||
"libxml2-2.9.0-open.gz.patch"
|
||||
"libxml2-2.9.1-disable_static_modules.patch"
|
||||
"libxml2-2.9.2-catalog-revert.patch"
|
||||
0004-detect-ws2tcpip.mingw.patch
|
||||
0005-fix-char-cast-warning.mingw.patch
|
||||
0006-fix-unused-var-warning.mingw.patch
|
||||
@@ -31,7 +30,6 @@ source=("http://xmlsoft.org/sources/libxml2-${pkgver}.tar.gz"
|
||||
0011-more-winsock-inclusion-order-fixes.mingw.patch
|
||||
0012-socklen-is-signed-on-mingw-w64.mingw.patch
|
||||
0013-fix-field-type-signedness.all.patch
|
||||
0014-fix-prototype-warning.all.patch
|
||||
0015-fix-unused-parameters-warning.all.patch
|
||||
0016-WARNING-to-be-fixed.all.patch
|
||||
0017-fix-const-warning.all.patch
|
||||
@@ -43,11 +41,7 @@ source=("http://xmlsoft.org/sources/libxml2-${pkgver}.tar.gz"
|
||||
0025-mingw-python-dont-remove-dot.patch)
|
||||
md5sums=('9e6a9aca9d155737868b3dc5fd82f788'
|
||||
'0df377025082cd93cccbca547f048011'
|
||||
'2a38e25bead58e4b4dc4550317369c90'
|
||||
'59ace31958bc1e824fc4f1434c778469'
|
||||
'eb14f4ce77ac4c55d0262b6be3011913'
|
||||
'9fd252fcb751fdf72688fe0cddeb373e'
|
||||
'98ba4981c95bb51a854232dd098a99e8'
|
||||
'29913184b0072167ae427fa91b2edd4a'
|
||||
'e3584e2079ba68c4c4c71208663602e0'
|
||||
'6db61e81820ad584b9cd6c7d0bae2d51'
|
||||
'e526d4e285579c5c8b9c61e889338454'
|
||||
@@ -58,7 +52,6 @@ md5sums=('9e6a9aca9d155737868b3dc5fd82f788'
|
||||
'ad9137ca850b62ada756a1706bcc65e1'
|
||||
'6b65d303079b21e1c93ec169d5f3f4d0'
|
||||
'543b01b756fa64fafb20819d20c984e6'
|
||||
'9a56b69cc5b1a7fc5d4eb0bab17ee4df'
|
||||
'6adb6886030e33bd40c29724bece6ee8'
|
||||
'd9e7c8cbc18c76575fd870ca2e39b66a'
|
||||
'de11e27ada1d7408aae9b54ed77aafe6'
|
||||
@@ -72,12 +65,8 @@ md5sums=('9e6a9aca9d155737868b3dc5fd82f788'
|
||||
prepare() {
|
||||
cd "${srcdir}/libxml2-${pkgver}"
|
||||
|
||||
#patch -Np0 -i "${srcdir}"/mingw32-libxml2-static-build-compile-fix.patch
|
||||
#patch -p1 -i ${srcdir}/libxml2-2.9.1-disable_static_modules.patch
|
||||
#patch -p1 -i ${srcdir}/libxml2-2.8.0_rc1-winnt.patch
|
||||
patch -p1 -i ${srcdir}/libxml2-2.9.0-largefile.patch
|
||||
patch -p1 -i ${srcdir}/libxml2-2.9.0-man_fixes.patch
|
||||
patch -p1 -i ${srcdir}/libxml2-2.9.0-open.gz.patch
|
||||
patch -Np0 -i "${srcdir}"/mingw32-libxml2-static-build-compile-fix.patch
|
||||
patch -p1 -i ${srcdir}/libxml2-2.9.2-catalog-revert.patch
|
||||
|
||||
patch -p1 -i ${srcdir}/0004-detect-ws2tcpip.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0005-fix-char-cast-warning.mingw.patch
|
||||
@@ -89,7 +78,6 @@ prepare() {
|
||||
patch -p1 -i ${srcdir}/0011-more-winsock-inclusion-order-fixes.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0012-socklen-is-signed-on-mingw-w64.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0013-fix-field-type-signedness.all.patch
|
||||
patch -p1 -i ${srcdir}/0014-fix-prototype-warning.all.patch
|
||||
patch -p1 -i ${srcdir}/0015-fix-unused-parameters-warning.all.patch
|
||||
patch -p1 -i ${srcdir}/0016-WARNING-to-be-fixed.all.patch
|
||||
patch -p1 -i ${srcdir}/0017-fix-const-warning.all.patch
|
||||
@@ -108,8 +96,6 @@ prepare() {
|
||||
|
||||
build()
|
||||
{
|
||||
export LDFLAGS+=" -Wl,-no-undefined"
|
||||
export CFLAGS+=" -fexceptions --param=ssp-buffer-size=4"
|
||||
|
||||
# Static build
|
||||
mkdir -p ${srcdir}/build-static-${CARCH} && cd ${srcdir}/build-static-${CARCH}
|
||||
@@ -123,7 +109,7 @@ build()
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--with-threads=win32 \
|
||||
CFLAGS="${CFLAGS} -DLIBXML_STATIC_FOR_DLL"
|
||||
CFLAGS="${CFLAGS} -DLIBXML_STATIC_FOR_DLL"
|
||||
make
|
||||
|
||||
# Shared build
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
From 168e20836fe9614dd2dd4b42006c17a783f11c48 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Duft <mduft@gentoo.org>
|
||||
Date: Thu, 20 Nov 2008 11:04:33 -0500
|
||||
Subject: [PATCH] Fix for ~x86-winnt
|
||||
|
||||
[Alexandre Rostovtsev <tetromino@gentoo.org>: port to 2.8.0-rc1]
|
||||
---
|
||||
dict.c | 2 +-
|
||||
include/wsockcompat.h | 2 +-
|
||||
nanohttp.c | 2 +-
|
||||
xmlIO.c | 4 ++++
|
||||
4 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dict.c b/dict.c
|
||||
index 3579f64..71e7bc6 100644
|
||||
--- a/dict.c
|
||||
+++ b/dict.c
|
||||
@@ -47,7 +47,7 @@
|
||||
#else
|
||||
#ifdef HAVE_INTTYPES_H
|
||||
#include <inttypes.h>
|
||||
-#elif defined(WIN32)
|
||||
+#elif defined(WIN32) || defined (__PARITY__)
|
||||
typedef unsigned __int32 uint32_t;
|
||||
#endif
|
||||
#endif
|
||||
diff --git a/include/wsockcompat.h b/include/wsockcompat.h
|
||||
index c762a64..1ed822b 100644
|
||||
--- a/include/wsockcompat.h
|
||||
+++ b/include/wsockcompat.h
|
||||
@@ -27,7 +27,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#if defined( __MINGW32__ ) || defined( _MSC_VER )
|
||||
+#if defined( __MINGW32__ ) || defined( _MSC_VER ) || defined(__PARITY__)
|
||||
/* Include <errno.h> here to ensure that it doesn't get included later
|
||||
* (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */
|
||||
#include <errno.h>
|
||||
diff --git a/nanohttp.c b/nanohttp.c
|
||||
index 2437fed..dbe97a7 100644
|
||||
--- a/nanohttp.c
|
||||
+++ b/nanohttp.c
|
||||
@@ -74,7 +74,7 @@
|
||||
#define XML_SOCKLEN_T unsigned int
|
||||
#endif
|
||||
|
||||
-#if defined(__MINGW32__) || defined(_WIN32_WCE)
|
||||
+#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(__PARITY__)
|
||||
#ifndef _WINSOCKAPI_
|
||||
#define _WINSOCKAPI_
|
||||
#endif
|
||||
diff --git a/xmlIO.c b/xmlIO.c
|
||||
index 73a995d..99562f6 100644
|
||||
--- a/xmlIO.c
|
||||
+++ b/xmlIO.c
|
||||
@@ -47,6 +47,7 @@
|
||||
#include <winnls.h> /* for CP_UTF8 */
|
||||
#endif
|
||||
|
||||
+#ifndef __PARITY__
|
||||
/* Figure a portable way to know if a file is a directory. */
|
||||
#ifndef HAVE_STAT
|
||||
# ifdef HAVE__STAT
|
||||
@@ -82,6 +83,7 @@
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
+#endif /* __PARITY__ */
|
||||
|
||||
#include <libxml/xmlmemory.h>
|
||||
#include <libxml/parser.h>
|
||||
@@ -657,6 +659,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
|
||||
{
|
||||
#ifdef HAVE_STAT
|
||||
int retval = -1;
|
||||
+#ifndef __PARITY__
|
||||
wchar_t *wPath;
|
||||
|
||||
wPath = __xmlIOWin32UTF8ToWChar(path);
|
||||
@@ -665,6 +668,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
|
||||
retval = _wstat(wPath,info);
|
||||
xmlFree(wPath);
|
||||
}
|
||||
+#endif
|
||||
/* maybe path in native encoding */
|
||||
if(retval < 0)
|
||||
retval = stat(path,info);
|
||||
--
|
||||
1.7.8.6
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- libxml2-2.7.6/libxml.h.orig 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
|
||||
@@ -1,22 +0,0 @@
|
||||
diff -aurN libxml2-2.6.23.orig/libxml.3 libxml2-2.6.23/libxml.3
|
||||
--- libxml2-2.6.23.orig/libxml.3 2005-10-28 18:13:58.000000000 +0200
|
||||
+++ libxml2-2.6.23/libxml.3 2006-01-06 23:00:43.000000000 +0100
|
||||
@@ -48,14 +48,14 @@
|
||||
library exports Push and Pull type parser interfaces for both XML and
|
||||
.IR html .
|
||||
.SH FILES
|
||||
-.TP 2.2i
|
||||
-.B /depot/lib/libxml_2.0.0/libxml.a
|
||||
+.TP
|
||||
+.B libxml.a
|
||||
static library
|
||||
.TP
|
||||
-.B /depot/lib/libxml_2.0.0/libxml.so
|
||||
+.B libxml.so
|
||||
shared library
|
||||
.TP
|
||||
-.B /depot/package/libxml_2.0.0/bin/xmllint
|
||||
+.B xmllint
|
||||
binary application for parsing XML files
|
||||
.SH AUTHORS
|
||||
Daniel Veillard (daniel@veillard.com).
|
||||
@@ -1,41 +0,0 @@
|
||||
diff -ur libxml2-2.4.20/xmlIO.c libxml2-2.4.20-/xmlIO.c
|
||||
--- libxml2-2.4.20/xmlIO.c Wed Mar 27 04:35:12 2002
|
||||
+++ libxml2-2.4.20-/xmlIO.c Thu May 23 20:35:12 2002
|
||||
@@ -465,8 +465,35 @@
|
||||
|
||||
if (path == NULL)
|
||||
return(NULL);
|
||||
- if (!xmlCheckFilename(path))
|
||||
- return(NULL);
|
||||
+
|
||||
+ if (!xmlCheckFilename(path)) {
|
||||
+ /* If we cannot open `foo.xml', we try `foo.xml.gz'. However we i
|
||||
+ * append .gz only if filename doesn't alreay end with .gz. */
|
||||
+ if (strlen(path) < 3 || strcmp(path + strlen(path) - 3, ".gz") != 0) {
|
||||
+ char *gz_filename = xmlMalloc(strlen(path) + 4);
|
||||
+
|
||||
+ if (gz_filename == NULL) {
|
||||
+ xmlGenericError(xmlGenericErrorContext,
|
||||
+ "xmlGzfileOpen: %s\n",
|
||||
+ "Failure allocating buffer for filename.");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ strcpy(gz_filename, path);
|
||||
+ strcat(gz_filename, ".gz");
|
||||
+
|
||||
+ fd = NULL;
|
||||
+
|
||||
+ if (xmlCheckFilename(gz_filename))
|
||||
+ fd = gzopen(gz_filename, "rb");
|
||||
+
|
||||
+ xmlFree(gz_filename);
|
||||
+
|
||||
+ return((void *) fd);
|
||||
+ } else {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
fd = gzopen(path, "rb");
|
||||
return((void *) fd);
|
||||
@@ -1,12 +0,0 @@
|
||||
--- libxml2-2.9.1/python/Makefile.am.orig 2013-04-19 09:56:45 +0300
|
||||
+++ libxml2-2.9.1/python/Makefile.am 2013-05-13 10:14:25 +0300
|
||||
@@ -24,7 +24,8 @@
|
||||
python_LTLIBRARIES = libxml2mod.la
|
||||
|
||||
libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
|
||||
-libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
|
||||
+libxml2mod_la_CPPFLAGS = -shared
|
||||
+libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -shared \
|
||||
$(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
|
||||
|
||||
BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
|
||||
30
mingw-w64-libxml2/libxml2-2.9.2-catalog-revert.patch
Normal file
30
mingw-w64-libxml2/libxml2-2.9.2-catalog-revert.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Thu, 16 Oct 2014 19:10:59 +0200
|
||||
Subject: [PATCH] Revert "Missing initialization for the catalog module"
|
||||
|
||||
It's not correct to always load the default catalog.
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1153753
|
||||
|
||||
This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
|
||||
|
||||
---
|
||||
parser.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/parser.c b/parser.c
|
||||
index 1d93967..67c9dfd 100644
|
||||
--- a/parser.c
|
||||
+++ b/parser.c
|
||||
@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
|
||||
#ifdef LIBXML_XPATH_ENABLED
|
||||
xmlXPathInit();
|
||||
#endif
|
||||
-#ifdef LIBXML_CATALOG_ENABLED
|
||||
- xmlInitializeCatalog();
|
||||
-#endif
|
||||
xmlParserInitialized = 1;
|
||||
#ifdef LIBXML_THREAD_ENABLED
|
||||
}
|
||||
--
|
||||
1.9.3
|
||||
Reference in New Issue
Block a user