From: Stuart Henderson Subject: Re: UPDATE: x11/qt6 and python ecosystem To: Rafael Sadowski Cc: ports@openbsd.org Date: Thu, 27 Nov 2025 15:25:35 +0000 On 2025/11/27 16:06, Rafael Sadowski wrote: > Here is a diff that updates your huge Qt6 ecosystem to the latest > upstream version 6.10.1. This diff includes the whole py-*,sip ecosystem. > > - qt6 and pyside 6.10.1 (incl. qtwebengine) > - py-qt-builder 1.19.0 > - py-sip 6.14.0 > - py-qt6webengine 6.10.0 > - py-qt5-sip 12.17.1 > - py-qt6-sip 13.10.2 > - py-qt5 / py-qscintilla (bump after PLIST change ( I guess for py-sip) > - py-qt6 6.10.0 > > Runtime test with qgis, freecad, KDE, upcoming KDE plasam 6.5 / kf6.20. > > Feedback and reviews welcome. (diff below is without qtwebengine > as I don't expect anyone to want to read it in-line. It's in > the tarball) not tested, but reading through py-* from this, most things look ok > diff --git a/x11/qt6/pyside6/pyside/patches/patch-sources_pyside6_libpyside_PySide6Config-spec_cmake_in b/x11/qt6/pyside6/pyside/patches/patch-sources_pyside6_libpyside_PySide6Config-spec_cmake_in > new file mode 100644 > index 00000000000..d81b355b46d > --- /dev/null > +++ b/x11/qt6/pyside6/pyside/patches/patch-sources_pyside6_libpyside_PySide6Config-spec_cmake_in > @@ -0,0 +1,11 @@ > +Index: sources/pyside6/libpyside/PySide6Config-spec.cmake.in > +--- sources/pyside6/libpyside/PySide6Config-spec.cmake.in.orig > ++++ sources/pyside6/libpyside/PySide6Config-spec.cmake.in > +@@ -16,5 +16,5 @@ set(PYSIDE_SO_VERSION "@pyside6_library_so_version@") > + > + # Set relocatable variables. > + set_and_check(PYSIDE_PYTHONPATH "@PACKAGE_PYSIDE_PYTHONPATH@") > +-set_and_check(PYSIDE_TYPESYSTEMS "@PACKAGE_PYSIDE_TYPESYSTEMS@") > +-set_and_check(PYSIDE_GLUE "@PACKAGE_PYSIDE_GLUE@") > ++set_and_check(PYSIDE_TYPESYSTEMS "${LOCALBASE}/share/PySide6/typesystems") > ++set_and_check(PYSIDE_GLUE "${LOCALBASE}/share/PySide6/glue") these refer to files coming from the package which is currently built, so should be TRUEPREFIX or PREFIX not LOCALBASE > diff --git a/x11/qt6/pyside6/shiboken/pkg/PLIST b/x11/qt6/pyside6/shiboken/pkg/PLIST > index f3ea636c5b5..bbeba8d256c 100644 > --- a/x11/qt6/pyside6/shiboken/pkg/PLIST > +++ b/x11/qt6/pyside6/shiboken/pkg/PLIST > @@ -1,41 +1,5 @@ > @bin bin/shiboken6 > bin/shiboken_tool.py > -include/shiboken6/ > -include/shiboken6/autodecref.h > -include/shiboken6/basewrapper.h > -include/shiboken6/basewrapper_p.h > -include/shiboken6/bindingmanager.h > -include/shiboken6/bufferprocs_py37.h > -include/shiboken6/gilstate.h > -include/shiboken6/helper.h > -include/shiboken6/pep384ext.h > -include/shiboken6/pep384impl.h > -include/shiboken6/pyobjectholder.h > -include/shiboken6/sbkarrayconverter.h > -include/shiboken6/sbkcontainer.h > -include/shiboken6/sbkconverter.h > -include/shiboken6/sbkcppstring.h > -include/shiboken6/sbkcpptonumpy.h > -include/shiboken6/sbkenum.h > -include/shiboken6/sbkerrors.h > -include/shiboken6/sbkfeature_base.h > -include/shiboken6/sbkmodule.h > -include/shiboken6/sbknumpycheck.h > -include/shiboken6/sbknumpyview.h > -include/shiboken6/sbkpython.h > -include/shiboken6/sbksmartpointer.h > -include/shiboken6/sbkstaticstrings.h > -include/shiboken6/sbkstring.h > -include/shiboken6/sbktypefactory.h > -include/shiboken6/sbkversion.h > -include/shiboken6/sbkwindows.h > -include/shiboken6/shiboken.h > -include/shiboken6/shibokenbuffer.h > -include/shiboken6/shibokenmacros.h > -include/shiboken6/signature.h > -include/shiboken6/signature_p.h > -include/shiboken6/threadstatesaver.h > -include/shiboken6/voidptr.h > lib/cmake/Shiboken6/ > lib/cmake/Shiboken6/Shiboken6Config${MODPY_ABI3SO}.cmake > lib/cmake/Shiboken6/Shiboken6Config.cmake > @@ -46,6 +10,7 @@ lib/cmake/Shiboken6/ShibokenHelpers.cmake > lib/cmake/Shiboken6Tools/ > lib/cmake/Shiboken6Tools/Shiboken6ToolsConfig.cmake > lib/cmake/Shiboken6Tools/Shiboken6ToolsConfigVersion.cmake > +lib/cmake/Shiboken6Tools/Shiboken6ToolsMacros.cmake > lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets${MODCMAKE_BUILD_SUFFIX} > lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake > @lib lib/libshiboken6${MODPY_ABI3SO}.so.${LIBshiboken6${MODPY_ABI3SO}_VERSION} > @@ -75,3 +40,55 @@ lib/python${MODPY_VERSION}/site-packages/shiboken6_generator/${MODPY_PYCACHE}_gi > lib/python${MODPY_VERSION}/site-packages/shiboken6_generator/${MODPY_PYCACHE}_git_shiboken_generator_version.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/shiboken6_generator/_config.py > lib/python${MODPY_VERSION}/site-packages/shiboken6_generator/_git_shiboken_generator_version.py > +lib/wheels/ > +lib/wheels/cmake/ > +lib/wheels/cmake/Shiboken6/ > +lib/wheels/cmake/Shiboken6/Shiboken6Targets${MODCMAKE_BUILD_SUFFIX} > +lib/wheels/cmake/Shiboken6/Shiboken6Targets.cmake > +lib/wheels/cmake/Shiboken6Tools/ > +lib/wheels/cmake/Shiboken6Tools/Shiboken6ToolsTargets${MODCMAKE_BUILD_SUFFIX} > +lib/wheels/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake lib/wheels/cmake seems strange > +shiboken6/ > +shiboken6/include/ > +shiboken6/include/autodecref.h > +shiboken6/include/basewrapper.h > +shiboken6/include/basewrapper_p.h > +shiboken6/include/bindingmanager.h > +shiboken6/include/bufferprocs_py37.h > +shiboken6/include/gilstate.h > +shiboken6/include/helper.h > +shiboken6/include/pep384ext.h > +shiboken6/include/pep384impl.h > +shiboken6/include/pyobjectholder.h > +shiboken6/include/sbkarrayconverter.h > +shiboken6/include/sbkbindingutils.h > +shiboken6/include/sbkcontainer.h > +shiboken6/include/sbkconverter.h > +shiboken6/include/sbkcppstring.h > +shiboken6/include/sbkcpptonumpy.h > +shiboken6/include/sbkenum.h > +shiboken6/include/sbkerrors.h > +shiboken6/include/sbkfeature_base.h > +shiboken6/include/sbkmodule.h > +shiboken6/include/sbkmodule_p.h > +shiboken6/include/sbknumpycheck.h > +shiboken6/include/sbknumpyview.h > +shiboken6/include/sbkpep.h > +shiboken6/include/sbkpepbuffer.h > +shiboken6/include/sbkpython.h > +shiboken6/include/sbksmartpointer.h > +shiboken6/include/sbkstaticstrings.h > +shiboken6/include/sbkstring.h > +shiboken6/include/sbktypefactory.h > +shiboken6/include/sbkversion.h > +shiboken6/include/sbkwindows.h > +shiboken6/include/shiboken.h > +shiboken6/include/shibokenbuffer.h > +shiboken6/include/shibokenmacros.h > +shiboken6/include/signature.h > +shiboken6/include/signature_p.h > +shiboken6/include/threadstatesaver.h > +shiboken6/include/voidptr.h can this not use include/shiboken6/ like normal ports? > +@lib shiboken6/libshiboken6${MODPY_ABI3SO}.so.${LIBshiboken6${MODPY_ABI3SO}_VERSION} so it has this in /usr/local/shiboken6, and there's also a copy in /usr/local/lib, but seems like a Python extension which is also installed in the correct dir lib/python${MODPY_VERSION}/site-packages/shiboken6/Shiboken${MODPY_ABI3SO}.so any idea what's going on there? does it want some rm/@comment or something else?