CVS commit: pkgsrc/devel/py-kivy

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun 12 07:29:06 UTC 2025

Modified Files:
        pkgsrc/devel/py-kivy: Makefile distinfo
Added Files:
        pkgsrc/devel/py-kivy/patches:
            patch-kivy_graphics_context__instructions.pyx
            patch-kivy_graphics_opengl.pyx patch-kivy_weakproxy.pyx

Log Message:
py-kivy: fix build with Cython 3 using upstream commit

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-kivy/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-kivy/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_context__instructions.pyx \
    pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_opengl.pyx \
    pkgsrc/devel/py-kivy/patches/patch-kivy_weakproxy.pyx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-kivy/Makefile
diff -u pkgsrc/devel/py-kivy/Makefile:1.19 pkgsrc/devel/py-kivy/Makefile:1.20
--- pkgsrc/devel/py-kivy/Makefile:1.19  Wed Apr 16 20:40:46 2025
+++ pkgsrc/devel/py-kivy/Makefile       Thu Jun 12 07:29:05 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2025/04/16 20:40:46 adam Exp $
+# $NetBSD: Makefile,v 1.20 2025/06/12 07:29:05 wiz Exp $
 
 DISTNAME=      Kivy-2.3.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=K/Kivy/}
 

Index: pkgsrc/devel/py-kivy/distinfo
diff -u pkgsrc/devel/py-kivy/distinfo:1.4 pkgsrc/devel/py-kivy/distinfo:1.5
--- pkgsrc/devel/py-kivy/distinfo:1.4   Wed Apr 16 20:40:46 2025
+++ pkgsrc/devel/py-kivy/distinfo       Thu Jun 12 07:29:05 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.4 2025/04/16 20:40:46 adam Exp $
+$NetBSD: distinfo,v 1.5 2025/06/12 07:29:05 wiz Exp $
 
 BLAKE2s (Kivy-2.3.1.tar.gz) = bc67e1d62d706dfe5c8f168960bf6b352db08539eb009993069dd7bf20b4de87
 SHA512 (Kivy-2.3.1.tar.gz) = f26983a6ccdc173d7d69f0c17a36dc8a4dfd31e4777363253b6bcbf549c44ff2d281e8529ff3ea6683fbfb1c16102bd436bb0433b00c23eb4084be30b3b487ad
 Size (Kivy-2.3.1.tar.gz) = 23967306 bytes
+SHA1 (patch-kivy_graphics_context__instructions.pyx) = 832277962827829929a90ee5feeb8da34d7051a9
+SHA1 (patch-kivy_graphics_opengl.pyx) = 968074f0b413e5b1b267d8d126cbee1a10756f00
+SHA1 (patch-kivy_weakproxy.pyx) = 34214bdd35389edab5cc13e3009870b183ac6371

Added files:

Index: pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_context__instructions.pyx
diff -u /dev/null pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_context__instructions.pyx:1.1
--- /dev/null   Thu Jun 12 07:29:06 2025
+++ pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_context__instructions.pyx  Thu Jun 12 07:29:05 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-kivy_graphics_context__instructions.pyx,v 1.1 2025/06/12 07:29:05 wiz Exp $
+
+https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68
+
+--- kivy/graphics/context_instructions.pyx.orig        2024-12-26 16:04:18.000000000 +0000
++++ kivy/graphics/context_instructions.pyx
+@@ -86,7 +86,7 @@ cdef tuple rgb_to_hsv(float r, float g, 
+ 
+ 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)
Index: pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_opengl.pyx
diff -u /dev/null pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_opengl.pyx:1.1
--- /dev/null   Thu Jun 12 07:29:06 2025
+++ pkgsrc/devel/py-kivy/patches/patch-kivy_graphics_opengl.pyx Thu Jun 12 07:29:05 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-kivy_graphics_opengl.pyx,v 1.1 2025/06/12 07:29:05 wiz Exp $
+
+https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68
+
+--- kivy/graphics/opengl.pyx.orig      2024-12-26 16:04:18.000000000 +0000
++++ kivy/graphics/opengl.pyx
+@@ -689,7 +689,7 @@ def glDrawElements(GLenum mode, GLsizei 
+     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, 
+     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).")
Index: pkgsrc/devel/py-kivy/patches/patch-kivy_weakproxy.pyx
diff -u /dev/null pkgsrc/devel/py-kivy/patches/patch-kivy_weakproxy.pyx:1.1
--- /dev/null   Thu Jun 12 07:29:06 2025
+++ pkgsrc/devel/py-kivy/patches/patch-kivy_weakproxy.pyx       Thu Jun 12 07:29:05 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-kivy_weakproxy.pyx,v 1.1 2025/06/12 07:29:05 wiz Exp $
+
+https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68
+
+--- kivy/weakproxy.pyx.orig    2024-12-26 16:04:18.000000000 +0000
++++ 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__())
+