external/lxml/UnpackedTarball_lxml.mk | 1
external/lxml/Wincompatible-pointer-types.patch | 65 ++++++++++++++++++++++++
2 files changed, 66 insertions(+)
New commits:
commit f09b9b2785732319fd3199337b3528de3a561393
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Apr 3 20:19:17 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Apr 3 21:36:29 2024 +0200
external/lxml: Silence -Wincompatible-pointer-types
...as seen with recent GCC 14 trunk,
> gcc -Wno-unused-result -Wsign-compare -DDYNAMIC_ANNOTATIONS_ENABLED=1 -g
-O0 -Wall -I/home/sberg/lo/core/workdir/UnpackedTarball/zlib
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3/Include -fPIC
-DCYTHON_CLINE_IN_TRACEBACK=0
-I/home/sberg/lo/core/workdir/UnpackedTarball/libxml2/include
-I/home/sberg/lo/core/workdir/UnpackedTarball/libxslt -Isrc -Isrc/lxml/includes
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3/Include
-I/home/sberg/lo/core/workdir/UnpackedTarball/python3 -c src/lxml/etree.c -o
build/temp.linux-x86_64-3.8-pydebug/src/lxml/etree.o -w
> src/lxml/etree.c: In function ‘__pyx_pf_4lxml_5etree_11TreeBuilder_4data’:
> src/lxml/etree.c:137698:66: error: passing argument 1 of
‘__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData’ from incompatible pointer
type [-Wincompatible-pointer-types]
> 137698 | __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)
> |
~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> |
|
> |
struct __pyx_obj_4lxml_5etree__SaxParserTarget *
> src/lxml/etree.c:137074:105: note: expected ‘struct
__pyx_obj_4lxml_5etree_TreeBuilder *’ but argument is of type ‘struct
__pyx_obj_4lxml_5etree__SaxParserTarget *’
> 137074 | static int
__pyx_f_4lxml_5etree_11TreeBuilder__handleSaxData(struct
__pyx_obj_4lxml_5etree_TreeBuilder *__pyx_v_self, PyObject *__pyx_v_data) {
> |
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
etc.
Change-Id: I19f6768bf031c04730972c1fa4a006e2a7d50e27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165758
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/external/lxml/UnpackedTarball_lxml.mk
b/external/lxml/UnpackedTarball_lxml.mk
index 4248b978c06a..58905943c7ee 100644
--- a/external/lxml/UnpackedTarball_lxml.mk
+++ b/external/lxml/UnpackedTarball_lxml.mk
@@ -17,6 +17,7 @@ $(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-pointer-types.patch
b/external/lxml/Wincompatible-pointer-types.patch
new file mode 100644
index 000000000000..68d017c4e5fb
--- /dev/null
+++ b/external/lxml/Wincompatible-pointer-types.patch
@@ -0,0 +1,65 @@
+--- 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);
