python3: update to 3.13.1.

2024-10-09 14:03:12 -04:00 · 2024-10-09 14:03:12 -04:00 · 53d581e2a4
commit 53d581e2a4
parent 98c2f3dfb7
7 changed files with 58 additions and 55 deletions
--- a/common/build-helper/python3.sh
+++ b/common/build-helper/python3.sh
@ -2,8 +2,10 @@
 if [ -n "$CROSS_BUILD" ]; then
 	export PYPREFIX="$XBPS_CROSS_BASE"
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
+	export CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
 	export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib"
 	export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
+	export CXX="${XBPS_CROSS_TRIPLET}-g++ -pthread $CXXFLAGS $LDFLAGS"
 	export LDSHARED="${CC} -shared $LDFLAGS"
 	export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
 	export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}"
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
 py2_sitelib="${py2_lib}/site-packages"
 py2_inc="usr/include/python${py2_ver}"

-py3_ver="3.12"
+py3_ver="3.13"
 py3_abiver=""
 py3_lib="usr/lib/python${py3_ver}"
 py3_sitelib="${py3_lib}/site-packages"
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@ -251,7 +251,7 @@ hook() {
 	generic_wrapper3 libetpan-config
 	generic_wrapper3 giblib-config
 	python_wrapper python-config 2.7
-	python_wrapper python3-config 3.12
+	python_wrapper python3-config 3.13
 	apr_apu_wrapper apu-1-config
 	qemu_wrapper llvm-config
 }
--- a/common/shlibs
+++ b/common/shlibs
@ -1730,8 +1730,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.12.0_1
-libpython3.12.so.1.0 python3-3.12.0_1
+libpython3.so python3-3.13.0_1
+libpython3.13.so.1.0 python3-3.13.0_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
 libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
--- a/srcpkgs/python3/patches/musl-pgo-tests.patch
+++ b/srcpkgs/python3/patches/musl-pgo-tests.patch
@ -0,0 +1,44 @@
+diff -ur a/Lib/test/test_math.py b/Lib/test/test_math.py
+--- a/Lib/test/test_math.py	2024-10-07 01:02:14.000000000 -0400
+++ b/Lib/test/test_math.py	2024-11-24 21:10:44.322603023 -0500
+@@ -2707,7 +2707,8 @@
+     # properly: it doesn't use the right sign when the result is zero.
+     @unittest.skipIf(
+         sys.platform.startswith(("freebsd", "wasi", "netbsd"))
+-        or (sys.platform == "android" and platform.machine() == "x86_64"),
+        or (sys.platform == "android" and platform.machine() == "x86_64")
+        or platform.libc_ver()[0] != 'glibc',
+         f"this platform doesn't implement IEE 754-2008 properly")
+     def test_fma_zero_result(self):
+         nonnegative_finites = [0.0, 1e-300, 2.3, 1e300]
+diff -ur a/Lib/test/test_re.py b/Lib/test/test_re.py
+--- a/Lib/test/test_re.py	2024-10-07 01:02:14.000000000 -0400
+++ b/Lib/test/test_re.py	2024-11-24 21:11:47.190747775 -0500
+@@ -4,6 +4,7 @@
+                           warnings_helper, SHORT_TIMEOUT, CPUStopwatch, requires_resource)
+ import locale
+ import re
+import platform
+ import string
+ import sys
+ import time
+@@ -2016,7 +2017,8 @@
+         self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3))
+ 
+     @unittest.skipIf(
+-        is_emscripten or is_wasi,
+        is_emscripten or is_wasi
+        or platform.libc_ver()[0] != 'glibc',
+         "musl libc issue on Emscripten/WASI, bpo-46390"
+     )
+     def test_locale_caching(self):
+@@ -2056,7 +2058,8 @@
+         self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5'))
+ 
+     @unittest.skipIf(
+-        is_emscripten or is_wasi,
+        is_emscripten or is_wasi
+        or platform.libc_ver()[0] != 'glibc',
+         "musl libc issue on Emscripten/WASI, bpo-46390"
+     )
+     def test_locale_compiled(self):
--- a/srcpkgs/python3/patches/ppc-fixes.patch
+++ b/srcpkgs/python3/patches/ppc-fixes.patch
@ -1,45 +0,0 @@
-diff -ur a/configure b/configure
--- a/configure
-+++ b/configure
-@@ -5952,6 +5952,14 @@
- printf "%s\n" "$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
-+if test x$MULTIARCH = xpowerpc-linux-musl
-+then
-+	MULTIARCH="powerpc-linux-gnu"
-+fi
-+if test x$MULTIARCH = xpowerpcle-linux-musl
-+then
-+	MULTIARCH="powerpcle-linux-gnu"
-+fi
- 
- 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CC compiler name" >&5
-@@ -6859,7 +6867,11 @@
-         powerpc64-linux-gnu
- #  endif
- # elif defined(__powerpc__)
-+#  if defined(__LITTLE_ENDIAN__)
-+        powerpcle-linux-gnu
-+#  else
-         powerpc-linux-gnu
-+#  endif
- # elif defined(__s390x__)
-         s390x-linux-gnu
- # elif defined(__s390__)
-diff -ur a/configure.ac b/configure.ac
--- a/configure.ac
-+++ b/configure.ac
-@@ -1039,7 +1039,11 @@
-         powerpc64-linux-gnu
- #  endif
- # elif defined(__powerpc__)
-+#  if defined(__LITTLE_ENDIAN__)
-+        powerpcle-linux-gnu
-+#  else
-         powerpc-linux-gnu
-+#  endif
- # elif defined(__s390x__)
-         s390x-linux-gnu
- # elif defined(__s390__)
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@ -3,12 +3,12 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.12.7
+version=3.13.1
 revision=1
 build_style="gnu-configure"
-configure_args="--enable-shared --enable-ipv6 --enable-optimizations
+configure_args="--enable-shared --enable-ipv6
 --enable-loadable-sqlite-extensions --with-computed-gotos
- --with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi
+ --with-dbmliborder=gdbm:ndbm --with-system-expat
 --without-ensurepip ac_cv_working_tzset=yes"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf autoconf-archive automake"
@ -20,13 +20,13 @@ short_desc="Python programming language (${version%.*} series)"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
-_bluez="bluez-5.64"
+_bluez="bluez-5.76"
 distfiles="
 https://www.python.org/ftp/python/${version%rc*}/Python-${version}.tar.xz
 ${KERNEL_SITE}/bluetooth/${_bluez}.tar.xz
 "
-checksum="24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550
- ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34"
+checksum="9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9
+ 55e2c645909ad82d833c42ce85ec20434e0ef0070941b1eab73facdd240bbd63"
 skip_extraction="${_bluez}.tar.xz"

 alternatives="
@ -44,6 +44,8 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"
 	configure_args+=" --with-build-python=python${py3_ver}"
 	configure_args+=" ac_cv_broken_sem_getvalue=no"
+else
+	configure_args+=" --enable-optimizations"
 fi

 post_extract() {