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 /misc | |
parent | Update benchmarks/ali to version 0.5.4. (diff) |
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
Diffstat (limited to 'misc')
-rw-r--r-- | misc/py-qt5-demo/Makefile | 2 | ||||
-rw-r--r-- | misc/qt5-examples/distinfo | 6 | ||||
-rw-r--r-- | misc/qt5-examples/pkg-plist | 81 | ||||
-rw-r--r-- | misc/qt5-l10n/pkg-plist | 14 |
4 files changed, 99 insertions, 4 deletions
diff --git a/misc/py-qt5-demo/Makefile b/misc/py-qt5-demo/Makefile index 64e09c333320..9b454de104ba 100644 --- a/misc/py-qt5-demo/Makefile +++ b/misc/py-qt5-demo/Makefile @@ -15,7 +15,7 @@ NO_BUILD= yes PORTSCOUT= limit:^${PYQT5_VERSION} -USES= python pyqt:5 +USES= python:3.5+ pyqt:5 USE_PYQT= core_run dbus_run designer_run \ designerplugin_run gui_run multimedia_run \ multimediawidgets_run network_run opengl_run \ diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo index f84a68955f4b..ea977fb7e974 100644 --- a/misc/qt5-examples/distinfo +++ b/misc/qt5-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590590417 -SHA256 (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3 -SIZE (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 592401236 +TIMESTAMP = 1605899661 +SHA256 (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240 +SIZE (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 586690220 diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist index b9e669005e5a..108aa8553ad3 100644 --- a/misc/qt5-examples/pkg-plist +++ b/misc/qt5-examples/pkg-plist @@ -101,6 +101,17 @@ %%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc %%QT_EXAMPLEDIR%%/aggregate/examples.pro %%QT_EXAMPLEDIR%%/androidextras/androidextras.pro +%%QT_EXAMPLEDIR%%/androidextras/customactivity/activityhandler.cpp +%%QT_EXAMPLEDIR%%/androidextras/customactivity/activityhandler.h +%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/res/layout/second_activity.xml +%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/res/values/strings.xml +%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/src/org/qtproject/example/activityhandler/CustomActivity.java +%%QT_EXAMPLEDIR%%/androidextras/customactivity/customactivity.pro +%%QT_EXAMPLEDIR%%/androidextras/customactivity/doc/src/qtandroidextras-example-customactivity.qdoc +%%QT_EXAMPLEDIR%%/androidextras/customactivity/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/customactivity/main.qml +%%QT_EXAMPLEDIR%%/androidextras/customactivity/qml.qrc %%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/AndroidManifest.xml %%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-hdpi/icon.png %%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-ldpi/icon.png @@ -116,6 +127,15 @@ %%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.cpp %%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.qml %%QT_EXAMPLEDIR%%/androidextras/jnimessenger/qml.qrc +%%QT_EXAMPLEDIR%%/androidextras/musiclist/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/musiclist/android/src/org/qtproject/example/musiclist/MusicList.java +%%QT_EXAMPLEDIR%%/androidextras/musiclist/doc/src/qtandroidextras-example-musiclist.qdoc +%%QT_EXAMPLEDIR%%/androidextras/musiclist/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/musiclist/main.qml +%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.cpp +%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.h +%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.pro +%%QT_EXAMPLEDIR%%/androidextras/musiclist/qml.qrc %%QT_EXAMPLEDIR%%/androidextras/notification/android/AndroidManifest.xml %%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-hdpi/icon.png %%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-ldpi/icon.png @@ -133,6 +153,63 @@ %%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.cpp %%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.h %%QT_EXAMPLEDIR%%/androidextras/notification/qml/main.qml +%%QT_EXAMPLEDIR%%/androidextras/services/common/common.pri +%%QT_EXAMPLEDIR%%/androidextras/services/common/common_broadcast.pri +%%QT_EXAMPLEDIR%%/androidextras/services/common/common_ro.pri +%%QT_EXAMPLEDIR%%/androidextras/services/common/main.qml +%%QT_EXAMPLEDIR%%/androidextras/services/common/qml.qrc +%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.h +%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.rep +%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice_ro.h +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/androidbinder.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/androidbinder.h +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/doc/src/qtandroidextras-example-service-binder.qdoc +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/qtandroidservice.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/qtandroidservice.h +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/service.pro +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/service_main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/servicebinder.pro +%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/servicebinderclient.pro +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/src/org/qtproject/example/qtandroidservice/ActivityUtils.java +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/doc/src/qtandroidextras-example-service-broadcastreceiver.qdoc +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/service.pro +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/service_main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/servicebroadcast.pro +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/servicebroadcastclient.pro +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/src/org/qtproject/example/qtandroidservice/ActivityUtils.java +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/doc/src/qtandroidextras-example-service-broadcastreceiver-samelib.qdoc +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/servicebroadcastsamelib.pro +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/doc/src/qtandroidextras-example-service-remoteobjects.qdoc +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/service.pro +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/service_main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/serviceremoteobjects.pro +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/serviceremoteobjectsclient.pro +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/doc/src/qtandroidextras-example-service-remoteobjects-samelib.qdoc +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/serviceremoteobjectssamelib.pro +%%QT_EXAMPLEDIR%%/androidextras/services/services.pro +%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java +%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/doc/src/qtandroidextras-example-service-same-process.qdoc +%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/main.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/qtandroidservice.cpp +%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/qtandroidservice.h +%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/servicesameprocess.pro %%QT_EXAMPLEDIR%%/assistant/assistant.pro %%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-example.png %%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-findfiledialog.png @@ -4948,16 +5025,20 @@ %%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.pro %%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.qml %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/+touch/texteditor.html +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/creatorKateHighlighter.png %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.cpp %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.h +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/einstein.png +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/example.md %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/fonts/fontello.ttf %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/images/qt-logo.png %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/+touch/texteditor.qml %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/texteditor.qml %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qtquickcontrols2.conf +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/red.png %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.cpp %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.html %%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.pro diff --git a/misc/qt5-l10n/pkg-plist b/misc/qt5-l10n/pkg-plist index 1255085b6230..e5e70dd89297 100644 --- a/misc/qt5-l10n/pkg-plist +++ b/misc/qt5-l10n/pkg-plist @@ -13,6 +13,7 @@ %%QT_L10NDIR%%/assistant_ru.qm %%QT_L10NDIR%%/assistant_sk.qm %%QT_L10NDIR%%/assistant_sl.qm +%%QT_L10NDIR%%/assistant_tr.qm %%QT_L10NDIR%%/assistant_uk.qm %%QT_L10NDIR%%/assistant_zh_CN.qm %%QT_L10NDIR%%/assistant_zh_TW.qm @@ -31,6 +32,7 @@ %%QT_L10NDIR%%/designer_ru.qm %%QT_L10NDIR%%/designer_sk.qm %%QT_L10NDIR%%/designer_sl.qm +%%QT_L10NDIR%%/designer_tr.qm %%QT_L10NDIR%%/designer_uk.qm %%QT_L10NDIR%%/designer_zh_CN.qm %%QT_L10NDIR%%/designer_zh_TW.qm @@ -51,6 +53,7 @@ %%QT_L10NDIR%%/linguist_sk.qm %%QT_L10NDIR%%/linguist_sl.qm %%QT_L10NDIR%%/linguist_sv.qm +%%QT_L10NDIR%%/linguist_tr.qm %%QT_L10NDIR%%/linguist_uk.qm %%QT_L10NDIR%%/linguist_zh_CN.qm %%QT_L10NDIR%%/linguist_zh_TW.qm @@ -86,6 +89,7 @@ %%QT_L10NDIR%%/qt_help_ru.qm %%QT_L10NDIR%%/qt_help_sk.qm %%QT_L10NDIR%%/qt_help_sl.qm +%%QT_L10NDIR%%/qt_help_tr.qm %%QT_L10NDIR%%/qt_help_uk.qm %%QT_L10NDIR%%/qt_help_zh_CN.qm %%QT_L10NDIR%%/qt_help_zh_TW.qm @@ -101,6 +105,7 @@ %%QT_L10NDIR%%/qt_sk.qm %%QT_L10NDIR%%/qt_sl.qm %%QT_L10NDIR%%/qt_sv.qm +%%QT_L10NDIR%%/qt_tr.qm %%QT_L10NDIR%%/qt_uk.qm %%QT_L10NDIR%%/qt_zh_CN.qm %%QT_L10NDIR%%/qt_zh_TW.qm @@ -124,6 +129,7 @@ %%QT_L10NDIR%%/qtbase_pl.qm %%QT_L10NDIR%%/qtbase_ru.qm %%QT_L10NDIR%%/qtbase_sk.qm +%%QT_L10NDIR%%/qtbase_tr.qm %%QT_L10NDIR%%/qtbase_uk.qm %%QT_L10NDIR%%/qtbase_zh_TW.qm %%QT_L10NDIR%%/qtconnectivity_bg.qm @@ -136,6 +142,7 @@ %%QT_L10NDIR%%/qtconnectivity_ko.qm %%QT_L10NDIR%%/qtconnectivity_pl.qm %%QT_L10NDIR%%/qtconnectivity_ru.qm +%%QT_L10NDIR%%/qtconnectivity_tr.qm %%QT_L10NDIR%%/qtconnectivity_uk.qm %%QT_L10NDIR%%/qtdeclarative_bg.qm %%QT_L10NDIR%%/qtdeclarative_da.qm @@ -151,6 +158,7 @@ %%QT_L10NDIR%%/qtdeclarative_pl.qm %%QT_L10NDIR%%/qtdeclarative_ru.qm %%QT_L10NDIR%%/qtdeclarative_sk.qm +%%QT_L10NDIR%%/qtdeclarative_tr.qm %%QT_L10NDIR%%/qtdeclarative_uk.qm %%QT_L10NDIR%%/qtlocation_bg.qm %%QT_L10NDIR%%/qtlocation_ca.qm @@ -164,6 +172,7 @@ %%QT_L10NDIR%%/qtlocation_ko.qm %%QT_L10NDIR%%/qtlocation_pl.qm %%QT_L10NDIR%%/qtlocation_ru.qm +%%QT_L10NDIR%%/qtlocation_tr.qm %%QT_L10NDIR%%/qtlocation_uk.qm %%QT_L10NDIR%%/qtmultimedia_ar.qm %%QT_L10NDIR%%/qtmultimedia_bg.qm @@ -182,6 +191,7 @@ %%QT_L10NDIR%%/qtmultimedia_pl.qm %%QT_L10NDIR%%/qtmultimedia_ru.qm %%QT_L10NDIR%%/qtmultimedia_sk.qm +%%QT_L10NDIR%%/qtmultimedia_tr.qm %%QT_L10NDIR%%/qtmultimedia_uk.qm %%QT_L10NDIR%%/qtmultimedia_zh_TW.qm %%QT_L10NDIR%%/qtquickcontrols2_ar.qm @@ -191,6 +201,7 @@ %%QT_L10NDIR%%/qtquickcontrols2_en.qm %%QT_L10NDIR%%/qtquickcontrols2_hu.qm %%QT_L10NDIR%%/qtquickcontrols2_ko.qm +%%QT_L10NDIR%%/qtquickcontrols2_tr.qm %%QT_L10NDIR%%/qtquickcontrols2_uk.qm %%QT_L10NDIR%%/qtquickcontrols2_zh_TW.qm %%QT_L10NDIR%%/qtquickcontrols_bg.qm @@ -201,7 +212,9 @@ %%QT_L10NDIR%%/qtquickcontrols_fi.qm %%QT_L10NDIR%%/qtquickcontrols_fr.qm %%QT_L10NDIR%%/qtquickcontrols_ja.qm +%%QT_L10NDIR%%/qtquickcontrols_ko.qm %%QT_L10NDIR%%/qtquickcontrols_ru.qm +%%QT_L10NDIR%%/qtquickcontrols_tr.qm %%QT_L10NDIR%%/qtquickcontrols_uk.qm %%QT_L10NDIR%%/qtquickcontrols_zh_TW.qm %%QT_L10NDIR%%/qtscript_ar.qm @@ -223,6 +236,7 @@ %%QT_L10NDIR%%/qtscript_pl.qm %%QT_L10NDIR%%/qtscript_ru.qm %%QT_L10NDIR%%/qtscript_sk.qm +%%QT_L10NDIR%%/qtscript_tr.qm %%QT_L10NDIR%%/qtscript_uk.qm %%QT_L10NDIR%%/qtserialport_de.qm %%QT_L10NDIR%%/qtserialport_en.qm |