Skip to content

Commit d3be842

Browse files
committed
py-kivy: fix build with Cython 3 using upstream commit
Bump PKGREVISION.
1 parent e6efa8f commit d3be842

5 files changed

Lines changed: 61 additions & 2 deletions

File tree

devel/py-kivy/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# $NetBSD: Makefile,v 1.19 2025/04/16 20:40:46 adam Exp $
1+
# $NetBSD: Makefile,v 1.20 2025/06/12 07:29:05 wiz Exp $
22

33
DISTNAME= Kivy-2.3.1
44
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5+
PKGREVISION= 1
56
CATEGORIES= devel python
67
MASTER_SITES= ${MASTER_SITE_PYPI:=K/Kivy/}
78

devel/py-kivy/distinfo

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
$NetBSD: distinfo,v 1.4 2025/04/16 20:40:46 adam Exp $
1+
$NetBSD: distinfo,v 1.5 2025/06/12 07:29:05 wiz Exp $
22

33
BLAKE2s (Kivy-2.3.1.tar.gz) = bc67e1d62d706dfe5c8f168960bf6b352db08539eb009993069dd7bf20b4de87
44
SHA512 (Kivy-2.3.1.tar.gz) = f26983a6ccdc173d7d69f0c17a36dc8a4dfd31e4777363253b6bcbf549c44ff2d281e8529ff3ea6683fbfb1c16102bd436bb0433b00c23eb4084be30b3b487ad
55
Size (Kivy-2.3.1.tar.gz) = 23967306 bytes
6+
SHA1 (patch-kivy_graphics_context__instructions.pyx) = 832277962827829929a90ee5feeb8da34d7051a9
7+
SHA1 (patch-kivy_graphics_opengl.pyx) = 968074f0b413e5b1b267d8d126cbee1a10756f00
8+
SHA1 (patch-kivy_weakproxy.pyx) = 34214bdd35389edab5cc13e3009870b183ac6371
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD: patch-kivy_graphics_context__instructions.pyx,v 1.1 2025/06/12 07:29:05 wiz Exp $
2+
3+
https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68
4+
5+
--- kivy/graphics/context_instructions.pyx.orig 2024-12-26 16:04:18.000000000 +0000
6+
+++ kivy/graphics/context_instructions.pyx
7+
@@ -86,7 +86,7 @@ cdef tuple rgb_to_hsv(float r, float g,
8+
9+
cdef tuple hsv_to_rgb(float h, float s, float v):
10+
if s == 0.0: return v, v, v
11+
- cdef long i = long(h * 6.0)
12+
+ cdef long i = <long>(h * 6.0)
13+
cdef float f = (h * <float>6.0) - i
14+
cdef float p = v * (<float>1.0 - s)
15+
cdef float q = v * (<float>1.0 - s * f)
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
$NetBSD: patch-kivy_graphics_opengl.pyx,v 1.1 2025/06/12 07:29:05 wiz Exp $
2+
3+
https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68
4+
5+
--- kivy/graphics/opengl.pyx.orig 2024-12-26 16:04:18.000000000 +0000
6+
+++ kivy/graphics/opengl.pyx
7+
@@ -689,7 +689,7 @@ def glDrawElements(GLenum mode, GLsizei
8+
cdef void *ptr = NULL
9+
if isinstance(indices, bytes):
10+
ptr = <void *>(<char *>(<bytes>indices))
11+
- elif isinstance(indices, (long, int)):
12+
+ elif isinstance(indices, int):
13+
ptr = <void *>(<unsigned int>indices)
14+
else:
15+
raise TypeError("Argument 'indices' has incorrect type (expected bytes or int).")
16+
@@ -1539,7 +1539,7 @@ def glVertexAttribPointer(GLuint index,
17+
cdef void *ptr = NULL
18+
if isinstance(data, bytes):
19+
ptr = <void *>(<char *>(<bytes>data))
20+
- elif isinstance(data, (long, int)):
21+
+ elif isinstance(data, int):
22+
ptr = <void *>(<unsigned int>data)
23+
else:
24+
raise TypeError("Argument 'data' has incorrect type (expected bytes or int).")
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
$NetBSD: patch-kivy_weakproxy.pyx,v 1.1 2025/06/12 07:29:05 wiz Exp $
2+
3+
https://github.com/kivy/kivy/commit/5a1b27d7d3bdee6cedb55440bfae9c4e66fb3c68
4+
5+
--- kivy/weakproxy.pyx.orig 2024-12-26 16:04:18.000000000 +0000
6+
+++ kivy/weakproxy.pyx
7+
@@ -253,9 +253,6 @@ cdef class WeakProxy(object):
8+
def __int__(self):
9+
return int(self.__ref__())
10+
11+
- def __long__(self):
12+
- return long(self.__ref__())
13+
-
14+
def __float__(self):
15+
return float(self.__ref__())
16+

0 commit comments

Comments
 (0)