From owner-svn-ports-all@freebsd.org Tue Dec 8 20:03:16 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B3534AA96A; Tue, 8 Dec 2020 20:03:16 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CrB1v6JjFz4qyc; Tue, 8 Dec 2020 20:03:15 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB15019E7B; Tue, 8 Dec 2020 20:03:15 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B8K3FPZ072251; Tue, 8 Dec 2020 20:03:15 GMT (envelope-from lbartoletti@FreeBSD.org) Received: (from lbartoletti@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B8K37CV072210; Tue, 8 Dec 2020 20:03:07 GMT (envelope-from lbartoletti@FreeBSD.org) Message-Id: <202012082003.0B8K37CV072210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lbartoletti set sender to lbartoletti@FreeBSD.org using -f From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= Date: Tue, 8 Dec 2020 20:03:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557300 - in head: Mk/Uses biology/py-ete3 cad/cura cad/uranium comms/py-qt5-sensors comms/py-qt5-serialport databases/py-qt5-sql deskutils/calibre deskutils/calibre/files deskutils/kad... X-SVN-Group: ports-head X-SVN-Commit-Author: lbartoletti X-SVN-Commit-Paths: in head: Mk/Uses biology/py-ete3 cad/cura cad/uranium comms/py-qt5-sensors comms/py-qt5-serialport databases/py-qt5-sql deskutils/calibre deskutils/calibre/files deskutils/kaddressbook/files devel/eri... X-SVN-Commit-Revision: 557300 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2020 20:03:16 -0000 Author: lbartoletti Date: Tue Dec 8 20:03:07 2020 New Revision: 557300 URL: https://svnweb.freebsd.org/changeset/ports/557300 Log: Update Qt/PySide2 to 5.15.2 / PyQt to 5.15.1 / SIP to 5.4.0 This commit combines several updates. - Update Qt to 5.12.2 - Update PyQt to 5.15.1 - Since PySide 5.15.1 is broken with Qt 5.15.2, so PySide and Shiboken are also updated to 5.15.2. - Update sip to 5.4.0 SIP is a collection of tools to create Python bindings for C and C++ libraries and used by PyQt and wxPython. There are some changes with sip5 [1]: - python 3.5+ is required - sip drops support of old deprecated methods as sipdistutils & cie. - this version breaks also PyQt5 extension ABI. SIP files will be installed in ${PYTHON_SITELIBDIR}/PyQt${_PYQT_VERSION}/bindings - some ports will use the new pyqtbuilder package with the pyproject.toml setup. Instead if the project have a setup.py, you should use sip-build to build it. - if a port needs sip, it should also needs pysip. BTW, py-qt5-core requires pysip, so that should be enough for PyQt packages. List of ports impacted by this change. Most of the patches have been integrated or are in the process of being integrated upstream: - devel/libsavitar - graphics/py-python-poppler-qt5 - net-im/scudcloud - net/libarcus - print/py-frescobaldi - science/py-veusz - graphics/qgis and graphics/qgis-ltr - deskutils/calibre A special note regarding calibre. New versions require sip>=5, we update it to the latest version (thanks to madpilot@) science/scidavis will remove the PyQt binding soon and there is no patch planned, so we remove the python option (ok makc@) While here, convert some ports to USE_PYQT (cad/cura, cad/uranium, devel/eric6, ...) Thanks to tcberner and adridg! [1] https://www.riverbankcomputing.com/static/Docs/sip/ PR: 250853 Exp-run by: antoine Added: head/deskutils/calibre/files/patch-setup_build.py (contents, props changed) head/deskutils/calibre/files/patch-setup_translations.py (contents, props changed) head/deskutils/calibre/files/patch-src_calibre_utils_formatter.py (contents, props changed) head/deskutils/kaddressbook/files/ head/deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff (contents, props changed) head/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff (contents, props changed) head/graphics/py-python-poppler-qt5/files/ head/graphics/py-python-poppler-qt5/files/patch-poppler-qt5.sip (contents, props changed) head/graphics/py-python-poppler-qt5/files/patch-project.py (contents, props changed) head/graphics/py-python-poppler-qt5/files/patch-pyproject.toml (contents, props changed) head/graphics/py-python-poppler-qt5/files/patch-types.sip (contents, props changed) head/graphics/py-python-poppler-qt5/files/patch-version.sip.in (contents, props changed) head/graphics/py-python-poppler-qt5/pkg-plist (contents, props changed) head/net/calendarsupport/files/ head/net/calendarsupport/files/patch-git-b4193fac.diff (contents, props changed) head/net/libarcus/files/ head/net/libarcus/files/patch-CMakeLists.txt (contents, props changed) head/net/libarcus/files/patch-cmake_FindSIP.cmake (contents, props changed) head/net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp (contents, props changed) head/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h (contents, props changed) head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp (contents, props changed) head/textproc/goldendict/files/ head/textproc/goldendict/files/patch-sptr.hh (contents, props changed) head/textproc/kompare/files/ head/textproc/kompare/files/patch-git-68d3eee3.diff (contents, props changed) Deleted: head/devel/py-sip/files/ head/devel/py-sip/pkg-plist head/graphics/qgis/files/patch-cmake_FindPyQt5.py head/graphics/qgis/files/patch-cmake_FindSIP.py Modified: head/Mk/Uses/pyqt.mk head/Mk/Uses/qt.mk head/biology/py-ete3/Makefile head/cad/cura/Makefile head/cad/uranium/Makefile head/comms/py-qt5-sensors/Makefile head/comms/py-qt5-serialport/Makefile head/databases/py-qt5-sql/Makefile head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/files/patch-src_calibre_linux.py head/deskutils/calibre/pkg-plist head/devel/eric6/Makefile head/devel/libsavitar/Makefile head/devel/libsavitar/distinfo (contents, props changed) head/devel/py-qt5-core/Makefile head/devel/py-qt5-dbus/Makefile head/devel/py-qt5-dbussupport/Makefile head/devel/py-qt5-designer/Makefile head/devel/py-qt5-designerplugin/Makefile head/devel/py-qt5-help/Makefile head/devel/py-qt5-location/Makefile head/devel/py-qt5-qscintilla2/Makefile head/devel/py-qt5-remoteobjects/Makefile head/devel/py-qt5-test/Makefile head/devel/py-qt5/Makefile head/devel/py-qt5/distinfo head/devel/py-qtbuilder/Makefile head/devel/py-sip/Makefile head/devel/py-sip/distinfo head/devel/pyside2-tools/Makefile head/devel/pyside2-tools/distinfo head/devel/pyside2/Makefile head/devel/pyside2/distinfo head/devel/qt5-assistant/files/patch-src__src.pro head/devel/qt5-buildtools/pkg-plist head/devel/qt5-core/Makefile head/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp head/devel/qt5-designer/files/patch-src__src.pro head/devel/qt5-help/files/patch-src__assistant__assistant.pro head/devel/qt5-help/files/patch-src__src.pro head/devel/qt5-linguist/files/patch-src__src.pro head/devel/qt5-linguisttools/files/patch-src__src.pro head/devel/qt5-qdbus/files/patch-src_src.pro head/devel/qt5-qdbusviewer/files/patch-src__src.pro head/devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro head/devel/qt5-qdoc/files/patch-src_src.pro head/devel/qt5-uitools/files/patch-src__src.pro head/devel/qt5/distinfo head/devel/shiboken2/Makefile head/devel/shiboken2/distinfo head/devel/shiboken2/pkg-plist head/devel/tortoisehg/Makefile head/graphics/py-python-poppler-qt5/Makefile head/graphics/py-qt5-svg/Makefile head/graphics/qgis-ltr/Makefile head/graphics/qgis-ltr/distinfo head/graphics/qgis/Makefile head/graphics/qt5-3d/pkg-plist head/graphics/qt5-pixeltool/files/patch-src__src.pro head/lang/py-qt5-qml/Makefile head/math/asymptote/Makefile head/misc/py-qt5-demo/Makefile head/misc/qt5-examples/distinfo head/misc/qt5-examples/pkg-plist head/misc/qt5-l10n/pkg-plist head/multimedia/py-qt5-multimedia/Makefile head/multimedia/py-qt5-multimediawidgets/Makefile head/net-im/scudcloud/Makefile head/net/libarcus/Makefile head/net/py-qt5-network/Makefile head/net/py-qt5-networkauth/Makefile head/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp head/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h head/print/py-frescobaldi/Makefile head/print/py-qt5-printsupport/Makefile head/science/py-veusz/Makefile head/science/py-veusz/files/patch-pyqtdistutils.py head/science/scidavis/Makefile head/sysutils/qt5-qtdiag/files/patch-src_src.pro head/sysutils/qt5-qtpaths/files/patch-src_src.pro head/sysutils/qt5-qtplugininfo/files/patch-src_src.pro head/textproc/py-qt5-xml/Makefile head/textproc/py-qt5-xmlpatterns/Makefile head/textproc/qt5-xmlpatterns/Makefile head/textproc/qt5-xmlpatterns/pkg-plist head/www/py-qt5-webchannel/Makefile head/www/py-qt5-webengine/Makefile head/www/py-qt5-webengine/distinfo head/www/py-qt5-webkit/Makefile head/www/py-qt5-webkitwidgets/Makefile head/www/py-qt5-websockets/Makefile head/x11-toolkits/py-qt5-chart/Makefile head/x11-toolkits/py-qt5-chart/distinfo head/x11-toolkits/py-qt5-gui/Makefile head/x11-toolkits/py-qt5-quick/Makefile head/x11-toolkits/py-qt5-quick3d/Makefile head/x11-toolkits/py-qt5-quickwidgets/Makefile head/x11-toolkits/py-qt5-widgets/Makefile head/x11-toolkits/qt5-declarative/Makefile head/x11-toolkits/qt5-declarative/pkg-plist head/x11-toolkits/qt5-quick3d/pkg-plist head/x11-toolkits/qt5-quickcontrols2/pkg-plist head/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro head/x11/py-qt5-opengl/Makefile head/x11/qt5-qev/files/patch-src_src.pro Modified: head/Mk/Uses/pyqt.mk ============================================================================== --- head/Mk/Uses/pyqt.mk Tue Dec 8 16:37:11 2020 (r557299) +++ head/Mk/Uses/pyqt.mk Tue Dec 8 20:03:07 2020 (r557300) @@ -53,28 +53,27 @@ 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/ -# https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/sip-4.19.15.tar.gz -MASTER_SITES_SIP= RIVERBANK/sip/${PORTVERSION} \ - SF/pyqt/sip/sip-${PORTVERSION} \ - GENTOO +MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/ MASTER_SITES_PYQT5= https://pypi.python.org/packages/source/P/PyQt5/ MASTER_SITES_PYQTSIP= https://pypi.python.org/packages/source/P/PyQt5-sip/ MASTER_SITES_PYQTCHART= https://pypi.python.org/packages/source/P/PyQtChart/ +MASTER_SITES_PYQTBUILDER= https://pypi.io/packages/source/P/PyQt-builder/ #https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ GENTOO -SIP_VERSION= 4.19.24 +SIP_VERSION= 5.4.0 QSCI2_VERSION= 2.11.5 -PYQT5_VERSION= 5.15.0 +PYQT5_VERSION= 5.15.1 PYQTSIP_VERSION= 12.8.0 +PYQTBUILDER_VERSION= 1.4.0 SIP_DISTNAME= sip-${SIP_VERSION} PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION} PYQTSIP_DISTNAME= PyQt5_sip-${PYQTSIP_VERSION} PYQTCHART_DISTNAME= PyQtChart-${PYQT_VERSION} +PYQTBUILDER_DISTNAME= PyQt-builder-${PYQTBUILDER_VERSION} PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo QSCI2_DISTNAME= QScintilla-${QSCI2_VERSION} PYQT5_LICENSE= GPLv3 @@ -109,8 +108,9 @@ _USE_PYQT_ALL= ${_USE_PYQT_COMMS} \ ${_USE_PYQT_WWW} \ ${_USE_PYQT_X11} \ ${_USE_PYQT_X11-TOOLKITS} -_USE_SIP_ALL= sip # pysip +_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} @@ -123,8 +123,9 @@ PYQT_LICENSE= ${PYQT${_PYQT_VERSION}_LICENSE} # PATH py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION} -# py-pysip_PATH= ${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION} +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} . for _component in ${_USE_PYQT_ALL} py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION} @@ -132,7 +133,8 @@ py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component # PORT py-sip_PORT= devel/py-sip -# py-pysip_PORT= devel/${PYQT_RELNAME}-sip +py-qtbuilder_PORT= devel/py-qtbuilder +py-pysip_PORT= devel/${PYQT_RELNAME}-sip py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2 . for _categorie in comms databases devel graphics lang misc multimedia net print textproc www x11 x11-toolkits @@ -179,29 +181,29 @@ py-xml_DESC= Python bindings for QtXml module py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module # The versionned executable of sip -SIP= ${LOCALBASE}/bin/sip-${PYTHON_VER} +SIP= ${LOCALBASE}/bin/sip5-${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= share/${_VERSION_SUBDIR_REL}/sip +_SIPDIR_REL= PyQt${_PYQT_VERSION}/bindings _DESIGNERDIR_REL= ${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL} _QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL} -# Absolute direcotries +# Absolute directories PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL} PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL} PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL} -PYQT_SIPDIR?= ${PREFIX}/${_SIPDIR_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=${_SIPDIR_REL} \ + PYQT_SIPDIR=${PYQT_SIPDIR} \ PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \ PYQT_QMLDIR=${_QMLDIR_REL} \ PYQT_SIPVERSION=${SIP_VERSION} \ @@ -256,7 +258,8 @@ do-configure: # 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_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} Modified: head/Mk/Uses/qt.mk ============================================================================== --- head/Mk/Uses/qt.mk Tue Dec 8 16:37:11 2020 (r557299) +++ head/Mk/Uses/qt.mk Tue Dec 8 20:03:07 2020 (r557300) @@ -24,7 +24,7 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 -QT5_VERSION?= 5.15.0 +QT5_VERSION?= 5.15.2 # We accept the Qt version to be passed by either or all of the three mk files. . if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS) Modified: head/biology/py-ete3/Makefile ============================================================================== --- head/biology/py-ete3/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/biology/py-ete3/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -19,7 +19,7 @@ PY_DEPENDS= ${PYNUMPY} \ BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} -USES= python pyqt:5 shebangfix +USES= python:3.5+ pyqt:5 shebangfix SHEBANG_GLOB= *.py USE_PYTHON= distutils concurrent autoplist USE_PYQT= core gui opengl printsupport svg widgets Modified: head/cad/cura/Makefile ============================================================================== --- head/cad/cura/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/cad/cura/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -13,10 +13,7 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= Uranium>0,1:cad/uranium -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-toolkits/py-qt5-gui@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qt5-widgets>0:x11-toolkits/py-qt5-widgets@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qt5-qml>0:lang/py-qt5-qml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \ @@ -31,7 +28,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-tool LIB_DEPENDS= libArcus.so:net/libarcus \ libSavitar.so:devel/libsavitar -USES= cmake gettext shebangfix python:3.4+ desktop-file-utils shared-mime-info +USES= cmake gettext shebangfix python:3.5+ pyqt:5 \ + desktop-file-utils shared-mime-info +USE_PYQT= gui widgets qml CMAKE_ARGS+= -DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts" USE_GITHUB= yes GH_ACCOUNT= Ultimaker Modified: head/cad/uranium/Makefile ============================================================================== --- head/cad/uranium/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/cad/uranium/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}qt5-quick>0:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} -USES= cmake python:3.4+ gettext +USES= cmake gettext python:3.5+ pyqt:5 +USE_PYQT= quick USE_GITHUB= yes GH_ACCOUNT= Ultimaker GH_TAGNAME= 3ed9c4de Modified: head/comms/py-qt5-sensors/Makefile ============================================================================== --- head/comms/py-qt5-sensors/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/comms/py-qt5-sensors/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtSensors PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run USE_PYTHON= concurrent flavors py3kplist Modified: head/comms/py-qt5-serialport/Makefile ============================================================================== --- head/comms/py-qt5-serialport/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/comms/py-qt5-serialport/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtSerialPort PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run USE_PYTHON= concurrent flavors py3kplist Modified: head/databases/py-qt5-sql/Makefile ============================================================================== --- head/databases/py-qt5-sql/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/databases/py-qt5-sql/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtSql PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= concurrent flavors py3kplist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/deskutils/calibre/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 4.23.0 -PORTREVISION= 5 +PORTVERSION= 5.6.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ @@ -30,7 +29,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:datab ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ @@ -49,14 +49,15 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ ${PY_PILLOW} \ - pdftohtml:graphics/poppler-utils + pdftohtml:graphics/poppler-utils \ + ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \ pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info shebangfix \ ssl tar:xz xorg USE_RC_SUBR= calibre SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION} -USE_PYQT= core gui network sip svg webengine widgets xmlpatterns +USE_PYQT= core gui network pysip qtbuilder sip svg webengine widgets xmlpatterns USE_QT= buildtools_build core dbus gui qmake_build widgets USE_GL= egl gl USE_GNOME= glib20 @@ -110,6 +111,6 @@ do-install: @${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \ ${STAGEDIR}${PREFIX}/share/applications/defaults.list @${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/3/* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/* .include Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Tue Dec 8 16:37:11 2020 (r557299) +++ head/deskutils/calibre/distinfo Tue Dec 8 20:03:07 2020 (r557300) @@ -1,3 +1,3 @@ -TIMESTAMP = 1597997606 -SHA256 (calibre-4.23.0.tar.xz) = 16de51473cf0e336f946a57251a1e4f4fbba1f857f17d8fc14aa132e7eb59518 -SIZE (calibre-4.23.0.tar.xz) = 36908740 +TIMESTAMP = 1606469769 +SHA256 (calibre-5.6.0.tar.xz) = 484a2e120fdbcff6c544d4c216afef0ff784c7665d3fd44d98acb0420d8f5e55 +SIZE (calibre-5.6.0.tar.xz) = 36653328 Added: head/deskutils/calibre/files/patch-setup_build.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-setup_build.py Tue Dec 8 20:03:07 2020 (r557300) @@ -0,0 +1,10 @@ +--- setup/build.py.orig 2020-10-10 16:20:32 UTC ++++ setup/build.py +@@ -496,6 +496,7 @@ exceptions = {needs_exceptions} + include-dirs = {ext.inc_dirs} + qmake-QT = ["widgets"] + sip-file = "{os.path.basename(sipf)}" ++tags = ["WS_X11"] + ''') + shutil.copy2(sipf, src_dir) + Added: head/deskutils/calibre/files/patch-setup_translations.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-setup_translations.py Tue Dec 8 20:03:07 2020 (r557300) @@ -0,0 +1,11 @@ +--- setup/translations.py.orig 2020-11-13 01:58:49 UTC ++++ setup/translations.py +@@ -159,7 +159,7 @@ class POT(Command): # {{{ + f.seek(0), f.truncate(), f.write('\n'.join(lines).encode('utf-8')) + break + else: +- raise SystemExit(f'Failed to add file_filter for {slug=} to config file') ++ raise SystemExit(f'Failed to add file_filter for {slug} to config file') + self.git('add .tx/config') + self.upload_pot(resource=slug) + self.git(['add', dest]) Modified: head/deskutils/calibre/files/patch-src_calibre_linux.py ============================================================================== --- head/deskutils/calibre/files/patch-src_calibre_linux.py Tue Dec 8 16:37:11 2020 (r557299) +++ head/deskutils/calibre/files/patch-src_calibre_linux.py Tue Dec 8 20:03:07 2020 (r557300) @@ -1,15 +1,6 @@ ---- src/calibre/linux.py.orig 2018-01-05 05:41:54 UTC +--- src/calibre/linux.py.orig 2020-11-13 01:58:49 UTC +++ src/calibre/linux.py -@@ -841,7 +841,7 @@ class PostInstall: - f.close() - des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', - 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') -- appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'metainfo') -+ appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata') - if not os.path.exists(appdata): - try: - os.mkdir(appdata) -@@ -1008,7 +1008,7 @@ Name=E-book Viewer +@@ -1103,7 +1103,7 @@ Name=E-book viewer GenericName=Viewer for E-books Comment=Viewer for E-books in all the major formats TryExec=ebook-viewer @@ -18,7 +9,7 @@ Icon=calibre-viewer Categories=Graphics;Viewer; ''' -@@ -1021,7 +1021,7 @@ Name=E-book Editor +@@ -1116,7 +1116,7 @@ Name=E-book editor GenericName=Editor for E-books Comment=Edit E-books in various formats TryExec=ebook-edit @@ -27,12 +18,12 @@ Icon=calibre-ebook-edit Categories=Office; ''' -@@ -1034,7 +1034,7 @@ Name=calibre +@@ -1129,7 +1129,7 @@ Name=calibre GenericName=E-book library management Comment=E-book library management: Convert, view, share, catalogue all your e-books TryExec=calibre --Exec=calibre --detach %F -+Exec=calibre %F +-Exec=calibre --detach %U ++Exec=calibre %U Icon=calibre-gui Categories=Office; - ''' + X-GNOME-UsesNotifications=true Added: head/deskutils/calibre/files/patch-src_calibre_utils_formatter.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-src_calibre_utils_formatter.py Tue Dec 8 20:03:07 2020 (r557300) @@ -0,0 +1,11 @@ +--- src/calibre/utils/formatter.py.orig 2020-11-13 01:58:49 UTC ++++ src/calibre/utils/formatter.py +@@ -536,7 +536,7 @@ class _Interpreter(object): + + def do_node_first_non_empty(self, prog): + for expr in prog.expression_list: +- if v := self.expr(expr): ++ if v == self.expr(expr): + return v + + NODE_OPS = { Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Tue Dec 8 16:37:11 2020 (r557299) +++ head/deskutils/calibre/pkg-plist Tue Dec 8 20:03:07 2020 (r557300) @@ -18,10 +18,6 @@ bin/lrfviewer bin/lrs2lrf bin/markdown-calibre bin/web2disk -lib/calibre/backports/__init__.py -lib/calibre/backports/functools_lru_cache.py -lib/calibre/backports/ipaddress.py -lib/calibre/biplist/__init__.py lib/calibre/calibre/__init__.py lib/calibre/calibre/constants.py lib/calibre/calibre/customize/__init__.py @@ -32,6 +28,7 @@ lib/calibre/calibre/customize/ui.py lib/calibre/calibre/customize/zipplugin.py lib/calibre/calibre/db/__init__.py lib/calibre/calibre/db/adding.py +lib/calibre/calibre/db/annotations.py lib/calibre/calibre/db/backend.py lib/calibre/calibre/db/backup.py lib/calibre/calibre/db/cache.py @@ -363,14 +360,12 @@ lib/calibre/calibre/ebooks/metadata/sources/base.py lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py lib/calibre/calibre/ebooks/metadata/sources/cli.py lib/calibre/calibre/ebooks/metadata/sources/covers.py -lib/calibre/calibre/ebooks/metadata/sources/douban.py lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py lib/calibre/calibre/ebooks/metadata/sources/google.py lib/calibre/calibre/ebooks/metadata/sources/google_images.py lib/calibre/calibre/ebooks/metadata/sources/identify.py lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py lib/calibre/calibre/ebooks/metadata/sources/overdrive.py -lib/calibre/calibre/ebooks/metadata/sources/ozon.py lib/calibre/calibre/ebooks/metadata/sources/prefs.py lib/calibre/calibre/ebooks/metadata/sources/search_engines.py lib/calibre/calibre/ebooks/metadata/sources/test.py @@ -638,6 +633,7 @@ lib/calibre/calibre/gui2/actions/add.py lib/calibre/calibre/gui2/actions/add_to_library.py lib/calibre/calibre/gui2/actions/annotate.py lib/calibre/calibre/gui2/actions/author_mapper.py +lib/calibre/calibre/gui2/actions/browse_annots.py lib/calibre/calibre/gui2/actions/catalog.py lib/calibre/calibre/gui2/actions/choose_library.py lib/calibre/calibre/gui2/actions/convert.py @@ -661,6 +657,7 @@ lib/calibre/calibre/gui2/actions/restart.py lib/calibre/calibre/gui2/actions/save_to_disk.py lib/calibre/calibre/gui2/actions/show_book_details.py lib/calibre/calibre/gui2/actions/show_quickview.py +lib/calibre/calibre/gui2/actions/show_stored_templates.py lib/calibre/calibre/gui2/actions/show_template_tester.py lib/calibre/calibre/gui2/actions/similar_books.py lib/calibre/calibre/gui2/actions/sort.py @@ -805,6 +802,7 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py lib/calibre/calibre/gui2/dialogs/duplicates.py lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py +lib/calibre/calibre/gui2/dialogs/enum_values_edit.py lib/calibre/calibre/gui2/dialogs/exim.py lib/calibre/calibre/gui2/dialogs/jobs_ui.py lib/calibre/calibre/gui2/dialogs/match_books.py @@ -855,11 +853,13 @@ lib/calibre/calibre/gui2/layout.py lib/calibre/calibre/gui2/layout_menu.py lib/calibre/calibre/gui2/library/__init__.py lib/calibre/calibre/gui2/library/alternate_views.py +lib/calibre/calibre/gui2/library/annotations.py lib/calibre/calibre/gui2/library/caches.py lib/calibre/calibre/gui2/library/delegates.py lib/calibre/calibre/gui2/library/models.py lib/calibre/calibre/gui2/library/views.py lib/calibre/calibre/gui2/linux_file_dialogs.py +lib/calibre/calibre/gui2/listener.py lib/calibre/calibre/gui2/lrf_renderer/__init__.py lib/calibre/calibre/gui2/lrf_renderer/bookview.py lib/calibre/calibre/gui2/lrf_renderer/config_ui.py @@ -1029,6 +1029,14 @@ lib/calibre/calibre/gui2/toc/__init__.py lib/calibre/calibre/gui2/toc/location.py lib/calibre/calibre/gui2/toc/main.py lib/calibre/calibre/gui2/tools.py +lib/calibre/calibre/gui2/tts/__init__.py +lib/calibre/calibre/gui2/tts/common.py +lib/calibre/calibre/gui2/tts/develop.py +lib/calibre/calibre/gui2/tts/errors.py +lib/calibre/calibre/gui2/tts/implementation.py +lib/calibre/calibre/gui2/tts/linux.py +lib/calibre/calibre/gui2/tts/macos.py +lib/calibre/calibre/gui2/tts/windows.py lib/calibre/calibre/gui2/tweak_book/__init__.py lib/calibre/calibre/gui2/tweak_book/boss.py lib/calibre/calibre/gui2/tweak_book/char_select.py @@ -1093,6 +1101,7 @@ lib/calibre/calibre/gui2/update.py lib/calibre/calibre/gui2/viewer/__init__.py lib/calibre/calibre/gui2/viewer/annotations.py lib/calibre/calibre/gui2/viewer/bookmarks.py +lib/calibre/calibre/gui2/viewer/config.py lib/calibre/calibre/gui2/viewer/convert_book.py lib/calibre/calibre/gui2/viewer/highlights.py lib/calibre/calibre/gui2/viewer/integration.py @@ -1106,6 +1115,7 @@ lib/calibre/calibre/gui2/viewer/toc.py lib/calibre/calibre/gui2/viewer/toolbars.py lib/calibre/calibre/gui2/viewer/ui.py lib/calibre/calibre/gui2/viewer/web_view.py +lib/calibre/calibre/gui2/viewer/widgets.py lib/calibre/calibre/gui2/webengine.py lib/calibre/calibre/gui2/widgets.py lib/calibre/calibre/gui2/widgets2.py @@ -1142,32 +1152,31 @@ lib/calibre/calibre/library/schema_upgrades.py lib/calibre/calibre/library/sqlite.py lib/calibre/calibre/libunzip.py lib/calibre/calibre/linux.py -lib/calibre/calibre/plugins/3/_patiencediff_c.so -lib/calibre/calibre/plugins/3/bzzdec.so -lib/calibre/calibre/plugins/3/cPalmdoc.so -lib/calibre/calibre/plugins/3/certgen.so -lib/calibre/calibre/plugins/3/chmlib.so -lib/calibre/calibre/plugins/3/freetype.so -lib/calibre/calibre/plugins/3/html_as_json.so -lib/calibre/calibre/plugins/3/html_syntax_highlighter.so -lib/calibre/calibre/plugins/3/hunspell.so -lib/calibre/calibre/plugins/3/hyphen.so -lib/calibre/calibre/plugins/3/icu.so -lib/calibre/calibre/plugins/3/imageops.so -lib/calibre/calibre/plugins/3/libheadless.so -lib/calibre/calibre/plugins/3/libmtp.so -lib/calibre/calibre/plugins/3/libusb.so -lib/calibre/calibre/plugins/3/lzma_binding.so -lib/calibre/calibre/plugins/3/lzx.so -lib/calibre/calibre/plugins/3/matcher.so -lib/calibre/calibre/plugins/3/msdes.so -lib/calibre/calibre/plugins/3/pictureflow.so -lib/calibre/calibre/plugins/3/podofo.so -lib/calibre/calibre/plugins/3/progress_indicator.so -lib/calibre/calibre/plugins/3/speedup.so -lib/calibre/calibre/plugins/3/sqlite_custom.so -lib/calibre/calibre/plugins/3/tokenizer.so -lib/calibre/calibre/plugins/3/unicode_names.so +lib/calibre/calibre/plugins/_patiencediff_c.so +lib/calibre/calibre/plugins/bzzdec.so +lib/calibre/calibre/plugins/cPalmdoc.so +lib/calibre/calibre/plugins/certgen.so +lib/calibre/calibre/plugins/freetype.so +lib/calibre/calibre/plugins/html_as_json.so +lib/calibre/calibre/plugins/html_syntax_highlighter.so +lib/calibre/calibre/plugins/hunspell.so +lib/calibre/calibre/plugins/hyphen.so +lib/calibre/calibre/plugins/icu.so +lib/calibre/calibre/plugins/imageops.so +lib/calibre/calibre/plugins/libheadless.so +lib/calibre/calibre/plugins/libmtp.so +lib/calibre/calibre/plugins/libusb.so +lib/calibre/calibre/plugins/lzx.so +lib/calibre/calibre/plugins/matcher.so +lib/calibre/calibre/plugins/msdes.so +lib/calibre/calibre/plugins/pictureflow.so +lib/calibre/calibre/plugins/podofo.so +lib/calibre/calibre/plugins/progress_indicator.so +lib/calibre/calibre/plugins/speedup.so +lib/calibre/calibre/plugins/sqlite_custom.so +lib/calibre/calibre/plugins/tokenizer.so +lib/calibre/calibre/plugins/unicode_names.so +lib/calibre/calibre/prints.py lib/calibre/calibre/ptempfile.py lib/calibre/calibre/rpdb.py lib/calibre/calibre/spell/__init__.py @@ -1223,13 +1232,10 @@ lib/calibre/calibre/test_build.py lib/calibre/calibre/translations/__init__.py lib/calibre/calibre/translations/dynamic.py lib/calibre/calibre/translations/msgfmt.py -lib/calibre/calibre/utils/Zeroconf.py lib/calibre/calibre/utils/__init__.py lib/calibre/calibre/utils/bibtex.py lib/calibre/calibre/utils/browser.py lib/calibre/calibre/utils/certgen.py -lib/calibre/calibre/utils/chm/__init__.py -lib/calibre/calibre/utils/chm/chm.py lib/calibre/calibre/utils/cleantext.py lib/calibre/calibre/utils/complete.py lib/calibre/calibre/utils/config.py @@ -1334,11 +1340,11 @@ lib/calibre/calibre/utils/test_lock.py lib/calibre/calibre/utils/text2int.py lib/calibre/calibre/utils/threadpool.py lib/calibre/calibre/utils/titlecase.py -lib/calibre/calibre/utils/unicode_getpass.py lib/calibre/calibre/utils/unicode_names.py lib/calibre/calibre/utils/unrar.py lib/calibre/calibre/utils/unsmarten.py lib/calibre/calibre/utils/windows/__init__.py +lib/calibre/calibre/utils/windows/winsapi.py lib/calibre/calibre/utils/windows/wintest.py lib/calibre/calibre/utils/winreg/__init__.py lib/calibre/calibre/utils/winreg/dde.py @@ -1360,10 +1366,6 @@ lib/calibre/calibre/web/feeds/templates.py lib/calibre/calibre/web/fetch/__init__.py lib/calibre/calibre/web/fetch/simple.py lib/calibre/calibre/web/fetch/utils.py -lib/calibre/calibre_lzma/__init__.py -lib/calibre/calibre_lzma/errors.py -lib/calibre/calibre_lzma/lzma1.py -lib/calibre/calibre_lzma/xz.py lib/calibre/css_selectors/__init__.py lib/calibre/css_selectors/errors.py lib/calibre/css_selectors/ordered_set.py @@ -1419,6 +1421,7 @@ lib/calibre/polyglot/reprlib.py lib/calibre/polyglot/smtplib.py lib/calibre/polyglot/socketserver.py lib/calibre/polyglot/urllib.py +lib/calibre/sgmllib.py lib/calibre/templite/__init__.py lib/calibre/tinycss/__init__.py lib/calibre/tinycss/color3.py @@ -1451,6 +1454,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/catalog/section_list_templates.conf %%DATADIR%%/catalog/stylesheet.css %%DATADIR%%/catalog/template.xhtml +%%DATADIR%%/changelog.json %%DATADIR%%/content-server/calibre.png %%DATADIR%%/content-server/empty.html %%DATADIR%%/content-server/index-generated.html @@ -1596,6 +1600,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/images/h-ellipsis.png %%DATADIR%%/images/help.png %%DATADIR%%/images/heuristics.png +%%DATADIR%%/images/highlight.png %%DATADIR%%/images/highlight_only_off.png %%DATADIR%%/images/highlight_only_on.png %%DATADIR%%/images/hotmail.png @@ -1783,6 +1788,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/quick_start/fra.epub %%DATADIR%%/quick_start/ita.epub %%DATADIR%%/quick_start/swe.epub +%%DATADIR%%/quick_start/tur.epub %%DATADIR%%/rapydscript/compiler.js.xz %%DATADIR%%/scripts.calibre_msgpack %%DATADIR%%/template-functions.json @@ -1803,9 +1809,9 @@ lib/calibre/tinycss/version.py %%DATADIR%%/viewer.html %%DATADIR%%/viewer.js %%PYTHON_SITELIBDIR%%/init_calibre.py -share/appdata/calibre-ebook-edit.appdata.xml -share/appdata/calibre-ebook-viewer.appdata.xml -share/appdata/calibre-gui.appdata.xml +share/metainfo/calibre-ebook-edit.metainfo.xml +share/metainfo/calibre-ebook-viewer.metainfo.xml +share/metainfo/calibre-gui.metainfo.xml share/applications/calibre-ebook-edit.desktop share/applications/calibre-ebook-viewer.desktop share/applications/calibre-gui.desktop Added: head/deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff Tue Dec 8 20:03:07 2020 (r557300) @@ -0,0 +1,60 @@ +Author: Volker Krause +Date: Sun Oct 25 18:22:58 2020 +0100 + + Compile with recent Qt 5.15 + + More QPrinter methods got deprecated there. DevicePixel no longer exists + as a unit, visually Point looks pretty much the same though. + +diff --git src/printing/compact/compactstyle.cpp src/printing/compact/compactstyle.cpp +index d950a963..71e74c0f 100644 +--- src/printing/compact/compactstyle.cpp ++++ src/printing/compact/compactstyle.cpp +@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre + + // print + QPrinter *printer = wizard()->printer(); +- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); ++ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); + + progress->addMessage(i18n("Setting up document")); + +diff --git src/printing/grantlee/grantleeprintstyle.cpp src/printing/grantlee/grantleeprintstyle.cpp +index d7afe8ef..49b5e494 100644 +--- src/printing/grantlee/grantleeprintstyle.cpp ++++ src/printing/grantlee/grantleeprintstyle.cpp +@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle() + void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress) + { + QPrinter *printer = wizard()->printer(); +- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); ++ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); + + progress->addMessage(i18n("Setting up document")); + +diff --git src/printing/mike/mikesstyle.cpp src/printing/mike/mikesstyle.cpp +index 9f698c53..81a4bd6f 100644 +--- src/printing/mike/mikesstyle.cpp ++++ src/printing/mike/mikesstyle.cpp +@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle() + void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress) + { + QPrinter *printer = wizard()->printer(); +- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); ++ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); + + progress->addMessage(i18n("Setting up document")); + +diff --git src/printing/ringbinder/ringbinderstyle.cpp src/printing/ringbinder/ringbinderstyle.cpp +index 60a39c86..5f600d6a 100644 +--- src/printing/ringbinder/ringbinderstyle.cpp ++++ src/printing/ringbinder/ringbinderstyle.cpp +@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri + config.sync(); + + QPrinter *printer = wizard()->printer(); +- printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel); ++ printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point); + + progress->addMessage(i18n("Setting up document")); + Modified: head/devel/eric6/Makefile ============================================================================== --- head/devel/eric6/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/eric6/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -6,16 +6,13 @@ DISTNAME= ${PORTNAME}-nolang-${DISTVERSION} PORTREVISION= 1 CATEGORIES= devel python -# Note to MAINTAINER: this should be converted to USES=pyqt, USE_PYQT=[...] -BUILD_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSION}:x11-toolkits/py-qt5-chart@${PY_FLAVOR} -RUN_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSION}:x11-toolkits/py-qt5-chart@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/} USES+= desktop-file-utils python:3.5+ pyqt:5 shebangfix USE_PYTHON= flavors -USE_PYQT= core gui qscintilla2 webengine \ +USE_PYQT= chart core gui qscintilla2 webengine \ help_run network_run svg_run sql_run INSTALL_PY= install.py -c -f eric6config.freebsd -i ${STAGEDIR} SHEBANG_FILES= *.py eric/eric6/*.py eric/scripts/*.py Modified: head/devel/libsavitar/Makefile ============================================================================== --- head/devel/libsavitar/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/libsavitar/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -2,20 +2,23 @@ PORTNAME= libSavitar DISTVERSION= 4.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel cad DIST_SUBDIR= Ultimaker +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 195633cf0c5f.patch:-p1 + MAINTAINER= db@FreeBSD.org COMMENT= C++ implementation of 3mf loading/python bindings LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR} LIB_DEPENDS= libpugixml.so:textproc/pugixml -USES= cmake compiler:c++11-lang python:3.4+ +USES= cmake compiler:c++11-lang python:3.5+ pyqt:5 +USE_PYQT= sip pysip USE_GITHUB= yes GH_ACCOUNT= Ultimaker GH_TAGNAME= 96eba0e Modified: head/devel/libsavitar/distinfo ============================================================================== --- head/devel/libsavitar/distinfo Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/libsavitar/distinfo Tue Dec 8 20:03:07 2020 (r557300) @@ -1,3 +1,5 @@ -TIMESTAMP = 1583953836 +TIMESTAMP = 1602393384 SHA256 (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = f64e9b20d6783247a88ddc751a80d20eec2073465c0b46fbba45c1ab9c01eb75 SIZE (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = 98038 +SHA256 (Ultimaker/195633cf0c5f.patch) = 5c4fce2fbf144ae92882234dc5b703a7e1f9594a80cfefbaaa083b4c7d81b0f4 +SIZE (Ultimaker/195633cf0c5f.patch) = 5331 Modified: head/devel/py-qt5-core/Makefile ============================================================================== --- head/devel/py-qt5-core/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-core/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -15,9 +15,9 @@ CONFIGURE_ARGS= ${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/ PYQT_DIST= yes -USES= python pyqt:5 qt:5 +USES= python:3.5+ pyqt:5 qt:5 USE_PYTHON= concurrent flavors py3kplist -USE_PYQT= sip +USE_PYQT= sip pysip USE_QT= core buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Modified: head/devel/py-qt5-dbus/Makefile ============================================================================== --- head/devel/py-qt5-dbus/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-dbus/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtDBus PYQT_DIST= yes -USES= python pyqt:5 qt:5 +USES= python:3.5+ pyqt:5 qt:5 USE_PYQT= sip_build core_run USE_PYTHON= concurrent flavors py3kplist USE_QT= core dbus qmake_build Modified: head/devel/py-qt5-dbussupport/Makefile ============================================================================== --- head/devel/py-qt5-dbussupport/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-dbussupport/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -15,7 +15,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= pkgconfig python pyqt:5 qt:5 +USES= pkgconfig python:3.5+ pyqt:5 qt:5 USE_PYQT= sip_build USE_PYTHON= concurrent flavors py3kplist USE_QT= core buildtools_build qmake_build Modified: head/devel/py-qt5-designer/Makefile ============================================================================== --- head/devel/py-qt5-designer/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-designer/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= concurrent flavors py3kplist Modified: head/devel/py-qt5-designerplugin/Makefile ============================================================================== --- head/devel/py-qt5-designerplugin/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-designerplugin/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -17,7 +17,7 @@ CONFIGURE_ARGS= --enable QtDesigner PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build USE_PYTHON= concurrent flavors py3kplist Modified: head/devel/py-qt5-help/Makefile ============================================================================== --- head/devel/py-qt5-help/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-help/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtHelp PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= concurrent flavors py3kplist Modified: head/devel/py-qt5-location/Makefile ============================================================================== --- head/devel/py-qt5-location/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-location/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtLocation PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= concurrent flavors py3kplist Modified: head/devel/py-qt5-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt5-qscintilla2/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-qscintilla2/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -17,7 +17,7 @@ DESTDIRNAME= INSTALL_ROOT HAS_CONFIGURE= yes -USES= python pyqt:5 gl qmake:no_env qt:5 +USES= python:3.5+ pyqt:5 gl qmake:no_env qt:5 USE_GL= gl USE_PYQT= core gui printsupport widgets USE_PYTHON= concurrent flavors py3kplist Modified: head/devel/py-qt5-remoteobjects/Makefile ============================================================================== --- head/devel/py-qt5-remoteobjects/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-remoteobjects/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtRemoteObjects PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= concurrent flavors py3kplist Modified: head/devel/py-qt5-test/Makefile ============================================================================== --- head/devel/py-qt5-test/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5-test/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34} CONFIGURE_ARGS= --enable QtTest PYQT_DIST= yes -USES= gl python pyqt:5 qt:5 +USES= gl python:3.5+ pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= concurrent flavors py3kplist Modified: head/devel/py-qt5/Makefile ============================================================================== --- head/devel/py-qt5/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -8,7 +8,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt 5 toolkit (meta port) -USES= metaport python pyqt:5 +USES= metaport python:3.5+ pyqt:5 USE_PYTHON= concurrent flavors py3kplist # Keep these synchronized with _USE_PYQT_ALL in Mk/Use/pyqt.mk Modified: head/devel/py-qt5/distinfo ============================================================================== --- head/devel/py-qt5/distinfo Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qt5/distinfo Tue Dec 8 20:03:07 2020 (r557300) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595064383 -SHA256 (PyQt5-5.15.0.tar.gz) = c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9 -SIZE (PyQt5-5.15.0.tar.gz) = 3262004 +TIMESTAMP = 1602000543 +SHA256 (PyQt5-5.15.1.tar.gz) = d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1 +SIZE (PyQt5-5.15.1.tar.gz) = 3264559 Modified: head/devel/py-qtbuilder/Makefile ============================================================================== --- head/devel/py-qtbuilder/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-qtbuilder/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -1,16 +1,16 @@ # $FreeBSD$ PORTNAME= qtbuilder -PORTVERSION= 1.4.0 # ${QTBUILDER_VERSION} +PORTVERSION= ${PYQTBUILDER_VERSION} CATEGORIES= devel python -MASTER_SITES= https://pypi.io/packages/source/P/PyQt-builder/ # ${MASTER_SITES_QTBUILDER} +MASTER_SITES= ${MASTER_SITES_PYQTBUILDER} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= PyQt-builder-${PORTVERSION} # ${QTBUILDER_DISTNAME} +DISTNAME= ${PYQTBUILDER_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= The PEP 517 compliant PyQt build system -USES= python +USES= python:3.5+ pyqt:5 USE_PYTHON= autoplist concurrent distutils flavors py3kplist USE_PYQT= # Modified: head/devel/py-sip/Makefile ============================================================================== --- head/devel/py-sip/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-sip/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -12,60 +12,20 @@ DISTNAME= ${SIP_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python to C and C++ bindings generator -USES= python pyqt:sip -USE_PYTHON= concurrent py3kplist flavors -USE_PYQT= # +LICENSE= SIP GPLv2 GPLv3 +LICENSE_COMB= multi +LICENSE_NAME_SIP= SIP License +LICENSE_GROUPS_SIP= FSF GPL OSI +LICENSE_PERMS_SIP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_FILE_SIP= ${WRKSRC}/LICENSE +LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE-GPL2 +LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPL3 -CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ - -e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \ - --sipdir ${PYQT_SIPDIR} \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib" +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} -PORTDOCS= * - -OPTIONS_DEFINE= DOCS DEBUG -DEBUG_CONFIGURE_ON= --debug - -# From upstreams site: -# When building PyQt5 v5.11 or later you must configure SIP to create a -# private copy of the sip module using a command line similar to the following: -# > python configure.py --sip-module PyQt5.sip --no-tools -CONFIGURE_WRKSRC= ${WRKSRC}/default -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} - -PYQT_SIPDIR= ${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip - -do-configure: - # The default sip 'flavor' - ${MKDIR} ${CONFIGURE_WRKSRC} && \ - cd ${CONFIGURE_WRKSRC} && \ - ${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \ - ${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' ${CONFIGURE_WRKSRC}/sipconfig.py - # The now needed version for 5.11 (which will be the default from 2019-03-16). - ${MKDIR} ${WRKSRC}/sip_qt5 && \ - cd ${WRKSRC}/sip_qt5 && \ - ${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools && \ - ${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' ${WRKSRC}/sip_qt5/sipconfig.py - -post-build: - cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} - -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \ - ${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR} - ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - -f -d ${PYTHONPREFIX_SITELIBDIR} \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - -f -d ${PYTHONPREFIX_SITELIBDIR} \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/sip - ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/sip.so - - cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install - ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/PyQt5/sip.so +USES= python:3.5+ pyqt:sip +USE_PYTHON= autoplist concurrent distutils flavors py3kplist +USE_PYQT= # .include Modified: head/devel/py-sip/distinfo ============================================================================== --- head/devel/py-sip/distinfo Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/py-sip/distinfo Tue Dec 8 20:03:07 2020 (r557300) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600752207 -SHA256 (sip-4.19.24.tar.gz) = edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5 -SIZE (sip-4.19.24.tar.gz) = 1055461 +TIMESTAMP = 1603131908 +SHA256 (sip-5.4.0.tar.gz) = 4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641 +SIZE (sip-5.4.0.tar.gz) = 1106676 Modified: head/devel/pyside2-tools/Makefile ============================================================================== --- head/devel/pyside2-tools/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/pyside2-tools/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pyside2-tools -DISTVERSION= 5.15.1 +DISTVERSION= 5.15.2 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/devel/pyside2-tools/distinfo ============================================================================== --- head/devel/pyside2-tools/distinfo Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/pyside2-tools/distinfo Tue Dec 8 20:03:07 2020 (r557300) @@ -1,3 +1,3 @@ -TIMESTAMP = 1601627385 -SHA256 (pyside-setup-opensource-src-5.15.1.tar.xz) = f175c1d8813257904cf0efeb58e44f68d53b9916f73adaf9ce19514c0271c3fa -SIZE (pyside-setup-opensource-src-5.15.1.tar.xz) = 3454052 +TIMESTAMP = 1606840487 +SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 +SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624 Modified: head/devel/pyside2/Makefile ============================================================================== --- head/devel/pyside2/Makefile Tue Dec 8 16:37:11 2020 (r557299) +++ head/devel/pyside2/Makefile Tue Dec 8 20:03:07 2020 (r557300) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pyside2 -DISTVERSION= 5.15.1 +DISTVERSION= 5.15.2 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -42,5 +42,15 @@ USE_QT+= webengine .else PLIST_SUB+= WEBENGINE="@comment " .endif + +# AVOID a build_fs_violation with poudriere +post-build: *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***