From 75a21786b3023ae1ea92c92dfa2555675aec0984 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Oct 2020 09:54:55 -0400 Subject: [PATCH] attic: rebuild for Python 3.9 --- srcpkgs/attic/patches/python-3.8.patch | 197 ------------------------- srcpkgs/attic/template | 14 +- 2 files changed, 10 insertions(+), 201 deletions(-) delete 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 deleted file mode 100644 index d319e7f6dcb..00000000000 --- a/srcpkgs/attic/patches/python-3.8.patch +++ /dev/null @@ -1,197 +0,0 @@ ---- 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 ebf921ea035..1b08972b359 100644 --- a/srcpkgs/attic/template +++ b/srcpkgs/attic/template @@ -1,12 +1,11 @@ # Template file for 'attic' pkgname=attic version=0.16 -revision=18 +revision=19 wrksrc="Attic-$version" build_style=python3-module -pycompile_module="attic" -hostmakedepends="python3-setuptools python3-devel libressl-devel python3-Sphinx" -makedepends="${hostmakedepends/python3-setuptools/} acl-devel" +hostmakedepends="python3-setuptools python3-Cython python3-Sphinx" +makedepends="python3-devel libressl-devel acl-devel" depends="python3-msgpack python3-llfuse" short_desc="Deduplicating backup program for efficient and secure backups" maintainer="Leah Neukirchen " @@ -19,6 +18,13 @@ pre_build() { if [ "$CROSS_BUILD" ]; then sed -i "s|\(possible_openssl_prefixes\) =.*|\1 = ['${XBPS_CROSS_BASE}/usr']|" setup.py fi + + local _file + for _file in attic/*.pyx; do + rm ${_file/pyx/c} + done + + python3 setup.py sdist } post_build() { PYTHONPATH=.. make -C docs man SPHINXBUILD=sphinx-build