All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Bernd Kuhls <bernd@kuhls.net>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/kodi: fix build with python 3.12
Date: Sun, 29 Oct 2023 09:47:49 +0100	[thread overview]
Message-ID: <20231029084749.GT687180@scaer> (raw)
In-Reply-To: <20231026180751.3150845-1-bernd@kuhls.net>

Bernd, All,

On 2023-10-26 20:07 +0200, Bernd Kuhls spake thusly:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...ypeInfo-add-initialization-of-tp_wat.patch | 59 +++++++++++++++++++
>  1 file changed, 59 insertions(+)
>  create mode 100644 package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch
> 
> diff --git a/package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch b/package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch
> new file mode 100644
> index 0000000000..ed0c340f52
> --- /dev/null
> +++ b/package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch
> @@ -0,0 +1,59 @@
> +From cbfee0e6add2b57c6a2a8641a60b4322543f4675 Mon Sep 17 00:00:00 2001
> +From: Lukas Rusak <lorusak@gmail.com>
> +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/82ccbf69a842db25d8117f1c41b47aa5b4ed96ab
> +
> +This change first appeared in Python v3.12.0a1
> +
> +Signed-off-by: Lukas Rusak <lorusak@gmail.com>
> +
> +Upstream: https://github.com/xbmc/xbmc/commit/2c84ee54a75770e291f38d4ebb2c31c8f2c3b8c5
> +
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> +---
> + 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 5a2599a84ea0f..74baa72ee5c4c 100644
> +--- a/xbmc/interfaces/python/swig.cpp
> ++++ b/xbmc/interfaces/python/swig.cpp
> +@@ -71,6 +71,9 @@ namespace PythonBindings
> + #endif
> + #if PY_VERSION_HEX < 0x03090000
> +       0,
> ++#endif
> ++#if PY_VERSION_HEX >= 0x030C00A1
> ++      0,
> + #endif
> +     };
> + 
> +
> +From e3ba40936cc10de05c46d507851568ee3e351f43 Mon Sep 17 00:00:00 2001
> +From: Lukas Rusak <lorusak@gmail.com>
> +Date: Thu, 13 Jul 2023 08:57:38 -0700
> +Subject: [PATCH] swig.cpp: add clang-format formatting
> +
> +Signed-off-by: Lukas Rusak <lorusak@gmail.com>
> +---
> + xbmc/interfaces/python/swig.cpp | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp
> +index 74baa72ee5c4c..0c49f87ca84e1 100644
> +--- a/xbmc/interfaces/python/swig.cpp
> ++++ b/xbmc/interfaces/python/swig.cpp
> +@@ -18,8 +18,8 @@ namespace PythonBindings
> + {
> +   TypeInfo::TypeInfo(const std::type_info& ti) : swigType(NULL), parentType(NULL), typeIndex(ti)
> +   {
> +-    static PyTypeObject py_type_object_header =
> +-    { PyVarObject_HEAD_INIT(nullptr, 0) 0,
> ++    static PyTypeObject py_type_object_header = {
> ++      PyVarObject_HEAD_INIT(nullptr, 0) 0,
> +       0,
> +       0,
> +       0,
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      reply	other threads:[~2023-10-29  8:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-26 18:07 [Buildroot] [PATCH 1/1] package/kodi: fix build with python 3.12 Bernd Kuhls
2023-10-29  8:47 ` Yann E. MORIN [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231029084749.GT687180@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.