[kodi] Use upstream python-3.12 fix

commit 6f23d1e0af7d98223841db543c48c31b8dc3fa9a Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Oct 31 08:32:07 2023 +0000 Use upstream python-3.12 fix kodi.spec | 7 +++++-- tp_watched_initializer.patch | 25 ++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) --- diff --git a/kodi.spec b/kodi.spec index 109e9f0..d9db047 100644 --- a/kodi.spec +++ b/kodi.spec @@ -39,7 +39,7 @@ Name: kodi Version: 20.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -79,7 +79,7 @@ Patch2: kodi-20-annobin-workaround.patch Patch3: https://github.com/xbmc/xbmc/pull/23453.patch#/fmt10_buildfix.patch # Add initializer for tp_watched -Patch4: tp_watched_initializer.patch +Patch4: https://github.com/xbmc/xbmc/commit/2c84ee54a75770e291f38d4ebb2c31c8f2c3b... %ifarch x86_64 %global _with_crystalhd 1 @@ -436,6 +436,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %changelog +* Tue Oct 31 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 20.2-6 +- Use upstream python-3.12 fix + * Thu Sep 28 2023 Michael Cronenworth <mike(a)cchtml.com&gt; - 20.2-5 - Update mariadb BR (RFBZ#6771) diff --git a/tp_watched_initializer.patch b/tp_watched_initializer.patch index 45fa7ca..d9c8c1a 100644 --- a/tp_watched_initializer.patch +++ b/tp_watched_initializer.patch @@ -1,10 +1,29 @@ +From 2c84ee54a75770e291f38d4ebb2c31c8f2c3b8c5 Mon Sep 17 00:00:00 2001 +From: Lukas Rusak <lorusak(a)gmail.com&gt; +Date: Wed, 12 Jul 2023 19:58:08 -0700 +Subject: [PATCH] PythonBindings: TypeInfo: add initialization of tp_watched + for PyTypeObject + +This member was added in upstream commit https://github.com/python/cpython/commit/82ccbf69a842db25d8117f1c41b47aa5... + +This change first appeared in Python v3.12.0a1 + +Signed-off-by: Lukas Rusak <lorusak(a)gmail.com&gt; +--- + xbmc/interfaces/python/swig.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp +index f9374d53e6d94..0c49f87ca84e1 100644 --- a/xbmc/interfaces/python/swig.cpp +++ b/xbmc/interfaces/python/swig.cpp -@@ -72,6 +72,7 @@ namespace PythonBindings +@@ -71,6 +71,9 @@ namespace PythonBindings + #endif #if PY_VERSION_HEX < 0x03090000 0, ++#endif ++#if PY_VERSION_HEX >= 0x030C00A1 ++ 0, #endif -+ 0 }; - static int size = (long*)&(py_type_object_header.tp_name) - (long*)&py_type_object_header;