From 21edc24e33edb533633263597c753624ac1b7588 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Jan 21 2019 18:49:20 +0000 Subject: Rename python37 patch. --- diff --git a/python-pycxx-7.0.3-python37.patch b/python-pycxx-7.0.3-python37.patch deleted file mode 100644 index 2e1bd61..0000000 --- a/python-pycxx-7.0.3-python37.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CXX/Python2/IndirectPythonInterface.hxx b/CXX/Python2/IndirectPythonInterface.hxx -index e2ee725..1c7cc24 100644 ---- a/CXX/Python2/IndirectPythonInterface.hxx -+++ b/CXX/Python2/IndirectPythonInterface.hxx -@@ -153,7 +153,7 @@ int &_Py_VerboseFlag(); - void _XINCREF( PyObject *op ); - void _XDECREF( PyObject *op ); - --char *__Py_PackageContext(); -+const char *__Py_PackageContext(); - } - - #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ -diff --git a/CXX/Python3/IndirectPythonInterface.hxx b/CXX/Python3/IndirectPythonInterface.hxx -index 6163536..9807b2e 100644 ---- a/CXX/Python3/IndirectPythonInterface.hxx -+++ b/CXX/Python3/IndirectPythonInterface.hxx -@@ -149,7 +149,7 @@ int &_Py_UnicodeFlag(); - void _XINCREF( PyObject *op ); - void _XDECREF( PyObject *op ); - --char *__Py_PackageContext(); -+const char *__Py_PackageContext(); - }; - - #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ -diff --git a/Src/IndirectPythonInterface.cxx b/Src/IndirectPythonInterface.cxx -index de0ca7f..b7d7d9e 100644 ---- a/Src/IndirectPythonInterface.cxx -+++ b/Src/IndirectPythonInterface.cxx -@@ -348,7 +348,7 @@ PyTypeObject *_CObject_Type() { return ptr__CObject_Type; } - PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; } - #endif - --char *__Py_PackageContext() { return *ptr__Py_PackageContext; } -+const char *__Py_PackageContext() { return *ptr__Py_PackageContext; } - - - // -@@ -468,7 +468,7 @@ int &_Py_InteractiveFlag() { return Py_InteractiveFlag; } - int &_Py_OptimizeFlag() { return Py_OptimizeFlag; } - int &_Py_NoSiteFlag() { return Py_NoSiteFlag; } - int &_Py_VerboseFlag() { return Py_VerboseFlag; } --char *__Py_PackageContext() { return _Py_PackageContext; } -+const char *__Py_PackageContext() { return _Py_PackageContext; } - - // - // Needed to keep the abstactions for delayload interface diff --git a/python-pycxx-7.1.0-python37.patch b/python-pycxx-7.1.0-python37.patch new file mode 100644 index 0000000..2e1bd61 --- /dev/null +++ b/python-pycxx-7.1.0-python37.patch @@ -0,0 +1,48 @@ +diff --git a/CXX/Python2/IndirectPythonInterface.hxx b/CXX/Python2/IndirectPythonInterface.hxx +index e2ee725..1c7cc24 100644 +--- a/CXX/Python2/IndirectPythonInterface.hxx ++++ b/CXX/Python2/IndirectPythonInterface.hxx +@@ -153,7 +153,7 @@ int &_Py_VerboseFlag(); + void _XINCREF( PyObject *op ); + void _XDECREF( PyObject *op ); + +-char *__Py_PackageContext(); ++const char *__Py_PackageContext(); + } + + #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ +diff --git a/CXX/Python3/IndirectPythonInterface.hxx b/CXX/Python3/IndirectPythonInterface.hxx +index 6163536..9807b2e 100644 +--- a/CXX/Python3/IndirectPythonInterface.hxx ++++ b/CXX/Python3/IndirectPythonInterface.hxx +@@ -149,7 +149,7 @@ int &_Py_UnicodeFlag(); + void _XINCREF( PyObject *op ); + void _XDECREF( PyObject *op ); + +-char *__Py_PackageContext(); ++const char *__Py_PackageContext(); + }; + + #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ +diff --git a/Src/IndirectPythonInterface.cxx b/Src/IndirectPythonInterface.cxx +index de0ca7f..b7d7d9e 100644 +--- a/Src/IndirectPythonInterface.cxx ++++ b/Src/IndirectPythonInterface.cxx +@@ -348,7 +348,7 @@ PyTypeObject *_CObject_Type() { return ptr__CObject_Type; } + PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; } + #endif + +-char *__Py_PackageContext() { return *ptr__Py_PackageContext; } ++const char *__Py_PackageContext() { return *ptr__Py_PackageContext; } + + + // +@@ -468,7 +468,7 @@ int &_Py_InteractiveFlag() { return Py_InteractiveFlag; } + int &_Py_OptimizeFlag() { return Py_OptimizeFlag; } + int &_Py_NoSiteFlag() { return Py_NoSiteFlag; } + int &_Py_VerboseFlag() { return Py_VerboseFlag; } +-char *__Py_PackageContext() { return _Py_PackageContext; } ++const char *__Py_PackageContext() { return _Py_PackageContext; } + + // + // Needed to keep the abstactions for delayload interface