Date: Tue, 3 Nov 2015 20:56:32 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400715 - in head/devel/py-game_sdl2: . files Message-ID: <201511032056.tA3KuWhH075355@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Nov 3 20:56:32 2015 New Revision: 400715 URL: https://svnweb.freebsd.org/changeset/ports/400715 Log: devel/py-game_sdl2: backport 32bit runtime fix after r394876 With cython-0.23 named enums maybe promoted to PyLong which can break py-game_sdl2 consumers e.g., $ renpy TypeError("'long' object is not iterable",) GitHub: renpy/renpy#778 MFH: 2015Q4 Added: head/devel/py-game_sdl2/files/ head/devel/py-game_sdl2/files/patch-src_pygame__sdl2_event.pyx (contents, props changed) Modified: head/devel/py-game_sdl2/Makefile (contents, props changed) Modified: head/devel/py-game_sdl2/Makefile ============================================================================== --- head/devel/py-game_sdl2/Makefile Tue Nov 3 20:21:02 2015 (r400714) +++ head/devel/py-game_sdl2/Makefile Tue Nov 3 20:56:32 2015 (r400715) @@ -2,6 +2,7 @@ PORTNAME= game_sdl2 PORTVERSION= 6.99.7 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO Added: head/devel/py-game_sdl2/files/patch-src_pygame__sdl2_event.pyx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-game_sdl2/files/patch-src_pygame__sdl2_event.pyx Tue Nov 3 20:56:32 2015 (r400715) @@ -0,0 +1,33 @@ +commit 1359d51 +Author: Tom Rothamel <tom@rothamel.us> +Date: Tue Nov 3 09:01:52 2015 -0500 + + Allow event types to be longs. + + Fixes renpy/renpy#778. +--- + src/pygame_sdl2/event.pyx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git src/pygame_sdl2/event.pyx src/pygame_sdl2/event.pyx +index 209fb83..22da508 100644 +--- src/pygame_sdl2/event.pyx ++++ src/pygame_sdl2/event.pyx +@@ -416,7 +416,7 @@ def set_blocked(t=None): + if t == None: + for et in event_names.keys(): + SDL_EventState(et, SDL_ENABLE) +- elif type(t) == int: ++ elif isinstance(t, (int, long)): + SDL_EventState(t, SDL_IGNORE) + else: + for et in t: +@@ -426,7 +426,7 @@ def set_allowed(t=None): + if t == None: + for et in event_names.keys(): + SDL_EventState(et, SDL_IGNORE) +- elif type(t) == int: ++ elif isinstance(t, (int, long)): + SDL_EventState(t, SDL_ENABLE) + else: + for et in t:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511032056.tA3KuWhH075355>