Mon Nov 20 00:07:41 2023 UTC ()
x11/py-wxPython: Cherry-pick upstream fix for cython 3.0.0 API withdrawal


(gdt)
diff -r1.6 -r1.7 pkgsrc/x11/py-wxPython/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/py-wxPython/distinfo
cvs diff -r1.6 -r1.7 pkgsrc/x11/py-wxPython/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-wxPython/Makefile 2023/11/14 14:03:19 1.6
+++ pkgsrc/x11/py-wxPython/Makefile 2023/11/20 00:07:41 1.7
@@ -1,38 +1,44 @@ @@ -1,38 +1,44 @@
1# $NetBSD: Makefile,v 1.6 2023/11/14 14:03:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2023/11/20 00:07:41 gdt Exp $
2 2
3DISTNAME= wxPython-4.2.1 3DISTNAME= wxPython-4.2.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_PYPI:=w/wxPython/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=w/wxPython/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wxpython.org/pages/downloads/ 10HOMEPAGE= https://wxpython.org/pages/downloads/
11COMMENT= GUI Toolkit for Python 11COMMENT= GUI Toolkit for Python
12# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows 12# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows
13LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
14 14
15DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy 15DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
16DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow 16DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
17DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 17DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
18 18
19PYTHON_VERSIONS_INCOMPATIBLE= 27 38 19PYTHON_VERSIONS_INCOMPATIBLE= 27 38
20USE_LANGUAGES+= c c++ 20USE_LANGUAGES+= c c++
21USE_TOOLS+= pkg-config 21USE_TOOLS+= pkg-config
22MAKE_ENV+= WX_CONFIG=wx-config-3.2 22MAKE_ENV+= WX_CONFIG=wx-config-3.2
23PYDISTUTILSPKG= no 23PYDISTUTILSPKG= no
24 24
 25TOOL_DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
 26
25BUILD_ARGS+= --use_syswx 27BUILD_ARGS+= --use_syswx
26BUILD_ARGS+= --prefix=${PREFIX} 28BUILD_ARGS+= --prefix=${PREFIX}
27BUILD_ARGS+= --destdir=${DESTDIR} 29BUILD_ARGS+= --destdir=${DESTDIR}
28 30
 31post-patch:
 32 # upstream (incorrectly) installs patch .orig files
 33 ${RM} -f ${WRKSRC}/wx/svg/_nanosvg.pyx.orig
 34
29do-build: 35do-build:
30 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py ${BUILD_ARGS} build_py 36 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py ${BUILD_ARGS} build_py
31 37
32do-install: 38do-install:
33 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} build.py ${BUILD_ARGS} install_py 39 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} build.py ${BUILD_ARGS} install_py
34 40
35.include "../../x11/wxGTK32/buildlink3.mk" 41.include "../../x11/wxGTK32/buildlink3.mk"
36.include "../../x11/gtk3/buildlink3.mk" 42.include "../../x11/gtk3/buildlink3.mk"
37.include "../../lang/python/egg.mk" 43.include "../../lang/python/egg.mk"
38.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/x11/py-wxPython/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-wxPython/distinfo 2023/06/26 20:53:23 1.1
+++ pkgsrc/x11/py-wxPython/distinfo 2023/11/20 00:07:41 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1 2023/06/26 20:53:23 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2023/11/20 00:07:41 gdt Exp $
2 2
3BLAKE2s (wxPython-4.2.1.tar.gz) = 12a049858c1d3c9764c31dad1476d8b9685ebebb9b708b4eb363129e02667fb9 3BLAKE2s (wxPython-4.2.1.tar.gz) = 12a049858c1d3c9764c31dad1476d8b9685ebebb9b708b4eb363129e02667fb9
4SHA512 (wxPython-4.2.1.tar.gz) = ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438 4SHA512 (wxPython-4.2.1.tar.gz) = ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438
5Size (wxPython-4.2.1.tar.gz) = 73724359 bytes 5Size (wxPython-4.2.1.tar.gz) = 73724359 bytes
 6SHA1 (patch-wx_svg___nanosvg.pyx) = f87fbd2d96a0f26b95524d0fd83bca4f1eed287d