office-gobmx/external/lxml/replace-setuptools-with-distutils.patch.1

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
external/lxml: Fix --enable-python=fully-internal build After commit a4b4a90557f9fc1839fc0eb297f4c6a4e94c761a Date: Sun Jul 2 14:54:23 2023 +0900 lxml: upgrade to release 4.9.2 , my `--enable-python=fully-internal` build started to fail with Building lxml version 4.9.2. Building without Cython. Building against libxml2 2.9.14 and libxslt 1.1.35 Traceback (most recent call last): File "setup.py", line 207, in <module> setup( File ".../libreoffice/instdir/program/python-core-3.8.18/lib/distutils/core.py", line 108, in setup _setup_distribution = dist = klass(attrs) File ".../libreoffice/instdir/program/python-core-3.8.18/lib/distutils/dist.py", line 274, in __init__ warnings.warn(msg) UserWarning: Unknown distribution option: 'project_urls' make[1]: * [.../libreoffice/external/lxml/ExternalProject_lxml.mk:26: .../libreoffice/workdir/ExternalProject/lxml/build] Error 1 make[1]: * Waiting for unfinished jobs.... make: *** [Makefile:289: build] Error 2 and Julien reports the same in [1]. The above commit includes a patch to switch from setuptools to distutils. Possibly the distutils variant of the `setup` function doesn't know about the "project_urls" keyword argument (at least in our bundled Python version), so extend the patch to drop that from the `setup.py`. [1] https://gerrit.libreoffice.org/c/core/+/153863 Change-Id: Icfac9fb0a3c62d3b30c12bc23ddbc0f9b088d788 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158230 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> 2023-10-20 03:37:35 -05:00			`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`
lxml: ignore warnings when calling setup.py build too Reverts dc97b366ab9ce3d38c84da06b8b37131579f87f3 "python3: silence distutils deprecated warning" and f41773d684dfb1bfebe484bbf6d1ec4b5937d348 "python3: silence distutils deprecated warning (take 2)" and c920605dd4c4520ab8ee80f9fb4746287835918c "external/lxml: Fix --enable-python=fully-internal build" Change-Id: I9131fa5ac22cf4f0279e7bf0edc5c50b61845044 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170206 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> 2024-07-09 04:42:05 -05:00
external/lxml: Fix --enable-python=fully-internal build After commit a4b4a90557f9fc1839fc0eb297f4c6a4e94c761a Date: Sun Jul 2 14:54:23 2023 +0900 lxml: upgrade to release 4.9.2 , my `--enable-python=fully-internal` build started to fail with Building lxml version 4.9.2. Building without Cython. Building against libxml2 2.9.14 and libxslt 1.1.35 Traceback (most recent call last): File "setup.py", line 207, in <module> setup( File ".../libreoffice/instdir/program/python-core-3.8.18/lib/distutils/core.py", line 108, in setup _setup_distribution = dist = klass(attrs) File ".../libreoffice/instdir/program/python-core-3.8.18/lib/distutils/dist.py", line 274, in __init__ warnings.warn(msg) UserWarning: Unknown distribution option: 'project_urls' make[1]: * [.../libreoffice/external/lxml/ExternalProject_lxml.mk:26: .../libreoffice/workdir/ExternalProject/lxml/build] Error 1 make[1]: * Waiting for unfinished jobs.... make: *** [Makefile:289: build] Error 2 and Julien reports the same in [1]. The above commit includes a patch to switch from setuptools to distutils. Possibly the distutils variant of the `setup` function doesn't know about the "project_urls" keyword argument (at least in our bundled Python version), so extend the patch to drop that from the `setup.py`. [1] https://gerrit.libreoffice.org/c/core/+/153863 Change-Id: Icfac9fb0a3c62d3b30c12bc23ddbc0f9b088d788 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158230 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> 2023-10-20 03:37:35 -05:00			`-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`