configure.ac | 2 download.lst | 4 external/python3/ExternalPackage_python3.mk | 271 +++++++++++++++++----------- external/python3/UnpackedTarball_python3.mk | 6 external/python3/generateExternalPackage.py | 2 external/python3/setuptools.patch.1 | 11 + 6 files changed, 187 insertions(+), 109 deletions(-)
New commits: commit 087c49c15ac353e6c0828b9afc35840c566ae406 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Oct 20 23:11:59 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Oct 21 21:05:53 2025 +0200 python3: upgrade to 3.12.12 * Add external/python3/setuptools.patch.1 to deal with the space in Lib/setuptools/_vendor/jaraco/text/Lorem ipsum.txt Downloaded from https://www.python.org/ftp/python/3.12.12/Python-3.12.12.tar.xz Change-Id: I0fe4730ee26267e0042fb10b6ad78bbc21ca1ce5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192758 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/configure.ac b/configure.ac index 721ffb1e31f1..293659be55c3 100644 --- a/configure.ac +++ b/configure.ac @@ -10661,7 +10661,7 @@ if test \( "$cross_compiling" = yes -a -z "$PYTHON_FOR_BUILD" \) -o "$enable_pyt SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=12 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.11 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.12 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) fi diff --git a/download.lst b/download.lst index 812239b80524..bd823aac34a6 100644 --- a/download.lst +++ b/download.lst @@ -606,8 +606,8 @@ POSTGRESQL_TARBALL := postgresql-15.14.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts -PYTHON_SHA256SUM := c30bb24b7f1e9a19b11b55a546434f74e739bb4c271a3e3a80ff4380d49f7adb -PYTHON_TARBALL := Python-3.12.11.tar.xz +PYTHON_SHA256SUM := fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +PYTHON_TARBALL := Python-3.12.12.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index b70477dc1944..056cd5973513 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -1352,71 +1352,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources,\ Lib/pkg_resources/__init__.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/_vendor,\ - Lib/pkg_resources/_vendor/__init__.py \ - Lib/pkg_resources/_vendor/typing_extensions.py \ - Lib/pkg_resources/_vendor/zipp.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/_vendor/importlib_resources,\ - Lib/pkg_resources/_vendor/importlib_resources/__init__.py \ - Lib/pkg_resources/_vendor/importlib_resources/_adapters.py \ - Lib/pkg_resources/_vendor/importlib_resources/_common.py \ - Lib/pkg_resources/_vendor/importlib_resources/_compat.py \ - Lib/pkg_resources/_vendor/importlib_resources/_itertools.py \ - Lib/pkg_resources/_vendor/importlib_resources/_legacy.py \ - Lib/pkg_resources/_vendor/importlib_resources/abc.py \ - Lib/pkg_resources/_vendor/importlib_resources/readers.py \ - Lib/pkg_resources/_vendor/importlib_resources/simple.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/_vendor/jaraco,\ - Lib/pkg_resources/_vendor/jaraco/__init__.py \ - Lib/pkg_resources/_vendor/jaraco/context.py \ - Lib/pkg_resources/_vendor/jaraco/functools.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/_vendor/jaraco/text,\ - Lib/pkg_resources/_vendor/jaraco/text/__init__.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/_vendor/more_itertools,\ - Lib/pkg_resources/_vendor/more_itertools/__init__.py \ - Lib/pkg_resources/_vendor/more_itertools/more.py \ - Lib/pkg_resources/_vendor/more_itertools/recipes.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/_vendor/packaging,\ - Lib/pkg_resources/_vendor/packaging/__init__.py \ - Lib/pkg_resources/_vendor/packaging/_elffile.py \ - Lib/pkg_resources/_vendor/packaging/_manylinux.py \ - Lib/pkg_resources/_vendor/packaging/_musllinux.py \ - Lib/pkg_resources/_vendor/packaging/_parser.py \ - Lib/pkg_resources/_vendor/packaging/_structures.py \ - Lib/pkg_resources/_vendor/packaging/_tokenizer.py \ - Lib/pkg_resources/_vendor/packaging/markers.py \ - Lib/pkg_resources/_vendor/packaging/requirements.py \ - Lib/pkg_resources/_vendor/packaging/specifiers.py \ - Lib/pkg_resources/_vendor/packaging/tags.py \ - Lib/pkg_resources/_vendor/packaging/utils.py \ - Lib/pkg_resources/_vendor/packaging/version.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/_vendor/platformdirs,\ - Lib/pkg_resources/_vendor/platformdirs/__init__.py \ - Lib/pkg_resources/_vendor/platformdirs/__main__.py \ - Lib/pkg_resources/_vendor/platformdirs/android.py \ - Lib/pkg_resources/_vendor/platformdirs/api.py \ - Lib/pkg_resources/_vendor/platformdirs/macos.py \ - Lib/pkg_resources/_vendor/platformdirs/unix.py \ - Lib/pkg_resources/_vendor/platformdirs/version.py \ - Lib/pkg_resources/_vendor/platformdirs/windows.py \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pkg_resources/extern,\ - Lib/pkg_resources/extern/__init__.py \ + Lib/pkg_resources/api_tests.txt \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pydoc_data,\ @@ -1434,7 +1370,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools,\ Lib/setuptools/__init__.py \ - Lib/setuptools/_deprecation_warning.py \ + Lib/setuptools/_core_metadata.py \ Lib/setuptools/_entry_points.py \ Lib/setuptools/_imp.py \ Lib/setuptools/_importlib.py \ @@ -1442,13 +1378,14 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_normalization.py \ Lib/setuptools/_path.py \ Lib/setuptools/_reqs.py \ + Lib/setuptools/_shutil.py \ + Lib/setuptools/_static.py \ Lib/setuptools/archive_util.py \ Lib/setuptools/build_meta.py \ Lib/setuptools/cli-32.exe \ Lib/setuptools/cli-64.exe \ Lib/setuptools/cli-arm64.exe \ Lib/setuptools/cli.exe \ - Lib/setuptools/dep_util.py \ Lib/setuptools/depends.py \ Lib/setuptools/discovery.py \ Lib/setuptools/dist.py \ @@ -1462,30 +1399,28 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/installer.py \ Lib/setuptools/launch.py \ Lib/setuptools/logging.py \ + Lib/setuptools/modified.py \ Lib/setuptools/monkey.py \ Lib/setuptools/msvc.py \ Lib/setuptools/namespaces.py \ Lib/setuptools/package_index.py \ - Lib/setuptools/py34compat.py \ Lib/setuptools/sandbox.py \ Lib/setuptools/unicode_utils.py \ Lib/setuptools/version.py \ + Lib/setuptools/warnings.py \ Lib/setuptools/wheel.py \ Lib/setuptools/windows_support.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_distutils,\ Lib/setuptools/_distutils/__init__.py \ - Lib/setuptools/_distutils/_collections.py \ - Lib/setuptools/_distutils/_functools.py \ Lib/setuptools/_distutils/_log.py \ Lib/setuptools/_distutils/_macos_compat.py \ + Lib/setuptools/_distutils/_modified.py \ Lib/setuptools/_distutils/_msvccompiler.py \ Lib/setuptools/_distutils/archive_util.py \ - Lib/setuptools/_distutils/bcppcompiler.py \ Lib/setuptools/_distutils/ccompiler.py \ Lib/setuptools/_distutils/cmd.py \ - Lib/setuptools/_distutils/config.py \ Lib/setuptools/_distutils/core.py \ Lib/setuptools/_distutils/cygwinccompiler.py \ Lib/setuptools/_distutils/debug.py \ @@ -1498,10 +1433,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_distutils/file_util.py \ Lib/setuptools/_distutils/filelist.py \ Lib/setuptools/_distutils/log.py \ - Lib/setuptools/_distutils/msvc9compiler.py \ - Lib/setuptools/_distutils/msvccompiler.py \ - Lib/setuptools/_distutils/py38compat.py \ - Lib/setuptools/_distutils/py39compat.py \ Lib/setuptools/_distutils/spawn.py \ Lib/setuptools/_distutils/sysconfig.py \ Lib/setuptools/_distutils/text_file.py \ @@ -1509,6 +1440,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_distutils/util.py \ Lib/setuptools/_distutils/version.py \ Lib/setuptools/_distutils/versionpredicate.py \ + Lib/setuptools/_distutils/zosccompiler.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_distutils/command,\ @@ -1531,17 +1463,49 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_distutils/command/install_headers.py \ Lib/setuptools/_distutils/command/install_lib.py \ Lib/setuptools/_distutils/command/install_scripts.py \ - Lib/setuptools/_distutils/command/py37compat.py \ - Lib/setuptools/_distutils/command/register.py \ Lib/setuptools/_distutils/command/sdist.py \ - Lib/setuptools/_distutils/command/upload.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_distutils/compat,\ + Lib/setuptools/_distutils/compat/__init__.py \ + Lib/setuptools/_distutils/compat/numpy.py \ + Lib/setuptools/_distutils/compat/py39.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_distutils/compilers/C,\ + Lib/setuptools/_distutils/compilers/C/base.py \ + Lib/setuptools/_distutils/compilers/C/cygwin.py \ + Lib/setuptools/_distutils/compilers/C/errors.py \ + Lib/setuptools/_distutils/compilers/C/msvc.py \ + Lib/setuptools/_distutils/compilers/C/unix.py \ + Lib/setuptools/_distutils/compilers/C/zos.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor,\ - Lib/setuptools/_vendor/__init__.py \ - Lib/setuptools/_vendor/ordered_set.py \ Lib/setuptools/_vendor/typing_extensions.py \ - Lib/setuptools/_vendor/zipp.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/autocommand,\ + Lib/setuptools/_vendor/autocommand/__init__.py \ + Lib/setuptools/_vendor/autocommand/autoasync.py \ + Lib/setuptools/_vendor/autocommand/autocommand.py \ + Lib/setuptools/_vendor/autocommand/automain.py \ + Lib/setuptools/_vendor/autocommand/autoparse.py \ + Lib/setuptools/_vendor/autocommand/errors.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/backports,\ + Lib/setuptools/_vendor/backports/__init__.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/backports/tarfile,\ + Lib/setuptools/_vendor/backports/tarfile/__init__.py \ + Lib/setuptools/_vendor/backports/tarfile/__main__.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/backports/tarfile/compat,\ + Lib/setuptools/_vendor/backports/tarfile/compat/__init__.py \ + Lib/setuptools/_vendor/backports/tarfile/compat/py38.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/importlib_metadata,\ @@ -1552,30 +1516,45 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_vendor/importlib_metadata/_functools.py \ Lib/setuptools/_vendor/importlib_metadata/_itertools.py \ Lib/setuptools/_vendor/importlib_metadata/_meta.py \ - Lib/setuptools/_vendor/importlib_metadata/_py39compat.py \ Lib/setuptools/_vendor/importlib_metadata/_text.py \ + Lib/setuptools/_vendor/importlib_metadata/diagnose.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/importlib_metadata/compat,\ + Lib/setuptools/_vendor/importlib_metadata/compat/__init__.py \ + Lib/setuptools/_vendor/importlib_metadata/compat/py311.py \ + Lib/setuptools/_vendor/importlib_metadata/compat/py39.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/inflect,\ + Lib/setuptools/_vendor/inflect/__init__.py \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/importlib_resources,\ - Lib/setuptools/_vendor/importlib_resources/__init__.py \ - Lib/setuptools/_vendor/importlib_resources/_adapters.py \ - Lib/setuptools/_vendor/importlib_resources/_common.py \ - Lib/setuptools/_vendor/importlib_resources/_compat.py \ - Lib/setuptools/_vendor/importlib_resources/_itertools.py \ - Lib/setuptools/_vendor/importlib_resources/_legacy.py \ - Lib/setuptools/_vendor/importlib_resources/abc.py \ - Lib/setuptools/_vendor/importlib_resources/readers.py \ - Lib/setuptools/_vendor/importlib_resources/simple.py \ +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/inflect/compat,\ + Lib/setuptools/_vendor/inflect/compat/__init__.py \ + Lib/setuptools/_vendor/inflect/compat/py38.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/jaraco,\ - Lib/setuptools/_vendor/jaraco/__init__.py \ Lib/setuptools/_vendor/jaraco/context.py \ - Lib/setuptools/_vendor/jaraco/functools.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/jaraco/collections,\ + Lib/setuptools/_vendor/jaraco/collections/__init__.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/jaraco/functools,\ + Lib/setuptools/_vendor/jaraco/functools/__init__.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/jaraco/text,\ + Lib/setuptools/_vendor/jaraco/text/Lorem_ipsum.txt \ Lib/setuptools/_vendor/jaraco/text/__init__.py \ + Lib/setuptools/_vendor/jaraco/text/layouts.py \ + Lib/setuptools/_vendor/jaraco/text/show-newlines.py \ + Lib/setuptools/_vendor/jaraco/text/strip-prefix.py \ + Lib/setuptools/_vendor/jaraco/text/to-dvorak.py \ + Lib/setuptools/_vendor/jaraco/text/to-qwerty.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/more_itertools,\ @@ -1593,6 +1572,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_vendor/packaging/_structures.py \ Lib/setuptools/_vendor/packaging/_tokenizer.py \ Lib/setuptools/_vendor/packaging/markers.py \ + Lib/setuptools/_vendor/packaging/metadata.py \ Lib/setuptools/_vendor/packaging/requirements.py \ Lib/setuptools/_vendor/packaging/specifiers.py \ Lib/setuptools/_vendor/packaging/tags.py \ @@ -1600,6 +1580,22 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_vendor/packaging/version.py \ )) +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/packaging/licenses,\ + Lib/setuptools/_vendor/packaging/licenses/__init__.py \ + Lib/setuptools/_vendor/packaging/licenses/_spdx.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/platformdirs,\ + Lib/setuptools/_vendor/platformdirs/__init__.py \ + Lib/setuptools/_vendor/platformdirs/__main__.py \ + Lib/setuptools/_vendor/platformdirs/android.py \ + Lib/setuptools/_vendor/platformdirs/api.py \ + Lib/setuptools/_vendor/platformdirs/macos.py \ + Lib/setuptools/_vendor/platformdirs/unix.py \ + Lib/setuptools/_vendor/platformdirs/version.py \ + Lib/setuptools/_vendor/platformdirs/windows.py \ +)) + $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/tomli,\ Lib/setuptools/_vendor/tomli/__init__.py \ Lib/setuptools/_vendor/tomli/_parser.py \ @@ -1607,11 +1603,80 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_vendor/tomli/_types.py \ )) +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/typeguard,\ + Lib/setuptools/_vendor/typeguard/__init__.py \ + Lib/setuptools/_vendor/typeguard/_checkers.py \ + Lib/setuptools/_vendor/typeguard/_config.py \ + Lib/setuptools/_vendor/typeguard/_decorators.py \ + Lib/setuptools/_vendor/typeguard/_exceptions.py \ + Lib/setuptools/_vendor/typeguard/_functions.py \ + Lib/setuptools/_vendor/typeguard/_importhook.py \ + Lib/setuptools/_vendor/typeguard/_memo.py \ + Lib/setuptools/_vendor/typeguard/_pytest_plugin.py \ + Lib/setuptools/_vendor/typeguard/_suppression.py \ + Lib/setuptools/_vendor/typeguard/_transformer.py \ + Lib/setuptools/_vendor/typeguard/_union_transformer.py \ + Lib/setuptools/_vendor/typeguard/_utils.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/wheel,\ + Lib/setuptools/_vendor/wheel/__init__.py \ + Lib/setuptools/_vendor/wheel/__main__.py \ + Lib/setuptools/_vendor/wheel/_bdist_wheel.py \ + Lib/setuptools/_vendor/wheel/_setuptools_logging.py \ + Lib/setuptools/_vendor/wheel/bdist_wheel.py \ + Lib/setuptools/_vendor/wheel/macosx_libfile.py \ + Lib/setuptools/_vendor/wheel/metadata.py \ + Lib/setuptools/_vendor/wheel/util.py \ + Lib/setuptools/_vendor/wheel/wheelfile.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/wheel/cli,\ + Lib/setuptools/_vendor/wheel/cli/__init__.py \ + Lib/setuptools/_vendor/wheel/cli/convert.py \ + Lib/setuptools/_vendor/wheel/cli/pack.py \ + Lib/setuptools/_vendor/wheel/cli/tags.py \ + Lib/setuptools/_vendor/wheel/cli/unpack.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/wheel/vendored,\ + Lib/setuptools/_vendor/wheel/vendored/__init__.py \ + Lib/setuptools/_vendor/wheel/vendored/vendor.txt \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/wheel/vendored/packaging,\ + Lib/setuptools/_vendor/wheel/vendored/packaging/__init__.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/_elffile.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/_manylinux.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/_musllinux.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/_parser.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/_structures.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/_tokenizer.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/markers.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/requirements.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/specifiers.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/tags.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/utils.py \ + Lib/setuptools/_vendor/wheel/vendored/packaging/version.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/zipp,\ + Lib/setuptools/_vendor/zipp/__init__.py \ + Lib/setuptools/_vendor/zipp/glob.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/_vendor/zipp/compat,\ + Lib/setuptools/_vendor/zipp/compat/__init__.py \ + Lib/setuptools/_vendor/zipp/compat/py310.py \ +)) + $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/command,\ Lib/setuptools/command/__init__.py \ + Lib/setuptools/command/_requirestxt.py \ Lib/setuptools/command/alias.py \ Lib/setuptools/command/bdist_egg.py \ Lib/setuptools/command/bdist_rpm.py \ + Lib/setuptools/command/bdist_wheel.py \ Lib/setuptools/command/build.py \ Lib/setuptools/command/build_clib.py \ Lib/setuptools/command/build_ext.py \ @@ -1625,15 +1690,19 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/command/install_egg_info.py \ Lib/setuptools/command/install_lib.py \ Lib/setuptools/command/install_scripts.py \ - Lib/setuptools/command/py36compat.py \ - Lib/setuptools/command/register.py \ Lib/setuptools/command/rotate.py \ Lib/setuptools/command/saveopts.py \ Lib/setuptools/command/sdist.py \ Lib/setuptools/command/setopt.py \ Lib/setuptools/command/test.py \ - Lib/setuptools/command/upload.py \ - Lib/setuptools/command/upload_docs.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/compat,\ + Lib/setuptools/compat/__init__.py \ + Lib/setuptools/compat/py310.py \ + Lib/setuptools/compat/py311.py \ + Lib/setuptools/compat/py312.py \ + Lib/setuptools/compat/py39.py \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/config,\ @@ -1653,10 +1722,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/config/_validate_pyproject/formats.py \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/setuptools/extern,\ - Lib/setuptools/extern/__init__.py \ -)) - $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/site-packages,\ Lib/site-packages/README.txt \ )) diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index bc979c337c4a..a34c4c58fdcc 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -19,8 +19,9 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,python3,\ unzip -q -d externals/pythonx86 -o $(gb_UnpackedTarget_TARFILE_LOCATION)/$(PYTHON_BOOTSTRAP_TARBALL) && \ chmod +x externals/pythonx86/tools/* && \ ) \ - unzip -q -d Lib/ -o Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl && \ - unzip -q -d Lib/ -o Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl \ + unzip -q -d Lib/ -o Lib/test/wheeldata/setuptools-79.0.1-py3-none-any.whl && \ + unzip -q -d Lib/ -o Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl && \ + mv Lib/setuptools/_vendor/jaraco/text/Lorem\ ipsum.txt Lib/setuptools/_vendor/jaraco/text/Lorem_ipsum.txt \ )) $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ @@ -40,6 +41,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/python-3.5.4-msvc-disable.patch.1 \ external/python3/ubsan.patch.0 \ external/python3/init-sys-streams-cant-initialize-stdin.patch.0 \ + external/python3/setuptools.patch.1 \ )) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) diff --git a/external/python3/generateExternalPackage.py b/external/python3/generateExternalPackage.py index b53a04e7f58a..afa4aab0610e 100755 --- a/external/python3/generateExternalPackage.py +++ b/external/python3/generateExternalPackage.py @@ -48,7 +48,7 @@ if __name__ == '__main__': print() if k == "Lib/msilib": print("ifeq (WNT,$(OS))") - print("$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/{},\".format(k.lower())) + print("$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/{},\".format(k.replace("Lib", "lib", 3))) for fileName in sorted(v): print(" {} \".format(fileName)) print("))") diff --git a/external/python3/setuptools.patch.1 b/external/python3/setuptools.patch.1 new file mode 100644 index 000000000000..dfbbfc8db7de --- /dev/null +++ b/external/python3/setuptools.patch.1 @@ -0,0 +1,11 @@ +--- a/Lib/setuptools/_vendor/jaraco/text/__init__.py ++++ b/Lib/setuptools/_vendor/jaraco/text/__init__.py +@@ -228,7 +228,7 @@ def unwrap(s): + + + lorem_ipsum: str = ( +- files(__name__).joinpath('Lorem ipsum.txt').read_text(encoding='utf-8') ++ files(__name__).joinpath('Lorem_ipsum.txt').read_text(encoding='utf-8') + ) + +
