From ee378dacefef8ce319bfd30042ba8f53f6725569 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 16 Nov 2024 09:27:01 -0500 Subject: [PATCH] wxPython: rebuild for python3-3.13 --- srcpkgs/wxPython/patches/wxsvg-cython.patch | 12 ++++++++++++ srcpkgs/wxPython/template | 9 +++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/wxPython/patches/wxsvg-cython.patch diff --git a/srcpkgs/wxPython/patches/wxsvg-cython.patch b/srcpkgs/wxPython/patches/wxsvg-cython.patch new file mode 100644 index 00000000000..0876d61c429 --- /dev/null +++ b/srcpkgs/wxPython/patches/wxsvg-cython.patch @@ -0,0 +1,12 @@ +The only thing preventing use of Cython 3 is an unused, invalid import. + +--- a/wx/svg/_nanosvg.pyx ++++ b/wx/svg/_nanosvg.pyx +@@ -42,7 +42,6 @@ + + import sys + +-cimport cython.object + from cpython.buffer cimport ( + Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE, + PyBuffer_Release) diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template index 0d29630771a..0ab2d5a2b9b 100644 --- a/srcpkgs/wxPython/template +++ b/srcpkgs/wxPython/template @@ -1,11 +1,11 @@ # Template file for 'wxPython' pkgname=wxPython version=4.2.1 -revision=5 +revision=6 build_style=python3-module make_build_args="--skip-build" make_install_args="--skip-build" -hostmakedepends="pkg-config python3-setuptools python3-pathlib2 python3-Cython0.29" +hostmakedepends="pkg-config python3-setuptools python3-Cython" makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel gst-plugins-base1-devel" depends="python3-six" @@ -32,6 +32,7 @@ post_patch() { pre_build() { chmod -R go+rX $wrksrc + PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}$wrksrc" if [ "$CROSS_BUILD" ]; then PYPREFIX="$XBPS_CROSS_BASE" @@ -39,9 +40,9 @@ pre_build() { CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS" env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" \ - LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx + PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + python3 build.py build_py --use_syswx else python3 build.py build_py --use_syswx fi