Python: update to 3.13.1

packages/addons/service/hyperion/patches/hyperion-0001-fix-build-with-python-313.patch

@@ -0,0 +1,21 @@
+From 8647a93f99121084e8749982f6f8f56e254d815d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <[email protected]>
+Date: Mon, 9 Dec 2024 11:18:31 +1100
+Subject: [PATCH] Remove PyEval_ReleaseLock();
+
+---
+ libsrc/effectengine/Effect.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libsrc/effectengine/Effect.cpp b/libsrc/effectengine/Effect.cpp
+index b89a36cb..a60c935a 100644
+--- a/libsrc/effectengine/Effect.cpp
++++ b/libsrc/effectengine/Effect.cpp
+@@ -120,7 +120,6 @@ void Effect::run()
+ 	// Clean up the thread state
+ 	Py_EndInterpreter(_interpreterThreadState);
+ 	_interpreterThreadState = nullptr;
+-	PyEval_ReleaseLock();
+ }
+
+ int Effect::getPriority() const

packages/lang/Python3/package.mk

@@ -3,8 +3,8 @@
 
 PKG_NAME="Python3"
 # When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION!
-PKG_VERSION="3.12.8"
-PKG_SHA256="c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e"
+PKG_VERSION="3.13.1"
+PKG_SHA256="9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.python.org/"
 PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"
@@ -14,7 +14,7 @@ PKG_LONGDESC="Python3 is an interpreted object-oriented programming language."
 PKG_BUILD_FLAGS="-cfg-libs -cfg-libs:host"
 PKG_TOOLCHAIN="autotools"
 
-PKG_PYTHON_VERSION="python3.12"
+PKG_PYTHON_VERSION="python3.13"
 
 PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_HAS_HG=/bin/false
                          ac_cv_prog_SVNVERSION=/bin/false
@@ -39,7 +39,6 @@ PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_HAS_HG=/bin/false
                          --disable-curses
                          --disable-pydoc
                          --disable-test-modules
-                         --disable-lib2to3
                          --disable-idle3
                          --with-expat=builtin
                          --with-doc-strings
@@ -78,7 +77,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false
                            --enable-curses
                            --disable-pydoc
                            --disable-test-modules
-                           --disable-lib2to3
                            --disable-idle3
                            --with-expat=system
                            --with-doc-strings
@@ -121,7 +119,7 @@ post_makeinstall_target() {
 
   PKG_INSTALL_PATH_LIB=${INSTALL}/usr/lib/${PKG_PYTHON_VERSION}
 
-  for dir in config compiler sysconfigdata lib-dynload/sysconfigdata lib2to3/tests test; do
+  for dir in config compiler sysconfigdata lib-dynload/sysconfigdata test; do
     rm -rf ${PKG_INSTALL_PATH_LIB}/${dir}
   done
 

packages/lang/Python3/patches/0001-Make-the-build-of-pyc-files-conditional.patch

@@ -20,27 +20,28 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 4a957fb004..9c5f3c031a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2329,6 +2329,7 @@ libinstall:	all $(srcdir)/Modules/xxmodule.c
- 		$(DESTDIR)$(LIBDEST); \
- 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+@@ -2576,6 +2576,7 @@ libinstall:	all $(srcdir)/Modules/xxmodule.c
+ 		patch --force --reject-file "$(abs_builddir)/app-store-compliance.rej" --strip 2 --directory "$(DESTDIR)$(LIBDEST)" --input "$(abs_srcdir)/$(APP_STORE_COMPLIANCE_PATCH)" || true ; \
+ 	fi
  	@ # Build PYC files for the 3 optimization levels (0, 1, 2)
 +ifeq (@PYC_BUILD@,yes)
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  		-o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST) -f \
-@@ -2338,6 +2339,7 @@ libinstall:	all $(srcdir)/Modules/xxmodule.c
+@@ -2585,7 +2586,8 @@ libinstall:	all $(srcdir)/Modules/xxmodule.c
  		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
  		-o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 +endif
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+
+ # bpo-21536: Misc/python-config.sh is generated in the build directory
+ # from $(srcdir)Misc/python-config.sh.in.
+ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
 diff --git a/configure.ac b/configure.ac
 index 8a32cb58f4..611c33949a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1479,6 +1479,12 @@ fi
+@@ -1510,6 +1510,12 @@ fi
 
  AC_MSG_CHECKING([LDLIBRARY])
 
@@ -50,7 +51,7 @@ index 8a32cb58f4..611c33949a 100644
 +	AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]),
 +	[ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ])
 +
- # MacOSX framework builds need more magic. LDLIBRARY is the dynamic
+ # Apple framework builds need more magic. LDLIBRARY is the dynamic
  # library that we build, but we do not want to link against it (we
  # will find it with a -framework option). For this reason there is an
 -- 

packages/lang/Python3/patches/0003-Add-an-option-to-disable-pydoc.patch

@@ -23,25 +23,25 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 9c5f3c031a..2243a658a9 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2050,7 +2050,9 @@ bininstall: commoninstall altbininstall
+@@ -2293,7 +2293,9 @@ bininstall: commoninstall altbininstall
  	-rm -f $(DESTDIR)$(BINDIR)/idle3
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
  	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
 +ifeq (@PYDOC@,yes)
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
 +endif
- 	-rm -f $(DESTDIR)$(BINDIR)/2to3
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
  	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -2102,7 +2104,6 @@ LIBSUBDIRS=	asyncio \
- 		lib2to3 lib2to3/fixes lib2to3/pgen2 \
+ 		rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \
+ 		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \
+@@ -2343,7 +2345,6 @@ LIBSUBDIRS=	asyncio \
  		logging \
  		multiprocessing multiprocessing/dummy \
+ 		pathlib \
 -		pydoc_data \
  		re \
  		site-packages \
  		sqlite3 \
-@@ -2257,6 +2258,10 @@ TESTSUBDIRS=	idlelib/idle_test \
+@@ -2496,6 +2497,10 @@ TESTSUBDIRS=	idlelib/idle_test \
 
  COMPILEALL_OPTS=-j0
 
@@ -52,9 +52,9 @@ index 9c5f3c031a..2243a658a9 100644
  TEST_MODULES=@TEST_MODULES@
 
  .PHONY: libinstall
-@@ -2471,7 +2476,9 @@ libainstall: all scripts
+@@ -2723,7 +2728,9 @@ libainstall: all scripts
+ 	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
  	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
- 	$(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION)
  	$(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION)
 +ifeq (@PYDOC@,yes)
  	$(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION)
@@ -66,7 +66,7 @@ diff --git a/configure.ac b/configure.ac
 index 059ac2f883..1a2dd28d1e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4511,6 +4511,12 @@ AS_VAR_IF([posix_threads], [stub], [
+@@ -4636,6 +4636,12 @@ AS_VAR_IF([posix_threads], [stub], [
    AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support])
  ])
 

packages/lang/Python3/patches/0005-Add-an-option-to-disable-IDLE.patch

@@ -22,7 +22,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 3f314d1354..5fad7f82fb 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2048,7 +2048,9 @@ bininstall: commoninstall altbininstall
+@@ -2291,7 +2291,9 @@ bininstall: commoninstall altbininstall
  	-rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc
  	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc)
  	-rm -f $(DESTDIR)$(BINDIR)/idle3
@@ -32,16 +32,16 @@ index 3f314d1354..5fad7f82fb 100644
  	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
  ifeq (@PYDOC@,yes)
  	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-@@ -2100,7 +2102,6 @@ LIBSUBDIRS=	asyncio \
+@@ -2339,7 +2341,6 @@ LIBSUBDIRS=	asyncio \
  		ensurepip ensurepip/_bundled \
  		html \
  		http \
 -		idlelib idlelib/Icons \
  		importlib importlib/resources importlib/metadata \
  		json \
  		logging \
-@@ -2267,6 +2268,10 @@ TESTSUBDIRS += test/test_lib2to3			\
- 		test/test_lib2to3/data/fixers/myfixes
+@@ -2501,6 +2502,10 @@ TESTSUBDIRS += test/test_lib2to3			\
+ LIBSUBDIRS += pydoc_data
  endif
 
 +ifeq (@IDLE@,yes)
@@ -51,10 +51,10 @@ index 3f314d1354..5fad7f82fb 100644
  TEST_MODULES=@TEST_MODULES@
 
  .PHONY: libinstall
-@@ -2484,7 +2489,9 @@ libainstall: all scripts
- ifeq (@LIB2TO3@,yes)
- 	$(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION)
- endif
+@@ -2727,7 +2732,9 @@ libainstall: all scripts
+ 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ 	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
+ 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
 +ifeq (@IDLE@,yes)
  	$(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION)
 +endif
@@ -65,9 +65,9 @@ diff --git a/configure.ac b/configure.ac
 index f0354c580d..43086962e9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -7567,6 +7567,12 @@ AC_ARG_ENABLE(lib2to3,
- 	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
- 	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
+@@ -7788,6 +7788,12 @@ AC_ARG_ENABLE(lib2to3,
+ # substitute multiline block, must come after last PY_STDLIB_MOD()
+ AC_SUBST([MODULE_BLOCK])
 
 +AC_SUBST(IDLE)
 +

packages/lang/Python3/patches/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch

@@ -15,10 +15,11 @@ diff --git a/configure.ac b/configure.ac
 index 43086962e9..561e33f550 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -95,6 +95,11 @@ AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [
+@@ -95,6 +95,12 @@ AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [
    AS_VAR_POPDEF([py_libs])
  ])
 
++# stdlib
 +AC_DEFUN([PY_STDLIB_MOD_SET_NA], [
 +  m4_foreach([mod], [$@], [
 +    AS_VAR_SET([py_cv_module_]mod, [n/a])])
@@ -27,18 +28,19 @@ index 43086962e9..561e33f550 100644
  AC_SUBST([BASECPPFLAGS])
  if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
      # If we're building out-of-tree, we need to make sure the following
-@@ -7258,11 +7263,6 @@ AC_ARG_ENABLE([test-modules],
- AC_MSG_RESULT([$TEST_MODULES])
- AC_SUBST([TEST_MODULES])
+@@ -7457,12 +7463,6 @@ AC_ARG_ENABLE([test-modules],
+ _RESTORE_VAR([CPPFLAGS])
 
+
+-# stdlib
 -AC_DEFUN([PY_STDLIB_MOD_SET_NA], [
 -  m4_foreach([mod], [$@], [
 -    AS_VAR_SET([py_cv_module_]mod, [n/a])])
 -])
 -
  # stdlib not available
  dnl Modules that are not available on some platforms
- dnl AIX has shadow passwords, but access is not via getspent()
+ AS_CASE([$ac_sys_system],
 -- 
 2.34.1