ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Python: upgrade to 3.11.11 (master only)

Browse Source 
Downloaded from https://www.python.org/ftp/python/3.11.11/Python-3.11.11.tar.xz

* Add external/python3/replace-powershell-with-wget.patch.1
to avoid

FindPythonForBuild:
 Invoke-WebRequest : The request was aborted: Could not create SSL/TLS secure
 channel.
 At line:1 char:1
 + Invoke-WebRequest https://aka.ms/nugetclidl -OutFile
 'C:\cygwin64\home\tdf\jenki ...
 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~
     + CategoryInfo          : InvalidOperation: (System.Net.HttpWebRequest:Htt
    pWebRequest) [Invoke-WebRequest], WebException
     + FullyQualifiedErrorId : WebCmdletWebResponseException,Microsoft.PowerShe
    ll.Commands.InvokeWebRequestCommand

 'py' is not recognized as an internal or external command,
 operable program or batch file.

when downloading nuget.exe from https://aka.ms/nugetclidl
using powershell. By default powershell uses TLS 1.0 and the site security requires TLS 1.2,
so it fails with 'The request was aborted: Could not create SSL/TLS
secure channel.'

Kudos to Caolán for helping with a compiling issue.
See https://lists.freedesktop.org/archives/libreoffice/2024-December/092830.html

Change-Id: If66a88dd8f8c7774c49f8c33e9e40d2d5418e7c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178681
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2025-01-09 15:42:20 +01:00
parent b06e7814d2
commit 50524481b3
13 changed files with 83 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/python3/ExternalPackage_python3.mk
Vendored
+42 -9
View File
@@ -186,7 +186,7 @@ endif
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
Lib/__future__.py \
Lib/__phello__.foo.py \
Lib/__hello__.py \
Lib/_aix_support.py \
Lib/_bootsubprocess.py \
Lib/_collections_abc.py \
@@ -210,7 +210,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/asyncore.py \
Lib/base64.py \
Lib/bdb.py \
Lib/binhex.py \
Lib/bisect.py \
Lib/bz2.py \
Lib/cProfile.py \
@@ -297,7 +296,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/queue.py \
Lib/quopri.py \
Lib/random.py \
Lib/re.py \
Lib/reprlib.py \
Lib/rlcompleter.py \
Lib/runpy.py \
@@ -356,6 +354,16 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/zipimport.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/__phello__,\
Lib/__phello__/__init__.py \
Lib/__phello__/spam.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/__phello__/ham,\
Lib/__phello__/ham/__init__.py \
Lib/__phello__/ham/eggs.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/asyncio,\
Lib/asyncio/__init__.py \
Lib/asyncio/__main__.py \
@@ -381,8 +389,10 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/asyncio/staggered.py \
Lib/asyncio/streams.py \
Lib/asyncio/subprocess.py \
Lib/asyncio/taskgroups.py \
Lib/asyncio/tasks.py \
Lib/asyncio/threads.py \
Lib/asyncio/timeouts.py \
Lib/asyncio/transports.py \
Lib/asyncio/trsock.py \
Lib/asyncio/unix_events.py \
@@ -460,7 +470,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/distutils/command/__init__.py \
Lib/distutils/command/bdist.py \
Lib/distutils/command/bdist_dumb.py \
Lib/distutils/command/bdist_msi.py \
Lib/distutils/command/bdist_rpm.py \
Lib/distutils/command/build.py \
Lib/distutils/command/build_clib.py \
@@ -650,8 +659,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/ensurepip/_bundled,\
Lib/ensurepip/_bundled/__init__.py \
Lib/ensurepip/_bundled/pip-23.0.1-py3-none-any.whl \
Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl \
Lib/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl \
))
@@ -672,14 +680,12 @@ $(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/importlib,\
Lib/importlib/__init__.py \
Lib/importlib/_abc.py \
Lib/importlib/_adapters.py \
Lib/importlib/_bootstrap.py \
Lib/importlib/_bootstrap_external.py \
Lib/importlib/_common.py \
Lib/importlib/abc.py \
Lib/importlib/machinery.py \
Lib/importlib/readers.py \
Lib/importlib/resources.py \
Lib/importlib/simple.py \
Lib/importlib/util.py \
))
@@ -693,6 +699,17 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/importlib/metadata/_text.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/importlib/resources,\
Lib/importlib/resources/__init__.py \
Lib/importlib/resources/_adapters.py \
Lib/importlib/resources/_common.py \
Lib/importlib/resources/_itertools.py \
Lib/importlib/resources/_legacy.py \
Lib/importlib/resources/abc.py \
Lib/importlib/resources/readers.py \
Lib/importlib/resources/simple.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/json,\
Lib/json/__init__.py \
Lib/json/decoder.py \
@@ -835,10 +852,25 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/pydoc_data/topics.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/re,\
Lib/re/__init__.py \
Lib/re/_casefix.py \
Lib/re/_compiler.py \
Lib/re/_constants.py \
Lib/re/_parser.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/site-packages,\
Lib/site-packages/README.txt \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/tomllib,\
Lib/tomllib/__init__.py \
Lib/tomllib/_parser.py \
Lib/tomllib/_re.py \
Lib/tomllib/_types.py \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest,\
Lib/unittest/__init__.py \
Lib/unittest/__main__.py \
@@ -869,6 +901,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/wsgiref/handlers.py \
Lib/wsgiref/headers.py \
Lib/wsgiref/simple_server.py \
Lib/wsgiref/types.py \
Lib/wsgiref/util.py \
Lib/wsgiref/validate.py \
))