Date: Wed, 5 Jun 2024 09:08:11 GMT From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 81a7884cfda6 - main - devel/py-ice: Unbreak build Message-ID: <202406050908.45598B3x094298@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=81a7884cfda61d0c85e697b9dd5cfb37cebdf44f commit 81a7884cfda61d0c85e697b9dd5cfb37cebdf44f Author: Michael Gmelin <grembo@FreeBSD.org> AuthorDate: 2024-06-05 09:06:09 +0000 Commit: Michael Gmelin <grembo@FreeBSD.org> CommitDate: 2024-06-05 09:06:09 +0000 devel/py-ice: Unbreak build --- devel/ice/files/patch-python_modules_IcePy_Slice.cpp | 15 +++++++++++++++ devel/ice/files/patch-python_modules_IcePy_Util.cpp | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/devel/ice/files/patch-python_modules_IcePy_Slice.cpp b/devel/ice/files/patch-python_modules_IcePy_Slice.cpp new file mode 100644 index 000000000000..d82f370c2ef0 --- /dev/null +++ b/devel/ice/files/patch-python_modules_IcePy_Slice.cpp @@ -0,0 +1,15 @@ +--- python/modules/IcePy/Slice.cpp.orig 2024-06-05 08:43:42 UTC ++++ python/modules/IcePy/Slice.cpp +@@ -20,8 +20,12 @@ + // + // Python headers needed for PyEval_EvalCode. + // ++#if PY_VERSION_HEX >= 0x02050000 && PY_VERSION_HEX < 0x030B0000 + #include <compile.h> + #include <eval.h> ++#else ++#include <compile.h> ++#endif + + using namespace std; + using namespace IcePy; diff --git a/devel/ice/files/patch-python_modules_IcePy_Util.cpp b/devel/ice/files/patch-python_modules_IcePy_Util.cpp new file mode 100644 index 000000000000..9a97a1d06742 --- /dev/null +++ b/devel/ice/files/patch-python_modules_IcePy_Util.cpp @@ -0,0 +1,14 @@ +--- python/modules/IcePy/Util.cpp.orig 2024-06-05 08:44:17 UTC ++++ python/modules/IcePy/Util.cpp +@@ -214,7 +214,11 @@ IcePy::getFunction() + // + // Get name of current function. + // ++#if PY_VERSION_HEX >= 0x02050000 && PY_VERSION_HEX < 0x030B0000 + PyFrameObject *f = PyThreadState_GET()->frame; ++#else ++ PyFrameObject *f = PyThreadState_GetFrame(PyThreadState_GET()); ++#endif + PyObjectHandle code = PyObject_GetAttrString(reinterpret_cast<PyObject*>(f), STRCAST("f_code")); + assert(code.get()); + PyObjectHandle func = PyObject_GetAttrString(code.get(), STRCAST("co_name"));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406050908.45598B3x094298>