diff options
| author | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-09-27 11:32:55 +0000 |
|---|---|---|
| committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-09-27 11:32:55 +0000 |
| commit | 2781b9caddc0dac491f83268126e97c4722c646b (patch) | |
| tree | 725eb0e7d2297457761a47ef1702fd063671b1f9 /science/silo/files/patch-python3.8 | |
| parent | Update to 7.1.0 (diff) | |
science/silo: Backport of patches from Debian to support Python 3
Obtained from: https://salsa.debian.org/science-team/silo-llnl/-/blob/debian/master/debian/patches/python3.patch
https://salsa.debian.org/science-team/silo-llnl/-/blob/debian/master/debian/patches/python3.8.patch
PR: 249759
Reported by: swills
Diffstat (limited to 'science/silo/files/patch-python3.8')
| -rw-r--r-- | science/silo/files/patch-python3.8 | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/science/silo/files/patch-python3.8 b/science/silo/files/patch-python3.8 new file mode 100644 index 000000000000..3b4f744b9ef0 --- /dev/null +++ b/science/silo/files/patch-python3.8 @@ -0,0 +1,45 @@ +Description: Fix for API change with python3.8 +Author: Alastair McKinstry <mckinstry@debian.org> +Last-Updated: 2019-10-25 +Forwarded: no + +Index: tools/python/pydbfile.cpp +=================================================================== +--- tools/python/pydbfile.cpp ++++ tools/python/pydbfile.cpp +@@ -69,6 +69,7 @@ using std::string; + #define Py_RETURN_NOTIMPLEMENTED return NULL + #endif + ++ + // **************************************************************************** + // Method: DBfile_DBGetToc + // +@@ -900,7 +901,11 @@ PyTypeObject DBfileType = + // Standard methods + // + tp_dealloc : (destructor)DBfile_dealloc, ++#if (PY_MAJOR_VERSION <= 3) && (PY_MINOR_VERSION <= 7) + tp_print : (printfunc)DBfile_print, ++#else ++ tp_vectorcall_offset : (printfunc)DBfile_print, ++#endif + #if PY_MAJOR_VERSION >= 3 + tp_getattr : 0, + #else +Index: tools/python/pydbtoc.cpp +=================================================================== +--- tools/python/pydbtoc.cpp ++++ tools/python/pydbtoc.cpp +@@ -355,7 +355,11 @@ PyTypeObject DBtocType = + // Standard methods + // + tp_dealloc : (destructor)DBtoc_dealloc, ++#if (PY_MAJOR_VERSION <= 3) && (PY_MINOR_VERSION <= 7) + tp_print : (printfunc)DBtoc_print, ++#else ++ tp_vectorcall_offset : (printfunc)DBtoc_print, ++#endif + #if PY_MAJOR_VERSION >= 3 + tp_getattr : 0, + #else |