diff mbox series

[meta-python,048/105] python3-kivy: upgrade 2.3.1 -> 2.3.2

Message ID 20261116175359.342679-48-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-python,001/105] python3-absl: upgrade 2.1.0 -> 2.5.1 | expand

Commit Message

Khem Raj Nov. 16, 2026, 5:53 p.m. UTC
Drop the Cython long patch, it is part of this release.

Changes:
- Maintenance release for Python 3.14: CI/wheels, CodeInput finally
  return fix, asyncio examples, kivy_deps.angle ~=0.5.0 on 3.14+,
  ffpyplayer restored, Pillow/media dependencies adjusted.
- Build: removed Python 2 "long" usage so it builds with Cython 3.1.x;
  build-time packaging requirement relaxed to packaging>=24.0,<26.
- KV parser f-strings resolve nested attribute names; SDL2 window
  creation falls back when GetDpiForWindow returns 0 (Windows).

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...n-2-long-from-Cython-files-fixes-bui.patch | 63 -------------------
 ...n3-kivy_2.3.1.bb => python3-kivy_2.3.2.bb} |  3 +-
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch
 rename meta-python/recipes-devtools/python/{python3-kivy_2.3.1.bb => python3-kivy_2.3.2.bb} (95%)
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch b/meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch
deleted file mode 100644
index c68e227482..0000000000
--- a/meta-python/recipes-devtools/python/python3-kivy/0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch
+++ /dev/null
@@ -1,63 +0,0 @@ 
-From 288e3d5ecff1bc5e7de29d9daddb83d697280004 Mon Sep 17 00:00:00 2001
-From: Mirko Galimberti <me@mirkogalimberti.com>
-Date: Sun, 18 May 2025 09:38:14 +0200
-Subject: [PATCH] Remove old Python 2 long from Cython files, fixes build with
- Cython `3.1.x` (#9056)
-
-Upstream-Status: Backport [https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- kivy/graphics/context_instructions.pyx | 2 +-
- kivy/graphics/opengl.pyx               | 4 ++--
- kivy/weakproxy.pyx                     | 3 ---
- 3 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/kivy/graphics/context_instructions.pyx b/kivy/graphics/context_instructions.pyx
-index 0d4b8f548..1c23c0e1c 100644
---- a/kivy/graphics/context_instructions.pyx
-+++ b/kivy/graphics/context_instructions.pyx
-@@ -86,7 +86,7 @@ cdef tuple rgb_to_hsv(float r, float g, float b):
- 
- cdef tuple hsv_to_rgb(float h, float s, float v):
-     if s == 0.0: return v, v, v
--    cdef long i = long(h * 6.0)
-+    cdef long i = <long>(h * 6.0)
-     cdef float f = (h * <float>6.0) - i
-     cdef float p = v * (<float>1.0 - s)
-     cdef float q = v * (<float>1.0 - s * f)
-diff --git a/kivy/graphics/opengl.pyx b/kivy/graphics/opengl.pyx
-index bcca70842..f535c62a6 100644
---- a/kivy/graphics/opengl.pyx
-+++ b/kivy/graphics/opengl.pyx
-@@ -689,7 +689,7 @@ def glDrawElements(GLenum mode, GLsizei count, GLenum type, indices):
-     cdef void *ptr = NULL
-     if isinstance(indices, bytes):
-         ptr = <void *>(<char *>(<bytes>indices))
--    elif isinstance(indices, (long, int)):
-+    elif isinstance(indices, int):
-         ptr = <void *>(<unsigned int>indices)
-     else:
-         raise TypeError("Argument 'indices' has incorrect type (expected bytes or int).")
-@@ -1539,7 +1539,7 @@ def glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean norma
-     cdef void *ptr = NULL
-     if isinstance(data, bytes):
-         ptr = <void *>(<char *>(<bytes>data))
--    elif isinstance(data, (long, int)):
-+    elif isinstance(data, int):
-         ptr = <void *>(<unsigned int>data)
-     else:
-         raise TypeError("Argument 'data' has incorrect type (expected bytes or int).")
-diff --git a/kivy/weakproxy.pyx b/kivy/weakproxy.pyx
-index cac4fe66b..e8e1c0b77 100644
---- a/kivy/weakproxy.pyx
-+++ b/kivy/weakproxy.pyx
-@@ -253,9 +253,6 @@ cdef class WeakProxy(object):
-     def __int__(self):
-         return int(self.__ref__())
- 
--    def __long__(self):
--        return long(self.__ref__())
--
-     def __float__(self):
-         return float(self.__ref__())
- 
diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb b/meta-python/recipes-devtools/python/python3-kivy_2.3.2.bb
similarity index 95%
rename from meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb
rename to meta-python/recipes-devtools/python/python3-kivy_2.3.2.bb
index a2602a9a81..9b630c5ba4 100644
--- a/meta-python/recipes-devtools/python/python3-kivy_2.3.1.bb
+++ b/meta-python/recipes-devtools/python/python3-kivy_2.3.2.bb
@@ -12,10 +12,9 @@  inherit setuptools3 pkgconfig features_check cython
 # Also, if using SDL2 as backend, SDL2 needs to be configured with gles
 SRC_URI = "git://github.com/kivy/kivy.git;protocol=https;branch=stable \
            file://0001-add-support-for-glesv2.patch \
-           file://0001-Remove-old-Python-2-long-from-Cython-files-fixes-bui.patch \
            "
 
-SRCREV = "20d74dcd30f143abbd1aa94c76bafc5bd934d5bd"
+SRCREV = "ec09ee880c666e70de42501f36dbc43e349e3712"
 
 
 PACKAGES += "${PN}-examples"