Skip to content

Commit 66b0e05

Browse files
BSDKaffeeBSDKaffee
committed
Qt: Update Qt6 to 6.5.2
As a patch release, Qt 6.5.2 does not introduce any new features but contains about 290 bug fixes, security updates, and other improvements to the top of the Qt 6.5.1 release. See more information about the most important changes and bug fixes from Qt 6.5.2 release note. Announcement: https://www.qt.io/blog/qt-6.5.2-released-1 Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
1 parent d05bd04 commit 66b0e05

108 files changed

Lines changed: 1918 additions & 1076 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Mk/Uses/qt-dist.mk‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ qmake_ARGS?= # empty
2121
.include "${USESDIR}/qmake.mk"
2222

2323
# Supported distribution arguments
24-
_COMMON_DISTS= 3d base charts datavis3d declarative imageformats multimedia \
24+
_COMMON_DISTS= 3d base charts datavis3d declarative imageformats location multimedia \
2525
networkauth quick3d quicktimeline remoteobjects scxml sensors \
2626
serialbus serialport speech svg tools translations virtualkeyboard \
2727
wayland webchannel webengine websockets
28-
_QT5_DISTS= connectivity gamepad graphicaleffects location quickcontrols \
28+
_QT5_DISTS= connectivity gamepad graphicaleffects quickcontrols \
2929
quickcontrols2 script webglplugin webview \
3030
x11extras xmlpatterns
31-
_QT6_DISTS= 5compat doc languageserver lottie positioning shadertools
31+
_QT6_DISTS= 5compat doc httpserver languageserver lottie positioning \
32+
quickeffectmaker shadertools
3233

3334
_QT_DISTS= ${_COMMON_DISTS} \
3435
${_QT${_QT_VER}_DISTS}
@@ -459,9 +460,9 @@ _sub_need_clean= \#\#
459460
. endif
460461
# The Qt modules have an install- and deinstall-step for wrangling
461462
# the qconfig-modules.h header, but qmake does not.
462-
. if ${PORTNAME} != "qmake"
463+
. if ${PORTNAME} != "qmake"
463464
post-install: qt-post-install
464-
. endif # PORTNAME != qmake
465+
. endif # PORTNAME != qmake
465466
qt-post-install:
466467
# We can't use SUB_FILES with the shared pkg-change.in.
467468
# We need it to be a script instead of a group of @unexecs.

‎Mk/Uses/qt.mk‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ _QT_MK_INCLUDED= qt.mk
2323
# Qt versions currently supported by the framework.
2424
_QT_SUPPORTED?= 5 6
2525
QT5_VERSION?= 5.15.8
26-
QT6_VERSION?= 6.5.1
27-
PYSIDE6_VERSION?= ${QT6_VERSION}.1
26+
QT6_VERSION?= 6.5.2
27+
PYSIDE6_VERSION?= ${QT6_VERSION}
2828

2929
# We accept the Qt version to be passed by either or all of the three mk files.
3030
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
@@ -131,26 +131,26 @@ _USES_POST+= qt
131131
_QT_MK_POST_INCLUDED= qt.mk
132132

133133
# The Qt components supported by qt.mk: list of shared, and version specific ones
134-
_USE_QT_COMMON= 3d charts datavis3d declarative doc examples imageformats \
134+
_USE_QT_COMMON= 3d charts datavis3d declarative doc examples imageformats location \
135135
multimedia networkauth quick3d quicktimeline remoteobjects scxml \
136-
sensors serialbus serialport svg virtualkeyboard wayland \
136+
sensors serialbus serialport speech svg virtualkeyboard wayland \
137137
webchannel webengine websockets
138138

139139
_USE_QT5_ONLY= assistant buildtools concurrent connectivity core dbus \
140140
declarative-test designer diag gamepad \
141-
graphicaleffects gui help l10n linguist linguisttools location \
141+
graphicaleffects gui help l10n linguist linguisttools \
142142
network opengl paths phonon4 pixeltool plugininfo printsupport \
143143
qdbus qdbusviewer qdoc qdoc-data qev qmake quickcontrols \
144-
quickcontrols2 script scripttools speech sql sql-mysql sql-odbc \
144+
quickcontrols2 script scripttools sql sql-mysql sql-odbc \
145145
sql-pgsql sql-sqlite2 sql-sqlite3 sql-tds testlib uiplugin \
146146
uitools webglplugin webkit websockets-qml webview \
147147
widgets x11extras xml xmlpatterns
148148
. if ${ARCH} == amd64 || ${ARCH} == i386
149149
_USE_QT5_ONLY+= sql-ibase
150150
. endif
151151

152-
_USE_QT6_ONLY= 5compat base languageserver lottie positioning shadertools \
153-
tools translations \
152+
_USE_QT6_ONLY= 5compat base httpserver languageserver lottie positioning \
153+
quickeffectmaker shadertools tools translations \
154154
sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc
155155

156156
# Dependency tuples: _LIB should be preferred if possible.
@@ -218,6 +218,9 @@ qt-gui_LIB= libQt${_QT_LIBVER}Gui.so
218218
qt-help_PORT= devel/${_QT_RELNAME}-help
219219
qt-help_LIB= libQt${_QT_LIBVER}Help.so
220220

221+
qt-httpserver_PORT= www/${_QT_RELNAME}-httpserver
222+
qt-httpserver_LIB= libQt${_QT_LIBVER}HttpServer.so
223+
221224
qt-imageformats_PORT= graphics/${_QT_RELNAME}-imageformats
222225
qt-imageformats_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so
223226

@@ -297,6 +300,9 @@ qt-quickcontrols_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
297300
qt-quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
298301
qt-quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so
299302

303+
qt-quickeffectmaker_PORT= graphics/${_QT_RELNAME}-quickeffectmaker
304+
qt-quickeffectmaker_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qqem
305+
300306
qt-quicktimeline_PORT= x11-toolkits/${_QT_RELNAME}-quicktimeline
301307
qt-quicktimeline_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Timeline/libqtquicktimelineplugin.so
302308

‎accessibility/qt6-speech/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PORTNAME= speech
22
PORTVERSION= ${QT6_VERSION}
3-
PORTREVISION= 1
43
CATEGORIES= accessibility
54
PKGNAMEPREFIX= qt6-
65

‎accessibility/qt6-speech/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1687324603
2-
SHA256 (KDE/Qt/6.5.1/qtspeech-everywhere-src-6.5.1.tar.xz) = 67120ba5f156962713b6fd5aeb109ed789f66d07e8bfbda4fa24d12d653457b6
3-
SIZE (KDE/Qt/6.5.1/qtspeech-everywhere-src-6.5.1.tar.xz) = 220208
1+
TIMESTAMP = 1689943801
2+
SHA256 (KDE/Qt/6.5.2/qtspeech-everywhere-src-6.5.2.tar.xz) = 88ff9c2876f4a76632bfee7f58c3277aab9ff49e24d628e4a19f6b0e7a62d4b2
3+
SIZE (KDE/Qt/6.5.2/qtspeech-everywhere-src-6.5.2.tar.xz) = 249568

‎comms/qt6-sensors/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1687324605
2-
SHA256 (KDE/Qt/6.5.1/qtsensors-everywhere-src-6.5.1.tar.xz) = c95aca8371c2909255d908f4d78a0bfd975a83a73ed882eabc561d444864aba5
3-
SIZE (KDE/Qt/6.5.1/qtsensors-everywhere-src-6.5.1.tar.xz) = 1485244
1+
TIMESTAMP = 1689943969
2+
SHA256 (KDE/Qt/6.5.2/qtsensors-everywhere-src-6.5.2.tar.xz) = 4006bd7cfbb4302a887bda82b7fe3c31633626363a5e6ba9730bdb4fa8ab2aa6
3+
SIZE (KDE/Qt/6.5.2/qtsensors-everywhere-src-6.5.2.tar.xz) = 1484712

‎comms/qt6-sensors/pkg-plist‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,6 @@ lib/cmake/Qt6Sensors/Qt6SensorsPlugins.cmake
143143
lib/cmake/Qt6Sensors/Qt6SensorsTargets-%%CMAKE_BUILD_TYPE%%.cmake
144144
lib/cmake/Qt6Sensors/Qt6SensorsTargets.cmake
145145
lib/cmake/Qt6Sensors/Qt6SensorsVersionlessTargets.cmake
146-
lib/cmake/Qt6Sensors/Qt6dummySensorPluginAdditionalTargetInfo.cmake
147-
lib/cmake/Qt6Sensors/Qt6dummySensorPluginConfig.cmake
148-
lib/cmake/Qt6Sensors/Qt6dummySensorPluginConfigVersion.cmake
149-
lib/cmake/Qt6Sensors/Qt6dummySensorPluginConfigVersionImpl.cmake
150-
lib/cmake/Qt6Sensors/Qt6dummySensorPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
151-
lib/cmake/Qt6Sensors/Qt6dummySensorPluginTargets.cmake
152146
lib/cmake/Qt6Sensors/Qt6genericSensorPluginAdditionalTargetInfo.cmake
153147
lib/cmake/Qt6Sensors/Qt6genericSensorPluginConfig.cmake
154148
lib/cmake/Qt6Sensors/Qt6genericSensorPluginConfigVersion.cmake
@@ -177,7 +171,6 @@ lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickVersionlessTargets.cmake
177171
%%QT_MKSPECDIR%%/modules/qt_lib_sensors_private.pri
178172
%%QT_MKSPECDIR%%/modules/qt_lib_sensorsquick.pri
179173
%%QT_MKSPECDIR%%/modules/qt_lib_sensorsquick_private.pri
180-
%%QT_PLUGINDIR%%/sensors/libqtsensors_dummy.so
181174
%%QT_PLUGINDIR%%/sensors/libqtsensors_generic.so
182175
%%QT_QMLDIR%%/QtSensors/libsensorsquickplugin.so
183176
%%QT_QMLDIR%%/QtSensors/plugins.qmltypes

‎comms/qt6-serialbus/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1687324610
2-
SHA256 (KDE/Qt/6.5.1/qtserialbus-everywhere-src-6.5.1.tar.xz) = dbff967829bf0ac75ed54fb0da4893a7a160309989d9e2da349622a72c5e157f
3-
SIZE (KDE/Qt/6.5.1/qtserialbus-everywhere-src-6.5.1.tar.xz) = 554324
1+
TIMESTAMP = 1689944077
2+
SHA256 (KDE/Qt/6.5.2/qtserialbus-everywhere-src-6.5.2.tar.xz) = f0426307cdc185547ad6331a670187d180cce4c11254d6a26aa997fe03b7cdfe
3+
SIZE (KDE/Qt/6.5.2/qtserialbus-everywhere-src-6.5.2.tar.xz) = 553888

‎comms/qt6-serialport/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1687324612
2-
SHA256 (KDE/Qt/6.5.1/qtserialport-everywhere-src-6.5.1.tar.xz) = c3554d0646d4e2b981a4b17f3d196317def7eabea42b81c97967e355bcb432a6
3-
SIZE (KDE/Qt/6.5.1/qtserialport-everywhere-src-6.5.1.tar.xz) = 279664
1+
TIMESTAMP = 1689944134
2+
SHA256 (KDE/Qt/6.5.2/qtserialport-everywhere-src-6.5.2.tar.xz) = 063c54169aea6b303183b434637ad050e9f67d7f22bb3eff1ede1905eb2ccc9e
3+
SIZE (KDE/Qt/6.5.2/qtserialport-everywhere-src-6.5.2.tar.xz) = 279364

‎databases/qt6-base_sqldriver/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1687324645
2-
SHA256 (KDE/Qt/6.5.1/qtbase-everywhere-src-6.5.1.tar.xz) = db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed
3-
SIZE (KDE/Qt/6.5.1/qtbase-everywhere-src-6.5.1.tar.xz) = 48287392
1+
TIMESTAMP = 1689944181
2+
SHA256 (KDE/Qt/6.5.2/qtbase-everywhere-src-6.5.2.tar.xz) = 3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269
3+
SIZE (KDE/Qt/6.5.2/qtbase-everywhere-src-6.5.2.tar.xz) = 48410716

‎devel/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5921,6 +5921,7 @@
59215921
SUBDIR += qt6-5compat
59225922
SUBDIR += qt6-base
59235923
SUBDIR += qt6-languageserver
5924+
SUBDIR += qt6-location
59245925
SUBDIR += qt6-positioning
59255926
SUBDIR += qt6-remoteobjects
59265927
SUBDIR += qt6-scxml

0 commit comments

Comments
 (0)