download.lst
| 4 -
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
| 31 ++++++++++
external/lxml/README
| 6 -
external/lxml/UnpackedTarball_lxml.mk
| 5 -
external/lxml/Wincompatible-function-pointer-types.patch
| 20 ------
external/lxml/replace-setuptools-with-distutils.patch.0
| 11 +++
6 files changed, 49 insertions(+), 28 deletions(-)
New commits:
commit a4b4a90557f9fc1839fc0eb297f4c6a4e94c761a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jul 2 14:54:23 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Oct 20 02:23:12 2023 +0200
lxml: upgrade to release 4.9.2
* external/lxml/Wincompatible-function-pointer-types.patch: fixed upstream.
* backport
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
from <https://github.com/lxml/lxml/pull/371>.
Changelog: https://lxml.de/4.9/changes-4.9.2.html
Change-Id: I8ea947b3b1fb30b9427d066bd41a5d4693ceedbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153863
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
diff --git a/download.lst b/download.lst
index 0a113753fbf9..ad03e50a6ad4 100644
--- a/download.lst
+++ b/download.lst
@@ -431,8 +431,8 @@ LPSOLVE_TARBALL :=
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LXML_SHA256SUM :=
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
-LXML_TARBALL := lxml-4.1.1.tgz
+LXML_SHA256SUM :=
2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67
+LXML_TARBALL := lxml-4.9.2.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
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
new file mode 100644
index 000000000000..ce1ec383cc63
--- /dev/null
+++
b/external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
@@ -0,0 +1,31 @@
+From 9686dd9c7670d18acff6360c8444520273d5f1b2 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jw...@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/README b/external/lxml/README
index ad9f0952c6b3..be90f0a862ce 100644
--- a/external/lxml/README
+++ b/external/lxml/README
@@ -1,7 +1,7 @@
-LXML XML processing python Library from [http://lxml.de/].
+LXML XML processing python Library from [https://lxml.de/].
This library is used for the .ui accessibility checker bin/gla11y
The archive was downloaded from:
-[http://lxml.de/files/lxml-4.1.1.tgz]
-on 2018-02-22.
+[https://lxml.de/files/lxml-4.9.2.tgz]
+on 2023-07-17.
diff --git a/external/lxml/UnpackedTarball_lxml.mk
b/external/lxml/UnpackedTarball_lxml.mk
index 3f4180404870..8d032e70dd90 100644
--- a/external/lxml/UnpackedTarball_lxml.mk
+++ b/external/lxml/UnpackedTarball_lxml.mk
@@ -11,10 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,lxml))
$(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/Wincompatible-function-pointer-types.patch \
+
external/lxml/0001-Make-regexp-string-raw-to-correct-its-escape-sequenc.patch.1
\
+ external/lxml/replace-setuptools-with-distutils.patch.0 \
))
# 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 bb9c7a02918b..000000000000
--- a/external/lxml/Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lxml/etree.c
-+++ src/lxml/etree.c
-@@ -6810,7 +6810,7 @@
- static void __pyx_f_4lxml_5etree__xpath_function_call(xmlXPathParserContext
*, int); /*proto*/
- static int __pyx_f_4lxml_5etree__register_xpath_function(void *, PyObject *,
PyObject *); /*proto*/
- static int __pyx_f_4lxml_5etree__unregister_xpath_function(void *, PyObject
*, PyObject *); /*proto*/
--static void __pyx_f_4lxml_5etree__registerExsltFunctionsForNamespaces(void *,
void *, xmlChar *); /*proto*/
-+static void __pyx_f_4lxml_5etree__registerExsltFunctionsForNamespaces(void *,
void *, xmlChar const *); /*proto*/
- static PyObject *__pyx_f_4lxml_5etree__initXSLTResolverContext(struct
__pyx_obj_4lxml_5etree__XSLTResolverContext *, struct
__pyx_obj_4lxml_5etree__BaseParser *); /*proto*/
- static xmlDoc *__pyx_f_4lxml_5etree__xslt_resolve_from_python(const xmlChar
*, void *, int, int *); /*proto*/
- static void __pyx_f_4lxml_5etree__xslt_store_resolver_exception(const xmlChar
*, void *, xsltLoadType); /*proto*/
-@@ -175892,7 +175892,7 @@
- * c_href = <const_xmlChar*> _c_href
- */
-
--static void __pyx_f_4lxml_5etree__registerExsltFunctionsForNamespaces(void
*__pyx_v__c_href, void *__pyx_v__ctxt, xmlChar *__pyx_v_c_prefix) {
-+static void __pyx_f_4lxml_5etree__registerExsltFunctionsForNamespaces(void
*__pyx_v__c_href, void *__pyx_v__ctxt, xmlChar const *__pyx_v_c_prefix) {
- const xmlChar *__pyx_v_c_href;
- xmlXPathContext *__pyx_v_ctxt;
- __Pyx_RefNannyDeclarations
diff --git a/external/lxml/replace-setuptools-with-distutils.patch.0
b/external/lxml/replace-setuptools-with-distutils.patch.0
new file mode 100644
index 000000000000..92494befa0f7
--- /dev/null
+++ b/external/lxml/replace-setuptools-with-distutils.patch.0
@@ -0,0 +1,11 @@
+--- setupinfo.py
++++ setupinfo.py
+@@ -4,7 +4,7 @@
+ import os.path
+ import subprocess
+
+-from setuptools.command.build_ext import build_ext as _build_ext
++from distutils.command.build_ext import build_ext as _build_ext
+ from distutils.core import Extension
+ from distutils.errors import CompileError, DistutilsOptionError
+ from versioninfo import get_base_dir
