From a5d34e166295fc3876bb56307095f2672627dbe7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 24 Dec 2019 10:52:44 +0100 Subject: [PATCH] attic: unbreak for Python 3.8.1 --- srcpkgs/attic/patches/python-3.8.patch | 197 +++++++++++++++++++++++++ srcpkgs/attic/template | 2 - 2 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/attic/patches/python-3.8.patch diff --git a/srcpkgs/attic/patches/python-3.8.patch b/srcpkgs/attic/patches/python-3.8.patch new file mode 100644 index 0000000000..d319e7f6dc --- /dev/null +++ b/srcpkgs/attic/patches/python-3.8.patch @@ -0,0 +1,197 @@ +--- attic/crypto.c.orig 2019-12-24 10:46:04.053414948 +0100 ++++ attic/crypto.c 2019-12-24 10:47:12.038209708 +0100 +@@ -3566,12 +3566,12 @@ static int __Pyx_GetException(PyObject * + *value = local_value; + *tb = local_tb; + #if CYTHON_COMPILING_IN_CPYTHON +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = local_type; +- tstate->exc_value = local_value; +- tstate->exc_traceback = local_tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = local_type; ++ tstate->curexc_value = local_value; ++ tstate->curexc_traceback = local_tb; + Py_XDECREF(tmp_type); + Py_XDECREF(tmp_value); + Py_XDECREF(tmp_tb); +@@ -3593,12 +3593,12 @@ static CYTHON_INLINE void __Pyx_Exceptio + PyObject *tmp_type, *tmp_value, *tmp_tb; + #if CYTHON_COMPILING_IN_CPYTHON + PyThreadState *tstate = PyThreadState_GET(); +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = *type; +- tstate->exc_value = *value; +- tstate->exc_traceback = *tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = *type; ++ tstate->curexc_value = *value; ++ tstate->curexc_traceback = *tb; + #else + PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb); + PyErr_SetExcInfo(*type, *value, *tb); +@@ -3611,9 +3611,9 @@ static CYTHON_INLINE void __Pyx_Exceptio + static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) { + #if CYTHON_COMPILING_IN_CPYTHON + PyThreadState *tstate = PyThreadState_GET(); +- *type = tstate->exc_type; +- *value = tstate->exc_value; +- *tb = tstate->exc_traceback; ++ *type = tstate->curexc_type; ++ *value = tstate->curexc_value; ++ *tb = tstate->curexc_traceback; + Py_XINCREF(*type); + Py_XINCREF(*value); + Py_XINCREF(*tb); +@@ -3625,12 +3625,12 @@ static void __Pyx_ExceptionReset(PyObjec + #if CYTHON_COMPILING_IN_CPYTHON + PyObject *tmp_type, *tmp_value, *tmp_tb; + PyThreadState *tstate = PyThreadState_GET(); +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = type; +- tstate->exc_value = value; +- tstate->exc_traceback = tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = type; ++ tstate->curexc_value = value; ++ tstate->curexc_traceback = tb; + Py_XDECREF(tmp_type); + Py_XDECREF(tmp_value); + Py_XDECREF(tmp_tb); +--- attic/hashindex.c.orig 2019-12-24 10:49:05.470535303 +0100 ++++ attic/hashindex.c 2019-12-24 10:49:36.622898937 +0100 +@@ -5186,9 +5186,9 @@ bad: + static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) { + #if CYTHON_COMPILING_IN_CPYTHON + PyThreadState *tstate = PyThreadState_GET(); +- *type = tstate->exc_type; +- *value = tstate->exc_value; +- *tb = tstate->exc_traceback; ++ *type = tstate->curexc_type; ++ *value = tstate->curexc_value; ++ *tb = tstate->curexc_traceback; + Py_XINCREF(*type); + Py_XINCREF(*value); + Py_XINCREF(*tb); +@@ -5200,12 +5200,12 @@ static void __Pyx_ExceptionReset(PyObjec + #if CYTHON_COMPILING_IN_CPYTHON + PyObject *tmp_type, *tmp_value, *tmp_tb; + PyThreadState *tstate = PyThreadState_GET(); +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = type; +- tstate->exc_value = value; +- tstate->exc_traceback = tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = type; ++ tstate->curexc_value = value; ++ tstate->curexc_traceback = tb; + Py_XDECREF(tmp_type); + Py_XDECREF(tmp_value); + Py_XDECREF(tmp_tb); +@@ -5248,12 +5248,12 @@ static int __Pyx_GetException(PyObject * + *value = local_value; + *tb = local_tb; + #if CYTHON_COMPILING_IN_CPYTHON +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = local_type; +- tstate->exc_value = local_value; +- tstate->exc_traceback = local_tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = local_type; ++ tstate->curexc_value = local_value; ++ tstate->curexc_traceback = local_tb; + Py_XDECREF(tmp_type); + Py_XDECREF(tmp_value); + Py_XDECREF(tmp_tb); +--- attic/platform_linux.c.orig 2019-12-24 10:51:25.399168631 +0100 ++++ attic/platform_linux.c 2019-12-24 10:51:34.711277325 +0100 +@@ -4517,12 +4517,12 @@ static int __Pyx_GetException(PyObject * + *value = local_value; + *tb = local_tb; + #if CYTHON_COMPILING_IN_CPYTHON +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = local_type; +- tstate->exc_value = local_value; +- tstate->exc_traceback = local_tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = local_type; ++ tstate->curexc_value = local_value; ++ tstate->curexc_traceback = local_tb; + Py_XDECREF(tmp_type); + Py_XDECREF(tmp_value); + Py_XDECREF(tmp_tb); +@@ -4544,12 +4544,12 @@ static CYTHON_INLINE void __Pyx_Exceptio + PyObject *tmp_type, *tmp_value, *tmp_tb; + #if CYTHON_COMPILING_IN_CPYTHON + PyThreadState *tstate = PyThreadState_GET(); +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = *type; +- tstate->exc_value = *value; +- tstate->exc_traceback = *tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = *type; ++ tstate->curexc_value = *value; ++ tstate->curexc_traceback = *tb; + #else + PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb); + PyErr_SetExcInfo(*type, *value, *tb); +@@ -4562,9 +4562,9 @@ static CYTHON_INLINE void __Pyx_Exceptio + static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) { + #if CYTHON_COMPILING_IN_CPYTHON + PyThreadState *tstate = PyThreadState_GET(); +- *type = tstate->exc_type; +- *value = tstate->exc_value; +- *tb = tstate->exc_traceback; ++ *type = tstate->curexc_type; ++ *value = tstate->curexc_value; ++ *tb = tstate->curexc_traceback; + Py_XINCREF(*type); + Py_XINCREF(*value); + Py_XINCREF(*tb); +@@ -4576,12 +4576,12 @@ static void __Pyx_ExceptionReset(PyObjec + #if CYTHON_COMPILING_IN_CPYTHON + PyObject *tmp_type, *tmp_value, *tmp_tb; + PyThreadState *tstate = PyThreadState_GET(); +- tmp_type = tstate->exc_type; +- tmp_value = tstate->exc_value; +- tmp_tb = tstate->exc_traceback; +- tstate->exc_type = type; +- tstate->exc_value = value; +- tstate->exc_traceback = tb; ++ tmp_type = tstate->curexc_type; ++ tmp_value = tstate->curexc_value; ++ tmp_tb = tstate->curexc_traceback; ++ tstate->curexc_type = type; ++ tstate->curexc_value = value; ++ tstate->curexc_traceback = tb; + Py_XDECREF(tmp_type); + Py_XDECREF(tmp_value); + Py_XDECREF(tmp_tb); diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template index 09cd9182e0..ed454302ce 100644 --- a/srcpkgs/attic/template +++ b/srcpkgs/attic/template @@ -15,8 +15,6 @@ license="BSD" distfiles="${PYPI_SITE}/A/Attic/Attic-0.16.tar.gz" checksum=6650cd28072101c2e05941e77b93a62f91da6179785e4e4b4880916c469bba2c -broken="https://build.voidlinux.org/builders/armv7l_builder/builds/21696/steps/shell_3/logs/stdio" - pre_build() { if [ "$CROSS_BUILD" ]; then sed -i "s|\(possible_openssl_prefixes\) =.*|\1 = ['${XBPS_CROSS_BASE}/usr']|" setup.py