ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

python3: upgrade to 3.13.14

Browse Source 
destdir-darwin.patch.1 is needed now after
https://github.com/python/cpython/issues/149351
The patch basically reverts it, otherwise the mac build fails with
dyld[52582]: Library not loaded: /@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython
  Referenced from: <B217B854-E01D-3BF6-ACE3-EE94548D7A23> /Users/tdf/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/instdir/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython
  Reason: tried: '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file)
/bin/sh: line 1: 52582 Abort trap: 6           DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}$I/LibreOfficeDev.app/Contents/Frameworks:$W/UnpackedTarball/cppunit/src/cppunit/.libs TEST_LIB=$W/LinkTarget/Library/libtest.dylib URE_BOOTSTRAP=vnd.sun.star.pathname:$I/LibreOfficeDev.app/Contents/Resources/fundamentalrc PYTHONPATH="$S/unotest/source/python:$I/LibreOfficeDev.app/Contents/Resources:$I/LibreOfficeDev.app/Contents/Frameworks:$S/pyuno/qa/pytests" UserInstallation=file://$W/PythonTest/pyuno_pytests_testimports/user TestUserDir="file://$W/PythonTest/pyuno_pytests_testimports/" PYTHONDONTWRITEBYTECODE=1 MAX_CONCURRENCY=4 MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 SAL_USE_VCLPLUGIN=svp LIBO_LANG=C $I/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython -m org.libreoffice.unittest testimports
[build CXX] starmath/qa/cppunit/test_parse.cxx
dyld[52524]: Library not loaded: /@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython
  Referenced from: <B217B854-E01D-3BF6-ACE3-EE94548D7A23> /Users/tdf/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/instdir/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython
  Reason: tried: '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file)
/bin/sh: line 1: 52524 Abort trap: 6           DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}$I/LibreOfficeDev.app/Contents/Frameworks:$W/UnpackedTarball/cppunit/src/cppunit/.libs TEST_LIB=$W/LinkTarget/Library/libtest.dylib URE_BOOTSTRAP=vnd.sun.star.pathname:$I/LibreOfficeDev.app/Contents/Resources/fundamentalrc PYTHONPATH="$S/unotest/source/python:$I/LibreOfficeDev.app/Contents/Resources:$I/LibreOfficeDev.app/Contents/Frameworks:$S/codemaker/tests/pythonmaker" UserInstallation=file://$W/PythonTest/codemaker_python/user TestUserDir="file://$W/PythonTest/codemaker_python/" PYTHONDONTWRITEBYTECODE=1 MAX_CONCURRENCY=4 MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 SAL_USE_VCLPLUGIN=svp LIBO_LANG=C $I/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython -m org.libreoffice.unittest test_pythonmaker

Downloaded from https://www.python.org/ftp/python/3.13.14/Python-3.13.14.tar.xz

Change-Id: I8f408fbdb2b37a4957f1e07a83176e6a3b889e96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/206365
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-06-13 17:20:07 +02:00
parent 49510fafbe
commit 4c223ffe8a
5 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -10796,7 +10796,7 @@ if test \( "$cross_compiling" = yes -a -z "$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=13
PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.13
PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14
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
download.lst
+2 -2
View File
@@ -611,8 +611,8 @@ POSTGRESQL_TARBALL := postgresql-15.18.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
PYTHON_SHA256SUM := 2ab91ff401783ccca64f75d10c882e957bdfd60e2bf5a72f8421793729b78a71
PYTHON_TARBALL := Python-3.13.13.tar.xz
PYTHON_SHA256SUM := 639e43243c620a308f968213df9e00f2f8f62332f7adbaa7a7eeb9783057c690
PYTHON_TARBALL := Python-3.13.14.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
external/python3/ExternalPackage_python3.mk
Vendored
+16 -29
View File
@@ -959,16 +959,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/pip/_vendor/certifi/core.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/dependency_groups,\
Lib/pip/_vendor/dependency_groups/LICENSE.txt \
Lib/pip/_vendor/dependency_groups/__init__.py \
Lib/pip/_vendor/dependency_groups/__main__.py \
Lib/pip/_vendor/dependency_groups/_implementation.py \
Lib/pip/_vendor/dependency_groups/_lint_dependency_groups.py \
Lib/pip/_vendor/dependency_groups/_pip_wrapper.py \
Lib/pip/_vendor/dependency_groups/_toml_compat.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/distlib,\
Lib/pip/_vendor/distlib/LICENSE.txt \
Lib/pip/_vendor/distlib/__init__.py \
@@ -1016,6 +1006,9 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/pip/_vendor/packaging/_parser.py \
Lib/pip/_vendor/packaging/_structures.py \
Lib/pip/_vendor/packaging/_tokenizer.py \
Lib/pip/_vendor/packaging/dependency_groups.py \
Lib/pip/_vendor/packaging/direct_url.py \
Lib/pip/_vendor/packaging/errors.py \
Lib/pip/_vendor/packaging/markers.py \
Lib/pip/_vendor/packaging/metadata.py \
Lib/pip/_vendor/packaging/pylock.py \
@@ -1234,7 +1227,9 @@ $(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/pip/_vendor/urllib3,\
Lib/pip/_vendor/urllib3/LICENSE.txt \
Lib/pip/_vendor/urllib3/__init__.py \
Lib/pip/_vendor/urllib3/_base_connection.py \
Lib/pip/_vendor/urllib3/_collections.py \
Lib/pip/_vendor/urllib3/_request_methods.py \
Lib/pip/_vendor/urllib3/_version.py \
Lib/pip/_vendor/urllib3/connection.py \
Lib/pip/_vendor/urllib3/connectionpool.py \
@@ -1242,42 +1237,33 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/pip/_vendor/urllib3/fields.py \
Lib/pip/_vendor/urllib3/filepost.py \
Lib/pip/_vendor/urllib3/poolmanager.py \
Lib/pip/_vendor/urllib3/request.py \
Lib/pip/_vendor/urllib3/response.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/urllib3/contrib,\
Lib/pip/_vendor/urllib3/contrib/__init__.py \
Lib/pip/_vendor/urllib3/contrib/_appengine_environ.py \
Lib/pip/_vendor/urllib3/contrib/appengine.py \
Lib/pip/_vendor/urllib3/contrib/ntlmpool.py \
Lib/pip/_vendor/urllib3/contrib/pyopenssl.py \
Lib/pip/_vendor/urllib3/contrib/securetransport.py \
Lib/pip/_vendor/urllib3/contrib/socks.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/urllib3/contrib/_securetransport,\
Lib/pip/_vendor/urllib3/contrib/_securetransport/__init__.py \
Lib/pip/_vendor/urllib3/contrib/_securetransport/bindings.py \
Lib/pip/_vendor/urllib3/contrib/_securetransport/low_level.py \
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/urllib3/contrib/emscripten,\
Lib/pip/_vendor/urllib3/contrib/emscripten/__init__.py \
Lib/pip/_vendor/urllib3/contrib/emscripten/connection.py \
Lib/pip/_vendor/urllib3/contrib/emscripten/fetch.py \
Lib/pip/_vendor/urllib3/contrib/emscripten/request.py \
Lib/pip/_vendor/urllib3/contrib/emscripten/response.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/urllib3/packages,\
Lib/pip/_vendor/urllib3/packages/__init__.py \
Lib/pip/_vendor/urllib3/packages/six.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/urllib3/packages/backports,\
Lib/pip/_vendor/urllib3/packages/backports/__init__.py \
Lib/pip/_vendor/urllib3/packages/backports/makefile.py \
Lib/pip/_vendor/urllib3/packages/backports/weakref_finalize.py \
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/urllib3/http2,\
Lib/pip/_vendor/urllib3/http2/__init__.py \
Lib/pip/_vendor/urllib3/http2/connection.py \
Lib/pip/_vendor/urllib3/http2/probe.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/urllib3/util,\
Lib/pip/_vendor/urllib3/util/__init__.py \
Lib/pip/_vendor/urllib3/util/connection.py \
Lib/pip/_vendor/urllib3/util/proxy.py \
Lib/pip/_vendor/urllib3/util/queue.py \
Lib/pip/_vendor/urllib3/util/request.py \
Lib/pip/_vendor/urllib3/util/response.py \
Lib/pip/_vendor/urllib3/util/retry.py \
@@ -1286,6 +1272,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/pip/_vendor/urllib3/util/ssltransport.py \
Lib/pip/_vendor/urllib3/util/timeout.py \
Lib/pip/_vendor/urllib3/util/url.py \
Lib/pip/_vendor/urllib3/util/util.py \
Lib/pip/_vendor/urllib3/util/wait.py \
))
external/python3/UnpackedTarball_python3.mk
Vendored
+2 -1
View File
@@ -21,7 +21,7 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,python3,\
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-26.0.1-py3-none-any.whl && \
unzip -q -d Lib/ -o Lib/ensurepip/_bundled/pip-26.1.2-py3-none-any.whl && \
mv Lib/setuptools/_vendor/jaraco/text/Lorem\ ipsum.txt Lib/setuptools/_vendor/jaraco/text/Lorem_ipsum.txt \
))
@@ -45,6 +45,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/sqlite3.patch.1 \
external/python3/lzma.patch.1 \
external/python3/decimal.patch.1 \
external/python3/destdir-darwin.patch.1 \
))
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
external/python3/destdir-darwin.patch.1
Vendored
+11
View File
@@ -0,0 +1,11 @@
--- python3/Makefile.pre.in 2026-06-12 15:31:46.305166136 +0200
+++ python3/Makefile.pre.in 2026-06-12 15:33:10.216862520 +0200
@@ -955,7 +955,7 @@
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
-all_load $(LIBRARY) \
- -install_name $(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
+ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
-compatibility_version $(VERSION) \
-current_version $(VERSION) \
-framework CoreFoundation $(LIBS);