mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-26 05:02:18 +00:00
47b26d9293
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
60 lines
1.6 KiB
Prolog
60 lines
1.6 KiB
Prolog
--- src/src.pro.orig 2020-11-20 20:00:38 UTC
|
|
+++ src/src.pro
|
|
@@ -1,55 +1,3 @@
|
|
TEMPLATE = subdirs
|
|
|
|
-qtHaveModule(widgets) {
|
|
- no-png {
|
|
- message("Some graphics-related tools are unavailable without PNG support")
|
|
- } else {
|
|
- QT_FOR_CONFIG += widgets
|
|
- qtConfig(pushbutton):qtConfig(toolbutton) {
|
|
- SUBDIRS = designer \
|
|
- pixeltool
|
|
-
|
|
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
|
|
-
|
|
- linguist.depends = designer
|
|
- }
|
|
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
|
|
- }
|
|
-}
|
|
-
|
|
-SUBDIRS += linguist \
|
|
- qtattributionsscanner
|
|
-
|
|
-qtConfig(library) {
|
|
- !android|android_app: SUBDIRS += qtplugininfo
|
|
-}
|
|
-
|
|
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
|
|
-QT_FOR_CONFIG += qdoc-private
|
|
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
|
|
-
|
|
-!android|android_app: SUBDIRS += qtpaths
|
|
-
|
|
-macos {
|
|
- SUBDIRS += macdeployqt
|
|
-}
|
|
-
|
|
-qtHaveModule(dbus): SUBDIRS += qdbus
|
|
-
|
|
-win32|winrt:SUBDIRS += windeployqt
|
|
-winrt:SUBDIRS += winrtrunner
|
|
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
|
|
-
|
|
-qtNomakeTools( \
|
|
- distancefieldgenerator \
|
|
- pixeltool \
|
|
-)
|
|
-
|
|
-# This is necessary to avoid a race condition between toolchain.prf
|
|
-# invocations in a module-by-module cross-build.
|
|
-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
|
|
- qdoc.depends += qtattributionsscanner
|
|
- windeployqt.depends += qtattributionsscanner
|
|
- winrtrunner.depends += qtattributionsscanner
|
|
- linguist.depends += qtattributionsscanner
|
|
-}
|
|
+SUBDIRS = qtdiag
|