From 03c4dc54a72f787da597972b43ff6ae9309ebad8 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 22 Apr 2025 14:04:03 +0200 Subject: gnu: python-zeroc-ice-3.6: Fix build with Python@3.11. * gnu/packages/python-xyz.scm (python-zeroc-ice-3.6) [source]: Add patch. * gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch: Add patch. Signed-off-by: Sharlatan Hellseher --- ...ython-zeroc-ice-3.6.5-python-3.11-support.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch (limited to 'gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch') diff --git a/gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch b/gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch new file mode 100644 index 00000000000..17cae7297c0 --- /dev/null +++ b/gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch @@ -0,0 +1,33 @@ +Only in zeroc-ice-3.6.5: setup.py.orig +diff --color -ur zeroc-ice-3.6.5.orig/src/Slice.cpp zeroc-ice-3.6.5/src/Slice.cpp +--- zeroc-ice-3.6.5.orig/src/Slice.cpp 2019-07-31 21:49:38.000000000 +0200 ++++ zeroc-ice-3.6.5/src/Slice.cpp 2023-10-12 10:52:07.029069937 +0200 +@@ -17,12 +17,6 @@ + #include + #include + +-// +-// Python headers needed for PyEval_EvalCode. +-// +-#include +-#include +- + using namespace std; + using namespace IcePy; + using namespace Slice; +diff --color -ur zeroc-ice-3.6.5.orig/src/Util.cpp zeroc-ice-3.6.5/src/Util.cpp +--- zeroc-ice-3.6.5.orig/src/Util.cpp 2019-07-31 21:49:38.000000000 +0200 ++++ zeroc-ice-3.6.5/src/Util.cpp 2023-10-12 10:49:15.033366926 +0200 +@@ -214,7 +214,12 @@ + // + // Get name of current function. + // ++ // Use PyEval_GetFrame with Pyhthon >= 3.11 ++#if PY_VERSION_HEX >= 0x030B0000 ++ PyFrameObject *f = PyEval_GetFrame(); ++#else + PyFrameObject *f = PyThreadState_GET()->frame; ++#endif + PyObjectHandle code = PyObject_GetAttrString(reinterpret_cast(f), STRCAST("f_code")); + assert(code.get()); + PyObjectHandle func = PyObject_GetAttrString(code.get(), STRCAST("co_name")); -- cgit v1.3