diff --git a/external/lxml/UnpackedTarball_lxml.mk b/external/lxml/UnpackedTarball_lxml.mk index 8d032e70dd90..1b19b6fd1680 100644 --- a/external/lxml/UnpackedTarball_lxml.mk +++ b/external/lxml/UnpackedTarball_lxml.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lxml,$(LXML_TARBALL))) $(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.0 \ + external/lxml/replace-setuptools-with-distutils.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/lxml/replace-setuptools-with-distutils.patch.0 b/external/lxml/replace-setuptools-with-distutils.patch.0 deleted file mode 100644 index 92494befa0f7..000000000000 --- a/external/lxml/replace-setuptools-with-distutils.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/external/lxml/replace-setuptools-with-distutils.patch.1 b/external/lxml/replace-setuptools-with-distutils.patch.1 new file mode 100644 index 000000000000..5275e40312c8 --- /dev/null +++ b/external/lxml/replace-setuptools-with-distutils.patch.1 @@ -0,0 +1,29 @@ +diff -ur lxml.org/setupinfo.py lxml/setupinfo.py +--- lxml.org/setupinfo.py 2023-10-20 10:32:17.921500435 +0200 ++++ lxml/setupinfo.py 2023-10-20 10:33:40.303323572 +0200 +@@ -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 +diff -ur lxml.org/setup.py lxml/setup.py +--- lxml.org/setup.py 2023-10-20 10:32:17.949501053 +0200 ++++ lxml/setup.py 2023-10-20 10:33:09.082631759 +0200 +@@ -217,9 +217,10 @@ + # `Unknown distribution option: 'bugtrack_url'` + # which distract folks from real causes of problems when troubleshooting + # bugtrack_url="https://bugs.launchpad.net/lxml", +- project_urls={ +- "Source": "https://github.com/lxml/lxml", +- }, ++ # same as for bugtrack_urls also for project_urls when using distutils instead of setuptools ++ #project_urls={ ++ # "Source": "https://github.com/lxml/lxml", ++ #}, + description=( + "Powerful and Pythonic XML processing library" + " combining libxml2/libxslt with the ElementTree API."