From ea61b9bd3e9fc3374d12e7620a4850a393f6d1b1 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Sat, 22 Feb 2020 07:30:15 +0300 Subject: [PATCH] python 3.8.2 compile: add tp_print to PyTypeObject MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I couldn't find this documented on the Internet though, as the 3.9 and 3.8.2rc documentation didn't mention it as an added item... I'm using Ubuntu 20.04 alpha with python3 --version Python 3.8.2rc1 This fixes pyuno/source/module/pyuno.cxx:1689:1: error: missing initializer for member ‘_typeobject::tp_print’ [-Werror=missing-field-initializers] Change-Id: Idec5720050572b34628267cd94557dabf7edbf3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89247 Tested-by: Jenkins Reviewed-by: Noel Grandin Gbp-Pq: Name python3.8.2.diff --- pyuno/source/module/pyuno.cxx | 3 +++ pyuno/source/module/pyuno_callable.cxx | 3 +++ pyuno/source/module/pyuno_iterator.cxx | 6 ++++++ pyuno/source/module/pyuno_runtime.cxx | 3 +++ pyuno/source/module/pyuno_struct.cxx | 3 +++ 5 files changed, 18 insertions(+) diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index a6a875addc4..bf6e5c667b7 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -1684,6 +1684,9 @@ static PyTypeObject PyUNOType = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX >= 0x03080200 + , 0 //Py_ssize_t tp_print +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index 656d1c84cb0..61c5a15155c 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -231,6 +231,9 @@ static PyTypeObject PyUNO_callable_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX >= 0x03080200 + , 0 //Py_ssize_t tp_print +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_iterator.cxx b/pyuno/source/module/pyuno_iterator.cxx index a7862857d71..6ba7f96a963 100644 --- a/pyuno/source/module/pyuno_iterator.cxx +++ b/pyuno/source/module/pyuno_iterator.cxx @@ -168,6 +168,9 @@ static PyTypeObject PyUNO_iterator_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX >= 0x03080200 + , 0 //Py_ssize_t tp_print +#endif #endif #endif }; @@ -305,6 +308,9 @@ static PyTypeObject PyUNO_list_iterator_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX >= 0x03080200 + , 0 //Py_ssize_t tp_print +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 6cee574c77f..72dd9e2964e 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -126,6 +126,9 @@ static PyTypeObject RuntimeImpl_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX >= 0x03080200 + , 0 //Py_ssize_t tp_print +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx index 50b74126bee..56b71cdf5cc 100644 --- a/pyuno/source/module/pyuno_struct.cxx +++ b/pyuno/source/module/pyuno_struct.cxx @@ -347,6 +347,9 @@ static PyTypeObject PyUNOStructType = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX >= 0x03080200 + , 0 //Py_ssize_t tp_print +#endif #endif #endif }; -- 2.30.2