commit: 80c4b8d98745485cbe83b20ae003a6463114f444 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Apr 25 15:35:57 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Apr 26 20:38:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c4b8d9
dev-libs/Ice: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Part-of: https://github.com/gentoo/gentoo/pull/41746 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-libs/Ice/files/Ice-3.7.8-py3k11.patch | 45 ------------------------------- 1 file changed, 45 deletions(-) diff --git a/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch b/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch deleted file mode 100644 index 7295aa6d9554..000000000000 --- a/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a98f34df525dce54a96f443806599978b293d7c5 Mon Sep 17 00:00:00 2001 -From: Jose <[email protected]> -Date: Thu, 3 Nov 2022 16:52:58 +0100 -Subject: [PATCH] Python 3.11 build fixes (#1394) - ---- - python/modules/IcePy/Slice.cpp | 7 ++++++- - python/modules/IcePy/Util.cpp | 5 +++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/python/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp -index e11365d8d40..7138e76dac0 100644 ---- a/python/modules/IcePy/Slice.cpp -+++ b/python/modules/IcePy/Slice.cpp -@@ -14,7 +14,12 @@ - // Python headers needed for PyEval_EvalCode. - // - #include <compile.h> --#include <eval.h> -+// Use ceval.h instead of eval.h with Pyhthon 3.11 and greater -+#if PY_VERSION_HEX >= 0x030B0000 -+# include <ceval.h> -+#else -+# include <eval.h> -+#endif - - using namespace std; - using namespace IcePy; -diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp -index f15c7a5c690..73955c933a2 100644 ---- a/python/modules/IcePy/Util.cpp -+++ b/python/modules/IcePy/Util.cpp -@@ -225,7 +225,12 @@ IcePy::getFunction() - // - // 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 = getAttr(reinterpret_cast<PyObject*>(f), "f_code", false); - assert(code.get()); - PyObjectHandle func = getAttr(code.get(), "co_name", false);
