diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh index 606a4bc6f9a8a2..ab5c47d52847b1 100644 --- 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.11" +py3_ver="3.12" py3_abiver="" py3_lib="usr/lib/python${py3_ver}" py3_sitelib="${py3_lib}/site-packages" diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index beaec6ee8af2a5..81e7b7bd2ee2fb 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -238,7 +238,7 @@ hook() { generic_wrapper3 libetpan-config generic_wrapper3 giblib-config python_wrapper python-config 2.7 - python_wrapper python3-config 3.11 + python_wrapper python3-config 3.12 apr_apu_wrapper apr-1-config apr_apu_wrapper apu-1-config } diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index f4f5e3d9c97acb..8e9f5e0c5527d1 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -8,7 +8,7 @@ _desc="Python programming language" pkgname=python3-tkinter -version=3.11.5 +version=3.12.0rc3 revision=1 build_style="gnu-configure" configure_args="--enable-shared --enable-ipv6 --enable-optimizations @@ -27,8 +27,8 @@ short_desc="${_desc} - GUI toolkit for Python3" maintainer="Andrew J. Hesford " homepage="https://www.python.org" license="Python-2.0" -distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f +distfiles="https://www.python.org/ftp/python/${version%rc*}/Python-${version}.tar.xz" +checksum=96397e891e98802b1d399dee3ceaeb9bcf0aa2566c8a7b1cce4d0196c277506a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3" @@ -36,9 +36,8 @@ if [ "$CROSS_BUILD" ]; then fi post_extract() { - # Ensure that internal copies of expat and libffi are not used. + # Ensure that the internal copy of expat is not used rm -r Modules/expat - rm -r Modules/_ctypes/{darwin,libffi}* } post_patch() { diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index a0e146d0e218ae..3241aea17caa45 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -3,7 +3,7 @@ # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter". # pkgname=python3 -version=3.11.5 +version=3.12.0rc3 revision=1 build_style="gnu-configure" configure_args="--enable-shared --enable-ipv6 --enable-optimizations @@ -22,10 +22,10 @@ license="Python-2.0" homepage="https://www.python.org" _bluez="bluez-5.64" distfiles=" - https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz + https://www.python.org/ftp/python/${version%rc*}/Python-${version}.tar.xz ${KERNEL_SITE}/bluetooth/${_bluez}.tar.xz " -checksum="85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f +checksum="96397e891e98802b1d399dee3ceaeb9bcf0aa2566c8a7b1cce4d0196c277506a ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34" skip_extraction="${_bluez}.tar.xz" @@ -43,9 +43,8 @@ if [ "$CROSS_BUILD" ]; then fi post_extract() { - # Ensure that internal copies of expat and libffi are not used - rm -rf Modules/expat - rm -rf Modules/_ctypes/{darwin,libffi}* + # Ensure that the internal copy of expat is not used + rm -r Modules/expat # Extract Bluetooth headers local _srcdistdir="${XBPS_SRCDISTDIR}/${sourcepkg}-${version}"