Commit Graph
16 Commits
Author SHA1 Message Date
Xisco Fauli 3bf78c951b python3: disable xxlimited on Windows for now
For some reason, daily builds are failing with

"E:\jenkins\workspace\build_master\workdir\UnpackedTarball\python3\PCBuild\pcbuild.sln" (Build target) (1) ->
"E:\jenkins\workspace\build_master\workdir\UnpackedTarball\python3\PCBuild\python.vcxproj.metaproj" (default target) (2) ->
"E:\jenkins\workspace\build_master\workdir\UnpackedTarball\python3\PCBuild\xxlimited.vcxproj" (default target) (40) ->
(Link target) ->
 LINK : fatal error LNK1104: cannot open file 'python313.lib' [E:\jenkins\workspace\build_master\workdir\UnpackedTarball\python3\PCBuild\xxlimited.vcxproj]

after

commit 241826dcb9
Author: Xisco Fauli <xiscofauli@libreoffice.org>
Date:   Tue Dec 9 17:49:43 2025 +0100

    python3: upgrade to 3.13.11 (master only)

so disable it until I find the real reason why it's failing

Change-Id: Ifff8dccc68540ec3cfc7285e8e1b381e3cc43682
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195794
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
2025-12-17 19:46:22 +01:00
Xisco Fauli 241826dcb9 python3: upgrade to 3.13.11 (master only)
* external/python3/decimal.patch.1 partially reverts
commit 849e0716d378d6f9f724d1b3c386f6613d52a49d
Author: Zachary Ware <zach@python.org>
Date:   Mon Mar 18 12:07:25 2024 -0500

    gh-115119: Switch Windows build to mpdecimal external (GH-115182)

to build mpdecimal as internal on Windows

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

Change-Id: Ia3385a3cc29f05ba898ec721c7e2a26c9d5f5ac2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195320
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-12-16 22:22:30 +01:00
Xisco Fauli 6408a49ac5 tdf#168513: python3: bundle lzma
Change-Id: I7b9729cd293aea781b204888236c3aa5aa858eaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193739
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
2025-11-11 21:40:00 +01:00
Xisco Fauli 4bf59e9258 python3: bundle _hashlib on Windows too
as Linux and MacOS already do

Change-Id: I42aae48a35e72b540a7fda51bb5907de2de64aab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193288
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
2025-11-03 15:27:55 +01:00
Xisco Fauli b6d2fe4fcc tdf#168514: Add pythonw.exe
Change-Id: Ib007a7203114501d96f109f6d0c3d33d991be347
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193258
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
2025-10-31 16:44:35 +01:00
Xisco Fauli 1dfb0c9936 tdf#168512: python3: bundle sqlite3
Add sqlite3.patch.1 since sqlite3.vcxproj expects the
sqlite version in the path

Change-Id: Ieb262b5401447cc9cc8c8d68197b3ec492c6ed94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191394
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-10-29 14:21:29 +01:00
Xisco Fauli 528cdd6573 python3: upgrade to 3.12.11 (master only)
* Py_DontWriteBytecodeFlag is deprecated now, replace it with
PyConfig.write_bytecode

* setuptools and pip are no longer available by default on mac.
Get them from the wheel files the same way linux and windows do

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

Change-Id: Id1043671d8fbb6b3bfa39afbf6aedd634c92c5f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181785
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-06-17 20:39:18 +02:00
Xisco Fauli 50524481b3 Python: upgrade to 3.11.11 (master only)
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>
2025-01-09 15:42:20 +01:00
Xisco Fauli a1295cb177 python: upgrade to 3.10.14 (master only)
Downloaded from https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tar.xz

* external/python3/macos-11.patch.0 should be long
obsolete by now

Change-Id: I454851f7684e699519370bdbbcd9bb9a2cccd077
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170051
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-07-05 23:15:07 +02:00
Taichi Haradaguchi c72d5d787f tdf#116412 include bz2 module in internal python
This commit includes the changes in 5e3510dbb6
and 219bef04b7, as well as the following changes:

* add bzip2 as permissable build target when cross compiling for Windows ARM64.
* add external/bzip2/disable-test.patch.0 for cross-compiling.
* revert the changes to configure.ac in 5e3510dbb6.
* change the argument of gb_UnpackedTarball_fix_end_of_line.

Change-Id: Iad8b1ed48d6c56e1302d9ac11620dc8084e79276
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157101
Tested-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
2023-10-14 08:53:14 +02:00
Taichi Haradaguchi 5cd48b4969 Revert "tdf#116412: include bz2 in internal python"
This reverts commit 5e3510dbb6.

Reason for revert: occured build error at https://ci.libreoffice.org/view/tb%20platform%20status/job/lo_daily_tb_win_arm64/966/

Change-Id: I9f9087964f7a85c03bca6be4eff5717d6d274c89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155391
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
2023-08-07 05:59:22 +02:00
Taichi Haradaguchi 5e3510dbb6 tdf#116412: include bz2 in internal python
Change-Id: Ie257446692227ae689fad2e61a42405a68e4f665
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139580
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
2023-07-30 09:20:29 +02:00
Taichi Haradaguchi ea5843b67f Python3: update to 3.8.15
* Fixes CVE-2022-40674
* Removed 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 as fixed upstream

Change-Id: I8e71f9a6b013ca4c45bf8774b284be98eee71bab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141691
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-10-24 21:01:48 +02:00
Jan-Marek Glogowski b4dfba9477 python3: update to 3.8.4
With all the prerequisites in place, LO can be updated to the
current Python release. Interestingly I found that Cygwin always
seems to use LC_COLLATE=C, probably because the default collation
rules are missing.

Then there are the changes introduced in "PEP 587 -- Python
Initialization Configuration", which appearingly have modified the
DLL search path behaviour on Windows, so the OpenSLL DLLs aren't
found anymore in the program directory. As a workaround, the
OpenSLL and libffi DLLs are now (also) installed into the Python
lib dir on Windows.

Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98437
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-07-17 10:15:06 +02:00
Michael Stahl b10be5d484 python3: upgrade to release 3.7.6
* external/python3/python-3.3.3-aix.patch.1:
  most of it doesn't apply and AIX port isn't maintained anyway so
  remove it for now
* external/python3/ubsan.patch.0:
  apparently one of the files was removed
* 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1:
  fixed upstream
* python3-osx-avoid-new-10.13.patch.1:
  replace with simply passing ac_cv_func_utimensat=no to configure
* external/python3/python-3.5.4-ssl.patch.1:
  project files to build OpenSSL removed upstream
* There have been changes to how python locates OpenSSL; new variables
  OPENSSL_INCLUDES etc; it turns out that you have to pass one directory
  to --with-openssl, as the variables cannot be passed
* libuuid.so.1 is a new dependency of the _uuid module
* libffi.so.6 is a new dependency of the _ctypes module (the bundled
  copy of libffi for non-Darwin platforms was removed)
* python-3.3.0-pythreadstate.patch.1:
  the PyThreadState functions have been changed such that
  CppunitTest_services asserts when there is a PyThreadAttach on top of
  PyThreadDetach on top of PyThreadAttach, i.e., 2 PyThreadState per
  thread (PyGILState_Check() fails).  Instead of patching in additional
  workarounds, change PyThreadAttach so that it re-uses an existing
  PyThreadState if one exists for the thread.

Change-Id: I24c19d79b43a30709261fd9db66312b2e3872fd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84765
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-08 10:22:17 +01:00
David Ostrovsky f0e68d4fea python3: upgrade to release 3.5.4
Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
2017-08-11 12:28:37 +02:00