CVS commit: pkgsrc/x11/py-wxPython

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Nov 20 00:07:41 UTC 2023

Modified Files:
        pkgsrc/x11/py-wxPython: Makefile distinfo

Log Message:
x11/py-wxPython: Cherry-pick upstream fix for cython 3.0.0 API withdrawal


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/py-wxPython/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/py-wxPython/distinfo

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

Modified files:

Index: pkgsrc/x11/py-wxPython/Makefile
diff -u pkgsrc/x11/py-wxPython/Makefile:1.6 pkgsrc/x11/py-wxPython/Makefile:1.7
--- pkgsrc/x11/py-wxPython/Makefile:1.6 Tue Nov 14 14:03:19 2023
+++ pkgsrc/x11/py-wxPython/Makefile     Mon Nov 20 00:07:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/11/14 14:03:19 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2023/11/20 00:07:41 gdt Exp $
 
 DISTNAME=      wxPython-4.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,10 +22,16 @@ USE_TOOLS+=                 pkg-config
 MAKE_ENV+=                     WX_CONFIG=wx-config-3.2
 PYDISTUTILSPKG=                        no
 
+TOOL_DEPENDS+=                 ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
+
 BUILD_ARGS+=                   --use_syswx
 BUILD_ARGS+=                   --prefix=${PREFIX}
 BUILD_ARGS+=                   --destdir=${DESTDIR}
 
+post-patch:
+       # upstream (incorrectly) installs patch .orig files
+       ${RM} -f ${WRKSRC}/wx/svg/_nanosvg.pyx.orig
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py ${BUILD_ARGS} build_py
 

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