diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-05-07 14:07:14 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-05-07 15:38:36 +0200 |
commit | 606623d0fc5321754d9a054881ae9cac94cd9f04 (patch) | |
tree | d12ff35a03b7f60d965d30ea0fbde2f9839c675c /external | |
parent | 11dcaad533553999dc643807f6f21f8f98bc9e20 (diff) |
lxml: upgrade to 5.2.1
* 0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 got
obsoleted with https://github.com/lxml/lxml/commit/9686dd9c7670d18acff6360c8444520273d5f1b2
* Wincompatible-function-pointer-types.patch and
Wincompatible-pointer-types.patch got obsoleted with
https://github.com/lxml/lxml/commit/6bdf4c321b92e002123b4c162c75524dbeb4d54d
Change-Id: I8f0dcba3bd64a1766a2292b687c8959c739ced6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167278
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'external')
4 files changed, 0 insertions, 182 deletions
diff --git a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 deleted file mode 100644 index ce1ec383cc63..000000000000 --- a/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 +++ /dev/null @@ -1,31 +0,0 @@ -From 9686dd9c7670d18acff6360c8444520273d5f1b2 Mon Sep 17 00:00:00 2001 -From: Jakub Wilk <jwilk@jwilk.net> -Date: Fri, 16 Jun 2023 09:24:21 +0200 -Subject: [PATCH] Make regexp string raw to correct its escape sequence usage - (GH-371) - -Fixes: - - $ python3 -Wd setup.py - setup.py:117: DeprecationWarning: invalid escape sequence \. - ... ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 709cbc68..7a3f46e5 100644 ---- a/setup.py -+++ b/setup.py -@@ -114,7 +114,7 @@ extra_options['packages'] = [ - - def setup_extra_options(): - is_interesting_package = re.compile('^(libxml|libxslt|libexslt)$').match -- is_interesting_header = re.compile('^(zconf|zlib|.*charset)\.h$').match -+ is_interesting_header = re.compile(r'^(zconf|zlib|.*charset)\.h$').match - - def extract_files(directories, pattern='*'): - def get_files(root, dir_path, files): --- -2.39.2 - diff --git a/external/lxml/UnpackedTarball_lxml.mk b/external/lxml/UnpackedTarball_lxml.mk index 58905943c7ee..0216801cb1a8 100644 --- a/external/lxml/UnpackedTarball_lxml.mk +++ b/external/lxml/UnpackedTarball_lxml.mk @@ -14,10 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lxml,$(LXML_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,lxml,0)) $(eval $(call gb_UnpackedTarball_add_patches,lxml, \ - external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1 \ external/lxml/replace-setuptools-with-distutils.patch.1 \ - external/lxml/Wincompatible-function-pointer-types.patch \ - external/lxml/Wincompatible-pointer-types.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/lxml/Wincompatible-function-pointer-types.patch b/external/lxml/Wincompatible-function-pointer-types.patch deleted file mode 100644 index 644082fdc8bc..000000000000 --- a/external/lxml/Wincompatible-function-pointer-types.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- src/lxml/etree.c -+++ src/lxml/etree.c -@@ -113118,7 +113118,7 @@ - * self._orig_loader = _register_document_loader() if set_document_loader else NULL - * if self._validator is not None: - */ -- __pyx_v_self->_c_ctxt->sax->serror = __pyx_f_4lxml_5etree__receiveParserError; -+ __pyx_v_self->_c_ctxt->sax->serror = (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveParserError; - - /* "src/lxml/parser.pxi":587 - * self._doc = None -@@ -117606,7 +117606,7 @@ - * sax.startElementNs = NULL - * sax.endElementNs = NULL - */ -- __pyx_v_sax->serror = __pyx_f_4lxml_5etree__receiveParserError; -+ __pyx_v_sax->serror = (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveParserError; - - /* "src/lxml/parser.pxi":923 - * sax.initialized = xmlparser.XML_SAX2_MAGIC -@@ -181690,7 +181690,7 @@ - * - * @cython.final - */ -- __pyx_v_xpathCtxt->error = __pyx_f_4lxml_5etree__receiveXPathError; -+ __pyx_v_xpathCtxt->error = (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveXPathError; - - /* "src/lxml/extensions.pxi":132 - * return utf -@@ -218964,7 +218964,7 @@ - * parser_ctxt, _receiveError, <void*>self._error_log) - * _connectGenericErrorLog(self._error_log, xmlerror.XML_FROM_RELAXNGP) - */ -- xmlRelaxNGSetParserStructuredErrors(__pyx_v_parser_ctxt, __pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); -+ xmlRelaxNGSetParserStructuredErrors(__pyx_v_parser_ctxt, (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); - - /* "src/lxml/relaxng.pxi":92 - * relaxng.xmlRelaxNGSetParserStructuredErrors( -@@ -219382,7 +219382,7 @@ - * valid_ctxt, _receiveError, <void*>self._error_log) - * _connectGenericErrorLog(self._error_log, xmlerror.XML_FROM_RELAXNGV) - */ -- xmlRelaxNGSetValidStructuredErrors(__pyx_v_valid_ctxt, __pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); -+ xmlRelaxNGSetValidStructuredErrors(__pyx_v_valid_ctxt, (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); - - /* "src/lxml/relaxng.pxi":134 - * relaxng.xmlRelaxNGSetValidStructuredErrors( -@@ -220271,7 +220271,7 @@ - * parser_ctxt, _receiveError, <void*>self._error_log) - * if self._doc is not None: - */ -- xmlSchemaSetParserStructuredErrors(__pyx_v_parser_ctxt, __pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); -+ xmlSchemaSetParserStructuredErrors(__pyx_v_parser_ctxt, (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); - - /* "src/lxml/xmlschema.pxi":74 - * xmlschema.xmlSchemaSetParserStructuredErrors( -@@ -220814,7 +220814,7 @@ - * valid_ctxt, _receiveError, <void*>self._error_log) - * - */ -- xmlSchemaSetValidStructuredErrors(__pyx_v_valid_ctxt, __pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); -+ xmlSchemaSetValidStructuredErrors(__pyx_v_valid_ctxt, (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); - - /* "src/lxml/xmlschema.pxi":131 - * valid_ctxt, _receiveError, <void*>self._error_log) -@@ -221579,7 +221579,7 @@ - * self._valid_ctxt, _receiveError, <void*>error_log) - * self._sax_plug = xmlschema.xmlSchemaSAXPlug( - */ -- xmlSchemaSetValidStructuredErrors(__pyx_v_self->_valid_ctxt, __pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_error_log)); -+ xmlSchemaSetValidStructuredErrors(__pyx_v_self->_valid_ctxt, (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_error_log)); - - /* "src/lxml/xmlschema.pxi":195 - * xmlschema.xmlSchemaSetValidOptions( -@@ -222756,7 +222756,7 @@ - * valid_ctxt, _receiveError, <void*>self._error_log) - * c_doc = _fakeRootDoc(doc._c_doc, root_node._c_node) - */ -- xmlSchematronSetValidStructuredErrors(__pyx_v_valid_ctxt, __pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); -+ xmlSchematronSetValidStructuredErrors(__pyx_v_valid_ctxt, (xmlStructuredErrorFunc)__pyx_f_4lxml_5etree__receiveError, ((void *)__pyx_v_self->__pyx_base._error_log)); - - /* "src/lxml/schematron.pxi":153 - * schematron.xmlSchematronSetValidStructuredErrors( diff --git a/external/lxml/Wincompatible-pointer-types.patch b/external/lxml/Wincompatible-pointer-types.patch deleted file mode 100644 index 68d017c4e5fb..000000000000 --- a/external/lxml/Wincompatible-pointer-types.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- src/lxml/etree.c -+++ src/lxml/etree.c -@@ -137695,7 +137695,7 @@ - * - * def start(self, tag, attrs, nsmap=None): - */ -- __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData(((struct __pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_data); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 832, __pyx_L1_error) -+ __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData((__pyx_v_self), __pyx_v_data); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(3, 832, __pyx_L1_error) - - /* "src/lxml/saxparser.pxi":826 - * return self._last -@@ -137856,7 +137856,7 @@ - * def end(self, tag): - */ - __Pyx_XDECREF(__pyx_r); -- __pyx_t_3 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxStart(((struct __pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_tag, __pyx_v_attrs, __pyx_v_nsmap); if (unlikely(!__pyx_t_3)) __PYX_ERR(3, 841, __pyx_L1_error) -+ __pyx_t_3 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxStart((__pyx_v_self), __pyx_v_tag, __pyx_v_attrs, __pyx_v_nsmap); if (unlikely(!__pyx_t_3)) __PYX_ERR(3, 841, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __pyx_r = __pyx_t_3; - __pyx_t_3 = 0; -@@ -137927,7 +137927,7 @@ - * assert self._last.tag == tag,\ - * f"end tag mismatch (expected {self._last.tag}, got {tag})" - */ -- __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxEnd(((struct __pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_tag); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 848, __pyx_L1_error) -+ __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxEnd((__pyx_v_self), __pyx_v_tag); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 848, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_v_element = __pyx_t_1; - __pyx_t_1 = 0; -@@ -138128,7 +138128,7 @@ - * def comment(self, comment): - */ - __Pyx_XDECREF(__pyx_r); -- __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxPi(((struct __pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_target, __pyx_v_data); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 859, __pyx_L1_error) -+ __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxPi((__pyx_v_self), __pyx_v_target, __pyx_v_data); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 859, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_r = __pyx_t_1; - __pyx_t_1 = 0; -@@ -138191,7 +138191,7 @@ - * return self._handleSaxComment(comment) # <<<<<<<<<<<<<< - */ - __Pyx_XDECREF(__pyx_r); -- __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxComment(((struct __pyx_obj_4lxml_5etree__SaxParserTarget *)__pyx_v_self), __pyx_v_comment); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 867, __pyx_L1_error) -+ __pyx_t_1 = __pyx_f_4lxml_5etree_11TreeBuilder__handleSaxComment((__pyx_v_self), __pyx_v_comment); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 867, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_r = __pyx_t_1; - __pyx_t_1 = 0; -@@ -203205,7 +203205,7 @@ - * context.register_context(transform_ctxt, input_doc) - * - */ -- __pyx_t_1 = ((PyObject *)__pyx_f_4lxml_5etree_12_XSLTContext__copy(((struct __pyx_obj_4lxml_5etree__BaseContext *)__pyx_v_self->_context))); if (unlikely(!__pyx_t_1)) __PYX_ERR(4, 550, __pyx_L9_error) -+ __pyx_t_1 = ((PyObject *)__pyx_f_4lxml_5etree_12_XSLTContext__copy((__pyx_v_self->_context))); if (unlikely(!__pyx_t_1)) __PYX_ERR(4, 550, __pyx_L9_error) - __Pyx_GOTREF(__pyx_t_1); - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4lxml_5etree__XSLTContext))))) __PYX_ERR(4, 550, __pyx_L9_error) - __Pyx_DECREF_SET(__pyx_v_context, ((struct __pyx_obj_4lxml_5etree__XSLTContext *)__pyx_t_1)); -@@ -205038,7 +205030,7 @@ - * - * new_xslt._xslt_resolver_context = stylesheet._xslt_resolver_context._copy() - */ -- __pyx_t_1 = ((PyObject *)__pyx_f_4lxml_5etree_12_XSLTContext__copy(((struct __pyx_obj_4lxml_5etree__BaseContext *)__pyx_v_stylesheet->_context))); if (unlikely(!__pyx_t_1)) __PYX_ERR(4, 691, __pyx_L1_error) -+ __pyx_t_1 = ((PyObject *)__pyx_f_4lxml_5etree_12_XSLTContext__copy((__pyx_v_stylesheet->_context))); if (unlikely(!__pyx_t_1)) __PYX_ERR(4, 691, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4lxml_5etree__XSLTContext))))) __PYX_ERR(4, 691, __pyx_L1_error) - __Pyx_GIVEREF(__pyx_t_1); |