Makefile.fetch | 1 - download.lst | 5 ----- external/python3/UnpackedTarball_python3.mk | 8 +------- 3 files changed, 1 insertion(+), 13 deletions(-)
New commits: commit 99e6d15b3f26815b11047f6fdfeb0051dd1e5f31 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Dec 17 10:38:11 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Dec 17 13:42:07 2025 +0100 python3: no longer needs python.exe from extern _freeze_module.vcxproj no longer needs python.exe to build deepfreeze.c after upgrading to python 3.13 in commit 241826dcb9bfa624e0761e6489b249b6fb507ea9 Author: Xisco Fauli <[email protected]> Date: Tue Dec 9 17:49:43 2025 +0100 python3: upgrade to 3.13.11 (master only) This commit partially reverts commit c9ae567c791bcffdc3fff9e3fb11b46275a13d2b Author: Xisco Fauli <[email protected]> Date: Fri Jan 10 15:48:09 2025 +0100 python3: get python.exe from extern Change-Id: Ie6c0770373acc1bfbab28b132a28ac204e0281e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195774 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/Makefile.fetch b/Makefile.fetch index 64c15b67b642..c994acdf707d 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -229,7 +229,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,POPPLER,POPPLER_DATA_TARBALL) \ $(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \ $(call fetch_Optional,PYTHON,PYTHON_TARBALL) \ - $(if $(filter WNT,$(OS)),PYTHON_BOOTSTRAP_TARBALL) \ $(call fetch_Optional,QXP,QXP_TARBALL) \ $(call fetch_Optional,REDLAND,RAPTOR_TARBALL) \ $(call fetch_Optional,REDLAND,RASQAL_TARBALL) \ diff --git a/download.lst b/download.lst index 61c314231692..9345262f22ba 100644 --- a/download.lst +++ b/download.lst @@ -616,11 +616,6 @@ PYTHON_TARBALL := Python-3.13.11.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -PYTHON_BOOTSTRAP_SHA256SUM := 406856be971d957e0bee7a5cefe20a5ec78d70a495e9e33cd0e53d31faec049d -PYTHON_BOOTSTRAP_TARBALL := python.3.12.8.nupkg -# three static lines -# so that git cherry-pick -# will not run into conflicts QXP_SHA256SUM := e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c QXP_TARBALL := libqxp-0.0.2.tar.xz # three static lines diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index bbfb6f0316c5..8543137f9a0b 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -11,15 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,python3)) $(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3)) -# Since Python 3.11, _freeze_module.vcxproj needs python.exe to build deepfreeze.c on Windows # Since a wheel file is just a zip file, unzil them to the Lib directory with the other libraries $(eval $(call gb_UnpackedTarball_set_pre_action,python3,\ - $(if $(filter WNT,$(OS)), \ - mkdir -p externals/pythonx86 && \ - unzip -q -d externals/pythonx86 -o $(gb_UnpackedTarget_TARFILE_LOCATION)/$(PYTHON_BOOTSTRAP_TARBALL) && \ - chmod +x externals/pythonx86/tools/* && \ - cp PC/pyconfig.h.in PC/pyconfig.h && \ - ) \ + cp PC/pyconfig.h.in PC/pyconfig.h && \ 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.3-py3-none-any.whl && \ mv Lib/setuptools/_vendor/jaraco/text/Lorem\ ipsum.txt Lib/setuptools/_vendor/jaraco/text/Lorem_ipsum.txt \
