diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index c05504c4ff9b..c08bc7cb22cf 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -1,269 +1,269 @@ # Handle PyQt related ports # # Feature: pyqt # Usage: USES=pyqt:ARGS # Valid ARGS: 5, 6 # # MAINTAINER: kde@FreeBSD.org # # Internal Port variables for PyQt ports: # PYQT_DIST - This port is part of PyQt5/6 itself. Variables and # targets are then set assuming a certain tarball and # port layout. # USE_PYQT - List of PyQt components to depend on # * foo:build only build depend # * foo:run only run depend # * foo:test only test depend # * foo build and run depend (default) # PYQT_SIPDIR - where sip files will be installed to # PYQT_APIDIR - where api files will be installed to # PYQT_DOCDIR - where doc files will be installed to # PYQT_EXAMPLESDIR - where examples will be installed to .if !defined(_INCLUDE_USES_PYQT_MK) _INCLUDE_USES_PYQT_MK= yes # At the moment we support PyQt bindings versions 5 and 6 # option is for internal use by the py-sip ports. _PYQT_SUPPORTED= 5 6 sip . if empty(pyqt_ARGS) IGNORE= pyqt needs a qt-version (${_PYQT_SUPPORTED}) . endif # At the moment we support PyQt bindings versions 5 and 6 . for ver in ${_PYQT_SUPPORTED:O:u} . if ${pyqt_ARGS:M${ver}} . if empty(_PYQT_VERSION) _PYQT_VERSION= ${ver} . else IGNORE?= cannot be installed: different PYQT versions specified via pyqt:[${_PYQT_SUPPORTED:S/ //g}] . endif . endif . endfor . if empty(_PYQT_VERSION) IGNORE?= USES=pyqt needs a version number (valid values: ${_PYQT_SUPPORTED}) _PYQT_VERSION= 0 . endif PYQT_MAINTAINER= kde@FreeBSD.org MASTER_SITE_RIVERBANK= https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/ MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/ MASTER_SITES_PYQT5= https://pypi.python.org/packages/source/P/PyQt5/ MASTER_SITES_PYQT6= https://pypi.python.org/packages/source/P/PyQt6/ MASTER_SITES_PYQT= ${MASTER_SITES_PYQT${_PYQT_VERSION}} MASTER_SITES_PYQT5SIP= https://pypi.python.org/packages/source/P/PyQt5-sip/ MASTER_SITES_PYQT6SIP= https://pypi.python.org/packages/source/P/PyQt6-sip/ MASTER_SITES_PYQTSIP= ${MASTER_SITES_PYQT${_PYQT_VERSION}SIP} MASTER_SITES_PYQT63D= https://pypi.python.org/packages/source/P/PyQt6-3D/ MASTER_SITES_PYQT3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}3D} MASTER_SITES_PYQT5CHART= https://pypi.python.org/packages/source/P/PyQtChart/ MASTER_SITES_PYQT6CHART= https://pypi.python.org/packages/source/P/PyQt6-Charts/ MASTER_SITES_PYQTCHART= ${MASTER_SITES_PYQT${_PYQT_VERSION}CHART} MASTER_SITES_PYQT6DATAVIS3D= https://pypi.python.org/packages/source/P/PyQt6-DataVisualization/ MASTER_SITES_PYQTDATAVIS3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D} MASTER_SITES_PYQT5NETWORKAUTH= https://pypi.python.org/packages/source/P/PyQtNetworkAuth/ MASTER_SITES_PYQT6NETWORKAUTH= https://pypi.python.org/packages/source/P/PyQt6-NetworkAuth/ MASTER_SITES_PYQTNETWORKAUTH= ${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH} MASTER_SITES_PYQTBUILDER= https://pypi.io/packages/source/P/PyQt-builder/ MASTER_SITES_PYQT5WEBENGINE= https://pypi.python.org/packages/source/P/PyQtWebEngine/ MASTER_SITES_PYQT6WEBENGINE= https://pypi.python.org/packages/source/P/PyQt6-WebEngine/ MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE} #https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ GENTOO # PORTEPOCH is important here, because version-comparisons in *_DEPENDS # take it into account (visually, 6.5.1 >= 5.5.3,1, but it isn't). # Adding the epoch directly into the version here cannot be done, # because the DISTVERSION of each of these ports is obtained from the # *_VERSION variable (and PORTEPOCH is set in each individual port). # # Where noted, the ports are epoched and the py-${comp}-PATH variables, # below, should have a suitable epoch appended to the version. -SIP_VERSION= 6.7.11 # ,1 +SIP_VERSION= 6.7.12 # ,1 SIP4_VERSION= 4.19.25 QSCI2_VERSION= 2.14.1 -PYQT5_VERSION= 5.15.9 +PYQT5_VERSION= 5.15.10 PYQT6_VERSION= 6.5.2 PYQT63D_VERSION= 6.5.0 PYQT5CHART_VERSION= 5.15.6 PYQT6CHART_VERSION= 6.5.0 PYQT6DATAVIS3D_VERSION= 6.5.0 PYQT5NETWORKAUTH_VERSION=5.15.5 PYQT6NETWORKAUTH_VERSION=6.5.0 PYQT5WEBENGINE_VERSION= 5.15.6 PYQT6WEBENGINE_VERSION= 6.5.0 -PYQT5SIP_VERSION= 12.12.2 +PYQT5SIP_VERSION= 12.13.0 PYQT6SIP_VERSION= 13.5.2 -PYQTBUILDER_VERSION= 1.15.2 +PYQTBUILDER_VERSION= 1.15.3 SIP_DISTNAME= sip-${SIP_VERSION} SIP4_DISTNAME= sip-${SIP4_VERSION} PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION} PYQT6_DISTNAME= PyQt6-${PYQT6_VERSION} PYQT5SIP_DISTNAME= PyQt5_sip-${PYQT5SIP_VERSION} PYQT6SIP_DISTNAME= PyQt6_sip-${PYQT6SIP_VERSION} PYQT63D_DISTNAME= PyQt6_3D-${PYQT63D_VERSION} PYQT5CHART_DISTNAME= PyQtChart-${PYQT5CHART_VERSION} PYQT6CHART_DISTNAME= PyQt6_Charts-${PYQT6CHART_VERSION} PYQT6DATAVIS3D_DISTNAME= PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION} PYQT5NETWORKAUTH_DISTNAME= PyQtNetworkAuth-${PYQT5NETWORKAUTH_VERSION} PYQT6NETWORKAUTH_DISTNAME= PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION} PYQTBUILDER_DISTNAME= PyQt-builder-${PYQTBUILDER_VERSION} PYQT5WEBENGINE_DISTNAME= PyQtWebEngine-${PYQT5WEBENGINE_VERSION} PYQT6WEBENGINE_DISTNAME= PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION} PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo PYQT6_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo QSCI2_DISTNAME= QScintilla_src-${QSCI2_VERSION} PYQT5_LICENSE= GPLv3 PYQT6_LICENSE= GPLv3 _USE_PYQT_ALL= pyqt5 pyqt6 3d chart datavis3d networkauth webengine _USE_SIP_ALL= sip pysip _USE_QSCINTILLA= qscintilla2 _USE_PYQTBUILDER= qtbuilder # Unversioned variables for the rest of the file PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION} PYQT3D_VERSION= ${PYQT${_PYQT_VERSION}3D_VERSION} PYQTCHART_VERSION= ${PYQT${_PYQT_VERSION}CHART_VERSION} PYQTDATAVIS3D_VERSION= ${PYQT${_PYQT_VERSION}DATAVIS3D_VERSION} PYQTNETWORKAUTH_VERSION=${PYQT${_PYQT_VERSION}NETWORKAUTH_VERSION} PYQTWEBENGINE_VERSION=${PYQT${_PYQT_VERSION}WEBENGINE_VERSION} PYQT_RELNAME= py-qt${_PYQT_VERSION} PYQT_PY_RELNAME= ${PYTHON_PKGNAMEPREFIX}qt${_PYQT_VERSION} PYQT_MASTERSITES= ${MASTER_SITES_PYQT${_PYQT_VERSION}} PYQT_DISTNAME= ${PYQT${_PYQT_VERSION}_DISTNAME} PYQT3D_DISTNAME= ${PYQT${_PYQT_VERSION}3D_DISTNAME} PYQTCHART_DISTNAME= ${PYQT${_PYQT_VERSION}CHART_DISTNAME} PYQTDATAVIS3D_DISTNAME= ${PYQT${_PYQT_VERSION}DATAVIS3D_DISTNAME} PYQTNETWORKAUTH_DISTNAME=${PYQT${_PYQT_VERSION}NETWORKAUTH_DISTNAME} PYQTWEBENGINE_DISTNAME=${PYQT${_PYQT_VERSION}WEBENGINE_DISTNAME} PYQT_DISTINFO_FILE= ${PYQT${_PYQT_VERSION}_DISTINFO_FILE} PYQT_LICENSE= ${PYQT${_PYQT_VERSION}_LICENSE} # PATH (see note about epochs, above) py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION},1 py-pysip_PATH= ${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION} py-qscintilla2_PATH= ${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION} py-qtbuilder_PATH= ${PYTHON_PKGNAMEPREFIX}qtbuilder>=${PYQTBUILDER_VERSION} py-pyqt5_PATH= ${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION} py-pyqt6_PATH= ${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION} py-3d_PATH= ${PYQT_PY_RELNAME}-3d>=${PYQT3D_VERSION} py-chart_PATH= ${PYQT_PY_RELNAME}-chart>=${PYQTCHART_VERSION} py-datavis3d_PATH= ${PYQT_PY_RELNAME}-datavis3d>=${PYQTDATAVIS3D_VERSION} py-networkauth_PATH= ${PYQT_PY_RELNAME}-networkauth>=${PYQTNETWORKAUTH_VERSION} py-webengine_PATH= ${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION} # PORT py-sip_PORT= devel/py-sip py-qtbuilder_PORT= devel/py-qtbuilder py-pysip_PORT= devel/${PYQT_RELNAME}-sip py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2 py-positioning_PORT= devel/${PYQT_RELNAME}-positioning py-pyqt5_PORT= devel/${PYQT_RELNAME}-pyqt py-pyqt6_PORT= devel/${PYQT_RELNAME}-pyqt py-3d_PORT= graphics/${PYQT_RELNAME}-3d py-chart_PORT= x11-toolkits/${PYQT_RELNAME}-chart py-datavis3d_PORT= x11-toolkits/${PYQT_RELNAME}-datavis3d py-networkauth_PORT= net/${PYQT_RELNAME}-networkauth py-webengine_PORT= www/${PYQT_RELNAME}-webengine # The versionned executable of sip SIP= ${LOCALBASE}/bin/sip-build-${PYTHON_VER} # Relative directories _VERSION_SUBDIR_REL= PyQt${_PYQT_VERSION}/${PYTHON_VER} _APIDIR_REL= share/${_VERSION_SUBDIR_REL}/qsci _DOCDIR_REL= share/doc/${_VERSION_SUBDIR_REL} _EXAMPLEDIR_REL= share/examples/${_VERSION_SUBDIR_REL} _SIPDIR_REL= PyQt${_PYQT_VERSION}/bindings _DESIGNERDIR_REL= ${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL} _QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL} # Absolute directories PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL} PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL} PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL} PYQT_SIPDIR?= ${PYTHON_SITELIBDIR}/${_SIPDIR_REL} PYQT_DESIGNERDIR= ${PREFIX}/${_DESIGNERDIR_REL} PYQT_QMLDIR= ${PREFIX}/${_QMLDIR_REL} PLIST_SUB+= PYQT_APIDIR=${_APIDIR_REL} \ PYQT_DOCDIR=${_DOCDIR_REL} \ PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \ PYQT_SIPDIR=${PYQT_SIPDIR} \ PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \ PYQT_QMLDIR=${_QMLDIR_REL} \ PYQT_SIPVERSION=${SIP_VERSION} \ PYQT_QSCIVERSION=${QSCI2_VERSION} \ PYQT_PYQTVERSION=${PYQT_VERSION} . if defined(PYQT_DIST) LICENSE?= ${PYQT_LICENSE} PLIST_SUB+= PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}" SIP_ARGS= --qmake ${QMAKE} \ --verbose \ --build-dir build \ --protected-is-public \ --api-dir ${PYQT_APIDIR} . if ${PORTNAME} == "pyqt" SIP_ARGS+= --confirm-license . endif . if ${PORTNAME} == "pyqt" . if !target(post-patch) post-patch: ${REINPLACE_CMD} -e "s#%%PYQT_DESIGNERDIR%%#${PYQT_DESIGNERDIR}#" ${WRKSRC}/project.py ${REINPLACE_CMD} -e "s#%%PYQT_QMLDIR%%#${PYQT_QMLDIR}#" ${WRKSRC}/project.py . endif # !target(post-patch) . endif . if !target(do-build) do-build: (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} -C ./build) . endif # !target(do-build) . if !target(do-install) do-install: (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) . endif # !target(do-install) . endif # defined(PYQT_DIST) # Set build, run and test depends -- we need to prefix them internally with "py-" # else we conflict with the ones defined in bsd.qt.mk with the same name _USE_PYQT_ALL+= ${_USE_SIP_ALL} \ ${_USE_QSCINTILLA} \ ${_USE_PYQTBUILDER} . for comp in ${_USE_PYQT_ALL:O:u} _USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}:build py-${comp}:run py-${comp}:test py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_TEST_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_build_BUILD_DEPENDS?= ${py-${comp}_BUILD_DEPENDS} py-${comp}_run_RUN_DEPENDS?= ${py-${comp}_RUN_DEPENDS} py-${comp}_test_TEST_DEPENDS?= ${py-${comp}_TEST_DEPENDS} . endfor _USE_PYQT= ${USE_PYQT:O:u} . for comp in ${_USE_PYQT} . if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}} BUILD_DEPENDS+= ${py-${comp:S/:/_/}_BUILD_DEPENDS} RUN_DEPENDS+= ${py-${comp:S/:/_/}_RUN_DEPENDS} TEST_DEPENDS+= ${py-${comp:S/:/_/}_TEST_DEPENDS} . else IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #' . endif . endfor .endif # defined(_INCLUDE_USES_PYQT_MK) diff --git a/devel/py-qt5-pyqt/Makefile b/devel/py-qt5-pyqt/Makefile index f458ed0950ec..0a240e7714e1 100644 --- a/devel/py-qt5-pyqt/Makefile +++ b/devel/py-qt5-pyqt/Makefile @@ -1,46 +1,46 @@ PORTNAME= pyqt PORTVERSION= ${PYQT_VERSION} -PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- DISTNAME= ${PYQT_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt5 toolkit, QtCore module WWW= https://riverbankcomputing.com/software/pyqt PYQT_DIST= yes LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libdbus-1.so:devel/dbus BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} -USES= pkgconfig python pyqt:5 qt:5 +USES= gl pkgconfig python pyqt:5 qt:5 +USE_GL= gl USE_PYTHON= concurrent flavors py3kplist USE_PYQT= qtbuilder sip pysip USE_QT= connectivity core dbus declarative designer gui help imageformats location \ multimedia network opengl printsupport quick3d remoteobjects \ sensors serialport speech sql svg testlib webchannel webkit websockets \ widgets x11extras xml xmlpatterns \ buildtools:build qmake:build PORTSCOUT?= limit:^${_QT_VERSION:R} post-extract: ${RM} -r ${WRKSRC}/pyuic/uic/port_v2 post-install: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ -name '*.so*' -exec ${STRIP_CMD} {} + .include diff --git a/devel/py-qt5-pyqt/distinfo b/devel/py-qt5-pyqt/distinfo index 5f1924810e23..abb940c25e87 100644 --- a/devel/py-qt5-pyqt/distinfo +++ b/devel/py-qt5-pyqt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676964932 -SHA256 (PyQt5-5.15.9.tar.gz) = dc41e8401a90dc3e2b692b411bd5492ab559ae27a27424eed4bd3915564ec4c0 -SIZE (PyQt5-5.15.9.tar.gz) = 3241160 +TIMESTAMP = 1697315085 +SHA256 (PyQt5-5.15.10.tar.gz) = d46b7804b1b10a4ff91753f8113e5b5580d2b4462f3226288e2d84497334898a +SIZE (PyQt5-5.15.10.tar.gz) = 3242654 diff --git a/devel/py-qt5-sip/distinfo b/devel/py-qt5-sip/distinfo index 0dbe40c3b4fa..fe023aa9c89b 100644 --- a/devel/py-qt5-sip/distinfo +++ b/devel/py-qt5-sip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695750685 -SHA256 (PyQt5_sip-12.12.2.tar.gz) = 10d9bfa9f59f0fd1cad81be187479316ffc95684f573efea94512cb4257d2b17 -SIZE (PyQt5_sip-12.12.2.tar.gz) = 123020 +TIMESTAMP = 1697314928 +SHA256 (PyQt5_sip-12.13.0.tar.gz) = 7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91 +SIZE (PyQt5_sip-12.13.0.tar.gz) = 123225 diff --git a/devel/py-qt5/Makefile b/devel/py-qt5/Makefile index d7fbb71afee0..556c6f022161 100644 --- a/devel/py-qt5/Makefile +++ b/devel/py-qt5/Makefile @@ -1,15 +1,14 @@ PORTNAME= qt5 PORTVERSION= ${PYQT_VERSION} -PORTREVISION= 2 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt 5 toolkit (meta port) WWW= https://riverbankcomputing.com/software/pyqt USES= metaport python pyqt:5 USE_PYTHON= concurrent flavors py3kplist USE_PYQT= pyqt5 chart networkauth .include diff --git a/devel/py-qtbuilder/distinfo b/devel/py-qtbuilder/distinfo index 45418df593b3..c4cd6790fd26 100644 --- a/devel/py-qtbuilder/distinfo +++ b/devel/py-qtbuilder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690243937 -SHA256 (PyQt-builder-1.15.2.tar.gz) = 746cfe83c03ebff4458d478a1c06714790ef93e458ecd5a28bc2837bac88eb74 -SIZE (PyQt-builder-1.15.2.tar.gz) = 3908851 +TIMESTAMP = 1697314645 +SHA256 (PyQt-builder-1.15.3.tar.gz) = 5b33e99edcb77d4a63a38605f4457a04cff4e254c771ed529ebc9589906ccdb1 +SIZE (PyQt-builder-1.15.3.tar.gz) = 3909851 diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 8b98eb1ca7c8..5ee2f442093a 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695674487 -SHA256 (sip-6.7.11.tar.gz) = f0dc3287a0b172e5664931c87847750d47e4fdcda4fe362b514af8edd655b469 -SIZE (sip-6.7.11.tar.gz) = 1165368 +TIMESTAMP = 1697314539 +SHA256 (sip-6.7.12.tar.gz) = 08e66f742592eb818ac8fda4173e2ed64c9f2d40b70bee11db1c499127d98450 +SIZE (sip-6.7.12.tar.gz) = 1169656