diff options
| author |   Robert Förster <Dessa@gmake.de> | 2022-12-06 18:06:08 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-12-24 06:58:18 +0000 |
| commit | 99b026bffaabca8577414e0b76618d5e9bee5b42 (patch) | |
| tree | c78202cc32e3fc3e61fe255018f5187378659459 /dev-libs/Ice/files | |
| parent | dev-python/pipenv: add 2022.11.30 (diff) | |
| download | gentoo-99b026bffaabca8577414e0b76618d5e9bee5b42.tar.gz gentoo-99b026bffaabca8577414e0b76618d5e9bee5b42.tar.bz2 gentoo-99b026bffaabca8577414e0b76618d5e9bee5b42.zip | |
dev-libs/Ice: version bump
Bug: https://bugs.gentoo.org/713426
Bug: https://bugs.gentoo.org/836056
Signed-off-by: Robert Förster <Dessa@gmake.de>
Closes: https://github.com/gentoo/gentoo/pull/28569
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/Ice/files')
| -rw-r--r-- | dev-libs/Ice/files/Ice-3.7.8-fix-musl-build.patch | 13 | ||||
| -rw-r--r-- | dev-libs/Ice/files/Ice-3.7.8-py3k11.patch | 45 |
2 files changed, 58 insertions, 0 deletions
diff --git a/dev-libs/Ice/files/Ice-3.7.8-fix-musl-build.patch b/dev-libs/Ice/files/Ice-3.7.8-fix-musl-build.patch new file mode 100644 index 000000000000..76fa6c5cb641 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.7.8-fix-musl-build.patch @@ -0,0 +1,13 @@ +https://github.com/void-linux/void-packages/blob/master/srcpkgs/Ice/patches/fix-musl.patch + +--- a/cpp/src/IceUtil/UtilException.cpp ++++ b/cpp/src/IceUtil/UtilException.cpp +@@ -43,7 +43,7 @@ + # endif + # endif + +-# if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS) ++# if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS) && defined(__GLIBC__) + # include <execinfo.h> + # include <cxxabi.h> + # include <stdint.h> diff --git a/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch b/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch new file mode 100644 index 000000000000..7295aa6d9554 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch @@ -0,0 +1,45 @@ +From a98f34df525dce54a96f443806599978b293d7c5 Mon Sep 17 00:00:00 2001 +From: Jose <pepone@users.noreply.github.com> +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); |