diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2023-09-18 20:02:30 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2023-09-25 15:35:16 +0000 |
| commit | 2a5c778173f13a057551b4284269b82f6faa077f (patch) | |
| tree | 76a8211e0a042247fea88fc5326899850cdf7e94 /Mk | |
| parent | 6a6a9ad85d351525e0a974e5e9ae36a30b30155a (diff) | |
| download | ports-2a5c778173f13a057551b4284269b82f6faa077f.tar.gz ports-2a5c778173f13a057551b4284269b82f6faa077f.zip | |
Qt5: Update to 5.15.10
Update devel/qt5-script* and www/qt5-webengine to 5.15.15-lts
Update devel/pyside2* and devel/shiboken2 to 5.15.10
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.10/release-note.md
PR: 273934
Exp-run by: antoine
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/qt-dist.mk | 35 | ||||
| -rw-r--r-- | Mk/Uses/qt.mk | 2 |
2 files changed, 23 insertions, 14 deletions
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index ef63764841d0..2a03c8fad100 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -105,36 +105,39 @@ DIST_SUBDIR= KDE/Qt/${_QT_VERSION} . if ${_QT_VER:M5} # KDE maintains a repository with a patched Qt5 distribution. _KDE_3d= 0 -_KDE_base= 157 +_KDE_base= 156 _KDE_charts= 0 -_KDE_connectivity= 5 +_KDE_connectivity= 6 _KDE_datavis3d= 0 -_KDE_declarative= 21 +_KDE_declarative= 31 _KDE_gamepad= 0 _KDE_graphicaleffects= 0 -_KDE_imageformats= 6 -_KDE_location= 3 -_KDE_multimedia= 1 +_KDE_imageformats= 9 +_KDE_location= 4 +_KDE_multimedia= 3 _KDE_networkauth= 0 _KDE_quick3d= 1 _KDE_quickcontrols= 0 -_KDE_quickcontrols2= 7 +_KDE_quickcontrols2= 6 _KDE_quicktimeline= 0 _KDE_remoteobjects= 0 _KDE_script= 0 -_KDE_script_ORIGIN_TAG= v5.15.11-lts -_KDE_script_VERSION= 5.15.11 +_KDE_script_ORIGIN_TAG= v5.15.15-lts +_KDE_script_VERSION= 5.15.15 _KDE_scxml= 0 _KDE_sensors= 0 _KDE_serialbus= 0 _KDE_serialport= 0 _KDE_speech= 1 _KDE_svg= 8 -_KDE_tools= 1 +_KDE_tools= 3 _KDE_translations= 0 _KDE_virtualkeyboard= 0 _KDE_wayland= 57 _KDE_webchannel= 3 +_KDE_webengine= 0 +_KDE_webengine_ORIGIN_TAG= v5.15.15-lts +_KDE_webengine_VERSION= 5.15.15 _KDE_webglplugin= 0 _KDE_websockets= 2 _KDE_webview= 0 @@ -142,10 +145,15 @@ _KDE_x11extras= 0 _KDE_xmlpatterns= 0 . if defined(_KDE_${_QT_DIST}) +. if defined(_KDE_${_QT_DIST}_ORIGIN_TAG) +_KDE_${_QT_DIST}_BRANCH= ${_KDE_${_QT_DIST}_VERSION} +. else +_KDE_${_QT_DIST}_BRANCH= kde/5.15 +COMMENT+= (KDE patched) +. endif QT5_KDE_PATCH= p${_KDE_${_QT_DIST}} _KDE_${_QT_DIST}_VERSION?= ${_QT_VERSION} _KDE_${_QT_DIST}_ORIGIN_TAG?= v${_KDE_${_QT_DIST}_VERSION}-lts-lgpl -COMMENT+= (KDE patched) . else QT5_KDE_PATCH= # . endif @@ -405,7 +413,7 @@ qt5-pre-configure: # As the patch collection was created after a version bump, all module verisions # are tagged as 5.15.3 touch ${WRKSRC}/.qmake.conf # easier than to -f before the sed - ${REINPLACE_CMD} -e '/MODULE_VERSION/s|5\.15\.[0-9]|${_QT_VERSION}|g' \ + ${REINPLACE_CMD} -e '/MODULE_VERSION/s|5\.15\.\([0-9]*\)|${_QT_VERSION}|g' \ ${WRKSRC}/.qmake.conf # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE **** @@ -525,7 +533,8 @@ qt-create-kde-distfile: ${_QT_DIST} \ ${DISTDIR}/${DIST_SUBDIR} \ ${_KDE_${_QT_DIST}_VERSION} \ - ${_KDE_${_QT_DIST}_ORIGIN_TAG} + ${_KDE_${_QT_DIST}_ORIGIN_TAG} \ + ${_KDE_${_QT_DIST}_BRANCH} .endif # defined(_QT_DIST_MK_INCLUDED) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 912cc591787d..2c3421a456fe 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -22,7 +22,7 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 -QT5_VERSION?= 5.15.8 +QT5_VERSION?= 5.15.10 QT6_VERSION?= 6.5.2 PYSIDE6_VERSION?= ${QT6_VERSION} |