Details

Reviewers

mr
cmt
yuri
bofh
thierry

Group Reviewers

portmgr

Commits

R11:337a99bc8b23: x11-toolkits/py-wxPython4: Update to 4.1

Summary

Import py-wxPython41
Fix wxgtk31 for string (as for wxgtk30: wxPython requires

unicode/std-string and not utf8)

Use wxPython41 and bump to wxgtk31

Some words for kicad*:

Since wxgtk31 uses gl, I have to enable KICAD_USE_EGL.
But for devel/kicad, I disable KICAD_USE_BUNDLED_GLEW to use

system GLEW and I need to link to graphics/glew-wayland for
include/GL/eglew.h

Questions:

Shall I remove py-wxPython40?
Or, is py-wxPython40 should be renamed py-wxPython and bump to 4.1?

Test Plan

poudriere 13amd64
local exp-run
test ports

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

lbartoletti created this revision.Jan 28 2022, 1:27 PM

Herald added a reviewer: portmgr. · View Herald TranscriptJan 28 2022, 1:27 PM

Herald added subscribers: Contributor Reviewers (ports), mat. · View Herald Transcript

lbartoletti requested review of this revision.Jan 28 2022, 1:27 PM

Harbormaster completed remote builds in B44144: Diff 102049.Jan 28 2022, 1:27 PM

lbartoletti added reviewers: mr, cmt, yuri, bofh, thierry.Jan 28 2022, 1:31 PM

tcberner added a subscriber: tcberner.Jan 28 2022, 3:06 PM

tcberner added inline comments.

Mk/bsd.wx.mk
140–141	^3.1, not 4.1?

tcberner added inline comments.Jan 28 2022, 3:09 PM

cad/kicad-devel/Makefile
71	would possibly be nicer using `CMAKE_ON`
x11-toolkits/py-wxPython41/Makefile
22 ↗	(On Diff #102049)	TODO: `USE_WX` -- remove `bsd.wx.mk` and create `Mk/Uses/wx.mk`

lbartoletti added inline comments.Jan 28 2022, 5:16 PM

Mk/bsd.wx.mk
140–141	Yes, it's (tricky and it's) for wxgtk3.1
cad/kicad-devel/Makefile
71	You're right of course ;) I didn't want to rewrite the Makefile (for now)
x11-toolkits/py-wxPython41/Makefile
22 ↗	(On Diff #102049)	Ah! Yes! I wondered why it wasn't `Mk/Uses/wx.mk`

yuri accepted this revision.Jan 28 2022, 5:35 PM

bofh accepted this revision.Jan 28 2022, 5:40 PM

lgtm, but you should include portrevision bumps for the ports that have their USE_WX bumped.

This revision is now accepted and ready to land.Jan 28 2022, 5:59 PM

Thanks. And for my questions? What's your preference?

In D34080#770789, @lbartoletti wrote:

Thanks. And for my questions? What's your preference?

@tcberner and others gentle ping :)

Shall I remove py-wxPython40?
Or, is py-wxPython40 should be renamed py-wxPython and bump to 4.1?

py-wxPython40 will no longer be used after this PR.

Moin moin

Thanks for the reminder.

If there is no reason to have multiple wxPthon4* ports I would suggest to only keep one -- and rename it to something stable under minor upgrades, like x11-toolkits/py-wxPython4 -- if that naming makes sense in the context :) or even x11-toolkits/py-wxPython.

mfg Tobias

In D34080#775209, @tcberner wrote:

Moin moin

Thanks for the reminder.

If there is no reason to have multiple wxPthon4* ports I would suggest to only keep one -- and rename it to something stable under minor upgrades, like x11-toolkits/py-wxPython4 -- if that naming makes sense in the context :) or even x11-toolkits/py-wxPython.

mfg Tobias

Thanks, it will be x11-toolkits/py-wxPython4

remove py-wxPython40 and rename 41 to 4
Add MOVED

This revision now requires review to proceed.Feb 24 2022, 3:17 PM

Harbormaster completed remote builds in B44565: Diff 103197.Feb 24 2022, 3:18 PM

lbartoletti retitled this revision from [WIP] x11-toolkits/py-wxPython41: Add new port and use it as default wx python to x11-toolkits/py-wxPython41: Add new port and use it as default wx python.Feb 24 2022, 3:20 PM

You could also create an UPDATING entry with the proper pkg-command to ease the upgrade path.