Skip to content

Commit

Permalink
Qt: Update Qt6 to 6.5.0
Browse files Browse the repository at this point in the history 
PR:	272422
Exp-run by:	antoine
  • Loading branch information
@tcberner @lbartoletti
tcberner authored and lbartoletti committed Jul 26, 2023
1 parent ff2647b commit 230148d
Show file tree
Hide file tree
Showing 55 changed files with 2,004 additions and 2,697 deletions.
2 changes: 1 addition & 1 deletion Mk/Uses/qt.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5 6
QT5_VERSION?= 5.15.8
QT6_VERSION?= 6.4.2
QT6_VERSION?= 6.5.0

# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
Expand Down
6 changes: 3 additions & 3 deletions accessibility/qt6-speech/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1675066902
SHA256 (KDE/Qt/6.4.2/qtspeech-everywhere-src-6.4.2.tar.xz) = a9c99f8d34d6f500abf64c9aebdd41f01e746bcf54ff62ad006662400cb494cb
SIZE (KDE/Qt/6.4.2/qtspeech-everywhere-src-6.4.2.tar.xz) = 219388
TIMESTAMP = 1680581849
SHA256 (KDE/Qt/6.5.0/qtspeech-everywhere-src-6.5.0.tar.xz) = 1d812737fae56d4024bce436f00ac48177426f8fd4cb2b09a865978c56e83d9a
SIZE (KDE/Qt/6.5.0/qtspeech-everywhere-src-6.5.0.tar.xz) = 219368
1 change: 0 additions & 1 deletion accessibility/qt6-speech/pkg-plist
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qtexttospeech_p.h
%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h
%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qttexttospeech-config_p.h
%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qvoice_p.h
%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeech
Expand Down
6 changes: 3 additions & 3 deletions comms/qt6-sensors/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1672934686
SHA256 (KDE/Qt/6.4.2/qtsensors-everywhere-src-6.4.2.tar.xz) = 455619ff28a39f4caba49c9e1952fbcfafc8ffc893b437d653d5465a077ee656
SIZE (KDE/Qt/6.4.2/qtsensors-everywhere-src-6.4.2.tar.xz) = 2106896
TIMESTAMP = 1680581850
SHA256 (KDE/Qt/6.5.0/qtsensors-everywhere-src-6.5.0.tar.xz) = 5ee434e2f4917c2d2e9b1de6cb1347c644a8c92338284efeb96202a557e72ea6
SIZE (KDE/Qt/6.5.0/qtsensors-everywhere-src-6.5.0.tar.xz) = 1513344
12 changes: 0 additions & 12 deletions comms/qt6-sensors/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qproximitysensor_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qrotationsensor_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensor_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensorbackend_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensorgesture_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensorgesturemanagerprivate_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtapsensor_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtiltsensor_p.h
%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtsensors-config_p.h
Expand Down Expand Up @@ -67,10 +64,6 @@
%%QT_INCDIR%%/QtSensors/QSensorBackendFactory
%%QT_INCDIR%%/QtSensors/QSensorChangesInterface
%%QT_INCDIR%%/QtSensors/QSensorFilter
%%QT_INCDIR%%/QtSensors/QSensorGesture
%%QT_INCDIR%%/QtSensors/QSensorGestureManager
%%QT_INCDIR%%/QtSensors/QSensorGesturePluginInterface
%%QT_INCDIR%%/QtSensors/QSensorGestureRecognizer
%%QT_INCDIR%%/QtSensors/QSensorManager
%%QT_INCDIR%%/QtSensors/QSensorPluginInterface
%%QT_INCDIR%%/QtSensors/QSensorReading
Expand Down Expand Up @@ -99,10 +92,6 @@
%%QT_INCDIR%%/QtSensors/qrotationsensor.h
%%QT_INCDIR%%/QtSensors/qsensor.h
%%QT_INCDIR%%/QtSensors/qsensorbackend.h
%%QT_INCDIR%%/QtSensors/qsensorgesture.h
%%QT_INCDIR%%/QtSensors/qsensorgesturemanager.h
%%QT_INCDIR%%/QtSensors/qsensorgestureplugininterface.h
%%QT_INCDIR%%/QtSensors/qsensorgesturerecognizer.h
%%QT_INCDIR%%/QtSensors/qsensormanager.h
%%QT_INCDIR%%/QtSensors/qsensorplugin.h
%%QT_INCDIR%%/QtSensors/qsensorsglobal.h
Expand All @@ -126,7 +115,6 @@
%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmlproximitysensor_p.h
%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmlrotationsensor_p.h
%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmlsensor_p.h
%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmlsensorgesture_p.h
%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmlsensorglobal_p.h
%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmlsensorrange_p.h
%%QT_INCDIR%%/QtSensorsQuick/%%FULLVER%%/QtSensorsQuick/private/qmltapsensor_p.h
Expand Down
6 changes: 3 additions & 3 deletions comms/qt6-serialbus/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1672934688
SHA256 (KDE/Qt/6.4.2/qtserialbus-everywhere-src-6.4.2.tar.xz) = 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b
SIZE (KDE/Qt/6.4.2/qtserialbus-everywhere-src-6.4.2.tar.xz) = 380860
TIMESTAMP = 1680581851
SHA256 (KDE/Qt/6.5.0/qtserialbus-everywhere-src-6.5.0.tar.xz) = 9748379362c49c9fdd3c5111ecea576c5b0fd9d49573db03435c166e58144897
SIZE (KDE/Qt/6.5.0/qtserialbus-everywhere-src-6.5.0.tar.xz) = 553428
18 changes: 17 additions & 1 deletion comms/qt6-serialbus/pkg-plist
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcandbcfileparser_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanframeprocessor_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanmessagedescription_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcansignaldescription_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanuniqueiddescription_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusadu_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusclient_p.h
Expand All @@ -11,11 +16,17 @@
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpclient_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpserver_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qtserialbus-config_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qtserialbusexports_p.h
%%QT_INCDIR%%/QtSerialBus/QCanBus
%%QT_INCDIR%%/QtSerialBus/QCanBusDevice
%%QT_INCDIR%%/QtSerialBus/QCanBusDeviceInfo
%%QT_INCDIR%%/QtSerialBus/QCanBusFactory
%%QT_INCDIR%%/QtSerialBus/QCanBusFrame
%%QT_INCDIR%%/QtSerialBus/QCanDbcFileParser
%%QT_INCDIR%%/QtSerialBus/QCanFrameProcessor
%%QT_INCDIR%%/QtSerialBus/QCanMessageDescription
%%QT_INCDIR%%/QtSerialBus/QCanSignalDescription
%%QT_INCDIR%%/QtSerialBus/QCanUniqueIdDescription
%%QT_INCDIR%%/QtSerialBus/QModbusClient
%%QT_INCDIR%%/QtSerialBus/QModbusDataUnit
%%QT_INCDIR%%/QtSerialBus/QModbusDataUnitMap
Expand All @@ -40,6 +51,12 @@
%%QT_INCDIR%%/QtSerialBus/qcanbusdeviceinfo.h
%%QT_INCDIR%%/QtSerialBus/qcanbusfactory.h
%%QT_INCDIR%%/QtSerialBus/qcanbusframe.h
%%QT_INCDIR%%/QtSerialBus/qcancommondefinitions.h
%%QT_INCDIR%%/QtSerialBus/qcandbcfileparser.h
%%QT_INCDIR%%/QtSerialBus/qcanframeprocessor.h
%%QT_INCDIR%%/QtSerialBus/qcanmessagedescription.h
%%QT_INCDIR%%/QtSerialBus/qcansignaldescription.h
%%QT_INCDIR%%/QtSerialBus/qcanuniqueiddescription.h
%%QT_INCDIR%%/QtSerialBus/qmodbusclient.h
%%QT_INCDIR%%/QtSerialBus/qmodbusdataunit.h
%%QT_INCDIR%%/QtSerialBus/qmodbusdevice.h
Expand All @@ -51,7 +68,6 @@
%%QT_INCDIR%%/QtSerialBus/qmodbusserver.h
%%QT_INCDIR%%/QtSerialBus/qmodbustcpclient.h
%%QT_INCDIR%%/QtSerialBus/qmodbustcpserver.h
%%QT_INCDIR%%/QtSerialBus/qserialbusglobal.h
%%QT_INCDIR%%/QtSerialBus/qtserialbus-config.h
%%QT_INCDIR%%/QtSerialBus/qtserialbusexports.h
%%QT_INCDIR%%/QtSerialBus/qtserialbusglobal.h
Expand Down
6 changes: 3 additions & 3 deletions comms/qt6-serialport/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1672934689
SHA256 (KDE/Qt/6.4.2/qtserialport-everywhere-src-6.4.2.tar.xz) = 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa
SIZE (KDE/Qt/6.4.2/qtserialport-everywhere-src-6.4.2.tar.xz) = 319000
TIMESTAMP = 1680581853
SHA256 (KDE/Qt/6.5.0/qtserialport-everywhere-src-6.5.0.tar.xz) = 9209a9f5978a4adf3a150582270432fe3b635d05513ad1a57bff5ca4954a4dff
SIZE (KDE/Qt/6.5.0/qtserialport-everywhere-src-6.5.0.tar.xz) = 278816
2 changes: 0 additions & 2 deletions comms/qt6-serialport/pkg-plist
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtserialport-config_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h
%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qwinoverlappedionotifier_p.h
%%QT_INCDIR%%/QtSerialPort/QSerialPort
%%QT_INCDIR%%/QtSerialPort/QSerialPortInfo
%%QT_INCDIR%%/QtSerialPort/QtSerialPort
Expand Down
6 changes: 3 additions & 3 deletions devel/qt6-5compat/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1672934692
SHA256 (KDE/Qt/6.4.2/qt5compat-everywhere-src-6.4.2.tar.xz) = f51f505c8e985b51b7d733e27d782c6fce181beef53364acb0368cc892c4b792
SIZE (KDE/Qt/6.4.2/qt5compat-everywhere-src-6.4.2.tar.xz) = 14638200
TIMESTAMP = 1680581855
SHA256 (KDE/Qt/6.5.0/qt5compat-everywhere-src-6.5.0.tar.xz) = a9e2f53a193fc2e131b01a2f6e7a1fbfe31309c2413fdc213e5a81c558c21261
SIZE (KDE/Qt/6.5.0/qt5compat-everywhere-src-6.5.0.tar.xz) = 14638216
11 changes: 1 addition & 10 deletions devel/qt6-5compat/pkg-plist
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/cp949codetbl_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbig5codec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryjson_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryjsonarray_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryjsonobject_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qbinaryjsonvalue_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qeucjpcodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qeuckrcodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qgb18030codec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qiconvcodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qicucodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qisciicodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qjiscodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qjpunicode_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qlatincodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qsimplecodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qsjiscodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qtcore5compat-config_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qtextcodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qtsciicodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qutfcodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qwindowscodec_p.h
%%QT_INCDIR%%/QtCore5Compat/%%FULLVER%%/QtCore5Compat/private/qxml_p.h
%%QT_INCDIR%%/QtCore5Compat/QBinaryJson
%%QT_INCDIR%%/QtCore5Compat/QConcatenable
Expand Down Expand Up @@ -123,6 +113,7 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets.cmake
%%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/private/GaussianInnerShadow.qml
%%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/private/GaussianMaskedBlur.qml
%%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/private/libqtgraphicaleffectsprivateplugin.so
%%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/private/plugins.qmltypes
%%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/private/qmldir
%%QT_QMLDIR%%/Qt5Compat/GraphicalEffects/qmldir
libdata/pkgconfig/Qt6Core5Compat.pc
Expand Down
3 changes: 2 additions & 1 deletion devel/qt6-base/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ SHEBANG_FILES= ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \
${WRKSRC}/mkspecs/features/uikit/devices.py \
${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \
${WRKSRC}/util/android/android_emulator_launcher.sh \
${WRKSRC}/util/testrunner/qt-testrunner.py
${WRKSRC}/util/testrunner/qt-testrunner.py \
${WRKSRC}/util/testrunner/sanitizer-testrunner.py
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

# zstd from base fails to compress files during the build (error 11: unsupported argument)
Expand Down
8 changes: 3 additions & 5 deletions devel/qt6-base/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
TIMESTAMP = 1680729396
SHA256 (KDE/Qt/6.4.2/qtbase-everywhere-src-6.4.2.tar.xz) = a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d
SIZE (KDE/Qt/6.4.2/qtbase-everywhere-src-6.4.2.tar.xz) = 47987188
SHA256 (KDE/Qt/6.4.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 61e345f12c6283792e230d3572756e6093d1be0c80d1f3dc0745e19532e28ebc
SIZE (KDE/Qt/6.4.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 1326
TIMESTAMP = 1680581858
SHA256 (KDE/Qt/6.5.0/qtbase-everywhere-src-6.5.0.tar.xz) = fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef
SIZE (KDE/Qt/6.5.0/qtbase-everywhere-src-6.5.0.tar.xz) = 48020636
13 changes: 0 additions & 13 deletions devel/qt6-base/files/patch-cmake_FindMySQL.cmake
View file

This file was deleted.

34 changes: 0 additions & 34 deletions devel/qt6-base/files/patch-src_corelib_global_qsimd__p.h
View file

This file was deleted.

Loading

0 comments on commit 230148d

Please sign in to comment.