diff --git a/srcpkgs/python/patches/fix-pr-21.patch b/srcpkgs/python/patches/fix-pr-21.patch deleted file mode 100644 index e1e5b771e79..00000000000 --- a/srcpkgs/python/patches/fix-pr-21.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Include/pyport.h -+++ b/Include/pyport.h -@@ -947,7 +947,6 @@ - #define Py_ULL(x) Py_LL(x##U) - #endif - --#ifdef Py_BUILD_CORE - /* - * Macros to protect CRT calls against instant termination when passed an - * invalid parameter (issue23524). -@@ -965,6 +964,5 @@ - #define _Py_END_SUPPRESS_IPH - - #endif /* _MSC_VER >= 1900 */ --#endif /* Py_BUILD_CORE */ - - #endif /* Py_PYPORT_H */ diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 99d9642e998..f6e5b29f3fc 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.7 -revision=5 -_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd +version=2.7.18.9 +revision=1 +_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d pycompile_dirs="usr/lib/python2.7" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel @@ -16,7 +16,7 @@ maintainer="Leah Neukirchen " license="Python-2.0" homepage="https://www.python.org" distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz" -checksum=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56 +checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4 alternatives=" python:idle:/usr/bin/idle2.7 @@ -30,10 +30,9 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then fi pre_configure() { - # Ensure that internal copies of expat, libffi and zlib are not used. + # Ensure that internal copies of expat and libffi are not used. rm -r Modules/expat rm -r Modules/_ctypes/libffi* - rm -r Modules/zlib # Enable loading sqlite extensions. vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py }