libxml 2.9.9 - include Python3 bindings in addition to Python2. This requires a special patch I have provided. I also enabled running the test suite.
This commit is contained in:
JPeterMugaas
@@ -1,11 +1,12 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
# Contributor: Renato Silva <br.renatosilva@gmail.com>
|
||||
|
||||
# Notation: python3 patch is based upon: https://gist.github.com/novocaine/09d5c00e67fd0aa13cfc
|
||||
_realname=libxml2
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=2.9.9
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('any')
|
||||
pkgdesc="XML parsing library, version 2 (mingw-w64)"
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
|
||||
@@ -18,6 +19,7 @@ license=(MIT)
|
||||
url="http://www.xmlsoft.org/"
|
||||
install=${_realname}-${CARCH}.install
|
||||
source=("http://xmlsoft.org/sources/${_realname}-${pkgver}.tar.gz"
|
||||
https://www.w3.org/XML/Test/xmlts20130923.tar.gz
|
||||
0015-fix-unused-parameters-warning.all.patch
|
||||
0016-WARNING-to-be-fixed.all.patch
|
||||
0017-fix-const-warning.all.patch
|
||||
@@ -27,8 +29,10 @@ source=("http://xmlsoft.org/sources/${_realname}-${pkgver}.tar.gz"
|
||||
0023-fix-sitedir-detection.mingw.patch
|
||||
0024-shrext-pyd.mingw.patch
|
||||
0025-mingw-python-dont-remove-dot.patch
|
||||
0026-mingw-relocate.patch)
|
||||
0026-mingw-relocate.patch
|
||||
libxml2-2.9.9-python.patch)
|
||||
sha256sums=('94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871'
|
||||
'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
|
||||
'a9457b1a5e7d9499270ccfdeabbf0ca75b0e4643c111a42a5da0d113bae485c5'
|
||||
'81811dc3a497025b1f7c8fe78b7510ab080be558a646c26b89b281a9348ad195'
|
||||
'd8f81b074420a5082a2f64fda613974ffc43a04867d521dccdda9b6ddeb3422b'
|
||||
@@ -38,7 +42,8 @@ sha256sums=('94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871'
|
||||
'e93902af20bee41ca7708280f30a1d087ab8c6f86d18939bdd56789cd1a73531'
|
||||
'bc182ef5108f0d317543e7d3ca309bbe2fc1faf832a49b3f56acc2795de2b626'
|
||||
'2d177b78b348be6466e545ef2df533c860983bf0811d1d14cdd04e1f3afef83f'
|
||||
'b66fcd4feccf6995289353d78f967be598928e66a8bc6fa910bf331402c53dc0')
|
||||
'b66fcd4feccf6995289353d78f967be598928e66a8bc6fa910bf331402c53dc0'
|
||||
'7b9bc59b174da93a547429b2f751047c758657953f6e2fb398e73b5ebf0f55e3')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@@ -60,8 +65,7 @@ del_file_exists() {
|
||||
# =========================================== #
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${_realname}-${pkgver}"
|
||||
|
||||
cd ${_realname}-${pkgver}
|
||||
del_file_exists pathtools.c pathtools.h
|
||||
|
||||
apply_patch_with_msg \
|
||||
@@ -74,7 +78,8 @@ prepare() {
|
||||
0023-fix-sitedir-detection.mingw.patch \
|
||||
0024-shrext-pyd.mingw.patch \
|
||||
0025-mingw-python-dont-remove-dot.patch \
|
||||
0026-mingw-relocate.patch
|
||||
0026-mingw-relocate.patch \
|
||||
libxml2-2.9.9-python.patch
|
||||
|
||||
libtoolize --copy --force
|
||||
aclocal
|
||||
@@ -82,9 +87,30 @@ prepare() {
|
||||
autoconf
|
||||
}
|
||||
|
||||
_setup_shared() {
|
||||
msg2 "Building shared for Python $1 ${CARCH}"
|
||||
[[ -d "${srcdir}"/build-shared-${CARCH}-py$1 ]] && rm -rf "${srcdir}"/build-shared-${CARCH}-py$1
|
||||
mkdir -p ${srcdir}/build-shared-${CARCH}-py$1 && cd ${srcdir}/build-shared-${CARCH}-py$1
|
||||
../${_realname}-${pkgver}/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
--host=${MINGW_CHOST} \
|
||||
--target=${MINGW_CHOST} \
|
||||
--build="${MINGW_CHOST}" \
|
||||
--with-python=${MINGW_PREFIX}/bin/python$1 \
|
||||
--with-modules \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--with-threads=win32
|
||||
|
||||
# Hack for mingw python
|
||||
local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX})
|
||||
find . -type f -name "Makefile" -exec sed -i "s|${PREFIX_DEPS}|${MINGW_PREFIX}|g" {} \;
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
# Static build
|
||||
msg2 "Building static for ${CARCH}"
|
||||
mkdir -p ${srcdir}/build-static-${CARCH} && cd ${srcdir}/build-static-${CARCH}
|
||||
../${_realname}-${pkgver}/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
@@ -100,30 +126,28 @@ build() {
|
||||
make
|
||||
|
||||
# Shared build
|
||||
mkdir -p ${srcdir}/build-shared-${CARCH} && cd ${srcdir}/build-shared-${CARCH}
|
||||
../${_realname}-${pkgver}/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
--host=${MINGW_CHOST} \
|
||||
--target=${MINGW_CHOST} \
|
||||
--build="${MINGW_CHOST}" \
|
||||
--with-python=${MINGW_PREFIX}/bin/python2 \
|
||||
--with-modules \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--with-threads=win32
|
||||
|
||||
# Hack for mingw python
|
||||
local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX})
|
||||
find . -type f -name "Makefile" -exec sed -i "s|${PREFIX_DEPS}|${MINGW_PREFIX}|g" {} \;
|
||||
_setup_shared 2
|
||||
make
|
||||
# A little trick from Cygwin because we only want the Python3 bindings
|
||||
_setup_shared 3
|
||||
make -C python top_builddir=${srcdir}/build-shared-${CARCH}-py2
|
||||
}
|
||||
|
||||
check() {
|
||||
cd ${srcdir}/build-shared-${CARCH}-py2
|
||||
cp -r ../xmlconf .
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
# First install shared
|
||||
cd ${srcdir}/build-shared-${CARCH}
|
||||
cd ${srcdir}/build-shared-${CARCH}-py2
|
||||
|
||||
make install DESTDIR="${pkgdir}"
|
||||
|
||||
# Then install python bindings for Python3
|
||||
make -C "${srcdir}/build-shared-${CARCH}-py3/python" DESTDIR="$pkgdir" install
|
||||
|
||||
# then manually install static
|
||||
cd ${srcdir}/build-static-${CARCH}
|
||||
|
||||
|
||||
125
mingw-w64-libxml2/libxml2-2.9.9-python.patch
Normal file
125
mingw-w64-libxml2/libxml2-2.9.9-python.patch
Normal file
@@ -0,0 +1,125 @@
|
||||
diff -ur libxml2-2.9.2.old/python/setup.py libxml2-2.9.2/python/setup.py
|
||||
--- libxml2-2.9.2.old/python/setup.py 2014-10-16 09:35:22.000000000 +0100
|
||||
+++ libxml2-2.9.2/python/setup.py 2015-01-22 12:23:18.804795900 +0000
|
||||
@@ -123,7 +123,7 @@
|
||||
|
||||
with_xslt=0
|
||||
if missing("libxslt-py.c") or missing("libxslt.py"):
|
||||
- if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
|
||||
+ if missing("xsltgenerator.py") or missing("libxslt-python-api.xml"):
|
||||
print("libxslt stub generator not found, libxslt not built")
|
||||
else:
|
||||
try:
|
||||
@@ -192,7 +192,6 @@
|
||||
includes.append(xslt_includes)
|
||||
modules.append('libxslt')
|
||||
|
||||
-
|
||||
extens=[Extension('libxml2mod', c_files, include_dirs=includes,
|
||||
library_dirs=libdirs,
|
||||
libraries=libs, define_macros=macros)]
|
||||
diff -ur libxml2-2.9.2.old/python/setup.py.in libxml2-2.9.2/python/setup.py.in
|
||||
--- libxml2-2.9.2.old/python/setup.py.in 2014-10-16 05:46:36.000000000 +0100
|
||||
+++ libxml2-2.9.2/python/setup.py.in 2015-01-22 12:24:13.423100400 +0000
|
||||
@@ -123,7 +123,7 @@
|
||||
|
||||
with_xslt=0
|
||||
if missing("libxslt-py.c") or missing("libxslt.py"):
|
||||
- if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
|
||||
+ if missing("xsltgenerator.py") or missing("libxslt-python-api.xml"):
|
||||
print("libxslt stub generator not found, libxslt not built")
|
||||
else:
|
||||
try:
|
||||
diff -ur libxml2-2.9.9/python/types.c.orig libxml2-2.9.9/python/types.c
|
||||
--- libxml2-2.9.9/python/types.c.orig 2018-03-05 10:29:58.000000000 -0500
|
||||
+++ libxml2-2.9.9/python/types.c 2019-06-09 02:48:44.150466800 -0400
|
||||
@@ -26,14 +26,20 @@
|
||||
|
||||
FILE *
|
||||
libxml_PyFileGet(PyObject *f) {
|
||||
- int fd, flags;
|
||||
+ int fd;
|
||||
FILE *res;
|
||||
const char *mode;
|
||||
+#ifdef _WIN32
|
||||
+ PyObject *modeObj, *modeBytes;
|
||||
+#else
|
||||
+ int flags;
|
||||
+#endif
|
||||
|
||||
fd = PyObject_AsFileDescriptor(f);
|
||||
/*
|
||||
* Get the flags on the fd to understand how it was opened
|
||||
*/
|
||||
+#ifndef _WIN32
|
||||
flags = fcntl(fd, F_GETFL, 0);
|
||||
switch (flags & O_ACCMODE) {
|
||||
case O_RDWR:
|
||||
@@ -76,6 +82,67 @@ libxml_PyFileGet(PyObject *f) {
|
||||
return(NULL);
|
||||
}
|
||||
return(res);
|
||||
+#else
|
||||
+ /*
|
||||
+ * The mode sniffing above isn't possible on windows -
|
||||
+ * the CRT simply doesn't expose an interface for
|
||||
+ * retreiving the mode of the fd (even though it supports
|
||||
+ * the same POSIX set at creation).
|
||||
+ *
|
||||
+ * So instead, we look for a .mode attribute on f.
|
||||
+ *
|
||||
+ * Python 3's open() always sets a .mode attribute
|
||||
+ * before returning a value (even when a custom opener
|
||||
+ * is provided), so this covers the majority of cases.
|
||||
+ *
|
||||
+ * This won't work for callers passing other file-like
|
||||
+ * objects that don't implement .mode; they will just
|
||||
+ * have to implement it somehow (hopefully they are
|
||||
+ * just wrapping something that does know the mode).
|
||||
+ */
|
||||
+
|
||||
+ modeObj = PyObject_GetAttrString(f, "mode");
|
||||
+ if (!modeObj) {
|
||||
+ return(NULL);
|
||||
+ }
|
||||
+
|
||||
+ if (PyUnicode_Check(modeObj)) {
|
||||
+ modeBytes = PyObject_CallMethod(
|
||||
+ modeObj, "encode", "s", "ascii");
|
||||
+ if (!modeBytes) {
|
||||
+ Py_DECREF(modeObj);
|
||||
+ return(NULL);
|
||||
+ }
|
||||
+ mode = PyBytes_AsString(modeBytes);
|
||||
+ if (!mode) {
|
||||
+ Py_DECREF(modeObj);
|
||||
+ return(NULL);
|
||||
+ }
|
||||
+ Py_DECREF(modeBytes);
|
||||
+ } else if (PyBytes_Check(modeObj)) {
|
||||
+ mode = PyBytes_AsString(modeObj);
|
||||
+ if (!mode) {
|
||||
+ Py_DECREF(modeObj);
|
||||
+ return(NULL);
|
||||
+ }
|
||||
+ } else {
|
||||
+ Py_DECREF(modeObj);
|
||||
+ return(NULL);
|
||||
+ }
|
||||
+
|
||||
+ Py_DECREF(modeObj);
|
||||
+
|
||||
+ fd = _dup(fd);
|
||||
+ if (fd == -1) {
|
||||
+ return(NULL);
|
||||
+ }
|
||||
+ res = _fdopen(fd, mode);
|
||||
+ if (res == NULL) {
|
||||
+ _close(fd);
|
||||
+ return(NULL);
|
||||
+ }
|
||||
+ return(res);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void libxml_PyFileRelease(FILE *f) {
|
||||
Reference in New Issue
Block a user