Skip to content

Commit

Permalink
python3, python3-tkinter: update to 3.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ahesford committed Sep 23, 2023
1 parent 5e524f0 commit 6300546
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion common/environment/setup/python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion common/hooks/pre-configure/02-script-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
9 changes: 4 additions & 5 deletions srcpkgs/python3-tkinter/template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,18 +27,17 @@ short_desc="${_desc} - GUI toolkit for Python3"
maintainer="Andrew J. Hesford <[email protected]>"
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"
configure_args+=" --with-build-python=python3.11"
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() {
Expand Down
11 changes: 5 additions & 6 deletions srcpkgs/python3/template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand All @@ -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}"
Expand Down

0 comments on commit 6300546

Please sign in to comment.