From efa25cfd8109c514840be613cbd7b9b4c602a01d Mon Sep 17 00:00:00 2001 From: Thomas W Rodgers Date: Wed, 27 Apr 2022 07:44:11 -0700 Subject: [PATCH] And this time with the boost-1.76.0-enum_type_object-type-python-3.11.patch --- ....0-enum_type_object-type-python-3.11.patch | 35 +++++++++++++++++++ boost.spec | 5 ++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 boost-1.76.0-enum_type_object-type-python-3.11.patch diff --git a/boost-1.76.0-enum_type_object-type-python-3.11.patch b/boost-1.76.0-enum_type_object-type-python-3.11.patch new file mode 100644 index 0000000..5b77498 --- /dev/null +++ b/boost-1.76.0-enum_type_object-type-python-3.11.patch @@ -0,0 +1,35 @@ +From ae5da2a7e8f1111757d8a474095486a5b22aa12d Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Mon, 25 Apr 2022 10:51:46 +0200 +Subject: [PATCH] Fix enum_type_object type on Python 3.11 + +The enum_type_object type inherits from PyLong_Type which is not tracked +by the GC. Instances doesn't have to be tracked by the GC: remove the +Py_TPFLAGS_HAVE_GC flag. + +The Python C API documentation says: + + "To create a container type, the tp_flags field of the type object + must include the Py_TPFLAGS_HAVE_GC and provide an implementation of + the tp_traverse handler." + +https://docs.python.org/dev/c-api/gcsupport.html + +The new exception was introduced in Python 3.11 by: +https://github.com/python/cpython/issues/88429 +--- + libs/python/src/object/enum.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libs/python/src/object/enum.cpp b/libs/python/src/object/enum.cpp +index 293e705899..5753b32e07 100644 +--- a/libs/python/src/object/enum.cpp ++++ b/libs/python/src/object/enum.cpp +@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = { + #if PY_VERSION_HEX < 0x03000000 + | Py_TPFLAGS_CHECKTYPES + #endif +- | Py_TPFLAGS_HAVE_GC + | Py_TPFLAGS_BASETYPE, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ diff --git a/boost.spec b/boost.spec index 35434f0..3ba31d7 100644 --- a/boost.spec +++ b/boost.spec @@ -42,7 +42,7 @@ Name: boost %global real_name boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.76.0 -Release: 12%{?dist} +Release: 13%{?dist} License: Boost and MIT and Python # Replace each . with _ in %%{version} @@ -1306,6 +1306,9 @@ fi %{_mandir}/man1/b2.1* %changelog +* Wed Apr 27 2022 Thomas Rodgers - 1.76.0-12 +- And this time with the boost-1.76.0-enum_type_object-type-python-3.11.patch + * Tue Apr 26 2022 Thomas Rodgers - 1.76.0-12 - Merged https://src.fedoraproject.org/rpms/boost/pull-request/13 (#204336) Miro Hrončok - Fix enum_type_object type on Python 3.11