Control: tags 1027849 + pending Dear maintainer,
I've prepared an NMU for zeroc-ice (versioned as 3.7.8-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru zeroc-ice-3.7.8/debian/changelog zeroc-ice-3.7.8/debian/changelog --- zeroc-ice-3.7.8/debian/changelog 2022-08-05 10:25:42.000000000 +0300 +++ zeroc-ice-3.7.8/debian/changelog 2023-01-09 21:57:08.000000000 +0200 @@ -1,3 +1,10 @@ +zeroc-ice (3.7.8-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream build fixes for Python 3.11. (Closes: #1027849) + + -- Adrian Bunk <b...@debian.org> Mon, 09 Jan 2023 21:57:08 +0200 + zeroc-ice (3.7.8-1) unstable; urgency=medium * New upstream version 3.7.8 diff -Nru zeroc-ice-3.7.8/debian/patches/0001-Python-3.11-build-fixes-1394.patch zeroc-ice-3.7.8/debian/patches/0001-Python-3.11-build-fixes-1394.patch --- zeroc-ice-3.7.8/debian/patches/0001-Python-3.11-build-fixes-1394.patch 1970-01-01 02:00:00.000000000 +0200 +++ zeroc-ice-3.7.8/debian/patches/0001-Python-3.11-build-fixes-1394.patch 2023-01-09 21:56:48.000000000 +0200 @@ -0,0 +1,48 @@ +From a98f34df525dce54a96f443806599978b293d7c5 Mon Sep 17 00:00:00 2001 +From: Jose <pep...@users.noreply.github.com> +Date: Thu, 3 Nov 2022 16:52:58 +0100 +Subject: 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 e11365d8d4..7138e76dac 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 f15c7a5c69..73955c933a 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); +-- +2.30.2 + diff -Nru zeroc-ice-3.7.8/debian/patches/series zeroc-ice-3.7.8/debian/patches/series --- zeroc-ice-3.7.8/debian/patches/series 2022-08-05 10:25:42.000000000 +0300 +++ zeroc-ice-3.7.8/debian/patches/series 2023-01-09 21:57:08.000000000 +0200 @@ -1 +1,2 @@ java-build.patch +0001-Python-3.11-build-fixes-1394.patch
