configure.ac | 2 +- download.lst | 4 ++-- external/python3/python-3.3.3-disable-obmalloc.patch.0 | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 19af76a34d0b363160f075ba16fb4d1300496ccb Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Jun 12 08:44:43 2024 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Feb 4 21:13:09 2025 +0100 Fix --disable-runtime-optimizations build ...after 19e9e49bdaeebc314c892c000385ec778edf759b "python3: upgrade to 3.9.19", by making external/python3/python-3.3.3-disable-obmalloc.patch.0 apply again Change-Id: I295e470f3e86740ee276336dd04c227b2b316140 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168695 Reviewed-by: Stephan Bergmann <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 9e6b4732ca2ad37a7bcfa6e406b3b244accd0508) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168712 (cherry picked from commit 426b23ace0233d679d2167ea32597768e9684750) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181044 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/python3/python-3.3.3-disable-obmalloc.patch.0 b/external/python3/python-3.3.3-disable-obmalloc.patch.0 index c4a1dea61ecf..9549e52af3fb 100644 --- a/external/python3/python-3.3.3-disable-obmalloc.patch.0 +++ b/external/python3/python-3.3.3-disable-obmalloc.patch.0 @@ -1,6 +1,6 @@ --- Objects/obmalloc.c +++ Objects/obmalloc.c -@@ -712,8 +712,8 @@ +@@ -722,8 +722,8 @@ #ifdef WITH_PYMALLOC @@ -8,10 +8,10 @@ #ifdef WITH_VALGRIND -#include <valgrind/valgrind.h> - /* If we're using GCC, use __builtin_expect() to reduce overhead of - the valgrind checks */ -@@ -1430,7 +1430,7 @@ - + /* -1 indicates that we haven't checked that we're running on valgrind yet. */ + static int running_on_valgrind = -1; +@@ -1591,7 +1591,7 @@ + { #ifdef WITH_VALGRIND if (UNLIKELY(running_on_valgrind == -1)) { - running_on_valgrind = RUNNING_ON_VALGRIND; commit 3b118ec684ee214183d9d65096584a506fe35ef2 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Dec 3 22:47:06 2024 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Feb 4 21:13:01 2025 +0100 Python: upgrade to 3.9.21 Downloaded from https://www.python.org/ftp/python/3.9.21/Python-3.9.21.tar.xz Change-Id: I8ef63130b2cbed9a7a9e6686f9c05b06d4d9e4bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177759 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 5a58ad8a4b5ebf83b41b47fc2a688171dd79e9cd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181043 Tested-by: Andras Timar <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/configure.ac b/configure.ac index 3935201f2c2a..e7be2ac54ad1 100644 --- a/configure.ac +++ b/configure.ac @@ -10115,7 +10115,7 @@ if test \( "$cross_compiling" = yes -a -z "$PYTHON_FOR_BUILD" \) -o "$enable_pyt SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=9 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.20 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.21 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 36dfcc69a8b4..fb55904af774 100644 --- a/download.lst +++ b/download.lst @@ -658,8 +658,8 @@ POSTGRESQL_TARBALL := postgresql-13.16.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts -PYTHON_SHA256SUM := 6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c -PYTHON_TARBALL := Python-3.9.20.tar.xz +PYTHON_SHA256SUM := 3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1 +PYTHON_TARBALL := Python-3.9.21.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
