FreeBSD Bugzilla – Attachment 219693 Details for
Bug 251145
cad/freecad: fix build with Python 3.9
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
https://github.com/FreeCAD/FreeCAD/commit/ae641dc5278efafa22b168fc196875558b92e436 applied to 18.4
cad_freecad_python3.9.diff (text/plain), 9.63 KB, created by
Oleg Sidorkin
on 2020-11-14 23:56:56 UTC
(
hide
)
Description:
https://github.com/FreeCAD/FreeCAD/commit/ae641dc5278efafa22b168fc196875558b92e436 applied to 18.4
Filename:
MIME Type:
Creator:
Oleg Sidorkin
Created:
2020-11-14 23:56:56 UTC
Size:
9.63 KB
patch
obsolete
>Index: cad/freecad/files/patch-src_Base_swigpyrun__1.3.25.h >=================================================================== >--- cad/freecad/files/patch-src_Base_swigpyrun__1.3.25.h (nonexistent) >+++ cad/freecad/files/patch-src_Base_swigpyrun__1.3.25.h (working copy) >@@ -0,0 +1,26 @@ >+--- src/Base/swigpyrun_1.3.25.h.orig 2020-11-14 21:10:37 UTC >++++ src/Base/swigpyrun_1.3.25.h >+@@ -699,7 +699,11 @@ PySwigObject_type(void) { >+ 0, /*tp_itemsize*/ >+ /* methods */ >+ (destructor)PySwigObject_dealloc, /*tp_dealloc*/ >++#if PY_VERSION_HEX < 0x03080000 >+ (printfunc)PySwigObject_print, /*tp_print*/ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ (getattrfunc)0, /*tp_getattr*/ >+ (setattrfunc)0, /*tp_setattr*/ >+ (cmpfunc)PySwigObject_compare, /*tp_compare*/ >+@@ -859,7 +863,11 @@ PySwigPacked_type(void) { >+ 0, /*tp_itemsize*/ >+ /* methods */ >+ (destructor)PySwigPacked_dealloc, /*tp_dealloc*/ >++#if PY_VERSION_HEX < 0x03080000 >+ (printfunc)PySwigPacked_print, /*tp_print*/ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ (getattrfunc)0, /*tp_getattr*/ >+ (setattrfunc)0, /*tp_setattr*/ >+ (cmpfunc)PySwigPacked_compare, /*tp_compare*/ > >Property changes on: cad/freecad/files/patch-src_Base_swigpyrun__1.3.25.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: cad/freecad/files/patch-src_Base_swigpyrun__1.3.33.h >=================================================================== >--- cad/freecad/files/patch-src_Base_swigpyrun__1.3.33.h (nonexistent) >+++ cad/freecad/files/patch-src_Base_swigpyrun__1.3.33.h (working copy) >@@ -0,0 +1,26 @@ >+--- src/Base/swigpyrun_1.3.33.h.orig 2020-11-14 21:10:37 UTC >++++ src/Base/swigpyrun_1.3.33.h >+@@ -1620,7 +1620,11 @@ _PySwigObject_type(void) { >+ sizeof(PySwigObject), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)PySwigObject_dealloc, /* tp_dealloc */ >++#if PY_VERSION_HEX < 0x03080000 >+ (printfunc)PySwigObject_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ #if PY_VERSION_HEX < 0x02020000 >+ (getattrfunc)PySwigObject_getattr, /* tp_getattr */ >+ #else >+@@ -1790,7 +1794,11 @@ _PySwigPacked_type(void) { >+ sizeof(PySwigPacked), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)PySwigPacked_dealloc, /* tp_dealloc */ >++#if PY_VERSION_HEX < 0x03080000 >+ (printfunc)PySwigPacked_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ (getattrfunc)0, /* tp_getattr */ >+ (setattrfunc)0, /* tp_setattr */ >+ (cmpfunc)PySwigPacked_compare, /* tp_compare */ > >Property changes on: cad/freecad/files/patch-src_Base_swigpyrun__1.3.33.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: cad/freecad/files/patch-src_Base_swigpyrun__1.3.36.h >=================================================================== >--- cad/freecad/files/patch-src_Base_swigpyrun__1.3.36.h (nonexistent) >+++ cad/freecad/files/patch-src_Base_swigpyrun__1.3.36.h (working copy) >@@ -0,0 +1,27 @@ >+--- src/Base/swigpyrun_1.3.36.h.orig 2020-11-14 21:10:37 UTC >++++ src/Base/swigpyrun_1.3.36.h >+@@ -1628,7 +1628,12 @@ _PySwigObject_type(void) { >+ sizeof(PySwigObject), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)PySwigObject_dealloc, /* tp_dealloc */ >++#if PY_VERSION_HEX < 0x03080000 >+ (printfunc)PySwigObject_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >++ >+ #if PY_VERSION_HEX < 0x02020000 >+ (getattrfunc)PySwigObject_getattr, /* tp_getattr */ >+ #else >+@@ -1798,7 +1803,11 @@ _PySwigPacked_type(void) { >+ sizeof(PySwigPacked), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)PySwigPacked_dealloc, /* tp_dealloc */ >++#if PY_VERSION_HEX < 0x03080000 >+ (printfunc)PySwigPacked_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ (getattrfunc)0, /* tp_getattr */ >+ (setattrfunc)0, /* tp_setattr */ >+ (cmpfunc)PySwigPacked_compare, /* tp_compare */ > >Property changes on: cad/freecad/files/patch-src_Base_swigpyrun__1.3.36.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: cad/freecad/files/patch-src_Base_swigpyrun__1.3.38.h >=================================================================== >--- cad/freecad/files/patch-src_Base_swigpyrun__1.3.38.h (nonexistent) >+++ cad/freecad/files/patch-src_Base_swigpyrun__1.3.38.h (working copy) >@@ -0,0 +1,28 @@ >+--- src/Base/swigpyrun_1.3.38.h.orig 2020-11-14 21:10:37 UTC >++++ src/Base/swigpyrun_1.3.38.h >+@@ -1741,7 +1741,11 @@ _PySwigObject_type(void) { >+ sizeof(SwigPyObject), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)SwigPyObject_dealloc, /* tp_dealloc */ >+- (printfunc)SwigPyObject_print, /* tp_print */ >++#if PY_VERSION_HEX < 0x03080000 >++ (printfunc)SwigPyObject_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ #if PY_VERSION_HEX < 0x02020000 >+ (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ >+ #else >+@@ -1919,7 +1923,11 @@ _PySwigPacked_type(void) { >+ sizeof(SwigPyPacked), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ >+- (printfunc)SwigPyPacked_print, /* tp_print */ >++#if PY_VERSION_HEX < 0x03080000 >++ (printfunc)SwigPyPacked_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ (getattrfunc)0, /* tp_getattr */ >+ (setattrfunc)0, /* tp_setattr */ >+ (cmpfunc)SwigPyPacked_compare, /* tp_compare */ > >Property changes on: cad/freecad/files/patch-src_Base_swigpyrun__1.3.38.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: cad/freecad/files/patch-src_Base_swigpyrun__1.3.40.h >=================================================================== >--- cad/freecad/files/patch-src_Base_swigpyrun__1.3.40.h (nonexistent) >+++ cad/freecad/files/patch-src_Base_swigpyrun__1.3.40.h (working copy) >@@ -0,0 +1,28 @@ >+--- src/Base/swigpyrun_1.3.40.h.orig 2020-11-14 21:10:37 UTC >++++ src/Base/swigpyrun_1.3.40.h >+@@ -1766,7 +1766,11 @@ _PySwigObject_type(void) { >+ sizeof(SwigPyObject), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)SwigPyObject_dealloc, /* tp_dealloc */ >+- (printfunc)SwigPyObject_print, /* tp_print */ >++#if PY_VERSION_HEX < 0x03080000 >++ (printfunc)SwigPyObject_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ #if PY_VERSION_HEX < 0x02020000 >+ (getattrfunc)SwigPyObject_getattr, /* tp_getattr */ >+ #else >+@@ -1948,7 +1952,11 @@ _PySwigPacked_type(void) { >+ sizeof(SwigPyPacked), /* tp_basicsize */ >+ 0, /* tp_itemsize */ >+ (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ >+- (printfunc)SwigPyPacked_print, /* tp_print */ >++#if PY_VERSION_HEX < 0x03080000 >++ (printfunc)SwigPyPacked_print, /* tp_print */ >++#else >++ 0, /*tp_vectorcall_offset*/ >++#endif >+ (getattrfunc)0, /* tp_getattr */ >+ (setattrfunc)0, /* tp_setattr */ >+ #if PY_VERSION_HEX>=0x03000000 > >Property changes on: cad/freecad/files/patch-src_Base_swigpyrun__1.3.40.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: cad/freecad/files/patch-src_CXX_Python3_cxx__extensions.cxx >=================================================================== >--- cad/freecad/files/patch-src_CXX_Python3_cxx__extensions.cxx (nonexistent) >+++ cad/freecad/files/patch-src_CXX_Python3_cxx__extensions.cxx (working copy) >@@ -0,0 +1,24 @@ >+--- src/CXX/Python3/cxx_extensions.cxx.orig 2019-10-22 16:53:35 UTC >++++ src/CXX/Python3/cxx_extensions.cxx >+@@ -381,7 +381,11 @@ PythonType::PythonType( size_t basic_size, int itemsiz >+ >+ // Methods to implement standard operations >+ table->tp_dealloc = (destructor)standard_dealloc; >++#if PY_VERSION_HEX < 0x03080000 >+ table->tp_print = 0; >++#else >++ table->tp_vectorcall_offset = 0; >++#endif >+ table->tp_getattr = 0; >+ table->tp_setattr = 0; >+ table->tp_repr = 0; >+@@ -524,7 +528,9 @@ PythonType &PythonType::supportClass() >+ #ifdef PYCXX_PYTHON_2TO3 >+ PythonType &PythonType::supportPrint() >+ { >++#if PY_VERSION_HEX < 0x03080000 >+ table->tp_print = print_handler; >++#endif >+ return *this; >+ } >+ #endif > >Property changes on: cad/freecad/files/patch-src_CXX_Python3_cxx__extensions.cxx >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 251145
: 219693