Commit 7e3e6797 authored by Jason E. Hale's avatar Jason E. Hale
Browse files

Qt6: Update to 6.8.1 

December 02, 2024

We (Qt upstream) have released Qt 6.8.1 today. As a patch release,
Qt 6.8.1 does not introduce new features but contains more than 550 bug
fixes, security updates, and other improvements on top of Qt 6.8.0
release. See more information about the most important changes and bug
fixes from the Qt 6.8.1 release note.

Announcement: https://www.qt.io/blog/qt-6.8.1-released
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.1/release-note.md

We (kde@) skipped shipping Qt 6.8.0 due to waiting for a compatible
version of PyQt to be released, but here are the announcements and
release notes from Qt 6.8.0.

Announcement: https://www.qt.io/blog/qt-6.8-released
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.0/release-note.md

PySide6: Update to 6.8.0.2

PySide6 and its related components have been updated alongside the Qt
release for compatibility. Older versions will not build with Qt 6.8.x.

Announcement: https://www.qt.io/blog/qt-for-python-release-6.8

PyQt6: Update to 6.8.0

This release also introduces x11-toolkits/py-qt6-graphs, python bindings
for the Qt Graphs module. As with PySide6, older versions of PyQt6 will
not build with Qt 6.8.x.

Support tools like py-sip and py-qtbuilder have also been updated to their
latest versions.

Announcement: https://www.riverbankcomputing.com/news/PyQt_v6.8.0_Released

Special thanks to Kenneth Raplee for testing and to SponiX for providing
access to build hardware!

PR:		283290
Exp-run by:	antoine (x2)
parent f78ccb1a

Mk/Uses/pyqt.mk

+21 −12
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ MASTER_SITES_PYQT6CHARTS= PYPI/source/P/PyQt6-Charts \ 
				RBDEV/PyQt6-Charts

MASTER_SITES_PYQT6DATAVIS3D=	PYPI/source/P/PyQt6-DataVisualization \

				RBDEV/PyQt6-DataVisualization

MASTER_SITES_PYQT6GRAPHS=	PYPI/source/P/PyQt6-Graphs \

				RBDEV/PyQt6-Graphs

MASTER_SITES_PYQT6NETWORKAUTH=	PYPI/source/P/PyQt6-NetworkAuth \

				RBDEV/PyQt6-NetworkAuth

MASTER_SITES_PYQT6WEBENGINE=	PYPI/source/P/PyQt6-WebEngine \
@@ -92,6 +94,7 @@ MASTER_SITES_PYQTSIP= ${MASTER_SITES_PYQT${_PYQT_VERSION}SIP} 
MASTER_SITES_PYQT3D=		${MASTER_SITES_PYQT${_PYQT_VERSION}3D}

MASTER_SITES_PYQTCHARTS=	${MASTER_SITES_PYQT${_PYQT_VERSION}CHARTS}

MASTER_SITES_PYQTDATAVIS3D=	${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D}

MASTER_SITES_PYQTGRAPHS=	${MASTER_SITES_PYQT${_PYQT_VERSION}GRAPHS}

MASTER_SITES_PYQTNETWORKAUTH=	${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}

MASTER_SITES_PYQTWEBENGINE=	${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
@@ -105,12 +108,12 @@ MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE} 
# below, should have a suitable epoch appended to the version.



# Qt version-agnostic components

PYQTBUILDER_VERSION=		1.16.4

PYQTBUILDER_VERSION=		1.17.0

QSCI2_VERSION=			2.14.1

SIP_VERSION=			6.8.6	# ,1

SIP_VERSION=			6.9.1	# ,1



# Qt 5 components

PYQT5SIP_VERSION=		12.15.0

PYQT5SIP_VERSION=		12.16.1

PYQT5_VERSION=			5.15.11

PYQT53D_VERSION=		5.15.7

PYQT5CHARTS_VERSION=		5.15.7
@@ -119,20 +122,21 @@ PYQT5NETWORKAUTH_VERSION= 5.15.6 
PYQT5WEBENGINE_VERSION=		5.15.7



# Qt 6 components

PYQT6SIP_VERSION=		13.8.0

PYQT6_VERSION=			6.7.1

PYQT63D_VERSION=		6.7.0

PYQT6CHARTS_VERSION=		6.7.0

PYQT6DATAVIS3D_VERSION=		6.7.0

PYQT6NETWORKAUTH_VERSION=	6.7.0

PYQT6WEBENGINE_VERSION=		6.7.0

PYQT6SIP_VERSION=		13.9.1

PYQT6_VERSION=			6.8.0

PYQT63D_VERSION=		6.8.0

PYQT6CHARTS_VERSION=		6.8.0

PYQT6DATAVIS3D_VERSION=		6.8.0

PYQT6GRAPHS_VERSION=		6.8.0

PYQT6NETWORKAUTH_VERSION=	6.8.0

PYQT6WEBENGINE_VERSION=		6.8.0



# Qt version-agnostic components

PYQTBUILDER_DISTNAME=		pyqt_builder-${PYQTBUILDER_VERSION}

QSCI2_DISTNAME=			QScintilla_src-${QSCI2_VERSION}



# Qt 5 components

PYQT5SIP_DISTNAME=		PyQt5_sip-${PYQT5SIP_VERSION}

PYQT5SIP_DISTNAME=		pyqt5_sip-${PYQT5SIP_VERSION}

PYQT5_DISTNAME=			PyQt5-${PYQT5_VERSION}

PYQT53D_DISTNAME=		PyQt3D-${PYQT53D_VERSION}

PYQT5CHARTS_DISTNAME=		PyQtChart-${PYQT5CHARTS_VERSION}
@@ -141,11 +145,12 @@ PYQT5NETWORKAUTH_DISTNAME= PyQtNetworkAuth-${PYQT5NETWORKAUTH_VERSION} 
PYQT5WEBENGINE_DISTNAME=	PyQtWebEngine-${PYQT5WEBENGINE_VERSION}



# Qt 6 components

PYQT6SIP_DISTNAME=		PyQt6_sip-${PYQT6SIP_VERSION}

PYQT6SIP_DISTNAME=		pyqt6_sip-${PYQT6SIP_VERSION}

PYQT6_DISTNAME=			PyQt6-${PYQT6_VERSION}

PYQT63D_DISTNAME=		PyQt6_3D-${PYQT63D_VERSION}

PYQT6CHARTS_DISTNAME=		PyQt6_Charts-${PYQT6CHARTS_VERSION}

PYQT6DATAVIS3D_DISTNAME=	PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION}

PYQT6GRAPHS_DISTNAME=		PyQt6_Graphs-${PYQT6GRAPHS_VERSION}

PYQT6NETWORKAUTH_DISTNAME=	PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION}

PYQT6WEBENGINE_DISTNAME=	PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION}
@@ -166,6 +171,7 @@ PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION} 
PYQT3D_VERSION=			${PYQT${_PYQT_VERSION}3D_VERSION}

PYQTCHARTS_VERSION=		${PYQT${_PYQT_VERSION}CHARTS_VERSION}

PYQTDATAVIS3D_VERSION=		${PYQT${_PYQT_VERSION}DATAVIS3D_VERSION}

PYQTGRAPHS_VERSION=		${PYQT${_PYQT_VERSION}GRAPHS_VERSION}

PYQTNETWORKAUTH_VERSION=	${PYQT${_PYQT_VERSION}NETWORKAUTH_VERSION}

PYQTWEBENGINE_VERSION=		${PYQT${_PYQT_VERSION}WEBENGINE_VERSION}
@@ -174,6 +180,7 @@ PYQT_DISTNAME= ${PYQT${_PYQT_VERSION}_DISTNAME} 
PYQT3D_DISTNAME=		${PYQT${_PYQT_VERSION}3D_DISTNAME}

PYQTCHARTS_DISTNAME=		${PYQT${_PYQT_VERSION}CHARTS_DISTNAME}

PYQTDATAVIS3D_DISTNAME=		${PYQT${_PYQT_VERSION}DATAVIS3D_DISTNAME}

PYQTGRAPHS_DISTNAME=		${PYQT${_PYQT_VERSION}GRAPHS_DISTNAME}

PYQTNETWORKAUTH_DISTNAME=	${PYQT${_PYQT_VERSION}NETWORKAUTH_DISTNAME}

PYQTWEBENGINE_DISTNAME=		${PYQT${_PYQT_VERSION}WEBENGINE_DISTNAME}
@@ -193,6 +200,7 @@ py-pyqt6_PATH= ${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION} 
py-3d_PATH=			${PYQT_PY_RELNAME}-3d>=${PYQT3D_VERSION}

py-charts_PATH=			${PYQT_PY_RELNAME}-charts>=${PYQTCHARTS_VERSION}

py-datavis3d_PATH=		${PYQT_PY_RELNAME}-datavis3d>=${PYQTDATAVIS3D_VERSION}

py-graphs_PATH=			${PYQT_PY_RELNAME}-graphs>=${PYQTCHART_VERSION}

py-networkauth_PATH=		${PYQT_PY_RELNAME}-networkauth>=${PYQTNETWORKAUTH_VERSION}

py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}
@@ -206,6 +214,7 @@ py-pyqt6_PORT= devel/${PYQT_RELNAME}-pyqt 
py-3d_PORT=			graphics/${PYQT_RELNAME}-3d

py-charts_PORT=			x11-toolkits/${PYQT_RELNAME}-charts

py-datavis3d_PORT=		x11-toolkits/${PYQT_RELNAME}-datavis3d

py-graphs_PORT=			x11-toolkits/${PYQT_RELNAME}-graphs

py-networkauth_PORT=		net/${PYQT_RELNAME}-networkauth

py-webengine_PORT=		www/${PYQT_RELNAME}-webengine

Mk/Uses/qt.mk

+5 −4
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ _QT_MK_INCLUDED= qt.mk 
# Qt versions currently supported by the framework.

_QT_SUPPORTED?=		5 6

QT5_VERSION?=		5.15.16

QT6_VERSION?=		6.7.3

PYSIDE6_VERSION?=	6.7.3

QT6_VERSION?=		6.8.1

PYSIDE6_VERSION?=	6.8.0.2



# Support for intermediate Qt6 releases. This partially defines

# _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
@@ -74,6 +74,7 @@ QT_DESCRIPTIONSDIR_REL?=${QT_DATADIR_REL}/modules 
QT_LIBEXECDIR_REL?=	libexec/${_QT_RELNAME}

QT_IMPORTDIR_REL?=	${QT_ARCHDIR_REL}/imports

QT_QMLDIR_REL?=		${QT_ARCHDIR_REL}/qml

QT_SBOMDIR_REL?=	${QT_ARCHDIR_REL}/sbom

QT_DATADIR_REL?=	share/${_QT_RELNAME}

QT_DOCDIR_REL?=		share/doc/${_QT_RELNAME}

QT_L10NDIR_REL?=	${QT_DATADIR_REL}/translations
@@ -111,7 +112,7 @@ QMAKESPEC?= ${QT_MKSPECDIR}/${QMAKESPECNAME} 
QMAKE_COMPILER=	$$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)



.  for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \

	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \

	QML SBOM DATA DOC L10N ETC EXAMPLE TEST MKSPEC \

	CMAKE TOOL

QT_${dir}DIR=	${PREFIX}/${QT_${dir}DIR_REL}

# Export all directories to the plist substituion for QT_DIST ports.
@@ -251,7 +252,7 @@ qt-imageformats_PORT= graphics/${_QT_RELNAME}-imageformats 
qt-imageformats_PATH=	${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so



qt-languageserver_PORT=	devel/${_QT_RELNAME}-languageserver

qt-languageserver_LIB=	libQt${_QT_LIBVER}LanguageServer.so

qt-languageserver_PATH=	${LOCALBASE}/${QT_LIBDIR_REL}/libQt6LanguageServer.a



qt-lottie_PORT=		graphics/${_QT_RELNAME}-lottie

qt-lottie_LIB=		libQt${_QT_LIBVER}Bodymovin.so

accessibility/qt6-speech/distinfo

+3 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1727500271

SHA256 (KDE/Qt/6.7.3/qtspeech-everywhere-src-6.7.3.tar.xz) = f609fbf41b6ef47c371d5388abb27bd00bab049e752fa046fd4b68a82f4a0912

SIZE (KDE/Qt/6.7.3/qtspeech-everywhere-src-6.7.3.tar.xz) = 262376
 
TIMESTAMP = 1733204902

SHA256 (KDE/Qt/6.8.1/qtspeech-everywhere-src-6.8.1.tar.xz) = b0c5fe36c157b0b0cceb89d0d6325e539652f33963f7424cc70300870ce1acdf

SIZE (KDE/Qt/6.8.1/qtspeech-everywhere-src-6.8.1.tar.xz) = 262512

accessibility/qt6-speech/pkg-plist

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechDependencies.cmake 
lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechPlugins.cmake

lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets-%%CMAKE_BUILD_TYPE%%.cmake

lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets.cmake

lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessAliasTargets.cmake

lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessTargets.cmake

%%QT_LIBDIR%%/libQt6TextToSpeech.prl

%%QT_LIBDIR%%/libQt6TextToSpeech.so
@@ -64,5 +65,6 @@ lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessTargets.cmake 
%%QT_QMLDIR%%/QtTextToSpeech/libtexttospeechqmlplugin.so

%%QT_QMLDIR%%/QtTextToSpeech/plugins.qmltypes

%%QT_QMLDIR%%/QtTextToSpeech/qmldir

%%QT_SBOMDIR%%/qtspeech-%%FULLVER%%.spdx

libdata/pkgconfig/Qt6TextToSpeech.pc

%%QT_DATADIR%%/modules/TextToSpeech.json

comms/qt6-connectivity/distinfo

+3 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1727500272

SHA256 (KDE/Qt/6.7.3/qtconnectivity-everywhere-src-6.7.3.tar.xz) = 80f99b2f097b79107d4b35ed9c5c82451148364ffd814d7ae0aaf206e5b2fcc5

SIZE (KDE/Qt/6.7.3/qtconnectivity-everywhere-src-6.7.3.tar.xz) = 1062684
 
TIMESTAMP = 1733204905

SHA256 (KDE/Qt/6.8.1/qtconnectivity-everywhere-src-6.8.1.tar.xz) = ccfd46e7ad2290710788274e145fb1f224d8a5ce360764ec10824b5908a6441c

SIZE (KDE/Qt/6.8.1/qtconnectivity-everywhere-src-6.8.1.tar.xz) = 1067952