[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - pyuno/source

[Justin Luth (via logerrit)]

 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(+)

New commits:
commit 619d16d73eeacba1a76d8d586ac031f948db3ae1
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Sat Feb 22 07:30:15 2020 +0300
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Sun May 24 00:38:32 2020 +0200

    python 3.8.2 compile: add tp_print to PyTypeObject
    
    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 <noel.grandin at collabora.co.uk>
    (cherry picked from commit 50ccb7e82b7053306721cbe220323be072306a29)

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index a6a875addc46..bf6e5c667b7c 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 656d1c84cb0e..61c5a15155c6 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 a7862857d719..6ba7f96a9632 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 6cee574c77f5..72dd9e2964eb 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 50b74126bee9..56b71cdf5cc4 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
 };