From 43315d5e41020a7dacc56ade458fe61d30fd56e5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 Mar 2021 11:55:53 +0100 Subject: [PATCH 1/2] python: update to 2.7.18.3. --- srcpkgs/python/template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python/template b/srcpkgs/python/template index fc52e87228e..8f50e121ae0 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -3,9 +3,9 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter". # pkgname=python -version=2.7.18 -revision=3 -wrksrc="Python-${version}" +version=2.7.18.3 +revision=1 +wrksrc="cpython-${version}" pycompile_dirs="usr/lib/python2.7" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel @@ -15,8 +15,8 @@ short_desc="Interpreted, interactive, object-oriented programming language" maintainer="Orphaned " license="Python-2.0" homepage="https://www.python.org" -distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 +distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz" +checksum=89876680a994095681bca9ec6a403a5ef72b89dc617b7dc6fc6cc8e0a105aa25 alternatives=" python:idle:/usr/bin/idle2.7 @@ -85,13 +85,13 @@ post_install() { rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests # Remove references to the install(1) wrapper. vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \ - ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata.py \ - ${DESTDIR}/usr/lib/python${version%.*}/config/Makefile + ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \ + ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile if [ "$CROSS_BUILD" ]; then # Remove references to cross toolchain. vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \ - ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata.py \ - ${DESTDIR}/usr/lib/python${version%.*}/config/Makefile + ${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \ + ${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile fi } From 17774b97252ccadfb701c154b93840207d5b9456 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 Mar 2021 11:55:56 +0100 Subject: [PATCH 2/2] python-tkinter: update to 2.7.18.3. --- srcpkgs/python-tkinter/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template index 51c2fd76650..0608e01b53c 100644 --- a/srcpkgs/python-tkinter/template +++ b/srcpkgs/python-tkinter/template @@ -7,9 +7,9 @@ _desc="Interpreted, interactive, object-oriented programming language" pkgname=python-tkinter -version=2.7.18 -revision=3 -wrksrc="Python-${version}" +version=2.7.18.3 +revision=1 +wrksrc="cpython-${version}" pycompile_dirs="usr/lib/python2.7/lib-tk" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel @@ -18,8 +18,8 @@ short_desc="${_desc} - GUI toolkit for Python2" maintainer="Orphaned " license="Python-2.0" homepage="https://www.python.org" -distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 +distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz" +checksum=89876680a994095681bca9ec6a403a5ef72b89dc617b7dc6fc6cc8e0a105aa25 pre_configure() { # Ensure that internal copies of expat, libffi and zlib are not used.