diff options
| author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-12-08 20:03:07 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-12-08 20:03:07 +0000 |
| commit | 47b26d9293f196d71c39ba4d82df23d179884405 (patch) | |
| tree | 3984ac0366432e29f9e1ac47cbac9b18032f7c04 /x11-toolkits/qt5-declarative | |
| parent | 96fd51619a1ebc0b215ab75ccc37ce7ab300ed8b (diff) | |
| download | ports-47b26d9293f196d71c39ba4d82df23d179884405.tar.gz ports-47b26d9293f196d71c39ba4d82df23d179884405.zip | |
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
Notes
Notes:
svn path=/head/; revision=557300
Diffstat (limited to 'x11-toolkits/qt5-declarative')
| -rw-r--r-- | x11-toolkits/qt5-declarative/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/qt5-declarative/pkg-plist | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index bbb8ac5f1c65..8dbdd39556e8 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -2,7 +2,6 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -17,6 +16,8 @@ USE_QT= core gui network sql testlib \ CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick +BINARY_ALIAS= python=${PYTHON_CMD} + QT_BINARIES= yes QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge diff --git a/x11-toolkits/qt5-declarative/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist index 0178b9f98c64..c81e84d3e0ef 100644 --- a/x11-toolkits/qt5-declarative/pkg-plist +++ b/x11-toolkits/qt5-declarative/pkg-plist @@ -699,6 +699,7 @@ %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleaffector_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleemitter_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleextruder_p.h +%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleflatset_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlegroup_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlepainter_p.h %%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlesmodule_p.h |