devel/py-qt6-pyqt: Update to 6.8.1

Support for the QtStateMachine module has been added.

Restrict QtPdf[Widgets] bindings to archs supported by print/qt6-pdf.
These really should be split out into a separate port along with a few
other lesser used bindings, but this is an intermediate step towards
better support for Tier 2 archs.

https://www.riverbankcomputing.com/news/PyQt_v6.8.1_Released

MFH:		2025Q1

5 files changed, 48 insertions, 43 deletions

diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 786ef6fb34f5..5cfa88989130 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -123,7 +123,7 @@ PYQT5WEBENGINE_VERSION=		5.15.7
 
 # Qt 6 components
 PYQT6SIP_VERSION=		13.10.0
-PYQT6_VERSION=			6.8.0
+PYQT6_VERSION=			6.8.1
 PYQT63D_VERSION=		6.8.0
 PYQT6CHARTS_VERSION=		6.8.0
 PYQT6DATAVIS3D_VERSION=		6.8.0
@@ -146,7 +146,7 @@ PYQT5WEBENGINE_DISTNAME=	PyQtWebEngine-${PYQT5WEBENGINE_VERSION}
 
 # Qt 6 components
 PYQT6SIP_DISTNAME=		pyqt6_sip-${PYQT6SIP_VERSION}
-PYQT6_DISTNAME=			PyQt6-${PYQT6_VERSION}
+PYQT6_DISTNAME=			pyqt6-${PYQT6_VERSION}
 PYQT63D_DISTNAME=		PyQt6_3D-${PYQT63D_VERSION}
 PYQT6CHARTS_DISTNAME=		PyQt6_Charts-${PYQT6CHARTS_VERSION}
 PYQT6DATAVIS3D_DISTNAME=	PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION}
diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
index 9a250a05ba86..b1aa11a0004b 100644
--- a/devel/py-qt6-pyqt/Makefile
+++ b/devel/py-qt6-pyqt/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pyqt
 DISTVERSION=	${PYQT_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
@@ -21,11 +20,21 @@ USE_GL=		opengl
 USE_PYQT=	pysip qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		base connectivity declarative imageformats multimedia \
-		pdf positioning quick3d remoteobjects sensors serialport \
+		positioning quick3d remoteobjects scxml sensors serialport \
 		shadertools speech svg tools translations webchannel \
 		websockets
 
-PORTSCOUT?=	limit:^${_QT_VERSION:R}
+PORTSCOUT=	limit:^${_QT_VERSION:R}
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386
+USE_QT+=	pdf
+PLIST_SUB+=	PDF=""
+.else
+SIP_ARGS+=	--disable QtPdf --disable QtPdfWidgets
+PLIST_SUB+=	PDF="@comment "
+.endif
 
 post-extract:
 	${RM} -r ${WRKSRC}/pyuic/uic/port_v2
@@ -40,4 +49,4 @@ post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo
index cfe39113ff75..67bd2fe59402 100644
--- a/devel/py-qt6-pyqt/distinfo
+++ b/devel/py-qt6-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733628605
-SHA256 (PyQt6-6.8.0.tar.gz) = 6d8628de4c2a050f0b74462e4c9cb97f839bf6ffabbca91711722ffb281570d9
-SIZE (PyQt6-6.8.0.tar.gz) = 1061357
+TIMESTAMP = 1739071690
+SHA256 (pyqt6-6.8.1.tar.gz) = 91d937d6166274fafd70f4dee11a8da6dbfdb0da53de05f5d62361ddf775e256
+SIZE (pyqt6-6.8.1.tar.gz) = 1064723
diff --git a/devel/py-qt6-pyqt/files/patch-sip_QtCore_qstringconverter__base.sip b/devel/py-qt6-pyqt/files/patch-sip_QtCore_qstringconverter__base.sip
deleted file mode 100644
index 700296f903bb..000000000000
--- a/devel/py-qt6-pyqt/files/patch-sip_QtCore_qstringconverter__base.sip
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix build with Qt 6.8.2
-
-/wrkdirs/usr/ports/devel/py-qt6-pyqt/work-py311/PyQt6-6.8.0/build/QtCore/sipQtCoreQStringConverterBase.cpp:58:26:
-error: call to implicitly-deleted copy constructor of '::QStringConvert
-   58 |             sipCpp = new ::QStringConverterBase(*a0);
-
---- sip/QtCore/qstringconverter_base.sip.orig	2024-12-06 14:41:44 UTC
-+++ sip/QtCore/qstringconverter_base.sip
-@@ -22,7 +22,7 @@
- 
- %If (Qt_6_4_0 -)
- 
--class QStringConverterBase
-+class QStringConverterBase /NoDefaultCtors/
- {
- %TypeHeaderCode
- #include <qstringconverter_base.h>
diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist
index e51a14d4b7f9..85c21a7d65af 100644
--- a/devel/py-qt6-pyqt/pkg-plist
+++ b/devel/py-qt6-pyqt/pkg-plist
@@ -18,8 +18,8 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/QtNfc.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtOpenGL.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtOpenGLWidgets.abi%%PYTHON_MAJOR_VER%%.so
-%%PYTHON_SITELIBDIR%%/PyQt6/QtPdf.abi%%PYTHON_MAJOR_VER%%.so
-%%PYTHON_SITELIBDIR%%/PyQt6/QtPdfWidgets.abi%%PYTHON_MAJOR_VER%%.so
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/QtPdf.abi%%PYTHON_MAJOR_VER%%.so
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/QtPdfWidgets.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtPositioning.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtPrintSupport.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtQml.abi%%PYTHON_MAJOR_VER%%.so
@@ -31,6 +31,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/QtSerialPort.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtSpatialAudio.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtSql.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt6/QtStateMachine.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtSvg.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtSvgWidgets.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtTest.abi%%PYTHON_MAJOR_VER%%.so
@@ -482,21 +483,21 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/QtOpenGLWidgets.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/QtOpenGLWidgetsmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/qopenglwidget.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdf.toml
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdfmod.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfbookmarkmodel.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocument.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocumentrenderoptions.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflink.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflinkmodel.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagenavigator.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagerenderer.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfsearchmodel.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfselection.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgets.toml
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgetsmod.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfpageselector.sip
-%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfview.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdf.toml
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdfmod.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfbookmarkmodel.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocument.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocumentrenderoptions.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflink.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflinkmodel.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagenavigator.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagerenderer.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfsearchmodel.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfselection.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgets.toml
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgetsmod.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfpageselector.sip
+%%PDF%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfview.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioning.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioningmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/qgeoaddress.sip
@@ -648,6 +649,18 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSql/qsqlresult.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSql/qsqltablemodel.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSql/qtsqlglobal.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/QtStateMachine.toml
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/QtStateMachinemod.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qabstractstate.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qabstracttransition.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qeventtransition.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qfinalstate.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qhistorystate.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qkeyeventtransition.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qmouseeventtransition.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qsignaltransition.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qstate.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtStateMachine/qstatemachine.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/QtSvg.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/QtSvgmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qsvggenerator.sip