Date: Mon, 26 Jan 2026 18:50:14 +0000 From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b5e003c2fda1 - main - x11-toolkits/py-wxpython: rename and update to 4.2.4 Message-ID: <6977b766.b502.6aeb2ad5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5e003c2fda1d616881907800ea84089e618981f commit b5e003c2fda1d616881907800ea84089e618981f Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2026-01-26 18:38:35 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2026-01-26 18:43:48 +0000 x11-toolkits/py-wxpython: rename and update to 4.2.4 Changelog: https://www.wxpython.org/news/2025-10-28-wxpython-424-release/index.html - now builds under USE_PYTHON=pep517 - future-proof for setuptools update - sync dependencies - expose test suite Event: Winter Field Day 2026 --- MOVED | 1 + Mk/bsd.wx.mk | 2 +- x11-toolkits/Makefile | 2 +- x11-toolkits/py-wxPython4/Makefile | 40 --------------- x11-toolkits/py-wxPython4/distinfo | 3 -- x11-toolkits/py-wxPython4/files/patch-setup.py | 11 ---- x11-toolkits/py-wxpython/Makefile | 58 ++++++++++++++++++++++ x11-toolkits/py-wxpython/distinfo | 5 ++ .../files/patch-build.py | 6 +-- .../py-wxpython/files/patch-pyproject.toml | 20 ++++++++ x11-toolkits/py-wxpython/files/patch-setup.py | 16 ++++++ .../{py-wxPython4 => py-wxpython}/pkg-descr | 0 12 files changed, 105 insertions(+), 59 deletions(-) diff --git a/MOVED b/MOVED index 6b078f6cb147..bfd46b61cf81 100644 --- a/MOVED +++ b/MOVED @@ -5087,3 +5087,4 @@ devel/tcl9-thread|devel/tcl-thread|2026-01-19|The new tcl-thread port supports b java/jta||2026-01-19|Has expired: manual download, no users in the ports tree, newer version is at https://github.com/jakartaee/transactions multimedia/ccextractor-gui||2026-01-20|Superseeded by flutter GUI, which we do not support x11-fonts/open-sans|x11-fonts/opensans-ttf|2026-01-24|Rename to match upstream naming +x11-toolkits/py-wxPython4|x11-toolkits/py-wxpython|2026-01-26|Normalise and match Python package name diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk index bbf84d1b1283..a8fee7b6f751 100644 --- a/Mk/bsd.wx.mk +++ b/Mk/bsd.wx.mk @@ -127,7 +127,7 @@ _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED _WX_PORT_wx_3.0= x11-toolkits/wxgtk30@${_GTKFLAVOR} _WX_LIB_wx_3.0= wx_baseu-3.0 -_WX_PORT_python_3.2= x11-toolkits/py-wxPython4@${PY_FLAVOR} +_WX_PORT_python_3.2= x11-toolkits/py-wxpython@${PY_FLAVOR} _WX_FILE_python_3.2= ${PYTHON_SITELIBDIR}/wx/__init__.py # wxgtk 3.2 diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index b7b1912bc431..a6670b4701a6 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -194,7 +194,7 @@ SUBDIR += py-superqt SUBDIR += py-tkinter SUBDIR += py-tktreectrl - SUBDIR += py-wxPython4 + SUBDIR += py-wxpython SUBDIR += pythonqt SUBDIR += qhotkey SUBDIR += qml-box2d diff --git a/x11-toolkits/py-wxPython4/Makefile b/x11-toolkits/py-wxPython4/Makefile deleted file mode 100644 index 5655d2574f91..000000000000 --- a/x11-toolkits/py-wxPython4/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -PORTNAME= wxPython -PORTVERSION= 4.2.3 -CATEGORIES= x11-toolkits python -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 42 -DIST_SUBDIR= python - -MAINTAINER= desktop@FreeBSD.org -COMMENT= GUI toolkit for the Python programming language -WWW= https://www.wxpython.org - -LICENSE= WXWINDOWS LGPL21+ GPLv2+ -LICENSE_COMB= multi -LICENSE_NAME_WXWINDOWS= wxWindows Library Licence, Version 3.1 -LICENSE_FILE_WXWINDOWS= ${WRKSRC}/license/licence.txt -LICENSE_PERMS_WXWINDOWS= dist-mirror pkg-mirror auto-accept - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR} \ - ${PKGNAMEPREFIX}requests>=2.28.1:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PKGNAMEPREFIX}requests>=2.28.1:www/py-requests@${PY_FLAVOR} - -USES= compiler:c++11-lib gl localbase pkgconfig python -USE_GL= glu -USE_WX= 3.2 -USE_PYTHON= autoplist distutils - -OPTIONS_DEFINE= NLS - -NLS_USES= gettext - -post-patch: - @${REINPLACE_CMD} -e "s|WX_CONFIG = 'wx-config'|WX_CONFIG = '${WX_CONFIG}'|" ${WRKSRC}/build.py - -post-install: - ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx -name *.so -exec ${STRIP_CMD} {} + - -.include <bsd.port.mk> diff --git a/x11-toolkits/py-wxPython4/distinfo b/x11-toolkits/py-wxPython4/distinfo deleted file mode 100644 index e08eb2d2eddc..000000000000 --- a/x11-toolkits/py-wxPython4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1766213363 -SHA256 (python/wxPython-4.2.3.tar.gz) = 20d6e0c927e27ced85643719bd63e9f7fd501df6e9a8aab1489b039897fd7c01 -SIZE (python/wxPython-4.2.3.tar.gz) = 58861286 diff --git a/x11-toolkits/py-wxPython4/files/patch-setup.py b/x11-toolkits/py-wxPython4/files/patch-setup.py deleted file mode 100644 index 8222dfc10e39..000000000000 --- a/x11-toolkits/py-wxPython4/files/patch-setup.py +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2024-11-05 05:01:05 UTC -+++ setup.py -@@ -18,7 +18,7 @@ from distutils.command.build import build as or - from setuptools.command.install import install as orig_install - from setuptools.command.bdist_egg import bdist_egg as orig_bdist_egg - from setuptools.command.sdist import sdist as orig_sdist --from setuptools.command.bdist_wheel import bdist_wheel as orig_bdist_wheel -+from wheel.bdist_wheel import bdist_wheel as orig_bdist_wheel - - from buildtools.config import Config, msg, opj, runcmd, canGetSOName, getSOName - import buildtools.version as version diff --git a/x11-toolkits/py-wxpython/Makefile b/x11-toolkits/py-wxpython/Makefile new file mode 100644 index 000000000000..154dc821b438 --- /dev/null +++ b/x11-toolkits/py-wxpython/Makefile @@ -0,0 +1,58 @@ +PORTNAME= wxpython +DISTVERSION= 4.2.4 +CATEGORIES= x11-toolkits python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DIST_SUBDIR= python + +PATCH_SITES= https://github.com/wxWidgets/Phoenix/commit/ +PATCHFILES= afddb14f78b08a576930babd4dc645d8f3f94701.patch:-p1 + +MAINTAINER= desktop@FreeBSD.org +COMMENT= GUI toolkit for the Python programming language +WWW= https://www.wxpython.org + +LICENSE= WXWINDOWS LGPL21+ GPLv2+ +LICENSE_COMB= multi +LICENSE_NAME_WXWINDOWS= wxWindows Library Licence, Version 3.1 +LICENSE_FILE_WXWINDOWS= ${WRKSRC}/license/licence.txt +LICENSE_PERMS_WXWINDOWS= dist-mirror pkg-mirror auto-accept + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \ + ${PY_TYPING_EXTENSIONS} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=0:devel/py-appdirs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-forked>=0:devel/py-pytest-forked@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jquery>=0:textproc/py-sphinxcontrib-jquery@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \ + ${PY_TYPING_EXTENSIONS} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} + +USES= compiler:c++11-lib localbase pkgconfig pyqt:6 python +USE_WX= 3.2 +USE_PYQT= sip:build sip:test +USE_PYTHON= autoplist cython pep517 pytest + +WRKSRC= ${WRKDIR}/wxPython-${DISTVERSION} + +# https://github.com/wxWidgets/Phoenix/issues/2819 +PEP517_BUILD_CMD= ${LOCALBASE}/bin/pyproject-build-${PYTHON_VER} --no-isolation --wheel ${PEP517_BUILD_CONFIG_SETTING} + +OPTIONS_DEFINE= NLS + +NLS_USES= gettext + +post-patch: + @${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG:T}|g' ${WRKSRC}/build.py + @${REINPLACE_CMD} -e 's|sip == 6.12.0|sip >= 6.12.0|' ${WRKSRC}/pyproject.toml + +post-install: + ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/wx -name "*.so" -exec ${STRIP_CMD} {} + + +.include <bsd.port.mk> diff --git a/x11-toolkits/py-wxpython/distinfo b/x11-toolkits/py-wxpython/distinfo new file mode 100644 index 000000000000..cd5e0fab824a --- /dev/null +++ b/x11-toolkits/py-wxpython/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1769400596 +SHA256 (python/wxpython-4.2.4.tar.gz) = 2eb123979c87bcb329e8a2452269d60ff8f9f651e9bf25c67579e53c4ebbae3c +SIZE (python/wxpython-4.2.4.tar.gz) = 58583054 +SHA256 (python/afddb14f78b08a576930babd4dc645d8f3f94701.patch) = 5f799a5507b56892e5a2160dd4f704e9606e6497392d93937e68637e7b51bf83 +SIZE (python/afddb14f78b08a576930babd4dc645d8f3f94701.patch) = 4990 diff --git a/x11-toolkits/py-wxPython4/files/patch-build.py b/x11-toolkits/py-wxpython/files/patch-build.py similarity index 75% rename from x11-toolkits/py-wxPython4/files/patch-build.py rename to x11-toolkits/py-wxpython/files/patch-build.py index 24b88f7e93ef..193d72c71ef8 100644 --- a/x11-toolkits/py-wxPython4/files/patch-build.py +++ b/x11-toolkits/py-wxpython/files/patch-build.py @@ -1,11 +1,11 @@ ---- build.py.orig 2019-05-21 23:12:12 UTC +--- build.py.orig 2025-10-29 00:38:50 UTC +++ build.py -@@ -401,7 +401,7 @@ def makeOptionParser(): +@@ -423,7 +423,7 @@ def makeOptionParser(): ("mac_framework", (False, "Build wxWidgets as a Mac framework.")), ("mac_arch", ("", "Comma separated list of architectures to build on Mac")), - ("use_syswx", (False, "Try to use an installed wx rather than building the " -+ ("use_syswx", (True, "Try to use an installed wx rather than building the " ++ ("use_syswx", (True, "Try to use an installed wx rather than building the " "one in this source tree. The wx-config in {prefix}/bin " "or the first found on the PATH determines which wx is " "used. Implies --no_magic.")), diff --git a/x11-toolkits/py-wxpython/files/patch-pyproject.toml b/x11-toolkits/py-wxpython/files/patch-pyproject.toml new file mode 100644 index 000000000000..6796bf577030 --- /dev/null +++ b/x11-toolkits/py-wxpython/files/patch-pyproject.toml @@ -0,0 +1,20 @@ +remove after setuptools update past 70.1 + +--- pyproject.toml.orig 2025-10-29 00:38:50 UTC ++++ pyproject.toml +@@ -1,5 +1,5 @@ + [project] +-name = "wxPython" ++name = "wxpython" + description = "Cross platform GUI toolkit for Python, \"Phoenix\" version" + requires-python = ">= 3.9" + authors = [ +@@ -71,7 +71,7 @@ requires = [ + + [build-system] + requires = [ +- "setuptools>=70.1", ++ "setuptools", + "cython >= 3.0.10", + "requests >= 2.26.0", + "sip == 6.12.0", diff --git a/x11-toolkits/py-wxpython/files/patch-setup.py b/x11-toolkits/py-wxpython/files/patch-setup.py new file mode 100644 index 000000000000..53c4fa7d5356 --- /dev/null +++ b/x11-toolkits/py-wxpython/files/patch-setup.py @@ -0,0 +1,16 @@ +remove after setuptools update past 70.1 + +--- setup.py.orig 2025-10-29 00:38:50 UTC ++++ setup.py +@@ -18,7 +18,10 @@ from setuptools.command.sdist import sdist as or + from setuptools.command.install import install as orig_install + from setuptools.command.bdist_egg import bdist_egg as orig_bdist_egg + from setuptools.command.sdist import sdist as orig_sdist +-from setuptools.command.bdist_wheel import bdist_wheel as orig_bdist_wheel ++try: ++ from setuptools.command.bdist_wheel import bdist_wheel as orig_bdist_wheel ++except ImportError: ++ from wheel.bdist_wheel import bdist_wheel as orig_bdist_wheel + + # Alter the path so that buildtools can be imported from the current directory. + sys.path.insert(0, os.path.dirname(__file__)) diff --git a/x11-toolkits/py-wxPython4/pkg-descr b/x11-toolkits/py-wxpython/pkg-descr similarity index 100% rename from x11-toolkits/py-wxPython4/pkg-descr rename to x11-toolkits/py-wxpython/pkg-descrhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6977b766.b502.6aeb2ad5>