diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2025-08-28 04:11:24 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2025-09-03 07:42:22 +0000 |
| commit | d58e63e8e89a91523bf001b47e2a2a8cc6fcdb32 (patch) | |
| tree | 59b750d9b3ddc42a12cd1a434e05dab5d352f633 | |
| parent | aa3810773bdff3ec7c7019ac57f324144bc0ca9a (diff) | |
Qt6: Update to 6.9.2
August 27, 2025 by Jani Heikkinen
We are excited to announce the release of Qt 6.9.2! As a patch release,
Qt 6.9.2 does not introduce new features but delivers over 550 bug fixes,
security updates, and enhancements on top of the Qt 6.9.1 release. For a
detailed breakdown of the most significant changes, refer to the
Qt 6.9.2 release notes.
Announcement:
https://www.qt.io/blog/qt-6.9.2-released
Release notes:
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.9.2/release-note.md
MFH: 2025Q3
Security: edf83c10-83b8-11f0-b6e5-4ccc6adda413
2a11aa1e-83c7-11f0-b6e5-4ccc6adda413
(cherry picked from commit a3496c5b8a05878249847fb36f865c3d9baad65c)
77 files changed, 529 insertions, 318 deletions
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 905e7793a780..88984a936848 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -23,8 +23,8 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 QT5_VERSION?= 5.15.17 -QT6_VERSION?= 6.9.1 -PYSIDE6_VERSION?= 6.9.1 +QT6_VERSION?= 6.9.2 +PYSIDE6_VERSION?= 6.9.2 # Support for intermediate Qt6 releases. This partially defines # _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk, diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo index 567830865d27..13aa551e21a9 100644 --- a/accessibility/qt6-speech/distinfo +++ b/accessibility/qt6-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159365 -SHA256 (KDE/Qt/6.9.1/qtspeech-everywhere-src-6.9.1.tar.xz) = 6807f59fcae2ef8f1f64210cfbfc8bcee1a40ed2d21eaee6673aba36bb7c1428 -SIZE (KDE/Qt/6.9.1/qtspeech-everywhere-src-6.9.1.tar.xz) = 262724 +TIMESTAMP = 1756196264 +SHA256 (KDE/Qt/6.9.2/qtspeech-everywhere-src-6.9.2.tar.xz) = b2b667375111637e45517a6e63475987691b922a19900abc52996617a0a088b1 +SIZE (KDE/Qt/6.9.2/qtspeech-everywhere-src-6.9.2.tar.xz) = 247748 diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo index 22ecc5d5940d..a0ec866ae05c 100644 --- a/comms/qt6-connectivity/distinfo +++ b/comms/qt6-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749158721 -SHA256 (KDE/Qt/6.9.1/qtconnectivity-everywhere-src-6.9.1.tar.xz) = 4988e50112104d5ad85e5b3cef66036ca445f18c22cf375d3dac9dcca95e0a17 -SIZE (KDE/Qt/6.9.1/qtconnectivity-everywhere-src-6.9.1.tar.xz) = 1072040 +TIMESTAMP = 1756196270 +SHA256 (KDE/Qt/6.9.2/qtconnectivity-everywhere-src-6.9.2.tar.xz) = 8affc67146dd6a2eb4b007623b47584b4783ff338bbe27725a0b6963216a0463 +SIZE (KDE/Qt/6.9.2/qtconnectivity-everywhere-src-6.9.2.tar.xz) = 1057556 diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo index 217aa3d597b2..56c28d00aef0 100644 --- a/comms/qt6-sensors/distinfo +++ b/comms/qt6-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159355 -SHA256 (KDE/Qt/6.9.1/qtsensors-everywhere-src-6.9.1.tar.xz) = f04b131acacfd42dfe056bd5861ff1e12e2ab57b3e20332becefa3644a409c6c -SIZE (KDE/Qt/6.9.1/qtsensors-everywhere-src-6.9.1.tar.xz) = 1500332 +TIMESTAMP = 1756196275 +SHA256 (KDE/Qt/6.9.2/qtsensors-everywhere-src-6.9.2.tar.xz) = 964ca82f39e2e25f952dc2f072f4c602392faf4ee9ce812b1957d4b8c9314462 +SIZE (KDE/Qt/6.9.2/qtsensors-everywhere-src-6.9.2.tar.xz) = 1485268 diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo index f23a69e57bb7..60e2d1dc16f5 100644 --- a/comms/qt6-serialbus/distinfo +++ b/comms/qt6-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159359 -SHA256 (KDE/Qt/6.9.1/qtserialbus-everywhere-src-6.9.1.tar.xz) = 491ece4583565f5d809ea9dd8caa2779a97c23a7d4d8352ba8a7a660e1ab04d7 -SIZE (KDE/Qt/6.9.1/qtserialbus-everywhere-src-6.9.1.tar.xz) = 550652 +TIMESTAMP = 1756196279 +SHA256 (KDE/Qt/6.9.2/qtserialbus-everywhere-src-6.9.2.tar.xz) = 951e07c2faf4476c75a59af96b40eeedbdf1a1c5c354c2825b59eaf3594f2a76 +SIZE (KDE/Qt/6.9.2/qtserialbus-everywhere-src-6.9.2.tar.xz) = 535216 diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo index b03e671e791b..55a6f2428bba 100644 --- a/comms/qt6-serialport/distinfo +++ b/comms/qt6-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159362 -SHA256 (KDE/Qt/6.9.1/qtserialport-everywhere-src-6.9.1.tar.xz) = 808fed52380c74ae89268306ce4d04b00f8f6b81f8c442489c390006d93eff10 -SIZE (KDE/Qt/6.9.1/qtserialport-everywhere-src-6.9.1.tar.xz) = 278276 +TIMESTAMP = 1756196284 +SHA256 (KDE/Qt/6.9.2/qtserialport-everywhere-src-6.9.2.tar.xz) = 8b90b2f0c2c07ab13085acf584a34201931477422f2d37a9694d62a2d56ce26b +SIZE (KDE/Qt/6.9.2/qtserialport-everywhere-src-6.9.2.tar.xz) = 263012 diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo index 546ff5b5438c..d20b26d71b45 100644 --- a/databases/qt6-base_sqldriver/distinfo +++ b/databases/qt6-base_sqldriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162799 -SHA256 (KDE/Qt/6.9.1/qtbase-everywhere-src-6.9.1.tar.xz) = 40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e -SIZE (KDE/Qt/6.9.1/qtbase-everywhere-src-6.9.1.tar.xz) = 49755912 +TIMESTAMP = 1756196336 +SHA256 (KDE/Qt/6.9.2/qtbase-everywhere-src-6.9.2.tar.xz) = 44be9c9ecfe04129c4dea0a7e1b36ad476c9cc07c292016ac98e7b41514f2440 +SIZE (KDE/Qt/6.9.2/qtbase-everywhere-src-6.9.2.tar.xz) = 49812824 diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo index edc65b188d2e..f2e9afa2d5fe 100644 --- a/devel/pyside6-tools/distinfo +++ b/devel/pyside6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162957 -SHA256 (KDE/Qt/6.9.1/pyside-setup-everywhere-src-6.9.1.tar.xz) = 04c712c5b9234add0d9b5aa3c01a0caede64a55b496127751f5d52a230cff748 -SIZE (KDE/Qt/6.9.1/pyside-setup-everywhere-src-6.9.1.tar.xz) = 16669448 +TIMESTAMP = 1756199026 +SHA256 (KDE/Qt/6.9.2/pyside-setup-everywhere-src-6.9.2.tar.xz) = 9ec087465342bdc9dbe492a30e58fdbbc5448655deacf5982a0fe7123f59222d +SIZE (KDE/Qt/6.9.2/pyside-setup-everywhere-src-6.9.2.tar.xz) = 16659400 diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo index 286d34785c38..5da70ab73961 100644 --- a/devel/pyside6/distinfo +++ b/devel/pyside6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162964 -SHA256 (KDE/Qt/6.9.1/pyside-setup-everywhere-src-6.9.1.tar.xz) = 04c712c5b9234add0d9b5aa3c01a0caede64a55b496127751f5d52a230cff748 -SIZE (KDE/Qt/6.9.1/pyside-setup-everywhere-src-6.9.1.tar.xz) = 16669448 +TIMESTAMP = 1756198983 +SHA256 (KDE/Qt/6.9.2/pyside-setup-everywhere-src-6.9.2.tar.xz) = 9ec087465342bdc9dbe492a30e58fdbbc5448655deacf5982a0fe7123f59222d +SIZE (KDE/Qt/6.9.2/pyside-setup-everywhere-src-6.9.2.tar.xz) = 16659400 diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo index 9bc603709f5b..246db8af503e 100644 --- a/devel/qt6-5compat/distinfo +++ b/devel/qt6-5compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159760 -SHA256 (KDE/Qt/6.9.1/qt5compat-everywhere-src-6.9.1.tar.xz) = 96c726ac3f0d5c40570e75196e4ab5c95d3de7c85d15604fe97ac2a6573d917a -SIZE (KDE/Qt/6.9.1/qt5compat-everywhere-src-6.9.1.tar.xz) = 14633560 +TIMESTAMP = 1756196357 +SHA256 (KDE/Qt/6.9.2/qt5compat-everywhere-src-6.9.2.tar.xz) = cb289905c689fc271ce783f8b67844040aa73d78f4f0cf8421fa713390a75b60 +SIZE (KDE/Qt/6.9.2/qt5compat-everywhere-src-6.9.2.tar.xz) = 14618016 diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 9ccdc12070a0..ec92164f3f97 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,6 +1,5 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt6- diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index 07b98015ee3b..f27032e50768 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162730 -SHA256 (KDE/Qt/6.9.1/qtbase-everywhere-src-6.9.1.tar.xz) = 40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e -SIZE (KDE/Qt/6.9.1/qtbase-everywhere-src-6.9.1.tar.xz) = 49755912 +TIMESTAMP = 1756196361 +SHA256 (KDE/Qt/6.9.2/qtbase-everywhere-src-6.9.2.tar.xz) = 44be9c9ecfe04129c4dea0a7e1b36ad476c9cc07c292016ac98e7b41514f2440 +SIZE (KDE/Qt/6.9.2/qtbase-everywhere-src-6.9.2.tar.xz) = 49812824 diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index 21e21ab67960..737f0c8e6992 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -149,6 +149,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtclasshelper_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcore-config_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcoreglobal_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtemporaryfile_p.h @@ -975,6 +976,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstracttextdocumentlayout_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblebridgeutils_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblecache_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblehelper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaction_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qactiongroup_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qastchandler_p.h @@ -2537,6 +2539,7 @@ bin/qmake6 %%QT_INCDIR%%/QtXml/qtxmlversion.h @comment lib/cmake/Qt6/3rdparty/extra-cmake-modules/0001-ECMEnableSanitizers.cmake-fix-GCC-s-note-variable-tr.patch @comment lib/cmake/Qt6/3rdparty/extra-cmake-modules/0002-ECMEnableSanitizers.cmake-replace-tabs-with-spaces.patch +@comment lib/cmake/Qt6/3rdparty/extra-cmake-modules/0003-ECMEnableSanitizers.cmake-fix-no-undefined-flag-replacement.patch lib/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS lib/cmake/Qt6/3rdparty/extra-cmake-modules/REUSE.toml lib/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/ECMFindModuleHelpersStub.cmake @@ -2695,6 +2698,7 @@ lib/cmake/Qt6/QtProcessConfigureArgs.cmake lib/cmake/Qt6/QtProperties.cmake lib/cmake/Qt6/QtPublicAndroidHelpers.cmake lib/cmake/Qt6/QtPublicAppleHelpers.cmake +lib/cmake/Qt6/QtPublicCMakeEarlyPolicyHelpers.cmake lib/cmake/Qt6/QtPublicCMakeHelpers.cmake lib/cmake/Qt6/QtPublicCMakeVersionHelpers.cmake lib/cmake/Qt6/QtPublicDependencyHelpers.cmake @@ -3178,6 +3182,9 @@ lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateConfigVersionImpl.cmake lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateTargets.cmake lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessTargets.cmake +lib/cmake/Qt6TestInternalsPrivate/QtRunCMake.cmake +lib/cmake/Qt6TestInternalsPrivate/QtRunCMakeTestWrappers.cmake +lib/cmake/Qt6TestInternalsPrivate/RunCMake.cmake lib/cmake/Qt6TestPrivate/Qt6TestPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6TestPrivate/Qt6TestPrivateConfig.cmake lib/cmake/Qt6TestPrivate/Qt6TestPrivateConfigVersion.cmake @@ -3545,7 +3552,6 @@ lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateVersionlessTargets.cmake %%QT_MKSPECDIR%%/features/mac/sdk.mk %%QT_MKSPECDIR%%/features/mac/sdk.prf %%QT_MKSPECDIR%%/features/mac/toolchain.prf -%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf %%QT_MKSPECDIR%%/features/metatypes.prf %%QT_MKSPECDIR%%/features/moc.prf %%QT_MKSPECDIR%%/features/no_debug_info.prf diff --git a/devel/qt6-grpc/distinfo b/devel/qt6-grpc/distinfo index 6ccbd2d59de8..fe09fb9eaa9d 100644 --- a/devel/qt6-grpc/distinfo +++ b/devel/qt6-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162742 -SHA256 (KDE/Qt/6.9.1/qtgrpc-everywhere-src-6.9.1.tar.xz) = c34c869e203289b0fd695a1e5391840bc51b919a8b55e1ed1ff36b4cb923a750 -SIZE (KDE/Qt/6.9.1/qtgrpc-everywhere-src-6.9.1.tar.xz) = 612464 +TIMESTAMP = 1756196365 +SHA256 (KDE/Qt/6.9.2/qtgrpc-everywhere-src-6.9.2.tar.xz) = a43d3c8823fe11b71d0c362527150914134239fa285feaff86fd692617353f64 +SIZE (KDE/Qt/6.9.2/qtgrpc-everywhere-src-6.9.2.tar.xz) = 602148 diff --git a/devel/qt6-grpc/pkg-plist b/devel/qt6-grpc/pkg-plist index 4b3f85dc5cec..6236cabe4363 100644 --- a/devel/qt6-grpc/pkg-plist +++ b/devel/qt6-grpc/pkg-plist @@ -283,6 +283,8 @@ lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesConfig.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesConfigVersion.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesConfigVersionImpl.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesDependencies.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesExtras.cmake +lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesProtobufProperties.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesTargets.cmake lib/cmake/Qt6ProtobufWellKnownTypes/Qt6ProtobufWellKnownTypesVersionlessAliasTargets.cmake diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo index 0510d91e9eaa..ed231d1067ab 100644 --- a/devel/qt6-languageserver/distinfo +++ b/devel/qt6-languageserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162750 -SHA256 (KDE/Qt/6.9.1/qtlanguageserver-everywhere-src-6.9.1.tar.xz) = ca17353612760b9bb6e3115bfacc9ba5e06d0d18b522f4f62ae6d510d63488ec -SIZE (KDE/Qt/6.9.1/qtlanguageserver-everywhere-src-6.9.1.tar.xz) = 152488 +TIMESTAMP = 1756196375 +SHA256 (KDE/Qt/6.9.2/qtlanguageserver-everywhere-src-6.9.2.tar.xz) = 781b6eafe1fe1ab7e942fb15dc220b79c602db6efdce7fdc272bf8512c068bee +SIZE (KDE/Qt/6.9.2/qtlanguageserver-everywhere-src-6.9.2.tar.xz) = 137008 diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo index 90252f026aee..e5b4a1f86b5a 100644 --- a/devel/qt6-location/distinfo +++ b/devel/qt6-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159282 -SHA256 (KDE/Qt/6.9.1/qtlocation-everywhere-src-6.9.1.tar.xz) = c0e8e8907e047ede59f5800f4f9bfd54286239aab1abe7df6723a8fcc127ef57 -SIZE (KDE/Qt/6.9.1/qtlocation-everywhere-src-6.9.1.tar.xz) = 3166576 +TIMESTAMP = 1756196382 +SHA256 (KDE/Qt/6.9.2/qtlocation-everywhere-src-6.9.2.tar.xz) = 5a45ed1967958982899b79891afc0b4530cf2e59d3b1a57af6dfdc645e1c73f9 +SIZE (KDE/Qt/6.9.2/qtlocation-everywhere-src-6.9.2.tar.xz) = 3149364 diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo index 39605ab9274b..ea1cd7a5c3f9 100644 --- a/devel/qt6-positioning/distinfo +++ b/devel/qt6-positioning/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162766 -SHA256 (KDE/Qt/6.9.1/qtpositioning-everywhere-src-6.9.1.tar.xz) = 7062734b4989248ca3f0e3e4aebb9aa2e7ed2d6bf19e779e520c6ef69706ff26 -SIZE (KDE/Qt/6.9.1/qtpositioning-everywhere-src-6.9.1.tar.xz) = 664156 +TIMESTAMP = 1756196387 +SHA256 (KDE/Qt/6.9.2/qtpositioning-everywhere-src-6.9.2.tar.xz) = 489a9801ffbda04b16c62f64a687efae4c1a07807f6b67f40ce1f37c3dfdbc1a +SIZE (KDE/Qt/6.9.2/qtpositioning-everywhere-src-6.9.2.tar.xz) = 649488 diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo index 09e9dca96f5f..6276bb15a0c2 100644 --- a/devel/qt6-remoteobjects/distinfo +++ b/devel/qt6-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159347 -SHA256 (KDE/Qt/6.9.1/qtremoteobjects-everywhere-src-6.9.1.tar.xz) = 273f079e7b8f72c2e4ba2fea8893cd24773f4c6471d726fbddc097ae8d2e0a10 -SIZE (KDE/Qt/6.9.1/qtremoteobjects-everywhere-src-6.9.1.tar.xz) = 543600 +TIMESTAMP = 1756196391 +SHA256 (KDE/Qt/6.9.2/qtremoteobjects-everywhere-src-6.9.2.tar.xz) = df624ef14befbc92a293f2c193c5a7fd5d3f9d795fb33cc38b4e0b869bf18b26 +SIZE (KDE/Qt/6.9.2/qtremoteobjects-everywhere-src-6.9.2.tar.xz) = 528608 diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo index a8e28a002a4c..131704ee7ea2 100644 --- a/devel/qt6-scxml/distinfo +++ b/devel/qt6-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159351 -SHA256 (KDE/Qt/6.9.1/qtscxml-everywhere-src-6.9.1.tar.xz) = 0c33de2023b33a54fa6debd46f422440dca92da532faa7742af051fd88254780 -SIZE (KDE/Qt/6.9.1/qtscxml-everywhere-src-6.9.1.tar.xz) = 560588 +TIMESTAMP = 1756196396 +SHA256 (KDE/Qt/6.9.2/qtscxml-everywhere-src-6.9.2.tar.xz) = e06af183012996a64f07745064318303d3765959ebba29489f8af0f50f32ebb6 +SIZE (KDE/Qt/6.9.2/qtscxml-everywhere-src-6.9.2.tar.xz) = 545560 diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo index f68da1180fac..818f2f0992b1 100644 --- a/devel/qt6-tools/distinfo +++ b/devel/qt6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162793 -SHA256 (KDE/Qt/6.9.1/qttools-everywhere-src-6.9.1.tar.xz) = 90c4a562f4ccfd043fd99f34c600853e0b5ba9babc6ec616c0f306f2ce3f4b4c -SIZE (KDE/Qt/6.9.1/qttools-everywhere-src-6.9.1.tar.xz) = 10339096 +TIMESTAMP = 1756196635 +SHA256 (KDE/Qt/6.9.2/qttools-everywhere-src-6.9.2.tar.xz) = d8b7f7e8e970cc0b975205fd6d5832ea917ef3e751df69b97439c1cddd67a489 +SIZE (KDE/Qt/6.9.2/qttools-everywhere-src-6.9.2.tar.xz) = 10330412 diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo index 7d9365eb10b7..dabf96c94680 100644 --- a/devel/qt6-translations/distinfo +++ b/devel/qt6-translations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162796 -SHA256 (KDE/Qt/6.9.1/qttranslations-everywhere-src-6.9.1.tar.xz) = 9761a1a555f447cdeba79fdec6a705dee8a7882ac10c12e85f49467ddd01a741 -SIZE (KDE/Qt/6.9.1/qttranslations-everywhere-src-6.9.1.tar.xz) = 1574708 +TIMESTAMP = 1756196641 +SHA256 (KDE/Qt/6.9.2/qttranslations-everywhere-src-6.9.2.tar.xz) = c73bb6281ed365c0f954f4b1b6e1b13e1b3fefd94854f46fcd9a412f641f7ed6 +SIZE (KDE/Qt/6.9.2/qttranslations-everywhere-src-6.9.2.tar.xz) = 1628840 diff --git a/devel/qt6-translations/pkg-plist b/devel/qt6-translations/pkg-plist index 3de69e0e8663..72d8b7e617a1 100644 --- a/devel/qt6-translations/pkg-plist +++ b/devel/qt6-translations/pkg-plist @@ -18,6 +18,7 @@ %%QT_L10NDIR%%/assistant_ru.qm %%QT_L10NDIR%%/assistant_sk.qm %%QT_L10NDIR%%/assistant_sl.qm +%%QT_L10NDIR%%/assistant_sv.qm %%QT_L10NDIR%%/assistant_tr.qm %%QT_L10NDIR%%/assistant_uk.qm %%QT_L10NDIR%%/assistant_zh_CN.qm @@ -41,6 +42,7 @@ %%QT_L10NDIR%%/designer_ru.qm %%QT_L10NDIR%%/designer_sk.qm %%QT_L10NDIR%%/designer_sl.qm +%%QT_L10NDIR%%/designer_sv.qm %%QT_L10NDIR%%/designer_tr.qm %%QT_L10NDIR%%/designer_uk.qm %%QT_L10NDIR%%/designer_zh_CN.qm @@ -106,6 +108,7 @@ %%QT_L10NDIR%%/qt_help_ru.qm %%QT_L10NDIR%%/qt_help_sk.qm %%QT_L10NDIR%%/qt_help_sl.qm +%%QT_L10NDIR%%/qt_help_sv.qm %%QT_L10NDIR%%/qt_help_tr.qm %%QT_L10NDIR%%/qt_help_uk.qm %%QT_L10NDIR%%/qt_help_zh_CN.qm @@ -116,6 +119,7 @@ %%QT_L10NDIR%%/qt_ja.qm %%QT_L10NDIR%%/qt_ka.qm %%QT_L10NDIR%%/qt_ko.qm +%%QT_L10NDIR%%/qt_lg.qm %%QT_L10NDIR%%/qt_lt.qm %%QT_L10NDIR%%/qt_lv.qm %%QT_L10NDIR%%/qt_nl.qm @@ -150,6 +154,7 @@ %%QT_L10NDIR%%/qtbase_ja.qm %%QT_L10NDIR%%/qtbase_ka.qm %%QT_L10NDIR%%/qtbase_ko.qm +%%QT_L10NDIR%%/qtbase_lg.qm %%QT_L10NDIR%%/qtbase_lv.qm %%QT_L10NDIR%%/qtbase_nl.qm %%QT_L10NDIR%%/qtbase_nn.qm @@ -157,6 +162,7 @@ %%QT_L10NDIR%%/qtbase_pt_BR.qm %%QT_L10NDIR%%/qtbase_ru.qm %%QT_L10NDIR%%/qtbase_sk.qm +%%QT_L10NDIR%%/qtbase_sv.qm %%QT_L10NDIR%%/qtbase_tr.qm %%QT_L10NDIR%%/qtbase_uk.qm %%QT_L10NDIR%%/qtbase_zh_CN.qm @@ -175,6 +181,7 @@ %%QT_L10NDIR%%/qtconnectivity_pl.qm %%QT_L10NDIR%%/qtconnectivity_pt_BR.qm %%QT_L10NDIR%%/qtconnectivity_ru.qm +%%QT_L10NDIR%%/qtconnectivity_sv.qm %%QT_L10NDIR%%/qtconnectivity_tr.qm %%QT_L10NDIR%%/qtconnectivity_uk.qm %%QT_L10NDIR%%/qtconnectivity_zh_CN.qm @@ -200,6 +207,7 @@ %%QT_L10NDIR%%/qtdeclarative_pt_BR.qm %%QT_L10NDIR%%/qtdeclarative_ru.qm %%QT_L10NDIR%%/qtdeclarative_sk.qm +%%QT_L10NDIR%%/qtdeclarative_sv.qm %%QT_L10NDIR%%/qtdeclarative_tr.qm %%QT_L10NDIR%%/qtdeclarative_uk.qm %%QT_L10NDIR%%/qtdeclarative_zh_CN.qm @@ -220,6 +228,7 @@ %%QT_L10NDIR%%/qtlocation_pl.qm %%QT_L10NDIR%%/qtlocation_pt_BR.qm %%QT_L10NDIR%%/qtlocation_ru.qm +%%QT_L10NDIR%%/qtlocation_sv.qm %%QT_L10NDIR%%/qtlocation_tr.qm %%QT_L10NDIR%%/qtlocation_uk.qm %%QT_L10NDIR%%/qtlocation_zh_CN.qm @@ -246,6 +255,7 @@ %%QT_L10NDIR%%/qtmultimedia_pt_BR.qm %%QT_L10NDIR%%/qtmultimedia_ru.qm %%QT_L10NDIR%%/qtmultimedia_sk.qm +%%QT_L10NDIR%%/qtmultimedia_sv.qm %%QT_L10NDIR%%/qtmultimedia_tr.qm %%QT_L10NDIR%%/qtmultimedia_uk.qm %%QT_L10NDIR%%/qtmultimedia_zh_CN.qm @@ -258,6 +268,7 @@ %%QT_L10NDIR%%/qtserialport_ko.qm %%QT_L10NDIR%%/qtserialport_pl.qm %%QT_L10NDIR%%/qtserialport_ru.qm +%%QT_L10NDIR%%/qtserialport_sv.qm %%QT_L10NDIR%%/qtserialport_tr.qm %%QT_L10NDIR%%/qtserialport_uk.qm %%QT_L10NDIR%%/qtserialport_zh_CN.qm @@ -267,8 +278,10 @@ %%QT_L10NDIR%%/qtwebengine_es.qm %%QT_L10NDIR%%/qtwebengine_ka.qm %%QT_L10NDIR%%/qtwebengine_ko.qm +%%QT_L10NDIR%%/qtwebengine_lg.qm %%QT_L10NDIR%%/qtwebengine_pl.qm %%QT_L10NDIR%%/qtwebengine_ru.qm +%%QT_L10NDIR%%/qtwebengine_sv.qm %%QT_L10NDIR%%/qtwebengine_tr.qm %%QT_L10NDIR%%/qtwebengine_uk.qm %%QT_L10NDIR%%/qtwebengine_zh_CN.qm @@ -282,6 +295,7 @@ %%QT_L10NDIR%%/qtwebsockets_ko.qm %%QT_L10NDIR%%/qtwebsockets_pl.qm %%QT_L10NDIR%%/qtwebsockets_ru.qm +%%QT_L10NDIR%%/qtwebsockets_sv.qm %%QT_L10NDIR%%/qtwebsockets_tr.qm %%QT_L10NDIR%%/qtwebsockets_uk.qm %%QT_L10NDIR%%/qtwebsockets_zh_CN.qm diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile index 72963cfcfc38..06262d87bd21 100644 --- a/devel/shiboken6/Makefile +++ b/devel/shiboken6/Makefile @@ -1,6 +1,5 @@ PORTNAME= shiboken6 DISTVERSION= ${PYSIDE6_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/pyside6/PySide6-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo index b696f5684bb8..837de6ee5f26 100644 --- a/devel/shiboken6/distinfo +++ b/devel/shiboken6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162943 -SHA256 (KDE/Qt/6.9.1/pyside-setup-everywhere-src-6.9.1.tar.xz) = 04c712c5b9234add0d9b5aa3c01a0caede64a55b496127751f5d52a230cff748 -SIZE (KDE/Qt/6.9.1/pyside-setup-everywhere-src-6.9.1.tar.xz) = 16669448 +TIMESTAMP = 1756198971 +SHA256 (KDE/Qt/6.9.2/pyside-setup-everywhere-src-6.9.2.tar.xz) = 9ec087465342bdc9dbe492a30e58fdbbc5448655deacf5982a0fe7123f59222d +SIZE (KDE/Qt/6.9.2/pyside-setup-everywhere-src-6.9.2.tar.xz) = 16659400 diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile index d92a2dbf6830..e94c04ce9f98 100644 --- a/graphics/qt6-3d/Makefile +++ b/graphics/qt6-3d/Makefile @@ -1,6 +1,5 @@ PORTNAME= 3d DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt6- diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo index 231aa0fba277..cd9b54578f75 100644 --- a/graphics/qt6-3d/distinfo +++ b/graphics/qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749158712 -SHA256 (KDE/Qt/6.9.1/qt3d-everywhere-src-6.9.1.tar.xz) = 9c46497a60147bb326a58b67b1f543bdf81b8aceed908b44d3dde896d79c4784 -SIZE (KDE/Qt/6.9.1/qt3d-everywhere-src-6.9.1.tar.xz) = 141817908 +TIMESTAMP = 1756196733 +SHA256 (KDE/Qt/6.9.2/qt3d-everywhere-src-6.9.2.tar.xz) = aa6e023b8b5605f212cc52c46c1a8b74bd2ca67d01473d305b5b48a7972bb659 +SIZE (KDE/Qt/6.9.2/qt3d-everywhere-src-6.9.2.tar.xz) = 141825804 diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo index c4ff0b43a29a..7df0e43a15d1 100644 --- a/graphics/qt6-imageformats/distinfo +++ b/graphics/qt6-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159278 -SHA256 (KDE/Qt/6.9.1/qtimageformats-everywhere-src-6.9.1.tar.xz) = ebe9f238daaf9bb752c7233edadf4af33fc4fa30d914936812b6410d3af1577c -SIZE (KDE/Qt/6.9.1/qtimageformats-everywhere-src-6.9.1.tar.xz) = 2039560 +TIMESTAMP = 1756196738 +SHA256 (KDE/Qt/6.9.2/qtimageformats-everywhere-src-6.9.2.tar.xz) = 8a023f7e2f57dedc02e2ab10c975f7cb3cccac9b8f0823c12fd6824834549139 +SIZE (KDE/Qt/6.9.2/qtimageformats-everywhere-src-6.9.2.tar.xz) = 2021564 diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo index 793146f6f402..be6b29505050 100644 --- a/graphics/qt6-lottie/distinfo +++ b/graphics/qt6-lottie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162753 -SHA256 (KDE/Qt/6.9.1/qtlottie-everywhere-src-6.9.1.tar.xz) = 8ee88c2e0773c96109c179d7e75a46ba7bc548b5bc8be409a23cbaddafa18ba2 -SIZE (KDE/Qt/6.9.1/qtlottie-everywhere-src-6.9.1.tar.xz) = 99436 +TIMESTAMP = 1756196742 +SHA256 (KDE/Qt/6.9.2/qtlottie-everywhere-src-6.9.2.tar.xz) = a4df93d2dd5c5942f1dc23e29667199fbf5cfaba84a51e6a9ffc874b967e31c6 +SIZE (KDE/Qt/6.9.2/qtlottie-everywhere-src-6.9.2.tar.xz) = 83560 diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo index 52b2a7170925..8e63980db866 100644 --- a/graphics/qt6-quickeffectmaker/distinfo +++ b/graphics/qt6-quickeffectmaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162778 -SHA256 (KDE/Qt/6.9.1/qtquickeffectmaker-everywhere-src-6.9.1.tar.xz) = 39b617c40642bb44f54e781ecea9338f2cf2b794c552df0b7a8795cabad15d31 -SIZE (KDE/Qt/6.9.1/qtquickeffectmaker-everywhere-src-6.9.1.tar.xz) = 4358748 +TIMESTAMP = 1756196749 +SHA256 (KDE/Qt/6.9.2/qtquickeffectmaker-everywhere-src-6.9.2.tar.xz) = 7985f1496ed411e3a3ae06ca55c8e37825e1c7f1c25ed4d120a68909ee0dd8f9 +SIZE (KDE/Qt/6.9.2/qtquickeffectmaker-everywhere-src-6.9.2.tar.xz) = 4342904 diff --git a/graphics/qt6-svg/Makefile b/graphics/qt6-svg/Makefile index 322b0d874e19..7eee8e4edde8 100644 --- a/graphics/qt6-svg/Makefile +++ b/graphics/qt6-svg/Makefile @@ -1,12 +1,8 @@ PORTNAME= svg DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt6- -PATCH_SITES= https://github.com/qt/qtsvg/commit/ -PATCHFILES+= 07b3434f91c95d196f687c51e1a58a95a0b1ef2e.patch:-p1 # PR 287659 - MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 classes for displaying the contents of SVG files diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo index a4042baa311f..8f066ad75a57 100644 --- a/graphics/qt6-svg/distinfo +++ b/graphics/qt6-svg/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1750609163 -SHA256 (KDE/Qt/6.9.1/qtsvg-everywhere-src-6.9.1.tar.xz) = 2dfc5de5fd891ff2afd9861e519bf1a26e6deb729b3133f68a28ba763c9abbd5 -SIZE (KDE/Qt/6.9.1/qtsvg-everywhere-src-6.9.1.tar.xz) = 2017876 -SHA256 (KDE/Qt/6.9.1/07b3434f91c95d196f687c51e1a58a95a0b1ef2e.patch) = 924277fa003f477372446f7ca6fc9e6139f47216a0eebd27e9c129f5d36a5855 -SIZE (KDE/Qt/6.9.1/07b3434f91c95d196f687c51e1a58a95a0b1ef2e.patch) = 1890 +TIMESTAMP = 1756201222 +SHA256 (KDE/Qt/6.9.2/qtsvg-everywhere-src-6.9.2.tar.xz) = d984cab8f26334aa1c15e5b8f0cd9f1b7c0c1289fe0b68c1c84ab469b75605a5 +SIZE (KDE/Qt/6.9.2/qtsvg-everywhere-src-6.9.2.tar.xz) = 2004052 diff --git a/graphics/qt6-wayland/Makefile b/graphics/qt6-wayland/Makefile index a63bdb800592..430aef820fe7 100644 --- a/graphics/qt6-wayland/Makefile +++ b/graphics/qt6-wayland/Makefile @@ -1,6 +1,5 @@ PORTNAME= wayland DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= graphics wayland PKGNAMEPREFIX= qt6- diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo index 80bc8f5217e5..d6f7ec8b5572 100644 --- a/graphics/qt6-wayland/distinfo +++ b/graphics/qt6-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159376 -SHA256 (KDE/Qt/6.9.1/qtwayland-everywhere-src-6.9.1.tar.xz) = 7d21ea0e687180ebb19b9a1f86ae9cfa7a25b4f02d5db05ec834164409932e3e -SIZE (KDE/Qt/6.9.1/qtwayland-everywhere-src-6.9.1.tar.xz) = 1152868 +TIMESTAMP = 1756196760 +SHA256 (KDE/Qt/6.9.2/qtwayland-everywhere-src-6.9.2.tar.xz) = cad79806565568f12f9983fed69219416abcee9d5deef4abdfcf94aa2eef7781 +SIZE (KDE/Qt/6.9.2/qtwayland-everywhere-src-6.9.2.tar.xz) = 1138152 diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo index bc8a457cec4b..c06929c61dfd 100644 --- a/misc/qt6-doc/distinfo +++ b/misc/qt6-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749158768 -SHA256 (KDE/Qt/6.9.1/qtdoc-everywhere-src-6.9.1.tar.xz) = 6e0cbebae5ce92dd3dc73fa7e11bd5afc44ca9fc7dc2c84e74c8ef1ab96d1ab5 -SIZE (KDE/Qt/6.9.1/qtdoc-everywhere-src-6.9.1.tar.xz) = 46287552 +TIMESTAMP = 1756196791 +SHA256 (KDE/Qt/6.9.2/qtdoc-everywhere-src-6.9.2.tar.xz) = 3fdabbb6556564fc8cdbdb7a98d41e827d6a09dd086255904532e78a3515cf62 +SIZE (KDE/Qt/6.9.2/qtdoc-everywhere-src-6.9.2.tar.xz) = 46187424 diff --git a/misc/qt6-doc/pkg-plist b/misc/qt6-doc/pkg-plist index 5b28b48f2430..707d63cdccf2 100644 --- a/misc/qt6-doc/pkg-plist +++ b/misc/qt6-doc/pkg-plist @@ -58,10 +58,10 @@ %%QT_DOCDIR%%/qtdoc/building-qt-for-qnx.html %%QT_DOCDIR%%/qtdoc/classes.html %%QT_DOCDIR%%/qtdoc/classesandfunctions.html -%%QT_DOCDIR%%/qtdoc/concepts.html %%QT_DOCDIR%%/qtdoc/configure-linux-device.html %%QT_DOCDIR%%/qtdoc/configure-options.html %%QT_DOCDIR%%/qtdoc/create-your-first-applications.html +%%QT_DOCDIR%%/qtdoc/cross-compiling-qt.html %%QT_DOCDIR%%/qtdoc/debug.html %%QT_DOCDIR%%/qtdoc/deployment-android.html %%QT_DOCDIR%%/qtdoc/deployment-plugins.html @@ -115,7 +115,6 @@ %%QT_DOCDIR%%/qtdoc/images/android-source-folder.png %%QT_DOCDIR%%/qtdoc/images/android.webp %%QT_DOCDIR%%/qtdoc/images/animation-examples.png -%%QT_DOCDIR%%/qtdoc/images/applicationwindow.png %%QT_DOCDIR%%/qtdoc/images/arrow_bc.png %%QT_DOCDIR%%/qtdoc/images/bgrContent.png %%QT_DOCDIR%%/qtdoc/images/btn_next.png @@ -167,16 +166,6 @@ %%QT_DOCDIR%%/qtdoc/images/project-structure.png %%QT_DOCDIR%%/qtdoc/images/project_structure.png %%QT_DOCDIR%%/qtdoc/images/qml-application.png -%%QT_DOCDIR%%/qtdoc/images/qml-extending-types.gif -%%QT_DOCDIR%%/qtdoc/images/qml-uses-animation.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-integratingjs.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-layouts-anchors.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-layouts-direct.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-layouts-positioners.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-text.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-opacity.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-rectangles.png -%%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-transforms.png %%QT_DOCDIR%%/qtdoc/images/qt-android-architecture.drawio.svg %%QT_DOCDIR%%/qtdoc/images/qt-codesample.png %%QT_DOCDIR%%/qtdoc/images/qt-edu-apply.png @@ -209,6 +198,8 @@ %%QT_DOCDIR%%/qtdoc/images/qthangman-example.png %%QT_DOCDIR%%/qtdoc/images/qthangman-store-example.png %%QT_DOCDIR%%/qtdoc/images/qtinstallercomponents.png +%%QT_DOCDIR%%/qtdoc/images/qtjenny-sequence.drawio.svg +%%QT_DOCDIR%%/qtdoc/images/qtjennydemo_overview.png %%QT_DOCDIR%%/qtdoc/images/qtquick-demo-calqlatr.png %%QT_DOCDIR%%/qtdoc/images/qtquick-demo-clocks-small.png %%QT_DOCDIR%%/qtdoc/images/qtquick-demo-photosurface-small.png @@ -306,10 +297,6 @@ %%QT_DOCDIR%%/qtdoc/porting-to-ios.html %%QT_DOCDIR%%/qtdoc/porting-to-qt6-using-clazy.html %%QT_DOCDIR%%/qtdoc/portingguide.html -%%QT_DOCDIR%%/qtdoc/qml-codingconventions.html -%%QT_DOCDIR%%/qtdoc/qml-glossary.html -%%QT_DOCDIR%%/qtdoc/qmlapplications.html -%%QT_DOCDIR%%/qtdoc/qmlfirststeps.html %%QT_DOCDIR%%/qtdoc/qmltypes.html %%QT_DOCDIR%%/qtdoc/qmlvaluetypes.html %%QT_DOCDIR%%/qtdoc/qnx-support.html @@ -357,6 +344,7 @@ %%QT_DOCDIR%%/qtdoc/qtdoc-demos-mediaplayer-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-osmbuildings-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-photosurface-example.html +%%QT_DOCDIR%%/qtdoc/qtdoc-demos-qtjennydemo-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-robotarm-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-rssnews-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-samegame-example.html @@ -372,8 +360,11 @@ %%QT_DOCDIR%%/qtdoc/qtentrypoint.html %%QT_DOCDIR%%/qtdoc/qtexamples.html %%QT_DOCDIR%%/qtdoc/qtexamplesandtutorials.html +%%QT_DOCDIR%%/qtdoc/qtjenny-concepts.html %%QT_DOCDIR%%/qtdoc/qtjenny-configuration.html %%QT_DOCDIR%%/qtdoc/qtjenny-installation.html +%%QT_DOCDIR%%/qtdoc/qtjenny-knownissues.html +%%QT_DOCDIR%%/qtdoc/qtjenny-whatsnew.html %%QT_DOCDIR%%/qtdoc/qtjenny.html %%QT_DOCDIR%%/qtdoc/qtlanguages.html %%QT_DOCDIR%%/qtdoc/qtmodules.html @@ -382,17 +373,6 @@ %%QT_DOCDIR%%/qtdoc/qtpurchasing-baseclasses.html %%QT_DOCDIR%%/qtdoc/qtpurchasing-googleplay.html %%QT_DOCDIR%%/qtdoc/qtpurchasing-iosclasses.html -%%QT_DOCDIR%%/qtdoc/qtquick-debugging.html -%%QT_DOCDIR%%/qtdoc/qtquick-deployment.html -%%QT_DOCDIR%%/qtdoc/qtquick-performance.html -%%QT_DOCDIR%%/qtdoc/qtquick-qml-runtime.html -%%QT_DOCDIR%%/qtdoc/qtquick-usecase-animations.html -%%QT_DOCDIR%%/qtdoc/qtquick-usecase-integratingjs.html -%%QT_DOCDIR%%/qtdoc/qtquick-usecase-layouts.html -%%QT_DOCDIR%%/qtdoc/qtquick-usecase-styling.html -%%QT_DOCDIR%%/qtdoc/qtquick-usecase-text.html -%%QT_DOCDIR%%/qtdoc/qtquick-usecase-userinput.html -%%QT_DOCDIR%%/qtdoc/qtquick-usecase-visual.html %%QT_DOCDIR%%/qtdoc/qundo.html %%QT_DOCDIR%%/qtdoc/rcc.html %%QT_DOCDIR%%/qtdoc/reference-overview.html @@ -408,7 +388,6 @@ %%QT_DOCDIR%%/qtdoc/style/offline-dark.css %%QT_DOCDIR%%/qtdoc/style/offline-simple.css %%QT_DOCDIR%%/qtdoc/style/offline.css -%%QT_DOCDIR%%/qtdoc/style/qt5-sidebar.html %%QT_DOCDIR%%/qtdoc/style/tree_config.xml %%QT_DOCDIR%%/qtdoc/supported-platforms.html %%QT_DOCDIR%%/qtdoc/testing-and-debugging.html @@ -438,7 +417,6 @@ %%QT_DOCDIR%%/qtdoc/wayland-and-qt.html %%QT_DOCDIR%%/qtdoc/wayland-requirements.html %%QT_DOCDIR%%/qtdoc/webos.html -%%QT_DOCDIR%%/qtdoc/whatsnew.html %%QT_DOCDIR%%/qtdoc/whatsnew60.html %%QT_DOCDIR%%/qtdoc/whatsnew61.html %%QT_DOCDIR%%/qtdoc/whatsnew62.html diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo index 79c7ec969efb..19172d04cb8a 100644 --- a/misc/qt6-examples/distinfo +++ b/misc/qt6-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159275 -SHA256 (KDE/Qt/6.9.1/qt-everywhere-src-6.9.1.tar.xz) = 364fde2d7fa42dd7c9b2ea6db3d462dd54f3869e9fd0ca0a0ca62f750cd8329b -SIZE (KDE/Qt/6.9.1/qt-everywhere-src-6.9.1.tar.xz) = 1102429456 +TIMESTAMP = 1756197827 +SHA256 (KDE/Qt/6.9.2/qt-everywhere-src-6.9.2.tar.xz) = 643f1fe35a739e2bf5e1a092cfe83dbee61ff6683684e957351c599767ca279c +SIZE (KDE/Qt/6.9.2/qt-everywhere-src-6.9.2.tar.xz) = 1102604088 diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist index 8414d862d431..d3b75f7af8f3 100644 --- a/misc/qt6-examples/pkg-plist +++ b/misc/qt6-examples/pkg-plist @@ -1020,6 +1020,8 @@ %%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/Contents.json %%QT_EXAMPLEDIR%%/demos/calqlatr/main.cpp %%QT_EXAMPLEDIR%%/demos/calqlatr/qmldir +%%QT_EXAMPLEDIR%%/demos/calqlatr/windows/calqlatr.ico +%%QT_EXAMPLEDIR%%/demos/calqlatr/windows/calqlatr.rc %%QT_EXAMPLEDIR%%/demos/car-configurator/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject.qtds @@ -1278,40 +1280,16 @@ %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/copy@2x.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/cut.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/cut@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/document-open-recent.svgz -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-next-view-page.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-next-view-page@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-next-view.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-next-view@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-next.svgz -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-previous-view-page.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-previous-view-page@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-previous-view.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-previous-view@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/go-previous.svgz -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/help-about.svgz %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/magnifier.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/magnifier@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/open.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/open@2x.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/paste.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/paste@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/print.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/print2x.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/qt-logo.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/qt-logo@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-fit-best.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-fit-best@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-fit-width.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-fit-width@2x.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-in.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-in@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-original.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-original@2x.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-out.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-out@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-previous.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/zoom-previous@2x.png %%QT_EXAMPLEDIR%%/demos/documentviewer/app/main.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/app/mainwindow.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/app/mainwindow.h @@ -1328,6 +1306,12 @@ %%QT_EXAMPLEDIR%%/demos/documentviewer/doc/src/documentviewer.qdoc %%QT_EXAMPLEDIR%%/demos/documentviewer/doc/src/txtviewer.qdoc %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/Q3DViewer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/Q3DViewer/QueryMimeTypes.qml +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/Q3DViewer/Viewer.qml +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/Q3DViewer/q3dviewer.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/Q3DViewer/q3dviewer.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/Q3DViewer/q3dviewer.json %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/imageviewer/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/imageviewer/imageviewer.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/imageviewer/imageviewer.h @@ -1344,12 +1328,6 @@ %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/pdfviewer.json %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/zoomselector.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/zoomselector.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/QueryMimeTypes.qml -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/Viewer.qml -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.json %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.cpp %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.h @@ -1748,6 +1726,46 @@ %%QT_EXAMPLEDIR%%/demos/photosurface/resources/photosurface.rc %%QT_EXAMPLEDIR%%/demos/photosurface/resources/shaders/gneiss.frag %%QT_EXAMPLEDIR%%/demos/photosurface/resources/welcome.pdf +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/Main.qml +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/backend.cpp +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/backend.h +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/doc/images/qtjennydemo_overview.png +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/doc/src/qtjennydemo.qdoc +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/main.cpp +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/app/build.gradle +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/app/src/main/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/app/src/main/java/org/qtproject/qt/qtjenny_generator/GenerateCppCode.kt +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/app/src/main/java/org/qtproject/qt/qtjenny_generator/MainActivity.kt +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/app/src/main/res/values/strings.xml +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/build.gradle +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/gradle.properties +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/gradle/libs.versions.toml +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/gradle/wrapper/gradle-wrapper.jar +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/gradle/wrapper/gradle-wrapper.properties +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/gradlew +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/gradlew.bat +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/settings.gradle +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/constructor_definition.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/constructors_ids_declarations.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/constructors_ids_initialisations.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/field_getter.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/field_setter.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/fields_ids_declarations.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/fields_ids_initialisations.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/header_final_postamble.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/header_initfunctions.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/header_initvars.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/header_postamble.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/header_preamble.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/initclass_postamble.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/initclass_preamble.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/method_definition.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/method_prologue.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/methods_ids_declarations.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/methods_ids_initialisations.kte +%%QT_EXAMPLEDIR%%/demos/qtjennydemo/qtjenny_generator/templates/param.kte %%QT_EXAMPLEDIR%%/demos/robotarm/Backend/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/robotarm/Backend/animatedparam.cpp %%QT_EXAMPLEDIR%%/demos/robotarm/Backend/animatedparam.h diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index 3c6442a01277..36b60cc1c246 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159292 -SHA256 (KDE/Qt/6.9.1/qtmultimedia-everywhere-src-6.9.1.tar.xz) = 955e36459518ee55f8e2bb79defc6e44aa94dc1edf5ac58a22d7734b2e07391d -SIZE (KDE/Qt/6.9.1/qtmultimedia-everywhere-src-6.9.1.tar.xz) = 9776408 +TIMESTAMP = 1756197836 +SHA256 (KDE/Qt/6.9.2/qtmultimedia-everywhere-src-6.9.2.tar.xz) = 7bf8a19a57a7432181b05d0e264acfd8ca4b75a3901d01a27a32935703e5ab12 +SIZE (KDE/Qt/6.9.2/qtmultimedia-everywhere-src-6.9.2.tar.xz) = 9768828 diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake index 508f5cd80e34..cbf22dd3f497 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake @@ -1,11 +1,11 @@ ---- src/multimedia/configure.cmake.orig 2025-05-04 13:16:35 UTC +--- src/multimedia/configure.cmake.orig 2025-08-18 00:47:41 UTC +++ src/multimedia/configure.cmake -@@ -132,7 +132,7 @@ qt_feature("ffmpeg" PRIVATE - LABEL "FFmpeg" +@@ -129,7 +129,7 @@ qt_feature("ffmpeg" PRIVATE ENABLE INPUT_ffmpeg STREQUAL 'yes' DISABLE INPUT_ffmpeg STREQUAL 'no' -- CONDITION FFmpeg_FOUND AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio) -+ CONDITION FFmpeg_FOUND AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_alsa OR QT_FEATURE_pulseaudio) + CONDITION FFmpeg_FOUND +- AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio) ++ AND (APPLE OR WIN32 OR ANDROID OR QNX OR OR QT_FEATURE_alsa OR QT_FEATURE_pulseaudio) + AND QT_FEATURE_thread ) qt_feature("pipewire" PRIVATE - LABEL "PipeWire" diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp deleted file mode 100644 index 567d571867a6..000000000000 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp +++ /dev/null @@ -1,15 +0,0 @@ -Fix 32-bit builds with PULSEAUDIO option. - ---- src/multimedia/pulseaudio/qpulseaudiosink.cpp.orig 2025-05-04 13:16:35 UTC -+++ src/multimedia/pulseaudio/qpulseaudiosink.cpp -@@ -491,8 +491,8 @@ qint64 QPulseAudioSink::write(const char *data, qint64 - // or even affect the system volume if flat volumes are enabled - - QAudioHelperInternal::applyVolume(volume(), m_format, -- QSpan{ reinterpret_cast<const std::byte *>(data), len }, -- QSpan{ reinterpret_cast<std::byte *>(dest), len }); -+ QSpan{ reinterpret_cast<const std::byte *>(data), static_cast<qsizetype>(len) }, -+ QSpan{ reinterpret_cast<std::byte *>(dest), static_cast<qsizetype>(len) }); - - if ((pa_stream_write(m_stream.get(), dest, len, nullptr, 0, PA_SEEK_RELATIVE)) < 0) { - engineLock.unlock(); diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index 60250965f115..2f80534bdab5 100644 --- a/multimedia/qt6-multimedia/pkg-plist +++ b/multimedia/qt6-multimedia/pkg-plist @@ -102,6 +102,7 @@ %%GSTREAMER%%%%QT_INCDIR%%/QtGstreamerMediaPluginImpl/QtGstreamerMediaPluginImplVersion %%GSTREAMER%%%%QT_INCDIR%%/QtGstreamerMediaPluginImpl/qtgstreamermediapluginimplversion.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_alignment_support_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_platform_implementation_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_qiodevice_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_qspan_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_rtsan_support_p.h @@ -112,8 +113,6 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioformat_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioringbuffer_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachine_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachineutils_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystem_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystem_platform_stream_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qautoresetevent_p.h @@ -342,7 +341,6 @@ %%QT_INCDIR%%/QtSpatialAudio/qtspatialaudioexports.h %%QT_INCDIR%%/QtSpatialAudio/qtspatialaudioglobal.h %%QT_INCDIR%%/QtSpatialAudio/qtspatialaudioversion.h -lib/cmake/Qt6/FindAVFoundation.cmake lib/cmake/Qt6/FindFFmpeg.cmake lib/cmake/Qt6/FindGObject.cmake lib/cmake/Qt6/FindGStreamer.cmake diff --git a/net/qt6-coap/distinfo b/net/qt6-coap/distinfo index 9babec5e4e0e..196205bd7d3e 100644 --- a/net/qt6-coap/distinfo +++ b/net/qt6-coap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162733 -SHA256 (KDE/Qt/6.9.1/qt-qtcoap-v6.9.1_GH0.tar.gz) = ab752e54498be742422a5257ca60d093ad4288878a83a2739da0df7c51363dd6 -SIZE (KDE/Qt/6.9.1/qt-qtcoap-v6.9.1_GH0.tar.gz) = 186513 +TIMESTAMP = 1756197840 +SHA256 (KDE/Qt/6.9.2/qt-qtcoap-v6.9.2_GH0.tar.gz) = 4f5c504b4e3e09112b42c65b6ced639dacf8ed1598b994cd5065f66a8f97751f +SIZE (KDE/Qt/6.9.2/qt-qtcoap-v6.9.2_GH0.tar.gz) = 186810 diff --git a/net/qt6-mqtt/distinfo b/net/qt6-mqtt/distinfo index 04ad26ed35b4..407c54ee07ad 100644 --- a/net/qt6-mqtt/distinfo +++ b/net/qt6-mqtt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162756 -SHA256 (KDE/Qt/6.9.1/qt-qtmqtt-v6.9.1_GH0.tar.gz) = 287aeb285035301961dcdb3899b3a359d95666491a1f61a9a6dff265756c9f3c -SIZE (KDE/Qt/6.9.1/qt-qtmqtt-v6.9.1_GH0.tar.gz) = 209623 +TIMESTAMP = 1756197843 +SHA256 (KDE/Qt/6.9.2/qt-qtmqtt-v6.9.2_GH0.tar.gz) = 1d5edb5b78f3b3248211afb3bd98947ebefc0e3acdd2db2f000dcda1a0fb362b +SIZE (KDE/Qt/6.9.2/qt-qtmqtt-v6.9.2_GH0.tar.gz) = 210422 diff --git a/net/qt6-networkauth/distinfo b/net/qt6-networkauth/distinfo index cbb107f032f6..567768330824 100644 --- a/net/qt6-networkauth/distinfo +++ b/net/qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159295 -SHA256 (KDE/Qt/6.9.1/qtnetworkauth-everywhere-src-6.9.1.tar.xz) = 7fadb15b372235546f1585145fd5dbb5d1177d041ef692b0ea232935387339cb -SIZE (KDE/Qt/6.9.1/qtnetworkauth-everywhere-src-6.9.1.tar.xz) = 447664 +TIMESTAMP = 1756197848 +SHA256 (KDE/Qt/6.9.2/qtnetworkauth-everywhere-src-6.9.2.tar.xz) = 2165d9568eb8ab9f3cb91abdb0e72c17fe7a70707150ef1738db94e75f318c84 +SIZE (KDE/Qt/6.9.2/qtnetworkauth-everywhere-src-6.9.2.tar.xz) = 432076 diff --git a/science/qt6-quick3dphysics/distinfo b/science/qt6-quick3dphysics/distinfo index 03a1722c995d..8e99d6679edf 100644 --- a/science/qt6-quick3dphysics/distinfo +++ b/science/qt6-quick3dphysics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162772 -SHA256 (KDE/Qt/6.9.1/qtquick3dphysics-everywhere-src-6.9.1.tar.xz) = 66e8365eb8c409a8426dec13a83203879f31845d555bf7632ce0728e8ddca24f -SIZE (KDE/Qt/6.9.1/qtquick3dphysics-everywhere-src-6.9.1.tar.xz) = 4683360 +TIMESTAMP = 1756197855 +SHA256 (KDE/Qt/6.9.2/qtquick3dphysics-everywhere-src-6.9.2.tar.xz) = 87fc6485638f52cd33dc1a755a11c78fd992e438fe77ef53e0ca57c63505cc8b +SIZE (KDE/Qt/6.9.2/qtquick3dphysics-everywhere-src-6.9.2.tar.xz) = 4668516 diff --git a/www/qt6-httpserver/distinfo b/www/qt6-httpserver/distinfo index 48782c3db88e..38c80b869b89 100644 --- a/www/qt6-httpserver/distinfo +++ b/www/qt6-httpserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162746 -SHA256 (KDE/Qt/6.9.1/qthttpserver-everywhere-src-6.9.1.tar.xz) = bfc7b511e2bbc365f11027ae8d7d2e33f3ff63591b866df9a880c51363f02b53 -SIZE (KDE/Qt/6.9.1/qthttpserver-everywhere-src-6.9.1.tar.xz) = 189852 +TIMESTAMP = 1756198097 +SHA256 (KDE/Qt/6.9.2/qthttpserver-everywhere-src-6.9.2.tar.xz) = 1343fa1d1d6dfda9b9de4a1ff36471b6ff4bd16f9ee7c19deb098c15e4714019 +SIZE (KDE/Qt/6.9.2/qthttpserver-everywhere-src-6.9.2.tar.xz) = 175292 diff --git a/www/qt6-webchannel/distinfo b/www/qt6-webchannel/distinfo index 4dcc026aaef9..0664bc0955ec 100644 --- a/www/qt6-webchannel/distinfo +++ b/www/qt6-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159379 -SHA256 (KDE/Qt/6.9.1/qtwebchannel-everywhere-src-6.9.1.tar.xz) = 19b401d9210afc416c4080b189b0c9940e90d1f7444f5d046f3d8b1ab5fcf9c0 -SIZE (KDE/Qt/6.9.1/qtwebchannel-everywhere-src-6.9.1.tar.xz) = 209516 +TIMESTAMP = 1756198104 +SHA256 (KDE/Qt/6.9.2/qtwebchannel-everywhere-src-6.9.2.tar.xz) = 878a6337ad4d2c2a1de5bedb28c36b05b2733242d10f6c3d0eae55c5433c8e65 +SIZE (KDE/Qt/6.9.2/qtwebchannel-everywhere-src-6.9.2.tar.xz) = 193888 diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index f3dd9cf36ef2..9939ff2dc4d5 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -14,7 +14,7 @@ PORTNAME?= webengine DISTVERSION= ${QT6_VERSION} # This is the parent port of print/qt6-pdf. Please always keep 'PORTREVISION?=' # and reset the value to '0' only after increasing QT6_VERSION in Mk/Uses/qt.mk. -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= www PKGNAMEPREFIX= qt6- @@ -24,15 +24,14 @@ COMMENT?= Qt 6 library to render web content # 32-bit platforms are not supported by upstream, but we're limping them along. ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ - ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers +BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libopenjp2.so:graphics/openjpeg \ libxkbcommon.so:x11/libxkbcommon -USES= bison cmake compiler:c++20-lang gl gperf localbase:ldflags \ - ninja:build pkgconfig python:build qt-dist:6,webengine +USES= cmake compiler:c++20-lang gl localbase:ldflags ninja:build \ + pkgconfig python:build qt-dist:6,webengine USE_GL= opengl USE_QT= base declarative tools USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ @@ -49,7 +48,8 @@ CMAKE_OFF+= QT_FEATURE_qtwebengine_build SYS_LIBS= freetype .else -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat +BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ + ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} LIB_DEPENDS+= libabsl_base.so:devel/abseil \ libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ @@ -72,7 +72,7 @@ LIB_DEPENDS+= libabsl_base.so:devel/abseil \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp -USES+= gnome jpeg minizip xorg +USES+= bison gnome gperf jpeg minizip xorg USE_GL+= gbm USE_QT+= positioning quick3d:build webchannel USE_GNOME+= glib20 libxml2 libxslt @@ -145,10 +145,12 @@ SNDIO_CMAKE_OFF= -DQT_FEATURE_webengine_system_sndio:BOOL=OFF .include <bsd.port.options.mk> -.if ${ARCH:Mi386} +.if !defined(BUILD_QTPDF) +. if ${ARCH:Mi386} USES+= nodejs:build,20 -.else +. else USES+= nodejs:build,lts +. endif .endif post-extract: diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo index d4d0b5b8184a..1937cd5f2816 100644 --- a/www/qt6-webengine/distinfo +++ b/www/qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159742 -SHA256 (KDE/Qt/6.9.1/qtwebengine-everywhere-src-6.9.1.tar.xz) = 787dfde22b348f6d620f2207ed7e32ad0a5389373182614272de28ff3f91c26c -SIZE (KDE/Qt/6.9.1/qtwebengine-everywhere-src-6.9.1.tar.xz) = 672204388 +TIMESTAMP = 1756198709 +SHA256 (KDE/Qt/6.9.2/qtwebengine-everywhere-src-6.9.2.tar.xz) = 99cb0792abc2e39b299d73d8e2aa076b9ebcd55c3f4a4b5fd514eef5a62d03ab +SIZE (KDE/Qt/6.9.2/qtwebengine-everywhere-src-6.9.2.tar.xz) = 672191852 diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake index 8264af9b3658..8bb309145150 100644 --- a/www/qt6-webengine/files/patch-cmake_Functions.cmake +++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake @@ -1,4 +1,4 @@ ---- cmake/Functions.cmake.orig 2025-05-29 01:27:28 UTC +--- cmake/Functions.cmake.orig 2025-08-18 00:53:11 UTC +++ cmake/Functions.cmake @@ -103,7 +103,7 @@ function(add_linker_options target buildDir completeSt set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp") @@ -9,7 +9,7 @@ get_gn_arch(cpu ${TEST_architecture_arch}) if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug") target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt") -@@ -370,6 +370,20 @@ function(add_gn_build_artifacts_to_target) +@@ -373,6 +373,20 @@ function(add_gn_build_artifacts_to_target) set_target_properties(${arg_CMAKE_TARGET} PROPERTIES LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP} ) diff --git a/www/qt6-webengine/files/patch-cmake_QtToolchainHelpers.cmake b/www/qt6-webengine/files/patch-cmake_QtToolchainHelpers.cmake index 4417cdb8a943..b732070f2d7e 100644 --- a/www/qt6-webengine/files/patch-cmake_QtToolchainHelpers.cmake +++ b/www/qt6-webengine/files/patch-cmake_QtToolchainHelpers.cmake @@ -1,4 +1,4 @@ ---- cmake/QtToolchainHelpers.cmake.orig 2025-05-29 01:27:28 UTC +--- cmake/QtToolchainHelpers.cmake.orig 2025-08-18 00:53:11 UTC +++ cmake/QtToolchainHelpers.cmake @@ -95,6 +95,8 @@ function(get_gn_os result) set(${result} "mac" PARENT_SCOPE) @@ -9,7 +9,7 @@ else() message(DEBUG "Unrecognized OS") endif() -@@ -310,7 +312,7 @@ macro(append_build_type_setup) +@@ -323,7 +325,7 @@ macro(append_build_type_setup) extend_gn_list(gnArgArg ARGS enable_precompiled_headers @@ -18,7 +18,7 @@ ) extend_gn_list(gnArgArg ARGS dcheck_always_on -@@ -402,7 +404,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -415,7 +417,7 @@ macro(append_compiler_linker_sdk_setup) use_libcxx=true ) endif() @@ -27,7 +27,7 @@ extend_gn_list(gnArgArg ARGS use_libcxx CONDITION QT_FEATURE_stdlib_libcpp ) -@@ -443,7 +445,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -456,7 +458,7 @@ macro(append_compiler_linker_sdk_setup) ) endif() get_gn_arch(cpu ${TEST_architecture_arch}) @@ -36,7 +36,7 @@ extend_gn_list_cflag(gnArgArg ARG arm_tune -@@ -548,7 +550,7 @@ macro(append_toolchain_setup) +@@ -561,7 +563,7 @@ macro(append_toolchain_setup) endif() unset(host_cpu) unset(target_cpu) diff --git a/www/qt6-webengine/files/patch-configure.cmake b/www/qt6-webengine/files/patch-configure.cmake index 5505a55e5e3c..b9217899f331 100644 --- a/www/qt6-webengine/files/patch-configure.cmake +++ b/www/qt6-webengine/files/patch-configure.cmake @@ -1,11 +1,11 @@ ---- configure.cmake.orig 2025-02-21 12:29:33 UTC +--- configure.cmake.orig 2025-08-18 00:53:11 UTC +++ configure.cmake -@@ -292,12 +292,12 @@ qt_webengine_configure_check("supported-platform" +@@ -291,12 +291,12 @@ qt_webengine_configure_check("supported-platform" qt_webengine_configure_check("supported-platform" MODULES QtWebEngine -- CONDITION LINUX OR (WIN32 AND NOT (WIN_ARM_64 AND DEFINED ENV{COIN_PLATFORM_ID})) OR MACOS -+ CONDITION LINUX OR (WIN32 AND NOT (WIN_ARM_64 AND DEFINED ENV{COIN_PLATFORM_ID})) OR MACOS OR FREEBSD +- CONDITION LINUX OR WIN32 OR MACOS ++ CONDITION LINUX OR WIN32 OR MACOS OR FREEBSD MESSAGE "Build can be done only on Linux, Windows or macOS." ) qt_webengine_configure_check("supported-platform" @@ -15,7 +15,7 @@ MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android." ) -@@ -317,15 +317,6 @@ qt_webengine_configure_check("static-build" +@@ -316,15 +316,6 @@ qt_webengine_configure_check("static-build" MESSAGE "Static build is not supported." ) @@ -31,7 +31,7 @@ qt_webengine_configure_check("python3" MODULES QtWebEngine QtPdf CONDITION Python3_FOUND -@@ -448,6 +439,8 @@ qt_webengine_configure_check("compiler" +@@ -455,6 +446,8 @@ qt_webengine_configure_check("compiler" CONDITION MSVC OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR @@ -40,7 +40,7 @@ (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported." -@@ -457,6 +450,8 @@ qt_webengine_configure_check("compiler" +@@ -464,6 +457,8 @@ qt_webengine_configure_check("compiler" CONDITION MSVC OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR @@ -49,7 +49,7 @@ (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") OR (ANDROID AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (MINGW AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR -@@ -709,7 +704,7 @@ qt_feature("webengine-ozone-x11" PRIVATE +@@ -725,7 +720,7 @@ qt_feature("webengine-ozone-x11" PRIVATE qt_feature("webengine-ozone-x11" PRIVATE LABEL "Support X11 on qpa-xcb" diff --git a/www/qt6-webengine/files/patch-security-rollup b/www/qt6-webengine/files/patch-security-rollup new file mode 100644 index 000000000000..8955c1fb52d9 --- /dev/null +++ b/www/qt6-webengine/files/patch-security-rollup @@ -0,0 +1,246 @@ +Security patches since 6.9.2 release + +CVE-2025-8879: Heap buffer overflow in libaom +CVE-2025-8880: Race in V8 +CVE-2025-8881: Inappropriate implementation in File Picker +CVE-2025-8901: Out of bounds write in ANGLE + +https://github.com/qt/qtwebengine-chromium/compare/136d7fe8aa41c9d4cd764a6b890af9699f5141dd..130-based.diff + +diff --git a/chromium/content/browser/web_contents/file_chooser_impl.cc b/chromium/content/browser/web_contents/file_chooser_impl.cc +index 7e2391bd1afd..d366c5d26bba 100644 +--- src/3rdparty/chromium/content/browser/web_contents/file_chooser_impl.cc ++++ src/3rdparty/chromium/content/browser/web_contents/file_chooser_impl.cc +@@ -169,6 +169,12 @@ void FileChooserImpl::OpenFileChooser(blink::mojom::FileChooserParamsPtr params, + return; + } + ++ // Do not allow open dialogs to have renderer-controlled default_file_name. ++ // See https://crbug.com/433800617 for context. ++ if (params->mode != blink::mojom::FileChooserParams::Mode::kSave) { ++ params->default_file_name = base::FilePath(); ++ } ++ + // Don't allow page with open FileChooser to enter BackForwardCache to avoid + // any unexpected behaviour from BackForwardCache. + BackForwardCache::DisableForRenderFrameHost( +diff --git a/chromium/media/audio/audio_input_device.cc b/chromium/media/audio/audio_input_device.cc +index a7d8e1098241..44abd451c397 100644 +--- src/3rdparty/chromium/media/audio/audio_input_device.cc ++++ src/3rdparty/chromium/media/audio/audio_input_device.cc +@@ -482,7 +482,7 @@ void AudioInputDevice::AudioThreadCallback::Process(uint32_t pending_data) { + const base::TimeTicks capture_time = + base::TimeTicks() + base::Microseconds(buffer->params.capture_time_us); + const base::TimeTicks now_time = base::TimeTicks::Now(); +- DCHECK_GE(now_time, capture_time); ++ // DCHECK_GE(now_time, capture_time); + + AudioGlitchInfo glitch_info{ + .duration = base::Microseconds(buffer->params.glitch_duration_us), +diff --git a/chromium/third_party/angle/src/compiler/translator/Compiler.cpp b/chromium/third_party/angle/src/compiler/translator/Compiler.cpp +index 107f61cf4603..04b698b7fc08 100644 +--- src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp ++++ src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp +@@ -775,24 +775,6 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root, + return false; + } + +- // For now, rewrite pixel local storage before collecting variables or any operations on images. +- // +- // TODO(anglebug.com/40096838): +- // Should this actually run after collecting variables? +- // Do we need more introspection? +- // Do we want to hide rewritten shader image uniforms from glGetActiveUniform? +- if (hasPixelLocalStorageUniforms()) +- { +- ASSERT( +- IsExtensionEnabled(mExtensionBehavior, TExtension::ANGLE_shader_pixel_local_storage)); +- if (!RewritePixelLocalStorage(this, root, getSymbolTable(), compileOptions, +- getShaderVersion())) +- { +- mDiagnostics.globalError("internal compiler error translating pixel local storage"); +- return false; +- } +- } +- + if (shouldRunLoopAndIndexingValidation(compileOptions) && + !ValidateLimitations(root, mShaderType, &mSymbolTable, &mDiagnostics)) + { +@@ -939,6 +921,24 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root, + return false; + } + ++ // For now, rewrite pixel local storage before collecting variables or any operations on images. ++ // ++ // TODO(anglebug.com/40096838): ++ // Should this actually run after collecting variables? ++ // Do we need more introspection? ++ // Do we want to hide rewritten shader image uniforms from glGetActiveUniform? ++ if (hasPixelLocalStorageUniforms()) ++ { ++ ASSERT( ++ IsExtensionEnabled(mExtensionBehavior, TExtension::ANGLE_shader_pixel_local_storage)); ++ if (!RewritePixelLocalStorage(this, root, getSymbolTable(), compileOptions, ++ getShaderVersion())) ++ { ++ mDiagnostics.globalError("internal compiler error translating pixel local storage"); ++ return false; ++ } ++ } ++ + // Clamping uniform array bounds needs to happen after validateLimitations pass. + if (compileOptions.clampIndirectArrayBounds) + { +diff --git a/chromium/third_party/angle/src/compiler/translator/ValidateOutputs.cpp b/chromium/third_party/angle/src/compiler/translator/ValidateOutputs.cpp +index 927783db73f6..d3481f1a4d1f 100644 +--- src/3rdparty/chromium/third_party/angle/src/compiler/translator/ValidateOutputs.cpp ++++ src/3rdparty/chromium/third_party/angle/src/compiler/translator/ValidateOutputs.cpp +@@ -72,15 +72,19 @@ ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &ext + void ValidateOutputsTraverser::visitSymbol(TIntermSymbol *symbol) + { + if (symbol->variable().symbolType() == SymbolType::Empty) ++ { + return; ++ } + + if (mVisitedSymbols.count(symbol->uniqueId().get()) == 1) ++ { + return; ++ } + + mVisitedSymbols.insert(symbol->uniqueId().get()); + + TQualifier qualifier = symbol->getQualifier(); +- if (qualifier == EvqFragmentOut) ++ if (qualifier == EvqFragmentOut || qualifier == EvqFragmentInOut) + { + const TLayoutQualifier &layoutQualifier = symbol->getType().getLayoutQualifier(); + if (layoutQualifier.location != -1) +diff --git a/chromium/third_party/blink/public/mojom/choosers/file_chooser.mojom b/chromium/third_party/blink/public/mojom/choosers/file_chooser.mojom +index 22ccb9cc709f..f323fa2aa2eb 100644 +--- src/3rdparty/chromium/third_party/blink/public/mojom/choosers/file_chooser.mojom ++++ src/3rdparty/chromium/third_party/blink/public/mojom/choosers/file_chooser.mojom +@@ -25,7 +25,7 @@ struct FileChooserParams { + kUploadFolder, + + // Allows picking a nonexistent file, and prompts to overwrite if the file +- // already exists. This is not for Blink but for PPAPI. ++ // already exists. + kSave, + }; + Mode mode = kOpen; +@@ -34,7 +34,8 @@ struct FileChooserParams { + // which will be either "Open" or "Save" depending on the mode. + mojo_base.mojom.String16 title; + +- // Default file name to select in the dialog with kSave mode. ++ // Default file name to select in the dialog with kSave mode. This value ++ // is cleared if mode is not kSave. + mojo_base.mojom.FilePath default_file_name; + + // |selected_files| has filenames which a file upload control already +diff --git a/chromium/third_party/libaom/source/libaom/av1/encoder/ratectrl.c b/chromium/third_party/libaom/source/libaom/av1/encoder/ratectrl.c +index 4fd5ec6bf54b..82a48c39cb10 100644 +--- src/3rdparty/chromium/third_party/libaom/source/libaom/av1/encoder/ratectrl.c ++++ src/3rdparty/chromium/third_party/libaom/source/libaom/av1/encoder/ratectrl.c +@@ -3236,8 +3236,9 @@ static void rc_scene_detection_onepass_rt(AV1_COMP *cpi, + // non-zero sad exists along bottom border even though source is static. + const int border = + rc->prev_frame_is_dropped || cpi->svc.number_temporal_layers > 1; +- // Store blkwise SAD for later use +- if (width == cm->render_width && height == cm->render_height) { ++ // Store blkwise SAD for later use. Disable for spatial layers for now. ++ if (width == cm->render_width && height == cm->render_height && ++ cpi->svc.number_spatial_layers == 1) { + if (cpi->src_sad_blk_64x64 == NULL) { + CHECK_MEM_ERROR(cm, cpi->src_sad_blk_64x64, + (uint64_t *)aom_calloc(sb_cols * sb_rows, +diff --git a/chromium/v8/src/wasm/streaming-decoder.cc b/chromium/v8/src/wasm/streaming-decoder.cc +index f3745b4c055a..ce5dad96d52f 100644 +--- src/3rdparty/chromium/v8/src/wasm/streaming-decoder.cc ++++ src/3rdparty/chromium/v8/src/wasm/streaming-decoder.cc +@@ -230,45 +230,61 @@ class V8_EXPORT_PRIVATE AsyncStreamingDecoder : public StreamingDecoder { + }; + + void AsyncStreamingDecoder::OnBytesReceived(base::Vector<const uint8_t> bytes) { +- DCHECK(!full_wire_bytes_.empty()); ++ TRACE_STREAMING("OnBytesReceived(%zu bytes)\n", bytes.size()); ++ ++ // Note: The bytes are passed by the embedder, and they might point into the ++ // sandbox. Hence we copy them once and then process those copied bytes, to ++ // avoid being vulnerable to concurrent modification. ++ // Since we might not be able to store the bytes contiguously in memory, ++ // remember up to two byte vectors to process after copying. ++ base::Vector<const uint8_t> copied_bytes[2] = {{}, {}}; ++ + // Fill the previous vector, growing up to 16kB. After that, allocate new + // vectors on overflow. ++ DCHECK(!full_wire_bytes_.empty()); ++ std::vector<uint8_t>* last_wire_byte_vector = &full_wire_bytes_.back(); ++ size_t existing_vector_size = last_wire_byte_vector->size(); + size_t remaining_capacity = +- std::max(full_wire_bytes_.back().capacity(), size_t{16} * KB) - +- full_wire_bytes_.back().size(); ++ std::max(last_wire_byte_vector->capacity(), size_t{16} * KB) - ++ existing_vector_size; + size_t bytes_for_existing_vector = std::min(remaining_capacity, bytes.size()); +- full_wire_bytes_.back().insert(full_wire_bytes_.back().end(), bytes.data(), +- bytes.data() + bytes_for_existing_vector); ++ last_wire_byte_vector->insert(last_wire_byte_vector->end(), bytes.data(), ++ bytes.data() + bytes_for_existing_vector); ++ copied_bytes[0] = ++ base::VectorOf(last_wire_byte_vector->data() + existing_vector_size, ++ bytes_for_existing_vector); + if (bytes.size() > bytes_for_existing_vector) { + // The previous vector's capacity is not enough to hold all new bytes, and + // it's bigger than 16kB, so expensive to copy. Allocate a new vector for + // the remaining bytes, growing exponentially. + size_t new_capacity = std::max(bytes.size() - bytes_for_existing_vector, +- 2 * full_wire_bytes_.back().capacity()); ++ 2 * last_wire_byte_vector->capacity()); + full_wire_bytes_.emplace_back(); +- full_wire_bytes_.back().reserve(new_capacity); +- full_wire_bytes_.back().insert(full_wire_bytes_.back().end(), +- bytes.data() + bytes_for_existing_vector, +- bytes.end()); ++ last_wire_byte_vector = &full_wire_bytes_.back(); ++ last_wire_byte_vector->reserve(new_capacity); ++ last_wire_byte_vector->insert(last_wire_byte_vector->end(), ++ bytes.data() + bytes_for_existing_vector, ++ bytes.end()); ++ copied_bytes[1] = base::VectorOf(*last_wire_byte_vector); + } ++ // Do not access `bytes` any more after copying. ++ DCHECK_EQ(bytes.size(), copied_bytes[0].size() + copied_bytes[1].size()); ++ bytes = {}; + + if (deserializing()) return; + +- TRACE_STREAMING("OnBytesReceived(%zu bytes)\n", bytes.size()); +- +- size_t current = 0; +- while (ok() && current < bytes.size()) { +- size_t num_bytes = +- state_->ReadBytes(this, bytes.SubVector(current, bytes.size())); +- current += num_bytes; +- module_offset_ += num_bytes; +- if (state_->offset() == state_->buffer().size()) { +- state_ = state_->Next(this); ++ for (base::Vector<const uint8_t> vec : copied_bytes) { ++ size_t current = 0; ++ while (ok() && current < vec.size()) { ++ size_t num_bytes = state_->ReadBytes(this, vec.SubVectorFrom(current)); ++ current += num_bytes; ++ module_offset_ += num_bytes; ++ if (state_->offset() == state_->buffer().size()) { ++ state_ = state_->Next(this); ++ } + } + } +- if (ok()) { +- processor_->OnFinishedChunk(); +- } ++ if (ok()) processor_->OnFinishedChunk(); + } + + size_t AsyncStreamingDecoder::DecodingState::ReadBytes( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc index 36e6cd423191..f4c2e1339c83 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-10-22 08:31:56 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-08-18 00:53:11 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/signin/profile_picker_handler.cc @@ -209,7 +209,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr @@ -9,7 +9,7 @@ } else if (base::FeatureList::IsEnabled( supervised_user::kShowKiteForSupervisedUsers) && entry->IsSupervised()) { -@@ -1224,7 +1224,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil +@@ -1222,7 +1222,7 @@ void ProfilePickerHandler::MaybeUpdateGuestMode() { } void ProfilePickerHandler::MaybeUpdateGuestMode() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc index ac3ee9a58d74..a5c5e3cf4a66 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2025-02-21 12:29:33 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2025-08-18 00:53:11 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc -@@ -403,7 +403,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -401,7 +401,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -440,7 +440,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -438,7 +438,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -542,7 +542,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -624,7 +624,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -777,7 +777,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -775,7 +775,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -832,7 +832,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -830,7 +830,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1017,7 +1017,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1015,7 +1015,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1078,7 +1078,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1076,7 +1076,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py deleted file mode 100644 index d42d489f943d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py +++ /dev/null @@ -1,27 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py.orig 2025-03-29 00:50:57 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -@@ -28,24 +28,6 @@ def generate_gperf(gperf_path, gperf_input, gperf_args - stdout=subprocess.PIPE, - universal_newlines=True) - gperf_output = gperf.communicate(gperf_input)[0] -- # Massage gperf output to be more palatable for modern compilers. -- # TODO(thakis): Upstream these to gperf so we don't need massaging. -- # `register` is deprecated in C++11 and removed in C++17, so remove -- # it from gperf's output. -- # https://savannah.gnu.org/bugs/index.php?53028 -- gperf_output = re.sub(r'\bregister ', '', gperf_output) -- # -Wimplicit-fallthrough needs an explicit fallthrough statement, -- # so replace gperf's /*FALLTHROUGH*/ comment with the statement. -- # https://savannah.gnu.org/bugs/index.php?53029 -- gperf_output = gperf_output.replace('/*FALLTHROUGH*/', -- ' [[fallthrough]];') -- # -Wpointer-to-int-cast warns about casting pointers to smaller ints -- # Replace {(int)(long)&(foo), bar} with -- # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar} -- gperf_output = re.sub( -- r'\(int\)\(long\)(.*?),', -- r'static_cast<int>(reinterpret_cast<uintptr_t>(\1)),', -- gperf_output) - script = 'third_party/blink/renderer/build/scripts/gperf.py' - return '// Generated by %s\n' % script + gperf_output - except OSError: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 index 04a903bd35f2..b3b99e8e202e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-02-21 12:29:33 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-08-18 00:53:11 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -384,7 +384,7 @@ name: "AppTitle", @@ -36,7 +36,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4313,7 +4313,7 @@ +@@ -4320,7 +4320,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -45,7 +45,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4460,7 +4460,7 @@ +@@ -4467,7 +4467,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -54,7 +54,7 @@ status: "experimental", base_feature: "none", }, -@@ -4503,7 +4503,7 @@ +@@ -4510,7 +4510,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index 9008177cfd17..577dde022f49 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2024-04-19 13:02:56 UTC +--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2025-08-18 00:53:11 UTC +++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -101,7 +101,7 @@ std::optional<std::u16string> OSExchangeDataProviderNo std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString() const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc index 05f2a3caf372..38b6dcc88c83 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2025-02-21 12:29:33 UTC +--- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2025-08-18 00:53:11 UTC +++ src/3rdparty/chromium/ui/base/ui_base_features.cc @@ -165,7 +165,7 @@ BASE_FEATURE(kWaylandTextInputV3, base::FEATURE_DISABLED_BY_DEFAULT); @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) BASE_FEATURE(kExperimentalFlingAnimation, -@@ -385,7 +385,7 @@ bool IsForcedColorsEnabled() { +@@ -389,7 +389,7 @@ bool IsForcedColorsEnabled() { // and Linux. This feature will be released for other platforms in later // milestones. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h index 2aca842bce0d..0cdc36728a12 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ui_base_features.h.orig 2025-02-21 12:29:33 UTC +--- src/3rdparty/chromium/ui/base/ui_base_features.h.orig 2025-08-18 00:53:11 UTC +++ src/3rdparty/chromium/ui/base/ui_base_features.h -@@ -143,7 +143,7 @@ BASE_DECLARE_FEATURE(kWaylandTextInputV3); +@@ -146,7 +146,7 @@ BASE_DECLARE_FEATURE(kWaylandTextInputV3); BASE_DECLARE_FEATURE(kWaylandTextInputV3); #endif // BUILDFLAG(IS_OZONE) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc index 2a4d92824384..b48a98195aeb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_gbm__wrapper.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/linux/gbm_wrapper.cc.orig 2024-09-30 07:45:04 UTC +--- src/3rdparty/chromium/ui/gfx/linux/gbm_wrapper.cc.orig 2025-08-18 00:53:11 UTC +++ src/3rdparty/chromium/ui/gfx/linux/gbm_wrapper.cc -@@ -319,7 +319,7 @@ class Device final : public ui::GbmDevice { +@@ -331,7 +331,7 @@ class Device final : public ui::GbmDevice { // of 1x1 BOs which are destroyed before creating the final BO creation used // to instantiate the returned GbmBuffer. gfx::Size size_for_verification = diff --git a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt index 4c6f56a2e4e2..f04b00dfc8d5 100644 --- a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt @@ -1,4 +1,4 @@ ---- src/core/CMakeLists.txt.orig 2025-03-09 19:36:47 UTC +--- src/core/CMakeLists.txt.orig 2025-08-18 00:53:11 UTC +++ src/core/CMakeLists.txt @@ -21,7 +21,7 @@ add_subdirectory(tools/qwebengine_convert_dict) # TOOLCHAIN SETUP @@ -9,7 +9,7 @@ setup_toolchains() endif() -@@ -200,7 +200,7 @@ foreach(arch ${archs}) +@@ -205,7 +205,7 @@ foreach(arch ${archs}) accessibility_activation_observer.cpp accessibility_activation_observer.h ) @@ -18,7 +18,7 @@ SOURCES ozone/gl_ozone_angle_qt.cpp ozone/gl_ozone_angle_qt.h ozone/ozone_util_qt.cpp ozone/ozone_util_qt.h -@@ -208,17 +208,17 @@ foreach(arch ${archs}) +@@ -213,17 +213,17 @@ foreach(arch ${archs}) ozone/surface_factory_qt.cpp ozone/surface_factory_qt.h ) @@ -39,7 +39,7 @@ SOURCES ozone/egl_helper.cpp ozone/egl_helper.h ) -@@ -438,7 +438,7 @@ foreach(arch ${archs}) +@@ -443,7 +443,7 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webenginedriver ) @@ -48,7 +48,7 @@ list(APPEND gnArgArg angle_enable_gl=true use_gtk=false # GTK toolkit bindings -@@ -505,6 +505,10 @@ foreach(arch ${archs}) +@@ -510,6 +510,10 @@ foreach(arch ${archs}) extend_gn_list(gnArgArg ARGS use_pulseaudio CONDITION QT_FEATURE_webengine_system_pulseaudio diff --git a/www/qt6-webengine/files/patch-src_core_api_configure.cmake b/www/qt6-webengine/files/patch-src_core_api_configure.cmake index 05e20daffc73..3988f9c60e8f 100644 --- a/www/qt6-webengine/files/patch-src_core_api_configure.cmake +++ b/www/qt6-webengine/files/patch-src_core_api_configure.cmake @@ -1,4 +1,4 @@ ---- src/core/api/configure.cmake.orig 2025-02-21 12:29:33 UTC +--- src/core/api/configure.cmake.orig 2025-08-18 00:53:11 UTC +++ src/core/api/configure.cmake @@ -10,6 +10,7 @@ if(NOT QT_CONFIGURE_RUNNING) if(PkgConfig_FOUND AND QT_FEATURE_pkg_config) @@ -8,7 +8,7 @@ pkg_check_modules(XDAMAGE xdamage) pkg_check_modules(GBM gbm) pkg_check_modules(LIBVA libva>=1.14) -@@ -76,6 +77,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE +@@ -90,6 +91,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE AUTODETECT NOT QT_FEATURE_webengine_embedded_build CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer ) @@ -20,7 +20,7 @@ qt_feature("webengine-pepper-plugins" PRIVATE LABEL "Pepper Plugins" PURPOSE "Enables use of Pepper plugins." -@@ -157,7 +163,7 @@ qt_feature("webengine-vaapi" PRIVATE +@@ -171,7 +177,7 @@ qt_feature("webengine-vaapi" PRIVATE PURPOSE "Enables support for VA-API hardware acceleration" AUTODETECT GBM_FOUND AND LIBVA_FOUND AND QT_FEATURE_vulkan # hardware accelerated encoding requires bundled libvpx @@ -29,7 +29,7 @@ ) list(LENGTH CMAKE_OSX_ARCHITECTURES osx_arch_count) qt_feature("webenginedriver" PUBLIC -@@ -196,15 +202,19 @@ qt_configure_add_summary_entry( +@@ -214,15 +220,19 @@ qt_configure_add_summary_entry( ) qt_configure_add_summary_entry( ARGS "webengine-vaapi" diff --git a/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp b/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp index 079bb283b405..07a5f9437eea 100644 --- a/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp +++ b/www/qt6-webengine/files/patch-src_core_compositor_native__skia__output__device__opengl.cpp @@ -1,6 +1,6 @@ ---- src/core/compositor/native_skia_output_device_opengl.cpp.orig 2025-03-09 19:36:47 UTC +--- src/core/compositor/native_skia_output_device_opengl.cpp.orig 2025-08-18 00:53:11 UTC +++ src/core/compositor/native_skia_output_device_opengl.cpp -@@ -247,7 +247,7 @@ QSGTexture *NativeSkiaOutputDeviceOpenGL::texture(QQui +@@ -248,7 +248,7 @@ QSGTexture *NativeSkiaOutputDeviceOpenGL::texture(QQui EGL_LINUX_DRM_FOURCC_EXT, drmFormat, EGL_DMA_BUF_PLANE0_FD_EXT, scopedFd.get(), EGL_DMA_BUF_PLANE0_OFFSET_EXT, static_cast<EGLAttrib>(nativePixmap->GetDmaBufOffset(0)), diff --git a/www/qt6-websockets/distinfo b/www/qt6-websockets/distinfo index 821443cc1d80..2856471e5674 100644 --- a/www/qt6-websockets/distinfo +++ b/www/qt6-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159745 -SHA256 (KDE/Qt/6.9.1/qtwebsockets-everywhere-src-6.9.1.tar.xz) = 98be8c863b7f02cc98eedc0b6eac07544c10a9d2fa11c685fd61f6b243f748f5 -SIZE (KDE/Qt/6.9.1/qtwebsockets-everywhere-src-6.9.1.tar.xz) = 462284 +TIMESTAMP = 1756198713 +SHA256 (KDE/Qt/6.9.2/qtwebsockets-everywhere-src-6.9.2.tar.xz) = be833f667ed8d6c2f41c0b9d1f8addf20b8d2b11c3a9466ec6d70c62121708ee +SIZE (KDE/Qt/6.9.2/qtwebsockets-everywhere-src-6.9.2.tar.xz) = 447432 diff --git a/www/qt6-webview/distinfo b/www/qt6-webview/distinfo index 64a0a82d21c9..a623e0ab91f3 100644 --- a/www/qt6-webview/distinfo +++ b/www/qt6-webview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159748 -SHA256 (KDE/Qt/6.9.1/qtwebview-everywhere-src-6.9.1.tar.xz) = c29ad4fbb8f7a2042c4941bef88bb13bd04757eed94d6937ae69e0e4ea0d59a5 -SIZE (KDE/Qt/6.9.1/qtwebview-everywhere-src-6.9.1.tar.xz) = 141260 +TIMESTAMP = 1756198717 +SHA256 (KDE/Qt/6.9.2/qtwebview-everywhere-src-6.9.2.tar.xz) = 4ccfd14ae68222d5709e54c970da51d7f0b4cf58af045a96935dfcc34f1b1ff1 +SIZE (KDE/Qt/6.9.2/qtwebview-everywhere-src-6.9.2.tar.xz) = 125560 diff --git a/x11-toolkits/qt6-charts/distinfo b/x11-toolkits/qt6-charts/distinfo index 85879594352a..8addf3d1abba 100644 --- a/x11-toolkits/qt6-charts/distinfo +++ b/x11-toolkits/qt6-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749158718 -SHA256 (KDE/Qt/6.9.1/qtcharts-everywhere-src-6.9.1.tar.xz) = b8871beb7ac816e9241db9cbdc4803a53313f84a1e4b951f108bd00709aec3d3 -SIZE (KDE/Qt/6.9.1/qtcharts-everywhere-src-6.9.1.tar.xz) = 4664732 +TIMESTAMP = 1756198725 +SHA256 (KDE/Qt/6.9.2/qtcharts-everywhere-src-6.9.2.tar.xz) = 9f01f15f64e73f18ee8b17b490c1b0ca02e969bc58919cf46bd1152c01a4ff4b +SIZE (KDE/Qt/6.9.2/qtcharts-everywhere-src-6.9.2.tar.xz) = 4649540 diff --git a/x11-toolkits/qt6-datavis3d/distinfo b/x11-toolkits/qt6-datavis3d/distinfo index 86ed51326fe6..0df731e483ed 100644 --- a/x11-toolkits/qt6-datavis3d/distinfo +++ b/x11-toolkits/qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749158725 -SHA256 (KDE/Qt/6.9.1/qtdatavis3d-everywhere-src-6.9.1.tar.xz) = 4c798b75f2a7c7e61ebb01f405a54fd80513ae46986714fa0fa05e8f6a5b32c7 -SIZE (KDE/Qt/6.9.1/qtdatavis3d-everywhere-src-6.9.1.tar.xz) = 3954892 +TIMESTAMP = 1756198732 +SHA256 (KDE/Qt/6.9.2/qtdatavis3d-everywhere-src-6.9.2.tar.xz) = 5dff1ca1a8754111977135a8904f42315544b06006281a961c1d160454dccb5c +SIZE (KDE/Qt/6.9.2/qtdatavis3d-everywhere-src-6.9.2.tar.xz) = 3939532 diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo index adf53cb16309..41f47bf1a765 100644 --- a/x11-toolkits/qt6-declarative/distinfo +++ b/x11-toolkits/qt6-declarative/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749158745 -SHA256 (KDE/Qt/6.9.1/qtdeclarative-everywhere-src-6.9.1.tar.xz) = ccb94665df0199d7ee387b965b29677c8b89cfb1782bb6f01239b1d1524cec97 -SIZE (KDE/Qt/6.9.1/qtdeclarative-everywhere-src-6.9.1.tar.xz) = 37006920 +TIMESTAMP = 1756198761 +SHA256 (KDE/Qt/6.9.2/qtdeclarative-everywhere-src-6.9.2.tar.xz) = 477f2d2c0bd98916107818725e6d498206e033dfb2859c52121e01a06ac42664 +SIZE (KDE/Qt/6.9.2/qtdeclarative-everywhere-src-6.9.2.tar.xz) = 37207872 diff --git a/x11-toolkits/qt6-graphs/distinfo b/x11-toolkits/qt6-graphs/distinfo index 094c7b265055..53a685ab28d8 100644 --- a/x11-toolkits/qt6-graphs/distinfo +++ b/x11-toolkits/qt6-graphs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162739 -SHA256 (KDE/Qt/6.9.1/qtgraphs-everywhere-src-6.9.1.tar.xz) = f52ddc5052cdbb5a3a321b211e42371014cccf3bc6c0f442d9bec3ddfe593444 -SIZE (KDE/Qt/6.9.1/qtgraphs-everywhere-src-6.9.1.tar.xz) = 5230620 +TIMESTAMP = 1756198768 +SHA256 (KDE/Qt/6.9.2/qtgraphs-everywhere-src-6.9.2.tar.xz) = a780fb639011a8b2a8cff28275886d7d705de991a300ea698cb0899255244a73 +SIZE (KDE/Qt/6.9.2/qtgraphs-everywhere-src-6.9.2.tar.xz) = 5214768 diff --git a/x11-toolkits/qt6-quick3d/Makefile b/x11-toolkits/qt6-quick3d/Makefile index 870ebc54f6a1..e5975b14e6b3 100644 --- a/x11-toolkits/qt6-quick3d/Makefile +++ b/x11-toolkits/qt6-quick3d/Makefile @@ -1,6 +1,5 @@ PORTNAME= quick3d DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- diff --git a/x11-toolkits/qt6-quick3d/distinfo b/x11-toolkits/qt6-quick3d/distinfo index 2ab8012a4fe5..5d99f689b291 100644 --- a/x11-toolkits/qt6-quick3d/distinfo +++ b/x11-toolkits/qt6-quick3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159340 -SHA256 (KDE/Qt/6.9.1/qtquick3d-everywhere-src-6.9.1.tar.xz) = f61600da8fbfd51b7d6b5c431cef453d7c24015c374ae25756c0faf0db2c9977 -SIZE (KDE/Qt/6.9.1/qtquick3d-everywhere-src-6.9.1.tar.xz) = 74173492 +TIMESTAMP = 1756198830 +SHA256 (KDE/Qt/6.9.2/qtquick3d-everywhere-src-6.9.2.tar.xz) = 2f0e97b0d29ecabb976d7f3dc23873a2d6415ba4d48d4090ddb54feb3a424800 +SIZE (KDE/Qt/6.9.2/qtquick3d-everywhere-src-6.9.2.tar.xz) = 74198672 diff --git a/x11-toolkits/qt6-quick3d/pkg-plist b/x11-toolkits/qt6-quick3d/pkg-plist index 7ace667fa65a..92dcb74a42d4 100644 --- a/x11-toolkits/qt6-quick3d/pkg-plist +++ b/x11-toolkits/qt6-quick3d/pkg-plist @@ -795,7 +795,6 @@ lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick3D/Helpers/designer/images/wasdcontroller16.png %%QT_QMLDIR%%/QtQuick3D/Helpers/designer/images/wasdcontroller@2x.png %%QT_QMLDIR%%/QtQuick3D/Helpers/impl/DepthOfFieldBlur.qml -%%QT_QMLDIR%%/QtQuick3D/Helpers/impl/LightmapperOutputWindow.qml %%QT_QMLDIR%%/QtQuick3D/Helpers/impl/SceneEffect.qml %%QT_QMLDIR%%/QtQuick3D/Helpers/impl/libqtquick3dhelpersimplplugin.so %%QT_QMLDIR%%/QtQuick3D/Helpers/impl/plugins.qmltypes @@ -804,6 +803,7 @@ lib/cmake/Qt6Quick3DUtilsPrivate/Qt6Quick3DUtilsPrivateVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick3D/Helpers/meshes/axisGrid.mesh %%QT_QMLDIR%%/QtQuick3D/Helpers/plugins.qmltypes %%QT_QMLDIR%%/QtQuick3D/Helpers/qmldir +%%QT_QMLDIR%%/QtQuick3D/LightmapperOutputWindow.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/AboutDialog.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/EditorView.qml %%QT_QMLDIR%%/QtQuick3D/MaterialEditor/FrostedGlass.qml diff --git a/x11-toolkits/qt6-quicktimeline/distinfo b/x11-toolkits/qt6-quicktimeline/distinfo index 956012c07124..d4d12a87b9f6 100644 --- a/x11-toolkits/qt6-quicktimeline/distinfo +++ b/x11-toolkits/qt6-quicktimeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159344 -SHA256 (KDE/Qt/6.9.1/qtquicktimeline-everywhere-src-6.9.1.tar.xz) = 78bfdbe7ca8178e4e0931372e07a3076dec503b6a55ff07e41b594d781897294 -SIZE (KDE/Qt/6.9.1/qtquicktimeline-everywhere-src-6.9.1.tar.xz) = 113032 +TIMESTAMP = 1756198835 +SHA256 (KDE/Qt/6.9.2/qtquicktimeline-everywhere-src-6.9.2.tar.xz) = bc65688d8cb588ff67d32a63a821163211452ae7cb07dd07c261230f380ec526 +SIZE (KDE/Qt/6.9.2/qtquicktimeline-everywhere-src-6.9.2.tar.xz) = 97140 diff --git a/x11-toolkits/qt6-shadertools/distinfo b/x11-toolkits/qt6-shadertools/distinfo index fe978d19e59e..43d578ee1f6f 100644 --- a/x11-toolkits/qt6-shadertools/distinfo +++ b/x11-toolkits/qt6-shadertools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749162783 -SHA256 (KDE/Qt/6.9.1/qtshadertools-everywhere-src-6.9.1.tar.xz) = 4e1ed24cce0887fb4b6c7be4f150239853a29c330c9717f6bacfb6376f3b4b74 -SIZE (KDE/Qt/6.9.1/qtshadertools-everywhere-src-6.9.1.tar.xz) = 1166596 +TIMESTAMP = 1756198848 +SHA256 (KDE/Qt/6.9.2/qtshadertools-everywhere-src-6.9.2.tar.xz) = 17678af9d9543224bbb932bf18d4fc05e180b2b3a3216241e557631bd6bf1495 +SIZE (KDE/Qt/6.9.2/qtshadertools-everywhere-src-6.9.2.tar.xz) = 1151576 diff --git a/x11-toolkits/qt6-virtualkeyboard/distinfo b/x11-toolkits/qt6-virtualkeyboard/distinfo index 64333d56dce0..0d8794532915 100644 --- a/x11-toolkits/qt6-virtualkeyboard/distinfo +++ b/x11-toolkits/qt6-virtualkeyboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159373 -SHA256 (KDE/Qt/6.9.1/qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz) = 80059a38bdb836f0785292396970edc108f477a68d9a35bed8393750de3d281f -SIZE (KDE/Qt/6.9.1/qtvirtualkeyboard-everywhere-src-6.9.1.tar.xz) = 3285440 +TIMESTAMP = 1756198856 +SHA256 (KDE/Qt/6.9.2/qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz) = 7b4100da01bafa72e20ab4e1459dcda1e6048e70b4d650b3c578613f0ffc11e3 +SIZE (KDE/Qt/6.9.2/qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz) = 3275760 |