From 9e6aa889b1a4c9591e2da545e69267a6eccbc68e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sun, 16 May 2021 10:24:41 +0200 Subject: [PATCH] python3-libxml2: updated to 2.9.12 --- python3-libxml2/.footprint | 2 +- python3-libxml2/.signature | 9 ++-- python3-libxml2/Pkgfile | 8 ++- python3-libxml2/python3.9.patch | 86 --------------------------------- 4 files changed, 8 insertions(+), 97 deletions(-) delete mode 100644 python3-libxml2/python3.9.patch diff --git a/python3-libxml2/.footprint b/python3-libxml2/.footprint index 442f455..856ad19 100644 --- a/python3-libxml2/.footprint +++ b/python3-libxml2/.footprint @@ -7,5 +7,5 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/__pycache__/libxml2.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/drv_libxml2.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/libxml2.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/libxml2_python-2.9.10-py3.9.egg-info +-rw-r--r-- root/root usr/lib/python3.9/site-packages/libxml2_python-2.9.12-py3.9.egg-info -rwxr-xr-x root/root usr/lib/python3.9/site-packages/libxml2mod.cpython-39-aarch64-linux-gnu.so diff --git a/python3-libxml2/.signature b/python3-libxml2/.signature index 6352f5e..619c976 100644 --- a/python3-libxml2/.signature +++ b/python3-libxml2/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt-arm64.pub -RWRitF9a2DJqMRNzu037O4erccCYXkaWszTqWJfAqZs8/3vqYkPUIXGypxhZIB4P9kW4UMov+g9Lqmjy56Pw3p+sFcVUtisWCgc= -SHA256 (Pkgfile) = 72a02d1f36aa8c6745af12ae99733a50b69a9b4cee71ea6f230679d9e1f710f2 -SHA256 (.footprint) = eff7c8dfdd55ef193f947baf8db8df2c7486b71a116ecf1fab7d69a669587bff -SHA256 (libxml2-2.9.10.tar.gz) = aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f -SHA256 (python3.9.patch) = 8150a23d01966bff1dbf110294012756f5a3a29bf4f671f0e07b84d4307e4bce +RWRitF9a2DJqMfyFRgkvXYKTuIdU3/JpWOPh/MXwBVmG3FUepmh+g7cOm1BkhmBWI94nWoXbAAb2wMV10vmJ7Vk/703P6Dv29Ac= +SHA256 (Pkgfile) = 61f73aa2af09d0ef8c34099748c423d515142fa876122cdc449d57644f32d3e2 +SHA256 (.footprint) = 919c3411990842a208ae2117b59b6e5faf2885570596e91b9ee289e4d6dc8aa2 +SHA256 (libxml2-2.9.12.tar.gz) = c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 diff --git a/python3-libxml2/Pkgfile b/python3-libxml2/Pkgfile index 45e80df..3fc86c7 100644 --- a/python3-libxml2/Pkgfile +++ b/python3-libxml2/Pkgfile @@ -5,14 +5,12 @@ # Depends on: python3-setuptools libxml2 name=python3-libxml2 -version=2.9.10 -release=2 -source=(ftp://xmlsoft.org/libxml2/libxml2-$version.tar.gz - python3.9.patch) +version=2.9.12 +release=1 +source=(ftp://xmlsoft.org/libxml2/libxml2-$version.tar.gz) build () { cd libxml2-$version/python - patch -p2 -i $SRC/python3.9.patch /usr/bin/python3 setup.py build /usr/bin/python3 setup.py install --root=$PKG } diff --git a/python3-libxml2/python3.9.patch b/python3-libxml2/python3.9.patch deleted file mode 100644 index 7f14cdd..0000000 --- a/python3-libxml2/python3.9.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit e4fb36841800038c289997432ca547c9bfef9db1 -Author: Miro Hrončok -Date: Fri Feb 28 12:48:14 2020 +0100 - - Parenthesize Py_Check() in ifs - - In C, if expressions should be parenthesized. - PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized - expression before, but that's not API to rely on. - - Since Python 3.9.0a4 it needs to be parenthesized explicitly. - - Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149 - -diff --git a/python/libxml.c b/python/libxml.c -index bc676c4e..81e709f3 100644 ---- a/python/libxml.c -+++ b/python/libxml.c -@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) { - lenread = PyBytes_Size(ret); - data = PyBytes_AsString(ret); - #ifdef PyUnicode_Check -- } else if PyUnicode_Check (ret) { -+ } else if (PyUnicode_Check (ret)) { - #if PY_VERSION_HEX >= 0x03030000 - Py_ssize_t size; - const char *tmp; -@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) { - lenread = PyBytes_Size(ret); - data = PyBytes_AsString(ret); - #ifdef PyUnicode_Check -- } else if PyUnicode_Check (ret) { -+ } else if (PyUnicode_Check (ret)) { - #if PY_VERSION_HEX >= 0x03030000 - Py_ssize_t size; - const char *tmp; -diff --git a/python/types.c b/python/types.c -index c2bafeb1..ed284ec7 100644 ---- a/python/types.c -+++ b/python/types.c -@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj) - if (obj == NULL) { - return (NULL); - } -- if PyFloat_Check (obj) { -+ if (PyFloat_Check (obj)) { - ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj)); -- } else if PyLong_Check(obj) { -+ } else if (PyLong_Check(obj)) { - #ifdef PyLong_AS_LONG - ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj)); - #else - ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj)); - #endif - #ifdef PyBool_Check -- } else if PyBool_Check (obj) { -+ } else if (PyBool_Check (obj)) { - - if (obj == Py_True) { - ret = xmlXPathNewBoolean(1); -@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj) - ret = xmlXPathNewBoolean(0); - } - #endif -- } else if PyBytes_Check (obj) { -+ } else if (PyBytes_Check (obj)) { - xmlChar *str; - - str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj), - PyBytes_GET_SIZE(obj)); - ret = xmlXPathWrapString(str); - #ifdef PyUnicode_Check -- } else if PyUnicode_Check (obj) { -+ } else if (PyUnicode_Check (obj)) { - #if PY_VERSION_HEX >= 0x03030000 - xmlChar *str; - const char *tmp; -@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj) - ret = xmlXPathWrapString(str); - #endif - #endif -- } else if PyList_Check (obj) { -+ } else if (PyList_Check (obj)) { - int i; - PyObject *node; - xmlNodePtr cur; -- 2.26.2