Date: Monday, November 4, 2019 @ 20:48:48
Author: arojas
Revision: 366764
Fix build with python 3.8
Added:
libreoffice-still/trunk/python-3.8.patch
Modified:
libreoffice-still/trunk/PKGBUILD
------------------+
PKGBUILD | 4 +
python-3.8.patch | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 189 insertions(+)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-04 20:41:51 UTC (rev 366763)
+++ PKGBUILD 2019-11-04 20:48:48 UTC (rev 366764)
@@ -54,6 +54,7 @@
${_additional_source_url2}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
+ python-3.8.patch
libreoffice-still.sh libreoffice-still.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -94,6 +95,7 @@
'49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+ '6b9452945dcabb349703aa694afb1446c93915ef7aed616dec5953f684229251'
'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
'07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6')
@@ -123,6 +125,8 @@
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
+
+ patch -p1 -i "$srcdir"/python-3.8.patch # Fix build with python 3.8
}
build() {
Added: python-3.8.patch
===================================================================
--- python-3.8.patch (rev 0)
+++ python-3.8.patch 2019-11-04 20:48:48 UTC (rev 366764)
@@ -0,0 +1,185 @@
+From a62b45cf541cf47d136bdff87dff4c13fd4296c2 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sberg...@redhat.com>
+Date: Fri, 7 Jun 2019 15:57:13 +0200
+Subject: [PATCH] Adapt to upcoming Python 3.8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+...which changed PyTypeObject in <https://github.com/python/cpython/commit/
+aacc77fbd77640a8f03638216fa09372cc21673d> "bpo-36974: implement PEP 590
+(GH-13185)".
+
+Change-Id: I687ec38aeda05d0747b9ed08221db75a758bed51
+Reviewed-on: https://gerrit.libreoffice.org/73664
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caol...@redhat.com>
+Tested-by: Caolán McNamara <caol...@redhat.com>
+(cherry picked from commit 2bd585f31d7abb066e3f53d9b29c822af20aea69)
+Reviewed-on: https://gerrit.libreoffice.org/73778
+---
+ pyuno/source/module/pyuno.cxx | 9 ++++++++-
+ pyuno/source/module/pyuno_callable.cxx | 9 ++++++++-
+ pyuno/source/module/pyuno_iterator.cxx | 18 ++++++++++++++++--
+ pyuno/source/module/pyuno_runtime.cxx | 9 ++++++++-
+ pyuno/source/module/pyuno_struct.cxx | 9 ++++++++-
+ 5 files changed, 48 insertions(+), 6 deletions(-)
+
+diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
+index f5f23bf058fa..e59319030eb8 100644
+--- a/pyuno/source/module/pyuno.cxx
++++ b/pyuno/source/module/pyuno.cxx
+@@ -1636,7 +1636,11 @@ static PyTypeObject PyUNOType =
+ sizeof (PyUNO),
+ 0,
+ PyUNO_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ PyUNO_getattr,
+ PyUNO_setattr,
+ /* this type does not exist in Python 3: (cmpfunc) */ nullptr,
+@@ -1680,6 +1684,9 @@ static PyTypeObject PyUNOType =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_callable.cxx
b/pyuno/source/module/pyuno_callable.cxx
+index 6519d20734c9..656d1c84cb0e 100644
+--- a/pyuno/source/module/pyuno_callable.cxx
++++ b/pyuno/source/module/pyuno_callable.cxx
+@@ -181,7 +181,11 @@ static PyTypeObject PyUNO_callable_Type =
+ sizeof (PyUNO_callable),
+ 0,
+ ::pyuno::PyUNO_callable_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -225,6 +229,9 @@ static PyTypeObject PyUNO_callable_Type =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_iterator.cxx
b/pyuno/source/module/pyuno_iterator.cxx
+index 5f643c13b67e..a7862857d719 100644
+--- a/pyuno/source/module/pyuno_iterator.cxx
++++ b/pyuno/source/module/pyuno_iterator.cxx
+@@ -118,7 +118,11 @@ static PyTypeObject PyUNO_iterator_Type =
+ sizeof (PyUNO_iterator),
+ 0,
+ PyUNO_iterator_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -162,6 +166,9 @@ static PyTypeObject PyUNO_iterator_Type =
+ 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+@@ -248,7 +255,11 @@ static PyTypeObject PyUNO_list_iterator_Type =
+ sizeof (PyUNO_list_iterator),
+ 0,
+ PyUNO_list_iterator_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -292,6 +303,9 @@ static PyTypeObject PyUNO_list_iterator_Type =
+ 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
+index 9887c1fbc828..d307f9af363c 100644
+--- a/pyuno/source/module/pyuno_runtime.cxx
++++ b/pyuno/source/module/pyuno_runtime.cxx
+@@ -75,7 +75,11 @@ static PyTypeObject RuntimeImpl_Type =
+ sizeof (RuntimeImpl),
+ 0,
+ RuntimeImpl::del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -119,6 +123,9 @@ static PyTypeObject RuntimeImpl_Type =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_struct.cxx
b/pyuno/source/module/pyuno_struct.cxx
+index 7088fc346145..9ad9439318ce 100644
+--- a/pyuno/source/module/pyuno_struct.cxx
++++ b/pyuno/source/module/pyuno_struct.cxx
+@@ -296,7 +296,11 @@ static PyTypeObject PyUNOStructType =
+ sizeof (PyUNO),
+ 0,
+ PyUNOStruct_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ PyUNOStruct_getattr,
+ PyUNOStruct_setattr,
+ /* this type does not exist in Python 3: (cmpfunc) */ nullptr,
+@@ -340,6 +344,9 @@ static PyTypeObject PyUNOStructType =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
