diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2023-11-23 17:26:11 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2023-11-23 17:43:42 +0000 |
| commit | 1d76bdf62dffad91834699701f41d3374dfb6a3a (patch) | |
| tree | 9df3b34adef4a17f62986e3bd2c8c2d41374d2f9 | |
| parent | c9efdf4124107ebddbec64bdd92a287d8db1793f (diff) | |
| download | ports-1d76bdf62dffad91834699701f41d3374dfb6a3a.tar.gz ports-1d76bdf62dffad91834699701f41d3374dfb6a3a.zip | |
Qt6: Update to 6.6.0
Qt 6.6.0 is a feature release with focus on improving UX capabilities
including responsive UI technology and the Qt Graph module.
The Qt Coap module has been added as net/qt6-coap. [1]
PySide6 and PyQt6 have also been updated to 6.6.0.
Announcement: https://www.qt.io/blog/qt-6.6-released
Rel note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md
PR: 275068, 274911 [1]
MFH: 2023Q4
Exp-run by: antoine
920 files changed, 7528 insertions, 3630 deletions
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index 4b6a2584aeb4..1a0756d8b183 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -89,15 +89,15 @@ SIP_VERSION= 6.7.12 # ,1 SIP4_VERSION= 4.19.25 QSCI2_VERSION= 2.14.1 PYQT5_VERSION= 5.15.10 -PYQT6_VERSION= 6.5.3 -PYQT63D_VERSION= 6.5.0 +PYQT6_VERSION= 6.6.0 +PYQT63D_VERSION= 6.6.0 PYQT5CHART_VERSION= 5.15.6 -PYQT6CHART_VERSION= 6.5.0 -PYQT6DATAVIS3D_VERSION= 6.5.0 +PYQT6CHART_VERSION= 6.6.0 +PYQT6DATAVIS3D_VERSION= 6.6.0 PYQT5NETWORKAUTH_VERSION=5.15.5 -PYQT6NETWORKAUTH_VERSION=6.5.0 +PYQT6NETWORKAUTH_VERSION=6.6.0 PYQT5WEBENGINE_VERSION= 5.15.6 -PYQT6WEBENGINE_VERSION= 6.5.0 +PYQT6WEBENGINE_VERSION= 6.6.0 PYQT5SIP_VERSION= 12.13.0 PYQT6SIP_VERSION= 13.6.0 PYQTBUILDER_VERSION= 1.15.3 diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index df0f45d1c5a7..3ba08696a1ee 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -28,7 +28,7 @@ _COMMON_DISTS= 3d base charts connectivity datavis3d declarative imageformats l _QT5_DISTS= gamepad graphicaleffects quickcontrols \ quickcontrols2 script webglplugin \ x11extras xmlpatterns -_QT6_DISTS= 5compat doc httpserver languageserver lottie positioning \ +_QT6_DISTS= 5compat coap doc graphs httpserver languageserver lottie positioning \ quick3dphysics quickeffectmaker shadertools _QT_DISTS= ${_COMMON_DISTS} \ @@ -95,11 +95,14 @@ _QT5_DISTNAME_kde= ${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},} # Qt6 specific distnames _QT6_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},} -# Effective master sites and disfile valus +# Effective master sites and distfile values +# net/qt6-coap has no submodule distfile and uses USE_GITHUB +. if ${_QT_DIST} != coap MASTER_SITES= ${_QT${_QT_VER}_MASTER_SITES${_KDE_${_QT_DIST}:D_kde}} MASTER_SITE_SUBDIR= ${_QT${_QT_VER}_MASTER_SITE_SUBDIR${_KDE_${_QT_DIST}:D_kde}} DISTNAME= ${_QT${_QT_VER}_DISTNAME${_KDE_${_QT_DIST}:D_kde}} DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} +. endif DIST_SUBDIR= KDE/Qt/${_QT_VERSION} . if ${_QT_VER:M5} @@ -299,6 +302,13 @@ QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}" PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \ FULLVER=${_QT_VERSION:C/-.*//} +. if defined(WITH_DEBUG) +PLIST_SUB+= DEBUG="" \ + NO_DEBUG="@comment " +. else +PLIST_SUB+= DEBUG="@comment " \ + NO_DEBUG="" +. endif # Handle additional PLIST directories, which should only be used for Qt-dist ports. . for dir in ETC diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index ecc85e94f7c3..67b419b47cf5 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.11 -QT6_VERSION?= 6.5.3 -PYSIDE6_VERSION?= 6.5.3 +QT6_VERSION?= 6.6.0 +PYSIDE6_VERSION?= 6.6.0 # We accept the Qt version to be passed by either or all of the three mk files. . if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS) @@ -112,6 +112,11 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endif . endfor +# Suppress warnings from rcc about not using a UTF-8 locale. +. if ${_QT_VER:M6} +USE_LOCALE?= C.UTF-8 +. endif + CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME} MAKE_ENV+= QT_SELECT=${_QT_RELNAME} @@ -155,7 +160,7 @@ _USE_QT5_ONLY= assistant buildtools concurrent core dbus \ _USE_QT5_ONLY+= sql-ibase . endif -_USE_QT6_ONLY= 5compat base httpserver languageserver lottie positioning \ +_USE_QT6_ONLY= 5compat base coap graphs httpserver languageserver lottie positioning \ quick3dphysics quickeffectmaker shadertools tools translations \ sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc @@ -179,6 +184,9 @@ qt-base_LIB= libQt${_QT_LIBVER}Core.so qt-charts_PORT= x11-toolkits/${_QT_RELNAME}-charts qt-charts_LIB= libQt${_QT_LIBVER}Charts.so +qt-coap_PORT= net/${_QT_RELNAME}-coap +qt-coap_LIB= libQt${_QT_LIBVER}Coap.so + qt-concurrent_PORT= devel/${_QT_RELNAME}-concurrent qt-concurrent_LIB= libQt${_QT_LIBVER}Concurrent.so @@ -218,6 +226,9 @@ qt-gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so qt-graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects qt-graphicaleffects_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtGraphicalEffects/qmldir +qt-graphs_PORT= x11-toolkits/${_QT_RELNAME}-graphs +qt-graphs_LIB= libQt${_QT_LIBVER}Graphs.so + qt-gui_PORT= x11-toolkits/${_QT_RELNAME}-gui qt-gui_LIB= libQt${_QT_LIBVER}Gui.so diff --git a/accessibility/qt6-speech/Makefile b/accessibility/qt6-speech/Makefile index 8b7b629f9a13..de9d255cf67d 100644 --- a/accessibility/qt6-speech/Makefile +++ b/accessibility/qt6-speech/Makefile @@ -1,14 +1,14 @@ PORTNAME= speech -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= accessibility PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Accessibilty features for Qt6 -USES= cmake gl pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= gl opengl -USE_QT= base declarative +USE_QT= base declarative multimedia OPTIONS_DEFINE= ALSA OPTIONS_DEFAULT= SPEECHD @@ -23,7 +23,6 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ALSA FLITE_LIB_DEPENDS= libflite.so:audio/flite -FLITE_USE= QT=multimedia FLITE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Flite SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo index 320d5e0fab5a..865816ae135c 100644 --- a/accessibility/qt6-speech/distinfo +++ b/accessibility/qt6-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931458 -SHA256 (KDE/Qt/6.5.3/qtspeech-everywhere-src-6.5.3.tar.xz) = 79c2f42c4d921a7e73825ead5681b5b32eac52f5e180e1899bb86e68206b0b9c -SIZE (KDE/Qt/6.5.3/qtspeech-everywhere-src-6.5.3.tar.xz) = 250112 +TIMESTAMP = 1697049627 +SHA256 (KDE/Qt/6.6.0/qtspeech-everywhere-src-6.6.0.tar.xz) = 969bdbff826808f0cfd80e8f2e357f00174489f30d9f895390cf59814abe9f9c +SIZE (KDE/Qt/6.6.0/qtspeech-everywhere-src-6.6.0.tar.xz) = 270044 diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo index d1fa85a705bb..ef8f501115f4 100644 --- a/comms/qt6-connectivity/distinfo +++ b/comms/qt6-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695965470 -SHA256 (KDE/Qt/6.5.3/qtconnectivity-everywhere-src-6.5.3.tar.xz) = 242231b06071eff72c8b2a39e54bf813f7eed3ef53473d2eb711603634be3f5b -SIZE (KDE/Qt/6.5.3/qtconnectivity-everywhere-src-6.5.3.tar.xz) = 986024 +TIMESTAMP = 1697049631 +SHA256 (KDE/Qt/6.6.0/qtconnectivity-everywhere-src-6.6.0.tar.xz) = 1c29c26247c28ef19b9ca87c38b4d61a1f94ee9021897962e0d5ba215f1c4010 +SIZE (KDE/Qt/6.6.0/qtconnectivity-everywhere-src-6.6.0.tar.xz) = 989076 diff --git a/comms/qt6-sensors/Makefile b/comms/qt6-sensors/Makefile index 6fd0ba8d53a2..8c15b4d10913 100644 --- a/comms/qt6-sensors/Makefile +++ b/comms/qt6-sensors/Makefile @@ -1,5 +1,5 @@ PORTNAME= sensors -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= comms PKGNAMEPREFIX= qt6- @@ -9,7 +9,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers -USES= cmake compiler:c++11-lang pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base declarative .include <bsd.port.mk> diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo index 04f41be54d2e..0c80347f50b4 100644 --- a/comms/qt6-sensors/distinfo +++ b/comms/qt6-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931461 -SHA256 (KDE/Qt/6.5.3/qtsensors-everywhere-src-6.5.3.tar.xz) = 19d1a7335a83124df886701ef2da389c3ba8e943ee7262c76c6d9b242e2dc293 -SIZE (KDE/Qt/6.5.3/qtsensors-everywhere-src-6.5.3.tar.xz) = 1484752 +TIMESTAMP = 1697049639 +SHA256 (KDE/Qt/6.6.0/qtsensors-everywhere-src-6.6.0.tar.xz) = 28f0be5d4eac103ba3bb660ea61806d0e193c1fab949d1c95f2cb7cb39d84498 +SIZE (KDE/Qt/6.6.0/qtsensors-everywhere-src-6.6.0.tar.xz) = 1485724 diff --git a/comms/qt6-serialbus/Makefile b/comms/qt6-serialbus/Makefile index 9a433c607e91..2fd248dcf395 100644 --- a/comms/qt6-serialbus/Makefile +++ b/comms/qt6-serialbus/Makefile @@ -1,6 +1,5 @@ PORTNAME= serialbus -PORTVERSION= ${QT6_VERSION} -PORTREVISION= 1 +DISTVERSION= ${QT6_VERSION} CATEGORIES= comms PKGNAMEPREFIX= qt6- @@ -10,7 +9,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers -USES= cmake compiler:c++11-lib qt-dist:6 +USES= cmake compiler:c++17-lang qt-dist:6 USE_QT= base serialport .include <bsd.port.mk> diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo index 04da1dccaa13..35bc3caaab3c 100644 --- a/comms/qt6-serialbus/distinfo +++ b/comms/qt6-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931463 -SHA256 (KDE/Qt/6.5.3/qtserialbus-everywhere-src-6.5.3.tar.xz) = 216d9599150d77c4717ec017b89b53e8d936c7d101c464d98219dd0f32aad08d -SIZE (KDE/Qt/6.5.3/qtserialbus-everywhere-src-6.5.3.tar.xz) = 553856 +TIMESTAMP = 1697049641 +SHA256 (KDE/Qt/6.6.0/qtserialbus-everywhere-src-6.6.0.tar.xz) = 18ccf07152ea995c6c1ef3ce9120b6baea7017a09626ec1c5bf4faa6dd29b94c +SIZE (KDE/Qt/6.6.0/qtserialbus-everywhere-src-6.6.0.tar.xz) = 554416 diff --git a/comms/qt6-serialport/Makefile b/comms/qt6-serialport/Makefile index d02e02bb1cef..d3eaec344f43 100644 --- a/comms/qt6-serialport/Makefile +++ b/comms/qt6-serialport/Makefile @@ -1,5 +1,5 @@ PORTNAME= serialport -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= comms PKGNAMEPREFIX= qt6- @@ -10,7 +10,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libudev.so:devel/libudev-devd -USES= cmake compiler:c++11-lib pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base .include <bsd.port.mk> diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo index e655bbe51934..8388a97d4bb7 100644 --- a/comms/qt6-serialport/distinfo +++ b/comms/qt6-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931465 -SHA256 (KDE/Qt/6.5.3/qtserialport-everywhere-src-6.5.3.tar.xz) = 99cbad398cb1422884f36276d226b54c501df9cb8e70eb0bd887bf6180844eda -SIZE (KDE/Qt/6.5.3/qtserialport-everywhere-src-6.5.3.tar.xz) = 279224 +TIMESTAMP = 1697049643 +SHA256 (KDE/Qt/6.6.0/qtserialport-everywhere-src-6.6.0.tar.xz) = ecfcbbf1c47a67ff599a409bf7682fed416f797860c01c934f5a78c336da4065 +SIZE (KDE/Qt/6.6.0/qtserialport-everywhere-src-6.6.0.tar.xz) = 279784 diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile index 29e779b35249..943242d3885e 100644 --- a/databases/qt6-base_sqldriver/Makefile +++ b/databases/qt6-base_sqldriver/Makefile @@ -15,7 +15,7 @@ FLAVOR?= sqlite WRKSRC_SUBDIR= src/plugins/sqldrivers -USES= cmake pkgconfig qt-dist:6 \ +USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 \ ${${FLAVOR}_USES} USE_QT= base diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo index d87b46660540..319c9315f8ec 100644 --- a/databases/qt6-base_sqldriver/distinfo +++ b/databases/qt6-base_sqldriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931486 -SHA256 (KDE/Qt/6.5.3/qtbase-everywhere-src-6.5.3.tar.xz) = df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546 -SIZE (KDE/Qt/6.5.3/qtbase-everywhere-src-6.5.3.tar.xz) = 47142456 +TIMESTAMP = 1697049668 +SHA256 (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e +SIZE (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 48350308 diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile index e05241b06d6a..8bc25e53817b 100644 --- a/devel/py-qt6-pyqt/Makefile +++ b/devel/py-qt6-pyqt/Makefile @@ -11,8 +11,8 @@ WWW= https://riverbankcomputing.com/software/pyqt PYQT_DIST= yes -LIB_DEPENDS= libqscintilla2_qt6.so:devel/qscintilla2-qt6 \ - libdbus-1.so:devel/dbus +LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libqscintilla2_qt6.so:devel/qscintilla2-qt6 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} @@ -20,20 +20,21 @@ USES= gl pkgconfig python pyqt:6 qt:6 USE_GL+= gl opengl USE_LOCALE= C.UTF-8 USE_PYTHON= concurrent flavors -USE_PYQT= qtbuilder sip pysip -USE_QT= 5compat base connectivity declarative imageformats \ - languageserver lottie multimedia positioning quick3d \ - remoteobjects sensors serialport speech shadertools \ - svg tools translations webchannel websockets +USE_PYQT= pysip qtbuilder sip +USE_QT= base connectivity declarative imageformats multimedia \ + positioning quick3d remoteobjects sensors serialport \ + shadertools speech svg tools translations webchannel \ + websockets PORTSCOUT?= limit:^${_QT_VERSION:R} .include <bsd.port.pre.mk> .if ${ARCH} == amd64 || ${ARCH} == i386 -PLIST_SUB+= WEBENGINE="" USE_QT+= webengine +PLIST_SUB+= WEBENGINE="" .else +SIP_ARGS+= --disable QtPdf --disable QtPdfWidgets PLIST_SUB+= WEBENGINE="@comment " .endif diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo index 20c226ba80a8..7eda106fa05d 100644 --- a/devel/py-qt6-pyqt/distinfo +++ b/devel/py-qt6-pyqt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697481647 -SHA256 (PyQt6-6.5.3.tar.gz) = bcbbf9511b038b4924298ca10999aa36eb37a0a38d0638f895f9bba6025c0a77 -SIZE (PyQt6-6.5.3.tar.gz) = 1039271 +TIMESTAMP = 1698889584 +SHA256 (PyQt6-6.6.0.tar.gz) = d41512d66044c2df9c5f515a56a922170d68a37b3406ffddc8b4adc57181b576 +SIZE (PyQt6-6.6.0.tar.gz) = 1043298 diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist index a010764a9ab0..019bdb63c1f8 100644 --- a/devel/py-qt6-pyqt/pkg-plist +++ b/devel/py-qt6-pyqt/pkg-plist @@ -191,6 +191,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtimeline.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtimer.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtimezone.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtipccommon.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtranslator.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtransposeproxymodel.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtversion.sip @@ -365,6 +366,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qaudiosource.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qcamera.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qcameradevice.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qcapturablewindow.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qimagecapture.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qmediacapturesession.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qmediadevices.sip @@ -379,6 +381,7 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframe.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframeformat.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideosink.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qwindowcapture.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimediaWidgets/QtMultimediaWidgets.toml %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimediaWidgets/QtMultimediaWidgetsmod.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimediaWidgets/qgraphicsvideoitem.sip @@ -468,12 +471,14 @@ bin/pyuic6 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocument.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocumentrenderoptions.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflink.sip +%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflinkmodel.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagenavigator.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagerenderer.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfsearchmodel.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfselection.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgets.toml %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgetsmod.sip +%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfpageselector.sip %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfview.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioning.toml %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioningmod.sip diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile index eb710a23659f..c8cca46e6912 100644 --- a/devel/pyside6-tools/Makefile +++ b/devel/pyside6-tools/Makefile @@ -26,20 +26,22 @@ USE_QT= base declarative languageserver tools SHEBANG_FILES= pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py PLIST_SUB= PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL} -WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside-tools +WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/pyside-tools PYSIDE_RELNAME= ${PORTNAME} PYSIDE_BINDIR_REL?= bin/${PYSIDE_RELNAME} +post-install: # Move scripts into a dedicated directory. They're too generically named, e.g.: # deploy.py and project.py. Unversioned copies of Qt tools like lrelease and # rcc are also installed which we probably don't want in PATH by default. # Install to: ${PREFIX}/bin/pyside6 by default for now until there are # consumers of this and a more fitting location is deemed necessary. -post-install: @${MV} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME} @${MKDIR} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL} @${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME} ${STAGEDIR}${PREFIX}/bin +# These directories contain templates that should not be byte-compiled. + @${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android/recipes ${WRKDIR} .for d in deploy_lib project qtpy2cpp_lib ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ @@ -50,4 +52,6 @@ post-install: ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d} .endfor + @${MV} ${WRKDIR}/recipes ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android + .include <bsd.port.mk> diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo index 7d2c1e305db3..e7c0f502e1c3 100644 --- a/devel/pyside6-tools/distinfo +++ b/devel/pyside6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696878310 -SHA256 (pyside-setup-everywhere-src-6.5.3.tar.xz) = 6606b1634fb2981f9ca7ce2e206cc92c252401de328df4ce23f63e8c998de8d3 -SIZE (pyside-setup-everywhere-src-6.5.3.tar.xz) = 13577208 +TIMESTAMP = 1697908000 +SHA256 (pyside-setup-everywhere-src-6.6.0.tar.xz) = 2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638 +SIZE (pyside-setup-everywhere-src-6.6.0.tar.xz) = 14054860 diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist index 9b765c5dac21..8edf72f8fd13 100644 --- a/devel/pyside6-tools/pkg-plist +++ b/devel/pyside6-tools/pkg-plist @@ -24,11 +24,7 @@ %%PYSIDE_BINDIR_REL%%/deploy_lib/android/android_helper.py %%PYSIDE_BINDIR_REL%%/deploy_lib/android/buildozer.py %%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__init__.tmpl.py -%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py -%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.pyc %%PYSIDE_BINDIR_REL%%/deploy_lib/commands.py %%PYSIDE_BINDIR_REL%%/deploy_lib/config.py %%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile index 5557e8c76ab6..604d40d9c4c0 100644 --- a/devel/pyside6/Makefile +++ b/devel/pyside6/Makefile @@ -18,15 +18,15 @@ USES= cmake gl llvm:lib python qt:6 tar:xz USE_GL= gl USE_LDCONFIG= yes USE_PYTHON= flavors -USE_QT= 3d base charts connectivity datavis3d declarative doc httpserver \ - imageformats location multimedia networkauth positioning \ - quick3d quicktimeline remoteobjects scxml sensors serialbus \ - serialport shadertools speech svg tools translations wayland \ - webchannel websockets +USE_QT= 3d base charts connectivity datavis3d declarative doc graphs \ + httpserver imageformats location multimedia networkauth \ + positioning quick3d quicktimeline remoteobjects scxml sensors \ + serialbus serialport shadertools speech svg tools translations \ + wayland webchannel websockets CMAKE_ARGS= -DPYTHON_EXECUTABLE=${PYTHON_CMD} -WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside6 +WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/pyside6 PLIST_SUB= DISTVERSION=${DISTVERSION} .include <bsd.port.pre.mk> diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo index f3ed4b178184..f9c9e1bf863e 100644 --- a/devel/pyside6/distinfo +++ b/devel/pyside6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696877935 -SHA256 (pyside-setup-everywhere-src-6.5.3.tar.xz) = 6606b1634fb2981f9ca7ce2e206cc92c252401de328df4ce23f63e8c998de8d3 -SIZE (pyside-setup-everywhere-src-6.5.3.tar.xz) = 13577208 +TIMESTAMP = 1697907967 +SHA256 (pyside-setup-everywhere-src-6.6.0.tar.xz) = 2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638 +SIZE (pyside-setup-everywhere-src-6.6.0.tar.xz) = 14054860 diff --git a/devel/pyside6/files/patch-PySide6_CMakeLists.txt b/devel/pyside6/files/patch-PySide6_CMakeLists.txt new file mode 100644 index 000000000000..c394b79ddd19 --- /dev/null +++ b/devel/pyside6/files/patch-PySide6_CMakeLists.txt @@ -0,0 +1,13 @@ +Install things where they should be and with the python bytecode instead +of into ${STAGEDIR}${WRKDIR}. Regressed by [1]. + +[1] https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?h=6.6&id=90b3bab77a6465220051f52e72fe24bba862b606 + +--- PySide6/CMakeLists.txt.orig 2023-10-21 18:54:46 UTC ++++ PySide6/CMakeLists.txt +@@ -111,4 +111,4 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsync + DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX}) + + install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio" +- DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") ++ DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}") diff --git a/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake b/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake index a191cf62dfcd..f3810bf7d5ff 100644 --- a/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake +++ b/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake @@ -1,11 +1,11 @@ ---- cmake/Macros/PySideModules.cmake.orig 2023-06-05 07:34:38 UTC +--- cmake/Macros/PySideModules.cmake.orig 2023-10-14 09:37:51 UTC +++ cmake/Macros/PySideModules.cmake -@@ -104,7 +104,7 @@ macro(create_pyside_module) +@@ -107,7 +107,7 @@ macro(create_pyside_module) get_target_property(qt_core_includes Qt${QT_MAJOR_VERSION}::Core INTERFACE_INCLUDE_DIRECTORIES) set(shiboken_include_dir_list ${pyside6_SOURCE_DIR} ${qt_platform_includes} - ${qt_core_includes}) + ${qt_core_includes} ${CMAKE_INSTALL_PREFIX}/include) - + # Transform the path separators into something shiboken understands. make_path(shiboken_include_dirs ${shiboken_include_dir_list}) diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist index 68f8126fb3c9..5dbc257f06d7 100644 --- a/devel/pyside6/pkg-plist +++ b/devel/pyside6/pkg-plist @@ -15,6 +15,8 @@ include/PySide6/QtDataVisualization/pyside6_qtdatavisualization_python.h include/PySide6/QtDataVisualization/qtdatavisualization_helper.h include/PySide6/QtDesigner/pyside6_qtdesigner_python.h include/PySide6/QtDesigner/qpydesignerextensions.h +include/PySide6/QtGraphs/pyside6_qtgraphs_python.h +include/PySide6/QtGraphs/qtgraphs_helper.h include/PySide6/QtGui/pyside6_qtgui_python.h include/PySide6/QtGui/qpytextobject.h include/PySide6/QtGui/qtguihelper.h @@ -79,7 +81,6 @@ include/PySide6/pysideproperty.h include/PySide6/pysideproperty_p.h include/PySide6/pysideqapp.h include/PySide6/pysideqenum.h -include/PySide6/pysideqflags.h include/PySide6/pysideqhash.h include/PySide6/pysideqmetatype.h include/PySide6/pysideqml.h @@ -115,10 +116,10 @@ lib/cmake/PySide6Qml/PySide6QmlConfigVersion.cmake lib/cmake/PySide6Qml/PySide6QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/PySide6Qml/PySide6QmlTargets.cmake lib/libpyside6.abi3.so -lib/libpyside6.abi3.so.6.5 +lib/libpyside6.abi3.so.6.6 lib/libpyside6.abi3.so.%%DISTVERSION%% lib/libpyside6qml.abi3.so -lib/libpyside6qml.abi3.so.6.5 +lib/libpyside6qml.abi3.so.6.6 lib/libpyside6qml.abi3.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.abi3.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.pyi @@ -132,6 +133,18 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PySide6/Qt3DLogic.pyi %%PYTHON_SITELIBDIR%%/PySide6/Qt3DRender.abi3.so %%PYTHON_SITELIBDIR%%/PySide6/Qt3DRender.pyi +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__init__.py +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/events%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/events%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/futures%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/futures%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/tasks%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/__pycache__/tasks%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/events.py +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/futures.py +%%PYTHON_SITELIBDIR%%/PySide6/QtAsyncio/tasks.py %%PYTHON_SITELIBDIR%%/PySide6/QtBluetooth.abi3.so %%PYTHON_SITELIBDIR%%/PySide6/QtBluetooth.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtCharts.abi3.so @@ -146,6 +159,9 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PySide6/QtDataVisualization.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtDesigner.abi3.so %%PYTHON_SITELIBDIR%%/PySide6/QtDesigner.pyi +%%PYTHON_SITELIBDIR%%/PySide6/QtExampleIcons.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtGraphs.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtGraphs.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtGui.abi3.so %%PYTHON_SITELIBDIR%%/PySide6/QtGui.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtHelp.abi3.so @@ -250,6 +266,7 @@ share/PySide6/glue/qtcharts.cpp share/PySide6/glue/qtcore.cpp share/PySide6/glue/qtdatavisualization.cpp share/PySide6/glue/qtdesigner.cpp +share/PySide6/glue/qtgraphs.cpp share/PySide6/glue/qtgui.cpp share/PySide6/glue/qtmultimedia.cpp share/PySide6/glue/qtnetwork.cpp @@ -294,6 +311,7 @@ share/PySide6/typesystems/typesystem_glgeti_v_includes.xml share/PySide6/typesystems/typesystem_glgeti_v_modifications.xml share/PySide6/typesystems/typesystem_glgetv_includes.xml share/PySide6/typesystems/typesystem_glgetv_modifications.xml +share/PySide6/typesystems/typesystem_graphs.xml share/PySide6/typesystems/typesystem_gui.xml share/PySide6/typesystems/typesystem_gui_common.xml share/PySide6/typesystems/typesystem_gui_mac.xml diff --git a/devel/qt6-5compat/Makefile b/devel/qt6-5compat/Makefile index 1ce779a3cb7b..87f795e038a3 100644 --- a/devel/qt6-5compat/Makefile +++ b/devel/qt6-5compat/Makefile @@ -1,6 +1,5 @@ PORTNAME= 5compat DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -12,10 +11,12 @@ LIB_DEPENDS= libicuuc.so:devel/icu \ libdouble-conversion.so:devel/double-conversion \ libpcre.so:devel/pcre \ libpcre2-16.so:devel/pcre2 \ + libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd -USES= cmake compiler:c++17-lang gettext-runtime gnome \ +USES= cmake compiler:c++17-lang gettext-runtime gl gnome \ qt-dist:6 +USE_GL= gl opengl USE_GNOME= glib20 USE_QT= base declarative shadertools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo index 4fb869c8923b..386803211884 100644 --- a/devel/qt6-5compat/distinfo +++ b/devel/qt6-5compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931493 -SHA256 (KDE/Qt/6.5.3/qt5compat-everywhere-src-6.5.3.tar.xz) = eeb2a9e27771e15aaa7935f61a8024b46cc8e2044ae0ceacff2754c0cb806464 -SIZE (KDE/Qt/6.5.3/qt5compat-everywhere-src-6.5.3.tar.xz) = 14638104 +TIMESTAMP = 1697049679 +SHA256 (KDE/Qt/6.6.0/qt5compat-everywhere-src-6.6.0.tar.xz) = 3d85edb66126f712266dcbfc6cd00383d46cc6d66c8b84607ca21e2bc71a8fca +SIZE (KDE/Qt/6.6.0/qt5compat-everywhere-src-6.6.0.tar.xz) = 14638540 diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 1d7ef7386faf..89ec755c6049 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,12 +1,8 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- -PATCH_SITES= https://github.com/qt/qtbase/commit/ -PATCHFILES= 3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch:-p1 - MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (core, gui, widgets, network,...) WWW= https://www.qt.io/ @@ -60,6 +56,7 @@ USES= cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \ qt-dist:6 shebangfix ssl USE_GL= egl opengl USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 pango +USE_LOCALE= C.UTF-8 CMAKE_ARGS= -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" CMAKE_ON= QT_AVOID_CMAKE_ARCHIVING_API \ QT_FIND_ALL_PACKAGES_ALWAYS \ diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index 0eacb1fbdb78..c3e7e528804d 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1695931495 -SHA256 (KDE/Qt/6.5.3/qtbase-everywhere-src-6.5.3.tar.xz) = df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546 -SIZE (KDE/Qt/6.5.3/qtbase-everywhere-src-6.5.3.tar.xz) = 47142456 -SHA256 (KDE/Qt/6.5.3/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 61e345f12c6283792e230d3572756e6093d1be0c80d1f3dc0745e19532e28ebc -SIZE (KDE/Qt/6.5.3/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 1326 +TIMESTAMP = 1697049681 +SHA256 (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e +SIZE (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 48350308 diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp index 0c78c2367aec..4eab6daffac2 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2023-09-21 19:24:26 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2023-09-13 16:02:48 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp @@ -112,23 +112,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) @@ -41,16 +41,15 @@ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) --DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) +#ifndef LIBRESSL_VERSION_NUMBER -+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) + DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) +#else +DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) +#endif + DEFINEFUNC3(int, CRYPTO_memcmp, const void * in_a, in_a, const void * in_b, in_b, size_t len, len, return 1, return); DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) - DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) -@@ -192,7 +209,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int +@@ -193,7 +210,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, return 0, return) DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) @@ -60,7 +59,7 @@ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -288,12 +307,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const +@@ -289,12 +308,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) @@ -75,7 +74,7 @@ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -750,8 +771,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -751,8 +772,8 @@ static LoadedOpenSsl loadOpenSsl() #endif #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> @@ -86,7 +85,7 @@ if (libcrypto->load() && libssl->load()) { // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found return result; -@@ -782,8 +803,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -783,8 +804,8 @@ static LoadedOpenSsl loadOpenSsl() libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1); libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1); # else @@ -97,7 +96,7 @@ # endif if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found -@@ -852,21 +873,34 @@ bool q_resolveOpenSslSymbols() +@@ -853,21 +874,34 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) @@ -132,7 +131,7 @@ #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -947,7 +981,9 @@ bool q_resolveOpenSslSymbols() +@@ -949,7 +983,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -143,7 +142,7 @@ RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -1042,12 +1078,14 @@ bool q_resolveOpenSslSymbols() +@@ -1044,12 +1080,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -158,7 +157,7 @@ RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1107,7 +1145,9 @@ bool q_resolveOpenSslSymbols() +@@ -1109,7 +1147,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RSA_free) RESOLVEFUNC(DH_bits) diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h index 905b1482b3d3..911ffd8d9f99 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2023-09-21 19:24:26 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2023-09-13 16:02:48 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h @@ -46,6 +46,13 @@ QT_BEGIN_NAMESPACE @@ -117,7 +117,7 @@ OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); void q_OCSP_CERTID_free(OCSP_CERTID *cid); int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); -@@ -664,8 +712,14 @@ void *q_CRYPTO_malloc(size_t num, const char *file, in +@@ -664,8 +712,15 @@ void *q_CRYPTO_malloc(size_t num, const char *file, in void *q_CRYPTO_malloc(size_t num, const char *file, int line); #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) @@ -129,10 +129,11 @@ +void q_CRYPTO_free(void *a); +# define q_OPENSSL_free(addr) q_CRYPTO_free(addr) +#endif ++ + int q_CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len); void q_SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val)); - const char *q_SSL_alert_type_string(int value); -@@ -728,7 +782,11 @@ int q_RSA_bits(RSA *a); +@@ -729,7 +784,11 @@ int q_RSA_bits(RSA *a); int q_DH_bits(DH *dh); int q_RSA_bits(RSA *a); diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index 34f81d81a326..4eaf2762f2cb 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -46,7 +46,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetime_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetimeparser_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdeadlinetimer_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h @@ -126,6 +125,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qoperatingsystemversion_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qparallelanimationgroup_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpermissions_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qplugin_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpoll_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qprocess_p.h @@ -144,6 +144,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsharedmemory_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_x86_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qspan_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringconverter_p.h @@ -152,6 +153,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcore-config_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtemporaryfile_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtenvironmentvariables_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtextstream_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qthread_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qthreadpool_p.h @@ -159,6 +161,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimerinfo_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimezoneprivate_data_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtimezoneprivate_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtipccommon_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtools_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtrace_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtranslator_p.h @@ -166,6 +169,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qunicodetables_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qunicodetools_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qurl_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvolatile_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwaitcondition_p.h @@ -173,6 +177,8 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlstreamgrammar_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlstreamparser_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qxmlutils_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qzipreader_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qzipwriter_p.h %%QT_INCDIR%%/QtCore/QAbstractAnimation %%QT_INCDIR%%/QtCore/QAbstractEventDispatcher %%QT_INCDIR%%/QtCore/QAbstractItemModel @@ -204,6 +210,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QBindingStorage %%QT_INCDIR%%/QtCore/QBitArray %%QT_INCDIR%%/QtCore/QBitRef +%%QT_INCDIR%%/QtCore/QBluetoothPermission %%QT_INCDIR%%/QtCore/QBuffer %%QT_INCDIR%%/QtCore/QByteArray %%QT_INCDIR%%/QtCore/QByteArrayAlgorithms @@ -213,6 +220,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QByteArrayView %%QT_INCDIR%%/QtCore/QCache %%QT_INCDIR%%/QtCore/QCalendar +%%QT_INCDIR%%/QtCore/QCalendarPermission %%QT_INCDIR%%/QtCore/QCborArray %%QT_INCDIR%%/QtCore/QCborError %%QT_INCDIR%%/QtCore/QCborMap @@ -231,6 +239,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QConcatenateTablesProxyModel %%QT_INCDIR%%/QtCore/QConstIterator %%QT_INCDIR%%/QtCore/QConstOverload +%%QT_INCDIR%%/QtCore/QContactsPermission %%QT_INCDIR%%/QtCore/QContiguousCache %%QT_INCDIR%%/QtCore/QContiguousCacheData %%QT_INCDIR%%/QtCore/QContiguousCacheTypedData @@ -316,6 +325,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QListSpecialMethodsBase %%QT_INCDIR%%/QtCore/QLittleEndianStorageType %%QT_INCDIR%%/QtCore/QLocale +%%QT_INCDIR%%/QtCore/QLocationPermission %%QT_INCDIR%%/QtCore/QLockFile %%QT_INCDIR%%/QtCore/QLoggingCategory %%QT_INCDIR%%/QtCore/QMap @@ -363,8 +373,10 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QMutableVectorIterator %%QT_INCDIR%%/QtCore/QMutex %%QT_INCDIR%%/QtCore/QMutexLocker +%%QT_INCDIR%%/QtCore/QNativeIpcKey %%QT_INCDIR%%/QtCore/QNoDebug %%QT_INCDIR%%/QtCore/QNonConstOverload +%%QT_INCDIR%%/QtCore/QNtfsPermissionCheckGuard %%QT_INCDIR%%/QtCore/QObject %%QT_INCDIR%%/QtCore/QObjectBindableProperty %%QT_INCDIR%%/QtCore/QObjectCleanupHandler @@ -378,6 +390,8 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QParallelAnimationGroup %%QT_INCDIR%%/QtCore/QPartialOrdering %%QT_INCDIR%%/QtCore/QPauseAnimation +%%QT_INCDIR%%/QtCore/QPermission +%%QT_INCDIR%%/QtCore/QPermissions %%QT_INCDIR%%/QtCore/QPersistentModelIndex %%QT_INCDIR%%/QtCore/QPluginLoader %%QT_INCDIR%%/QtCore/QPluginMetaData @@ -389,7 +403,6 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QProcessEnvironment %%QT_INCDIR%%/QtCore/QPromise %%QT_INCDIR%%/QtCore/QProperty -%%QT_INCDIR%%/QtCore/QPropertyAlias %%QT_INCDIR%%/QtCore/QPropertyAnimation %%QT_INCDIR%%/QtCore/QPropertyBinding %%QT_INCDIR%%/QtCore/QPropertyBindingError @@ -424,6 +437,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QScopedPointerDeleter %%QT_INCDIR%%/QtCore/QScopedPointerObjectDeleteLater %%QT_INCDIR%%/QtCore/QScopedPointerPodDeleter +%%QT_INCDIR%%/QtCore/QScopedPropertyUpdateGroup %%QT_INCDIR%%/QtCore/QScopedValueRollback %%QT_INCDIR%%/QtCore/QSemaphore %%QT_INCDIR%%/QtCore/QSemaphoreReleaser @@ -570,11 +584,13 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QtVersion %%QT_INCDIR%%/QtCore/QtVersionChecks %%QT_INCDIR%%/QtCore/q20algorithm.h +%%QT_INCDIR%%/QtCore/q20chrono.h %%QT_INCDIR%%/QtCore/q20functional.h %%QT_INCDIR%%/QtCore/q20iterator.h %%QT_INCDIR%%/QtCore/q20memory.h %%QT_INCDIR%%/QtCore/q20type_traits.h %%QT_INCDIR%%/QtCore/q23functional.h +%%QT_INCDIR%%/QtCore/q23utility.h %%QT_INCDIR%%/QtCore/qabstractanimation.h %%QT_INCDIR%%/QtCore/qabstracteventdispatcher.h %%QT_INCDIR%%/QtCore/qabstractitemmodel.h @@ -650,6 +666,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qflags.h %%QT_INCDIR%%/QtCore/qfloat16.h %%QT_INCDIR%%/QtCore/qforeach.h +%%QT_INCDIR%%/QtCore/qfunctionaltools_impl.h %%QT_INCDIR%%/QtCore/qfunctionpointer.h %%QT_INCDIR%%/QtCore/qfuture.h %%QT_INCDIR%%/QtCore/qfuture_impl.h @@ -672,6 +689,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qjsonobject.h %%QT_INCDIR%%/QtCore/qjsonvalue.h %%QT_INCDIR%%/QtCore/qlatin1stringmatcher.h +%%QT_INCDIR%%/QtCore/qlatin1stringview.h %%QT_INCDIR%%/QtCore/qlibrary.h %%QT_INCDIR%%/QtCore/qlibraryinfo.h %%QT_INCDIR%%/QtCore/qline.h @@ -706,6 +724,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qpair.h %%QT_INCDIR%%/QtCore/qparallelanimationgroup.h %%QT_INCDIR%%/QtCore/qpauseanimation.h +%%QT_INCDIR%%/QtCore/qpermissions.h %%QT_INCDIR%%/QtCore/qplugin.h %%QT_INCDIR%%/QtCore/qpluginloader.h %%QT_INCDIR%%/QtCore/qpoint.h @@ -765,6 +784,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qsystemsemaphore.h %%QT_INCDIR%%/QtCore/qtaggedpointer.h %%QT_INCDIR%%/QtCore/qtclasshelpermacros.h +%%QT_INCDIR%%/QtCore/qtconfiginclude.h %%QT_INCDIR%%/QtCore/qtconfigmacros.h %%QT_INCDIR%%/QtCore/qtcore-config.h %%QT_INCDIR%%/QtCore/qtcoreexports.h @@ -782,6 +802,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/qtimeline.h %%QT_INCDIR%%/QtCore/qtimer.h %%QT_INCDIR%%/QtCore/qtimezone.h +%%QT_INCDIR%%/QtCore/qtipccommon.h %%QT_INCDIR%%/QtCore/qtmetamacros.h %%QT_INCDIR%%/QtCore/qtmochelpers.h %%QT_INCDIR%%/QtCore/qtnoop.h @@ -887,10 +908,7 @@ bin/qmake6 %%QT_INCDIR%%/QtDeviceDiscoverySupport/QtDeviceDiscoverySupportDepends %%QT_INCDIR%%/QtDeviceDiscoverySupport/QtDeviceDiscoverySupportVersion %%QT_INCDIR%%/QtDeviceDiscoverySupport/qtdevicediscoverysupportversion.h -%%QT_INCDIR%%/QtExampleIcons/QtExampleIcons %%QT_INCDIR%%/QtExampleIcons/QtExampleIconsDepends -%%QT_INCDIR%%/QtExampleIcons/QtExampleIconsVersion -%%QT_INCDIR%%/QtExampleIcons/qtexampleiconsversion.h %%QT_INCDIR%%/QtFbSupport/%%FULLVER%%/QtFbSupport/private/qfbbackingstore_p.h %%QT_INCDIR%%/QtFbSupport/%%FULLVER%%/QtFbSupport/private/qfbcursor_p.h %%QT_INCDIR%%/QtFbSupport/%%FULLVER%%/QtFbSupport/private/qfbscreen_p.h @@ -900,8 +918,8 @@ bin/qmake6 %%QT_INCDIR%%/QtFbSupport/QtFbSupportDepends %%QT_INCDIR%%/QtFbSupport/QtFbSupportVersion %%QT_INCDIR%%/QtFbSupport/qtfbsupportversion.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/atspiadaptor_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/dbusconnection_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/atspiadaptor_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/dbusconnection_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstractfileiconengine_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstractfileiconprovider_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstractlayoutstyleinfo_p.h @@ -945,8 +963,8 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_x86_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawingprimitive_sse2_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qedidparser_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qedidvendortable_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qedidparser_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qedidvendortable_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qeglconvenience_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qeglpbuffer_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qeglplatformcontext_p.h @@ -972,7 +990,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgenericunixfontdatabase_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgenericunixservices_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgenericunixthemes_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qglxconvenience_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qglxconvenience_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qglyphrun_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgrayraster_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qgridlayoutengine_p.h @@ -982,6 +1000,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhighdpiscaling_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qicc_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qicon_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qiconengine_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qiconloader_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagepixmapcleanuphooks_p.h @@ -1034,28 +1053,22 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrbtree_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrgba64_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhi_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhi_p_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhigles2_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhigles2_p_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhinull_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhinull_p_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhivulkan_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrhivulkanext_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qscreen_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qsessionmanager_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshader_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshader_p_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshaderdescription_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshaderdescription_p_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshapedpixmapdndwindow_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshortcut_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshortcutmap_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qsimpledrag_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspi_constant_mappings_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspi_struct_marshallers_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspiaccessiblebridge_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspiapplicationadaptor_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspidbuscache_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspi_constant_mappings_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspi_struct_marshallers_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspiaccessiblebridge_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspiapplicationadaptor_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qspidbuscache_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qstandarditemmodel_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qstatictext_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qstatusnotifieritemadaptor_p.h @@ -1083,7 +1096,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtguiglobal_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtriangulatingstroker_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtriangulator_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtx11extras_p.h +%%X11%%%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qtx11extras_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qundostack_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qunixeventdispatcher_qpa_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qvectorpath_p.h @@ -1096,8 +1109,6 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qxdgnotificationproxy_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qxkbcommon_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qxpmhandler_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qzipreader_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qzipwriter_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformaccessibility.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformbackingstore.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformclipboard.h @@ -1136,6 +1147,10 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformwindow_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qwindowsysteminterface.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qwindowsysteminterface_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/rhi/qrhi.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/rhi/qrhi_platform.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/rhi/qshader.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/rhi/qshaderdescription.h %%QT_INCDIR%%/QtGui/QAbstractFileIconProvider %%QT_INCDIR%%/QtGui/QAbstractTextDocumentLayout %%QT_INCDIR%%/QtGui/QAbstractUndoItem @@ -1362,9 +1377,9 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/QtGui %%QT_INCDIR%%/QtGui/QtGuiDepends %%QT_INCDIR%%/QtGui/QtGuiVersion -%%QT_INCDIR%%/QtGui/bus_interface.h -%%QT_INCDIR%%/QtGui/cache_adaptor.h -%%QT_INCDIR%%/QtGui/deviceeventcontroller_adaptor.h +%%X11%%%%QT_INCDIR%%/QtGui/bus_interface.h +%%X11%%%%QT_INCDIR%%/QtGui/cache_adaptor.h +%%X11%%%%QT_INCDIR%%/QtGui/deviceeventcontroller_adaptor.h %%QT_INCDIR%%/QtGui/qabstractfileiconprovider.h %%QT_INCDIR%%/QtGui/qabstracttextdocumentlayout.h %%QT_INCDIR%%/QtGui/qaccessible.h @@ -1479,7 +1494,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/qvulkanwindow.h %%QT_INCDIR%%/QtGui/qwindow.h %%QT_INCDIR%%/QtGui/qwindowdefs.h -%%QT_INCDIR%%/QtGui/socket_interface.h +%%X11%%%%QT_INCDIR%%/QtGui/socket_interface.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/devicehandlerlist_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h %%QT_INCDIR%%/QtInputSupport/%%FULLVER%%/QtInputSupport/private/qevdevkeyboardhandler_p.h @@ -2453,6 +2468,7 @@ lib/cmake/Qt6/FindLibb2.cmake lib/cmake/Qt6/FindLibproxy.cmake lib/cmake/Qt6/FindLibsystemd.cmake lib/cmake/Qt6/FindLibudev.cmake +lib/cmake/Qt6/FindMimer.cmake lib/cmake/Qt6/FindMtdev.cmake lib/cmake/Qt6/FindMySQL.cmake lib/cmake/Qt6/FindOracle.cmake @@ -2478,6 +2494,7 @@ lib/cmake/Qt6/FindWrapOpenSSL.cmake lib/cmake/Qt6/FindWrapOpenSSLHeaders.cmake lib/cmake/Qt6/FindWrapPCRE2.cmake lib/cmake/Qt6/FindWrapPNG.cmake +lib/cmake/Qt6/FindWrapResolv.cmake lib/cmake/Qt6/FindWrapRt.cmake lib/cmake/Qt6/FindWrapSystemDoubleConversion.cmake lib/cmake/Qt6/FindWrapSystemFreetype.cmake @@ -2507,6 +2524,7 @@ lib/cmake/Qt6/Qt6VersionlessTargets.cmake lib/cmake/Qt6/QtAndroidHelpers.cmake lib/cmake/Qt6/QtAppHelpers.cmake lib/cmake/Qt6/QtAutogenHelpers.cmake +lib/cmake/Qt6/QtBaseTopLevelHelpers.cmake lib/cmake/Qt6/QtBuild.cmake lib/cmake/Qt6/QtBuildInformation.cmake lib/cmake/Qt6/QtCMakeHelpers.cmake @@ -2537,6 +2555,7 @@ lib/cmake/Qt6/QtGenerateLibPri.cmake lib/cmake/Qt6/QtGenerateVersionScript.cmake lib/cmake/Qt6/QtGlobalStateHelpers.cmake lib/cmake/Qt6/QtHeadersClean.cmake +lib/cmake/Qt6/QtInitProject.cmake lib/cmake/Qt6/QtInstallHelpers.cmake lib/cmake/Qt6/QtJavaHelpers.cmake lib/cmake/Qt6/QtLalrHelpers.cmake @@ -2957,6 +2976,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_BINDIR%%/qmake %%QT_BINDIR%%/qmake6 %%QT_BINDIR%%/qt-cmake +%%QT_BINDIR%%/qt-cmake-create %%QT_BINDIR%%/qt-configure-module %%QT_BINDIR%%/qtpaths %%QT_BINDIR%%/qtpaths6 @@ -3040,7 +3060,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o +%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o +%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++/qmake.conf diff --git a/devel/qt6-languageserver/Makefile b/devel/qt6-languageserver/Makefile index 91e08d8608c1..0f7c03bf51fd 100644 --- a/devel/qt6-languageserver/Makefile +++ b/devel/qt6-languageserver/Makefile @@ -1,5 +1,5 @@ PORTNAME= languageserver -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -9,7 +9,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers -USES= cmake compiler:c++11-lang pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base .include <bsd.port.mk> diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo index 690535674ede..00fcad36b4d1 100644 --- a/devel/qt6-languageserver/distinfo +++ b/devel/qt6-languageserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931497 -SHA256 (KDE/Qt/6.5.3/qtlanguageserver-everywhere-src-6.5.3.tar.xz) = c0c0c174c0554c932bc4e4f4c08a69f28e05f5608d92fe4ae2c7986b237a218a -SIZE (KDE/Qt/6.5.3/qtlanguageserver-everywhere-src-6.5.3.tar.xz) = 153808 +TIMESTAMP = 1697049688 +SHA256 (KDE/Qt/6.6.0/qtlanguageserver-everywhere-src-6.6.0.tar.xz) = aec93019862bf63769206fe56a2230cd9e37994806a4bf28415203b4eb9a490e +SIZE (KDE/Qt/6.6.0/qtlanguageserver-everywhere-src-6.6.0.tar.xz) = 154304 diff --git a/devel/qt6-location/Makefile b/devel/qt6-location/Makefile index 7959621404f6..295bfb0a0be4 100644 --- a/devel/qt6-location/Makefile +++ b/devel/qt6-location/Makefile @@ -1,6 +1,5 @@ PORTNAME= location -PORTVERSION= ${QT6_VERSION} -PORTREVISION= 1 +DISTVERSION= ${QT6_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -13,6 +12,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= gl opengl -USE_QT= base declarative positioning +USE_QT= base declarative positioning shadertools .include <bsd.port.mk> diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo index 3f3e4f34d4c5..2355de5577e8 100644 --- a/devel/qt6-location/distinfo +++ b/devel/qt6-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931500 -SHA256 (KDE/Qt/6.5.3/qtlocation-everywhere-src-6.5.3.tar.xz) = 530cd1d597bfa7018cddd243594b47ee4252544b577ce1e9976c7253ca64e7cc -SIZE (KDE/Qt/6.5.3/qtlocation-everywhere-src-6.5.3.tar.xz) = 3032844 +TIMESTAMP = 1697049692 +SHA256 (KDE/Qt/6.6.0/qtlocation-everywhere-src-6.6.0.tar.xz) = f5968be76108bf22af334b403027cf0a859284cb824250e728bb8daca2d70794 +SIZE (KDE/Qt/6.6.0/qtlocation-everywhere-src-6.6.0.tar.xz) = 3035992 diff --git a/devel/qt6-positioning/Makefile b/devel/qt6-positioning/Makefile index a76584870d96..011ecbe781d6 100644 --- a/devel/qt6-positioning/Makefile +++ b/devel/qt6-positioning/Makefile @@ -1,5 +1,5 @@ PORTNAME= positioning -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -10,7 +10,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++11-lang gl pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= gl opengl USE_QT= base declarative serialbus serialport diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo index 63f00f09c408..57b53eb9baee 100644 --- a/devel/qt6-positioning/distinfo +++ b/devel/qt6-positioning/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931502 -SHA256 (KDE/Qt/6.5.3/qtpositioning-everywhere-src-6.5.3.tar.xz) = ab1a099b2b3e7330398b2ab2b4420a3c32904d74ce4515ebb8e2cb83209d6d8f -SIZE (KDE/Qt/6.5.3/qtpositioning-everywhere-src-6.5.3.tar.xz) = 1456364 +TIMESTAMP = 1697049695 +SHA256 (KDE/Qt/6.6.0/qtpositioning-everywhere-src-6.6.0.tar.xz) = 8d6520fa3c759ed33eaea7cb1aa7e1e7ec999f828e496a6c592847d61f0fa539 +SIZE (KDE/Qt/6.6.0/qtpositioning-everywhere-src-6.6.0.tar.xz) = 1513304 diff --git a/devel/qt6-remoteobjects/Makefile b/devel/qt6-remoteobjects/Makefile index e37018afe18a..3c3493a99750 100644 --- a/devel/qt6-remoteobjects/Makefile +++ b/devel/qt6-remoteobjects/Makefile @@ -1,5 +1,5 @@ PORTNAME= remoteobjects -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -9,7 +9,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers -USES= cmake compiler:c++11-lang gl pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= gl opengl USE_QT= base declarative diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo index 3d5e4933ad33..ecac797f50f2 100644 --- a/devel/qt6-remoteobjects/distinfo +++ b/devel/qt6-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931504 -SHA256 (KDE/Qt/6.5.3/qtremoteobjects-everywhere-src-6.5.3.tar.xz) = 8d9c9e40fb8b092c25c5bd3a4ab0fa316a2b64d7733d9d54604bc5b40446e7a1 -SIZE (KDE/Qt/6.5.3/qtremoteobjects-everywhere-src-6.5.3.tar.xz) = 527260 +TIMESTAMP = 1697049697 +SHA256 (KDE/Qt/6.6.0/qtremoteobjects-everywhere-src-6.6.0.tar.xz) = 261194e35bb9420225f095c58a5a549686797a3d2b7ea6f0d582d7d681f1f76b +SIZE (KDE/Qt/6.6.0/qtremoteobjects-everywhere-src-6.6.0.tar.xz) = 527892 diff --git a/devel/qt6-remoteobjects/pkg-plist b/devel/qt6-remoteobjects/pkg-plist index 82c4a491ce72..3f07bf630a02 100644 --- a/devel/qt6-remoteobjects/pkg-plist +++ b/devel/qt6-remoteobjects/pkg-plist @@ -57,11 +57,8 @@ %%QT_INCDIR%%/QtRemoteObjectsQml/QtRemoteObjectsQmlDepends %%QT_INCDIR%%/QtRemoteObjectsQml/QtRemoteObjectsQmlVersion %%QT_INCDIR%%/QtRemoteObjectsQml/qtremoteobjectsqmlversion.h -%%QT_INCDIR%%/QtRepParser/QtRepParser %%QT_INCDIR%%/QtRepParser/QtRepParserDepends -%%QT_INCDIR%%/QtRepParser/QtRepParserVersion %%QT_INCDIR%%/QtRepParser/parser.g -%%QT_INCDIR%%/QtRepParser/qtrepparserversion.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtRemoteObjectsTestsConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfig.cmake @@ -129,7 +126,7 @@ lib/cmake/Qt6RepParser/Qt6RepParserVersionlessTargets.cmake libdata/pkgconfig/Qt6RemoteObjects.pc libdata/pkgconfig/Qt6RemoteObjectsQml.pc libdata/pkgconfig/Qt6RepParser.pc -%%QT_LIBEXECDIR%%/repc +%%QT_TOOLDIR%%/repc %%QT_DATADIR%%/modules/RemoteObjects.json %%QT_DATADIR%%/modules/RemoteObjectsQml.json %%QT_DATADIR%%/modules/RepParser.json diff --git a/devel/qt6-scxml/Makefile b/devel/qt6-scxml/Makefile index 31daa120bfdb..cff348d1ee3e 100644 --- a/devel/qt6-scxml/Makefile +++ b/devel/qt6-scxml/Makefile @@ -1,5 +1,5 @@ PORTNAME= scxml -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -10,7 +10,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++11-lang gl pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= gl opengl USE_QT= base declarative diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo index eb17982eaf43..587d69fb6297 100644 --- a/devel/qt6-scxml/distinfo +++ b/devel/qt6-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931507 -SHA256 (KDE/Qt/6.5.3/qtscxml-everywhere-src-6.5.3.tar.xz) = f3d8672ac05fe8155759086fa1f97568cd39caab5e6c93ea1af7f76e098aa751 -SIZE (KDE/Qt/6.5.3/qtscxml-everywhere-src-6.5.3.tar.xz) = 1163256 +TIMESTAMP = 1697049705 +SHA256 (KDE/Qt/6.6.0/qtscxml-everywhere-src-6.6.0.tar.xz) = 57ecd0db5d8b063d0334c4b21461585b4904d4884c88de125bd72e967e8a1043 +SIZE (KDE/Qt/6.6.0/qtscxml-everywhere-src-6.6.0.tar.xz) = 1175844 diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile index ccbd02673873..b789b10ffc85 100644 --- a/devel/qt6-tools/Makefile +++ b/devel/qt6-tools/Makefile @@ -1,6 +1,5 @@ PORTNAME= tools DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo index 5224238fd3b5..b35d54b4aa90 100644 --- a/devel/qt6-tools/distinfo +++ b/devel/qt6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931512 -SHA256 (KDE/Qt/6.5.3/qttools-everywhere-src-6.5.3.tar.xz) = fc91d32b3f696725bbb48b0df240c25b606bbee3bd22627cfcbee876a6405e37 -SIZE (KDE/Qt/6.5.3/qttools-everywhere-src-6.5.3.tar.xz) = 8591996 +TIMESTAMP = 1697049711 +SHA256 (KDE/Qt/6.6.0/qttools-everywhere-src-6.6.0.tar.xz) = 4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 +SIZE (KDE/Qt/6.6.0/qttools-everywhere-src-6.6.0.tar.xz) = 8582212 diff --git a/devel/qt6-tools/files/patch-configure.cmake b/devel/qt6-tools/files/patch-configure.cmake new file mode 100644 index 000000000000..3fcd6e398037 --- /dev/null +++ b/devel/qt6-tools/files/patch-configure.cmake @@ -0,0 +1,27 @@ +Fix detection of zstd. + +CMake Error at /usr/local/lib/cmake/zstd/zstdTargets.cmake:42 (message): + Some (but not all) targets in this export set were already defined. + + Targets Defined: zstd::libzstd_shared + + Targets not yet defined: zstd::libzstd_static + +Call Stack (most recent call first): + /usr/local/lib/cmake/zstd/zstdConfig.cmake:1 (include) + /usr/local/lib/cmake/Qt6/FindWrapZSTD.cmake:24 (find_package) + /usr/local/lib/cmake/Qt6/QtFindPackageHelpers.cmake:156 (find_package) + src/designer/src/lib/CMakeLists.txt:415 (qt_find_package) + +Regressed by: https://code.qt.io/cgit/qt/qttools.git/commit/?h=6.6.0&id=ff5c080c2eb9267c43da6fafe953bf50076443c4 + +--- configure.cmake.orig 2023-09-11 09:43:37 UTC ++++ configure.cmake +@@ -7,6 +7,7 @@ + + #### Libraries + ++qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME designer) + + + #### Tests diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist index 39f5e5188af0..c4aac07876f2 100644 --- a/devel/qt6-tools/pkg-plist +++ b/devel/qt6-tools/pkg-plist @@ -222,6 +222,25 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h %%QT_INCDIR%%/QtHelp/qthelpversion.h +%%QT_INCDIR%%/QtQDocCatch/QtQDocCatchDepends +%%QT_INCDIR%%/QtQDocCatch/catch/catch.hpp +%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/QtQDocCatchConversionsPrivateDepends +%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/qdoc_catch_conversions.h +%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/qt_catch_conversions.h +%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/std_catch_conversions.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/QtQDocCatchGeneratorsPrivateDepends +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/cycle_generator.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/oneof_generator.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/k_partition_of_r_generator.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/path_generator.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qchar_generator.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qstring_generator.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/namespaces.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/copy_value.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/generator_handler.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/move_into_vector.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/distribution.h +%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/percentages.h %%QT_INCDIR%%/QtTools/%%FULLVER%%/QtTools/private/qttools-config_p.h %%QT_INCDIR%%/QtTools/QtTools %%QT_INCDIR%%/QtTools/QtToolsDepends @@ -295,6 +314,24 @@ lib/cmake/Qt6LinguistTools/Qt6LinguistToolsMacros.cmake lib/cmake/Qt6LinguistTools/Qt6LinguistToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6LinguistTools/Qt6LinguistToolsTargets.cmake lib/cmake/Qt6LinguistTools/Qt6LinguistToolsVersionlessTargets.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfig.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfigVersion.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateTargets.cmake +lib/cmake/Qt6QDocCatchConversionsPrivate/Qt6QDocCatchConversionsPrivateVersionlessTargets.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfig.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfigVersion.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateTargets.cmake +lib/cmake/Qt6QDocCatchGeneratorsPrivate/Qt6QDocCatchGeneratorsPrivateVersionlessTargets.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfig.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfigVersion.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateTargets.cmake +lib/cmake/Qt6QDocCatchPrivate/Qt6QDocCatchPrivateVersionlessTargets.cmake lib/cmake/Qt6Tools/Qt6ToolsAdditionalTargetInfo.cmake lib/cmake/Qt6Tools/Qt6ToolsConfig.cmake lib/cmake/Qt6Tools/Qt6ToolsConfigVersion.cmake @@ -366,6 +403,11 @@ lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_linguist.pri %%QT_MKSPECDIR%%/modules/qt_lib_linguist_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatch_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversionsprivate.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversionsprivate_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgeneratorsprivate.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgeneratorsprivate_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_tools_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_uiplugin.pri %%QT_MKSPECDIR%%/modules/qt_lib_uitools.pri @@ -374,17 +416,22 @@ lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake libdata/pkgconfig/Qt6Designer.pc libdata/pkgconfig/Qt6Help.pc libdata/pkgconfig/Qt6Linguist.pc +libdata/pkgconfig/Qt6QDocCatchConversionsPrivate.pc +libdata/pkgconfig/Qt6QDocCatchGeneratorsPrivate.pc libdata/pkgconfig/Qt6UiPlugin.pc libdata/pkgconfig/Qt6UiTools.pc -%%QT_LIBEXECDIR%%/lprodump -%%QT_LIBEXECDIR%%/lrelease-pro -%%QT_LIBEXECDIR%%/lupdate-pro -%%QT_LIBEXECDIR%%/qhelpgenerator -%%QT_LIBEXECDIR%%/qtattributionsscanner +%%QT_TOOLDIR%%/lprodump +%%QT_TOOLDIR%%/lrelease-pro +%%QT_TOOLDIR%%/lupdate-pro +%%QT_TOOLDIR%%/qhelpgenerator +%%QT_TOOLDIR%%/qtattributionsscanner %%QT_DATADIR%%/modules/Designer.json %%QT_DATADIR%%/modules/DesignerComponentsPrivate.json %%QT_DATADIR%%/modules/Help.json %%QT_DATADIR%%/modules/Linguist.json +%%QT_DATADIR%%/modules/QDocCatchConversionsPrivate.json +%%QT_DATADIR%%/modules/QDocCatchGeneratorsPrivate.json +%%QT_DATADIR%%/modules/QDocCatchPrivate.json %%QT_DATADIR%%/modules/Tools.json %%QT_DATADIR%%/modules/UiPlugin.json %%QT_DATADIR%%/modules/UiTools.json diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo index e40ea68e6f1f..f937cd76d0ae 100644 --- a/devel/qt6-translations/distinfo +++ b/devel/qt6-translations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931515 -SHA256 (KDE/Qt/6.5.3/qttranslations-everywhere-src-6.5.3.tar.xz) = 83b44c0ddcf9c28e836f63c21a3fea2fb2c24cb630eefc79984f5bec44e949e3 -SIZE (KDE/Qt/6.5.3/qttranslations-everywhere-src-6.5.3.tar.xz) = 1468564 +TIMESTAMP = 1697049713 +SHA256 (KDE/Qt/6.6.0/qttranslations-everywhere-src-6.6.0.tar.xz) = a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c +SIZE (KDE/Qt/6.6.0/qttranslations-everywhere-src-6.6.0.tar.xz) = 1468592 diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile index 2e6cad8d62d9..9737ec7f9ad8 100644 --- a/devel/shiboken6/Makefile +++ b/devel/shiboken6/Makefile @@ -29,7 +29,7 @@ CMAKE_ARGS= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \ -DUSE_PYTHON_VERSION=${PYTHON_VER} \ -DBUILD_TESTS:BOOL=false -WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/shiboken6 +WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION:R}/sources/shiboken6 PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= DOCS diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo index 01f7aa6108fa..bafdbaa6c0be 100644 --- a/devel/shiboken6/distinfo +++ b/devel/shiboken6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696877778 -SHA256 (pyside-setup-everywhere-src-6.5.3.tar.xz) = 6606b1634fb2981f9ca7ce2e206cc92c252401de328df4ce23f63e8c998de8d3 -SIZE (pyside-setup-everywhere-src-6.5.3.tar.xz) = 13577208 +TIMESTAMP = 1697907858 +SHA256 (pyside-setup-everywhere-src-6.6.0.tar.xz) = 2dd002db8851a87173354f38aa8c6ec42d0ff1fac99ea422b29e2dfce52d1638 +SIZE (pyside-setup-everywhere-src-6.6.0.tar.xz) = 14054860 diff --git a/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake b/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake new file mode 100644 index 000000000000..4f4be866326a --- /dev/null +++ b/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake @@ -0,0 +1,13 @@ +We don't need bash for a simple export command. + +--- cmake/ShibokenHelpers.cmake.orig 2023-10-14 09:37:51 UTC ++++ cmake/ShibokenHelpers.cmake +@@ -772,7 +772,7 @@ $@") + $@") + else() + string(REPLACE ";" ":" path_dirs_native "${path_dirs_native}") +- file(WRITE "${wrapper_path}" "#!/bin/bash ++ file(WRITE "${wrapper_path}" "#!/bin/sh + export LD_LIBRARY_PATH=${path_dirs_native}:$LD_LIBRARY_PATH + $@") + endif() diff --git a/devel/shiboken6/files/patch-data_shiboken6.pc.in b/devel/shiboken6/files/patch-data_shiboken6.pc.in index 3496cfee10da..2830d8e58633 100644 --- a/devel/shiboken6/files/patch-data_shiboken6.pc.in +++ b/devel/shiboken6/files/patch-data_shiboken6.pc.in @@ -1,6 +1,6 @@ ---- data/shiboken6.pc.in.orig 2020-12-13 08:07:53 UTC +--- data/shiboken6.pc.in.orig 2023-10-14 09:37:51 UTC +++ data/shiboken6.pc.in -@@ -9,5 +9,5 @@ python_include_dir=@PYTHON_INCLUDE_DIRS@ +@@ -8,5 +8,5 @@ Version: @shiboken6_VERSION@ Name: shiboken6 Description: Support library for Python bindings created with the Shiboken6 generator. Version: @shiboken6_VERSION@ diff --git a/devel/shiboken6/files/patch-sources_shiboken6_libshiboken_helper.h b/devel/shiboken6/files/patch-libshiboken_helper.h index d7333d860c45..be473aa32a58 100644 --- a/devel/shiboken6/files/patch-sources_shiboken6_libshiboken_helper.h +++ b/devel/shiboken6/files/patch-libshiboken_helper.h @@ -1,11 +1,11 @@ ---- libshiboken/helper.h.orig 2020-12-13 07:16:46 UTC +--- libshiboken/helper.h.orig 2023-10-14 09:37:51 UTC +++ libshiboken/helper.h -@@ -92,7 +92,7 @@ class AutoArrayPointer +@@ -61,7 +61,7 @@ class AutoArrayPointer T *data; }; - + -using ThreadId = unsigned long long; +using ThreadId = pthread_t; LIBSHIBOKEN_API ThreadId currentThreadId(); LIBSHIBOKEN_API ThreadId mainThreadId(); - + diff --git a/devel/shiboken6/pkg-plist b/devel/shiboken6/pkg-plist index e4e8e3ea3d98..cbc90f9f6ac1 100644 --- a/devel/shiboken6/pkg-plist +++ b/devel/shiboken6/pkg-plist @@ -13,13 +13,13 @@ include/shiboken6/sbkconverter.h include/shiboken6/sbkcppstring.h include/shiboken6/sbkcpptonumpy.h include/shiboken6/sbkenum.h -include/shiboken6/sbkenum_p.h include/shiboken6/sbkerrors.h include/shiboken6/sbkfeature_base.h include/shiboken6/sbkmodule.h include/shiboken6/sbknumpycheck.h include/shiboken6/sbknumpyview.h include/shiboken6/sbkpython.h +include/shiboken6/sbksmartpointer.h include/shiboken6/sbkstaticstrings.h include/shiboken6/sbkstring.h include/shiboken6/sbktypefactory.h @@ -43,7 +43,7 @@ lib/cmake/Shiboken6Tools/Shiboken6ToolsConfigVersion.cmake lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake lib/libshiboken6.abi3.so -lib/libshiboken6.abi3.so.6.5 +lib/libshiboken6.abi3.so.6.6 lib/libshiboken6.abi3.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.abi3.so %%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.pyi diff --git a/graphics/py-qt6-3d/distinfo b/graphics/py-qt6-3d/distinfo index 925233511024..f1658c3d4b99 100644 --- a/graphics/py-qt6-3d/distinfo +++ b/graphics/py-qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690463072 -SHA256 (PyQt6_3D-6.5.0.tar.gz) = f8ef3e2965a518367eb4cc693fd9f23698fcbeb909c7dcb7269737b8d877f68b -SIZE (PyQt6_3D-6.5.0.tar.gz) = 7469119 +TIMESTAMP = 1698896095 +SHA256 (PyQt6_3D-6.6.0.tar.gz) = 372b206eb8185f2b6ff048629d3296cb137c9e5901b113119ffa46a317726988 +SIZE (PyQt6_3D-6.6.0.tar.gz) = 7469031 diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile index 7cb7e81e534b..b09cda3c0b0d 100644 --- a/graphics/qt6-3d/Makefile +++ b/graphics/qt6-3d/Makefile @@ -1,6 +1,5 @@ PORTNAME= 3d DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt6- @@ -31,27 +30,12 @@ USE_GNOME= glib20 USE_QT= base declarative shadertools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -OPTIONS_DEFINE_i386= SIMD -OPTIONS_DEFINE_amd64= SIMD -OPTIONS_DEFAULT_i386= SIMD -OPTIONS_DEFAULT_amd64= SIMD +.include <bsd.port.pre.mk> -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSIMD} -. if !empty(MACHINE_CPU:Mavx2) -CMAKE_ARGS+= -DINPUT_qt3d_simd=avx2 -PLIST_SUB+= AVX2="" SIMD="" -. elif !empty(MACHINE_CPU:Msse2) -CMAKE_ARGS+= -DINPUT_qt3d_simd=sse2 -PLIST_SUB+= AVX2="@comment " SIMD="" -. else -CMAKE_ARGS+= -DINPUT_qt3d_simd=no -PLIST_SUB+= SIMD="@comment " -. endif +.if ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB+= SIMD="" .else -CMAKE_ARGS+= -DINPUT_qt3d_simd=no PLIST_SUB+= SIMD="@comment " .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo index 576df37d65b0..d6465d849db9 100644 --- a/graphics/qt6-3d/distinfo +++ b/graphics/qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931577 -SHA256 (KDE/Qt/6.5.3/qt3d-everywhere-src-6.5.3.tar.xz) = 0d369f2028fd5208cb664ce39708e450005755187f4ac24fdbda7a6c3938fddc -SIZE (KDE/Qt/6.5.3/qt3d-everywhere-src-6.5.3.tar.xz) = 161746380 +TIMESTAMP = 1697049779 +SHA256 (KDE/Qt/6.6.0/qt3d-everywhere-src-6.6.0.tar.xz) = 0da87a46217f4d72f6d0de9768605d5325ef3d093f73a5e0d73dd88e99c1fc2a +SIZE (KDE/Qt/6.6.0/qt3d-everywhere-src-6.6.0.tar.xz) = 161687452 diff --git a/graphics/qt6-3d/pkg-plist b/graphics/qt6-3d/pkg-plist index 327fed751087..7574a14b4746 100644 --- a/graphics/qt6-3d/pkg-plist +++ b/graphics/qt6-3d/pkg-plist @@ -126,7 +126,7 @@ %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/coresettings_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/job_common_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_p.h -%%SIMD%%%%AVX2%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_avx2_p.h +%%SIMD%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_avx2_p.h %%SIMD%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_sse_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/nullservices_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/propertychangehandler_p.h diff --git a/graphics/qt6-imageformats/Makefile b/graphics/qt6-imageformats/Makefile index 5f471b780854..8848e2e748d4 100644 --- a/graphics/qt6-imageformats/Makefile +++ b/graphics/qt6-imageformats/Makefile @@ -1,6 +1,5 @@ PORTNAME= imageformats DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt6- @@ -20,6 +19,7 @@ LIB_DEPENDS= libjasper.so:graphics/jasper \ libharfbuzz.so:print/harfbuzz \ libicudata.so:devel/icu \ libjbig.so:graphics/jbigkit \ + libmng.so:graphics/libmng \ libpcre.so:devel/pcre \ libpcre2-16.so:devel/pcre2 \ libpng16.so:graphics/png \ diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo index 0a08786ba74b..333e224d4b82 100644 --- a/graphics/qt6-imageformats/distinfo +++ b/graphics/qt6-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931580 -SHA256 (KDE/Qt/6.5.3/qtimageformats-everywhere-src-6.5.3.tar.xz) = 49c026c49a738ed024c072a4b205cdc1235507da4a2d0ea740bd574fff138ccb -SIZE (KDE/Qt/6.5.3/qtimageformats-everywhere-src-6.5.3.tar.xz) = 1975664 +TIMESTAMP = 1697049786 +SHA256 (KDE/Qt/6.6.0/qtimageformats-everywhere-src-6.6.0.tar.xz) = e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384 +SIZE (KDE/Qt/6.6.0/qtimageformats-everywhere-src-6.6.0.tar.xz) = 1975848 diff --git a/graphics/qt6-imageformats/pkg-plist b/graphics/qt6-imageformats/pkg-plist index 198be65a9da1..e928929d15a5 100644 --- a/graphics/qt6-imageformats/pkg-plist +++ b/graphics/qt6-imageformats/pkg-plist @@ -13,6 +13,12 @@ lib/cmake/Qt6Gui/Qt6QJp2PluginConfigVersion.cmake lib/cmake/Qt6Gui/Qt6QJp2PluginConfigVersionImpl.cmake lib/cmake/Qt6Gui/Qt6QJp2PluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Gui/Qt6QJp2PluginTargets.cmake +lib/cmake/Qt6Gui/Qt6QMngPluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Gui/Qt6QMngPluginConfig.cmake +lib/cmake/Qt6Gui/Qt6QMngPluginConfigVersion.cmake +lib/cmake/Qt6Gui/Qt6QMngPluginConfigVersionImpl.cmake +lib/cmake/Qt6Gui/Qt6QMngPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Gui/Qt6QMngPluginTargets.cmake lib/cmake/Qt6Gui/Qt6QTgaPluginAdditionalTargetInfo.cmake lib/cmake/Qt6Gui/Qt6QTgaPluginConfig.cmake lib/cmake/Qt6Gui/Qt6QTgaPluginConfigVersion.cmake @@ -39,6 +45,7 @@ lib/cmake/Qt6Gui/Qt6QWebpPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Gui/Qt6QWebpPluginTargets.cmake %%QT_PLUGINDIR%%/imageformats/libqicns.so %%QT_PLUGINDIR%%/imageformats/libqjp2.so +%%QT_PLUGINDIR%%/imageformats/libqmng.so %%QT_PLUGINDIR%%/imageformats/libqtga.so %%QT_PLUGINDIR%%/imageformats/libqtiff.so %%QT_PLUGINDIR%%/imageformats/libqwbmp.so diff --git a/graphics/qt6-lottie/Makefile b/graphics/qt6-lottie/Makefile index 179d47ef092e..84d6d7fcfdfa 100644 --- a/graphics/qt6-lottie/Makefile +++ b/graphics/qt6-lottie/Makefile @@ -1,5 +1,5 @@ PORTNAME= lottie -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= graphics PKGNAMEPREFIX= qt6- @@ -10,7 +10,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++11-lang gl pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= gl opengl USE_QT= base declarative websockets diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo index 2d255279622b..a68aa7a2d810 100644 --- a/graphics/qt6-lottie/distinfo +++ b/graphics/qt6-lottie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931582 -SHA256 (KDE/Qt/6.5.3/qtlottie-everywhere-src-6.5.3.tar.xz) = 3d2c4685b104c01c341fed9528f56d63a69d8ee6d5996bc55100720637a95722 -SIZE (KDE/Qt/6.5.3/qtlottie-everywhere-src-6.5.3.tar.xz) = 91144 +TIMESTAMP = 1697049789 +SHA256 (KDE/Qt/6.6.0/qtlottie-everywhere-src-6.6.0.tar.xz) = 1d98b45107a4b9a6337bc7ac37b9e54cdaa68110f814d93eecc8fbf8d338f84f +SIZE (KDE/Qt/6.6.0/qtlottie-everywhere-src-6.6.0.tar.xz) = 92276 diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo index 70a722868576..b81bd8d58561 100644 --- a/graphics/qt6-quickeffectmaker/distinfo +++ b/graphics/qt6-quickeffectmaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931587 -SHA256 (KDE/Qt/6.5.3/qtquickeffectmaker-everywhere-src-6.5.3.tar.xz) = b9679bbad1cccb1433fd66b4c95950c5930c0813b486b53c29148059a8aa9ca7 -SIZE (KDE/Qt/6.5.3/qtquickeffectmaker-everywhere-src-6.5.3.tar.xz) = 4367220 +TIMESTAMP = 1697049793 +SHA256 (KDE/Qt/6.6.0/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz) = d7cb379fc7ad228343b20c1f68ed7864de2b43601d1879469dcb5659f9d1f77f +SIZE (KDE/Qt/6.6.0/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz) = 4367288 diff --git a/graphics/qt6-svg/Makefile b/graphics/qt6-svg/Makefile index 5653eb827881..1b6c6acca233 100644 --- a/graphics/qt6-svg/Makefile +++ b/graphics/qt6-svg/Makefile @@ -1,6 +1,5 @@ PORTNAME= svg DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt6- diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo index 64f384fe7ac3..4929e9bae51e 100644 --- a/graphics/qt6-svg/distinfo +++ b/graphics/qt6-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931589 -SHA256 (KDE/Qt/6.5.3/qtsvg-everywhere-src-6.5.3.tar.xz) = fc41c47b69ca1f80473cd4b11996394155781105345392961d064d04f95d5bef -SIZE (KDE/Qt/6.5.3/qtsvg-everywhere-src-6.5.3.tar.xz) = 1728084 +TIMESTAMP = 1697049796 +SHA256 (KDE/Qt/6.6.0/qtsvg-everywhere-src-6.6.0.tar.xz) = 33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de +SIZE (KDE/Qt/6.6.0/qtsvg-everywhere-src-6.6.0.tar.xz) = 1651728 diff --git a/graphics/qt6-svg/pkg-plist b/graphics/qt6-svg/pkg-plist index 0a4d2d9b6dc2..1dd398947c9f 100644 --- a/graphics/qt6-svg/pkg-plist +++ b/graphics/qt6-svg/pkg-plist @@ -1,5 +1,4 @@ %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfont_p.h -%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgglobal_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvggraphics_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvghandler_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgnode_p.h @@ -7,6 +6,7 @@ %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstyle_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgtinydocument_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgexports_p.h +%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgglobal_p.h %%QT_INCDIR%%/QtSvg/QSvgGenerator %%QT_INCDIR%%/QtSvg/QSvgRenderer %%QT_INCDIR%%/QtSvg/QtSvg diff --git a/graphics/qt6-wayland/Makefile b/graphics/qt6-wayland/Makefile index 56b127d760b0..a96319c2ec45 100644 --- a/graphics/qt6-wayland/Makefile +++ b/graphics/qt6-wayland/Makefile @@ -1,6 +1,5 @@ PORTNAME= wayland DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 CATEGORIES= graphics wayland PKGNAMEPREFIX= qt6- diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo index c0896b57ecf5..7d2a1793d52a 100644 --- a/graphics/qt6-wayland/distinfo +++ b/graphics/qt6-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931592 -SHA256 (KDE/Qt/6.5.3/qtwayland-everywhere-src-6.5.3.tar.xz) = f72a8588b7ff9b81bb311f2c8b541c11788b81003537b010360ca80eae52369f -SIZE (KDE/Qt/6.5.3/qtwayland-everywhere-src-6.5.3.tar.xz) = 1059396 +TIMESTAMP = 1697049798 +SHA256 (KDE/Qt/6.6.0/qtwayland-everywhere-src-6.6.0.tar.xz) = 30c3d82d85d050c83370710a26d12c802199c51eba5c2726e9d6243edd03b7e8 +SIZE (KDE/Qt/6.6.0/qtwayland-everywhere-src-6.6.0.tar.xz) = 1125748 diff --git a/graphics/qt6-wayland/pkg-plist b/graphics/qt6-wayland/pkg-plist index cbf55d9c9cf6..88886f1b5b56 100644 --- a/graphics/qt6-wayland/pkg-plist +++ b/graphics/qt6-wayland/pkg-plist @@ -1,10 +1,12 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclient-config_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclientglobal_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-cursor-shape-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-fractional-scale-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-hardware-integration.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-pointer-gestures-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-key-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-text-input-method-unstable-v1.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-toplevel-drag-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h @@ -17,6 +19,7 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wp-primary-selection-unstable-v1.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-output-unstable-v1.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-shell.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandabstractdecoration_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandbuffer_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandclientbufferintegration_p.h @@ -71,11 +74,13 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkanwindow_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-cursor-shape-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-fractional-scale-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-pointer-gestures-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-key-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-text-input-method-unstable-v1-client-protocol.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-toplevel-drag-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h @@ -88,6 +93,7 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wp-primary-selection-unstable-v1-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-output-unstable-v1-client-protocol.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-shell-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtension %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtensionTemplate %%QT_INCDIR%%/QtWaylandClient/QtWaylandClient @@ -596,7 +602,7 @@ lib/cmake/Qt6WlShellIntegrationPrivate/Qt6WlShellIntegrationPrivateVersionlessTa %%QT_QMLDIR%%/QtWayland/Compositor/qmlfiles/WaylandOutputWindow.qml libdata/pkgconfig/Qt6WaylandClient.pc libdata/pkgconfig/Qt6WaylandCompositor.pc -%%QT_LIBEXECDIR%%/qtwaylandscanner +%%QT_TOOLDIR%%/qtwaylandscanner %%QT_DATADIR%%/modules/WaylandClient.json %%QT_DATADIR%%/modules/WaylandCompositor.json %%QT_DATADIR%%/modules/WaylandEglClientHwIntegrationPrivate.json diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo index c90785aa7ea6..4b8483d41922 100644 --- a/misc/qt6-doc/distinfo +++ b/misc/qt6-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931602 -SHA256 (KDE/Qt/6.5.3/qtdoc-everywhere-src-6.5.3.tar.xz) = ef08bcf8daec21c37e23fc39e696f1e067dff29b751fb924bb53c189d80783cc -SIZE (KDE/Qt/6.5.3/qtdoc-everywhere-src-6.5.3.tar.xz) = 13049924 +TIMESTAMP = 1697049807 +SHA256 (KDE/Qt/6.6.0/qtdoc-everywhere-src-6.6.0.tar.xz) = d37634d87a9bdd78ca42c9ace3cd08954a227c58ecd6270919aadef55977261e +SIZE (KDE/Qt/6.6.0/qtdoc-everywhere-src-6.6.0.tar.xz) = 13121692 diff --git a/misc/qt6-doc/pkg-plist b/misc/qt6-doc/pkg-plist index 43c7a046594a..19a5c3b9a783 100644 --- a/misc/qt6-doc/pkg-plist +++ b/misc/qt6-doc/pkg-plist @@ -66,7 +66,6 @@ %%QT_DOCDIR%%/qtdoc/deployment.html %%QT_DOCDIR%%/qtdoc/desktop-integration.html %%QT_DOCDIR%%/qtdoc/embedded-linux.html -%%QT_DOCDIR%%/qtdoc/examples-android.html %%QT_DOCDIR%%/qtdoc/examples-animation.html %%QT_DOCDIR%%/qtdoc/examples-draganddrop.html %%QT_DOCDIR%%/qtdoc/examples-gestures.html @@ -221,6 +220,7 @@ %%QT_DOCDIR%%/qtdoc/images/threadsandobjects.png %%QT_DOCDIR%%/qtdoc/images/threadvisual-example.png %%QT_DOCDIR%%/qtdoc/images/tool-examples.png +%%QT_DOCDIR%%/qtdoc/images/txtviewer_screenshot.png %%QT_DOCDIR%%/qtdoc/images/wayland-multi-process.png %%QT_DOCDIR%%/qtdoc/images/wayland-single-process-develop.png %%QT_DOCDIR%%/qtdoc/images/wayland-single-process-eglfs.png @@ -275,6 +275,7 @@ %%QT_DOCDIR%%/qtdoc/newclasses63.html %%QT_DOCDIR%%/qtdoc/newclasses64.html %%QT_DOCDIR%%/qtdoc/newclasses65.html +%%QT_DOCDIR%%/qtdoc/newclasses66.html %%QT_DOCDIR%%/qtdoc/obsoleteclasses.html %%QT_DOCDIR%%/qtdoc/obsoleteqmltypes.html %%QT_DOCDIR%%/qtdoc/overviews-main.html @@ -327,6 +328,7 @@ %%QT_DOCDIR%%/qtdoc/qtdoc-demos-colorpaletteclient-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-dice-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-documentviewer-example.html +%%QT_DOCDIR%%/qtdoc/qtdoc-demos-documentviewer-plugins-txtviewer-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-fx-material-showroom-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-hangman-example.html %%QT_DOCDIR%%/qtdoc/qtdoc-demos-mediaplayer-example.html @@ -410,6 +412,7 @@ %%QT_DOCDIR%%/qtdoc/whatsnew63.html %%QT_DOCDIR%%/qtdoc/whatsnew64.html %%QT_DOCDIR%%/qtdoc/whatsnew65.html +%%QT_DOCDIR%%/qtdoc/whatsnew66.html %%QT_DOCDIR%%/qtdoc/whatsnewqt6.html %%QT_DOCDIR%%/qtdoc/why-moc.html %%QT_DOCDIR%%/qtdoc/windows-building.html diff --git a/misc/qt6-examples/Makefile b/misc/qt6-examples/Makefile index 91342b7e6c13..549544acef55 100644 --- a/misc/qt6-examples/Makefile +++ b/misc/qt6-examples/Makefile @@ -1,14 +1,13 @@ PORTNAME= examples -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= misc MASTER_SITES= QT/official_releases/qt/${QT6_VERSION:R}/${QT6_VERSION}/single PKGNAMEPREFIX= qt6- DISTNAME= qt-everywhere-src-${QT6_VERSION} -#WRKSRC= ${WRKDIR}/qt-everywhere-src-${QT5_VERSION} DIST_SUBDIR= KDE/Qt/${QT6_VERSION} MAINTAINER= kde@FreeBSD.org -COMMENT= Qt 6 examples sourcecode +COMMENT= Qt 6 examples source code NO_ARCH= yes NO_BUILD= yes @@ -17,26 +16,26 @@ USES= qt:6 tar:xz USE_QT= # EXAMPLESDIR= ${PREFIX}/share/examples/qt6 -# The destination location depends on the values given in -# share/doc/qt5/<module>/examples-manifest.xml. The exception is -# qtscript and qtserialbus where the examples are looked up in $EXAMPLESDIR/. -# This way, the examples show up in qtcreator on the examples front page. _QT_DISTS= 3d 5compat activeqt base charts coap connectivity datavis3d \ - declarative doc httpserver mqtt multimedia networkauth opcua \ - positioning quick3d quick3dphysics remoteobjects scxml \ - sensors serialbus serialport speech svg tools virtualkeyboard \ + declarative doc graphs httpserver mqtt multimedia networkauth \ + opcua positioning quick3d quick3dphysics remoteobjects scxml \ + sensors serialbus serialport speech tools virtualkeyboard \ wayland webchannel webengine websockets webview -EXAMPLES= ${_QT_DISTS:C/^/qt/} +EXAMPLES= ${_QT_DISTS:C/^/qt/} .for example in ${EXAMPLES} EXTRACT_AFTER_ARGS+= ${DISTNAME:S/-opensource//}/${example}/examples .endfor +EXTRACT_AFTER_ARGS+= ${DISTNAME:S/-opensource//}/qtsvg/tests/manual/examples do-install: .for example in ${EXAMPLES} cd ${WRKSRC}/${example}/examples && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .endfor + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/svg + cd ${WRKSRC}/qtsvg/tests/manual/examples && \ + ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/svg .include <bsd.port.mk> diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo index fd6a1c2bcf1b..54768f6f8d1d 100644 --- a/misc/qt6-examples/distinfo +++ b/misc/qt6-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931936 -SHA256 (KDE/Qt/6.5.3/qt-everywhere-src-6.5.3.tar.xz) = 7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb -SIZE (KDE/Qt/6.5.3/qt-everywhere-src-6.5.3.tar.xz) = 798402796 +TIMESTAMP = 1697050141 +SHA256 (KDE/Qt/6.6.0/qt-everywhere-src-6.6.0.tar.xz) = 652538fcb5d175d8f8176c84c847b79177c87847b7273dccaec1897d80b50002 +SIZE (KDE/Qt/6.6.0/qt-everywhere-src-6.6.0.tar.xz) = 812361632 diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist index 3381b3fb415f..201eb1d7e47e 100644 --- a/misc/qt6-examples/pkg-plist +++ b/misc/qt6-examples/pkg-plist @@ -452,6 +452,11 @@ %%QT_EXAMPLEDIR%%/coap/simplecoapclient/optiondialog.h %%QT_EXAMPLEDIR%%/coap/simplecoapclient/optiondialog.ui %%QT_EXAMPLEDIR%%/coap/simplecoapclient/simplecoapclient.pro +%%QT_EXAMPLEDIR%%/core/permissions/CMakeLists.txt +%%QT_EXAMPLEDIR%%/core/permissions/Info.plist +%%QT_EXAMPLEDIR%%/core/permissions/Main.qml +%%QT_EXAMPLEDIR%%/core/permissions/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/core/permissions/main.cpp %%QT_EXAMPLEDIR%%/core5/CMakeLists.txt %%QT_EXAMPLEDIR%%/core5/core5.pro %%QT_EXAMPLEDIR%%/core5/widgets/CMakeLists.txt @@ -489,6 +494,7 @@ %%QT_EXAMPLEDIR%%/corelib/bindableproperties/bindablesubscription/main.cpp %%QT_EXAMPLEDIR%%/corelib/bindableproperties/doc/images/bindable_properties_example.png %%QT_EXAMPLEDIR%%/corelib/bindableproperties/doc/src/bindableproperties.qdoc +%%QT_EXAMPLEDIR%%/corelib/bindableproperties/shared/CMakeLists.txt %%QT_EXAMPLEDIR%%/corelib/bindableproperties/shared/countries.qrc %%QT_EXAMPLEDIR%%/corelib/bindableproperties/shared/finland.png %%QT_EXAMPLEDIR%%/corelib/bindableproperties/shared/germany.png @@ -566,10 +572,10 @@ %%QT_EXAMPLEDIR%%/corelib/serialization/CMakeLists.txt %%QT_EXAMPLEDIR%%/corelib/serialization/cbordump/CMakeLists.txt %%QT_EXAMPLEDIR%%/corelib/serialization/cbordump/cbordump.pro +%%QT_EXAMPLEDIR%%/corelib/serialization/cbordump/cbortag.py %%QT_EXAMPLEDIR%%/corelib/serialization/cbordump/doc/images/cbordump.png %%QT_EXAMPLEDIR%%/corelib/serialization/cbordump/doc/src/cbordump.qdoc %%QT_EXAMPLEDIR%%/corelib/serialization/cbordump/main.cpp -%%QT_EXAMPLEDIR%%/corelib/serialization/cbordump/tag-transform.xslt %%QT_EXAMPLEDIR%%/corelib/serialization/convert/CMakeLists.txt %%QT_EXAMPLEDIR%%/corelib/serialization/convert/cborconverter.cpp %%QT_EXAMPLEDIR%%/corelib/serialization/convert/cborconverter.h @@ -1117,66 +1123,83 @@ %%QT_EXAMPLEDIR%%/demos/dice/meshes/object_3.mesh %%QT_EXAMPLEDIR%%/demos/dice/meshes/side_Table_Pine_LOD0_M_Side_Table_Natural_Wenge_Wood_4K_0.mesh %%QT_EXAMPLEDIR%%/demos/dice/qt_attribution.json +%%QT_EXAMPLEDIR%%/demos/dice/sounds/onedice.wav +%%QT_EXAMPLEDIR%%/demos/dice/sounds/rolling.wav %%QT_EXAMPLEDIR%%/demos/documentviewer/CMakeLists.txt -%%QT_EXAMPLEDIR%%/demos/documentviewer/abstractviewer.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/abstractviewer.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/abstractviewer.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/abstractviewer.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/documentviewer.qrc +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/images/copy.png +%%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 +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/mainwindow.ui +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/recentfilemenu.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/recentfilemenu.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/recentfiles.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/recentfiles.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/viewerfactory.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/viewerfactory.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/app/viewerinterfaces.h %%QT_EXAMPLEDIR%%/demos/documentviewer/doc/images/documentviewer_open.png +%%QT_EXAMPLEDIR%%/demos/documentviewer/doc/images/txtviewer_screenshot.png %%QT_EXAMPLEDIR%%/demos/documentviewer/doc/src/documentviewer.qdoc -%%QT_EXAMPLEDIR%%/demos/documentviewer/documentviewer.qrc -%%QT_EXAMPLEDIR%%/demos/documentviewer/hoverwatcher.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/hoverwatcher.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/copy.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/copy@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/cut.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/cut@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/document-open-recent.svgz -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-next-view-page.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-next-view-page@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-next-view.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-next-view@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-next.svgz -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-previous-view-page.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-previous-view-page@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-previous-view.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-previous-view@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/go-previous.svgz -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/help-about.svgz -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/magnifier.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/magnifier@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/open.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/open@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/paste.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/paste@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/print.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/print2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/qt-logo.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/qt-logo@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-fit-best.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-fit-best@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-fit-width.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-fit-width@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-in.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-in@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-original.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-original@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-out.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-out@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-previous.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/images/zoom-previous@2x.png -%%QT_EXAMPLEDIR%%/demos/documentviewer/jsonviewer.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/jsonviewer.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/main.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/mainwindow.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/mainwindow.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/mainwindow.ui -%%QT_EXAMPLEDIR%%/demos/documentviewer/pdfviewer.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/pdfviewer.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/txtviewer.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/txtviewer.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/viewerfactory.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/viewerfactory.h -%%QT_EXAMPLEDIR%%/demos/documentviewer/zoomselector.cpp -%%QT_EXAMPLEDIR%%/demos/documentviewer/zoomselector.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/doc/src/txtviewer.qdoc +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/jsonviewer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/jsonviewer/jsonviewer.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/jsonviewer/jsonviewer.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/jsonviewer/jsonviewer.json +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/hoverwatcher.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/hoverwatcher.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/pdfviewer.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/pdfviewer.h +%%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/txtviewer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.cpp +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.h +%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.json %%QT_EXAMPLEDIR%%/demos/hangman/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/hangman/dict.txt %%QT_EXAMPLEDIR%%/demos/hangman/doc/images/qthangman-example.png @@ -1322,74 +1345,81 @@ %%QT_EXAMPLEDIR%%/demos/mediaplayer/Config/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/mediaplayer/Config/Config.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/Config/qmldir -%%QT_EXAMPLEDIR%%/demos/mediaplayer/ErrorPopup.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/Main.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/AudioControl.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/ControlImages.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/CustomButton.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/CustomRadioButton.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/CustomSlider.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/PlaybackControl.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/PlaybackRateControl.qml %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/PlaybackSeekControl.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Add_file.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Add_file_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Cancel_Button.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Error.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/FullScreen_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/FullScreen_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Load_Button.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Loop_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Loop_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Loop_Playlist.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Menu_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Menu_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Mute_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Mute_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Next_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Next_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Play_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Playlist_Active.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Playlist_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Playlist_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Previous_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Previous_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Rate_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Rate_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Settings_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Settings_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Shuffle_Active.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Shuffle_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Shuffle_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Single_Loop.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Stop_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Trash_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Trash_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Volume_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/icons/Volume_Icon_Dark.svg %%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaControls/qmldir -%%QT_EXAMPLEDIR%%/demos/mediaplayer/MetadataInfo.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/PlayerMenuBar.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/PlaylistInfo.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/SettingsInfo.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/ThemeInfo.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/TouchMenu.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/TracksInfo.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/TracksOptions.qml -%%QT_EXAMPLEDIR%%/demos/mediaplayer/UrlPopup.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/ErrorPopup.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/Images.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/Main.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/MetadataInfo.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/PlayerMenuBar.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/PlaylistInfo.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/SettingsInfo.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/ThemeInfo.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/TouchMenu.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/TracksInfo.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/TracksOptions.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/UrlPopup.qml +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Default_CoverArt.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Movie_Active.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Movie_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Movie_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Music_Active.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Music_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Music_Icon_Dark.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Shadow.png +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Shadow@2x.png +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/icons/Warning_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/MediaPlayer/qmldir %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/mediaplayer.png %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.qdoc -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Add_file.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Add_file_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Cancel_Button.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Default_CoverArt.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Error.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/FullScreen_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/FullScreen_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Load_Button.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Loop_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Loop_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Loop_Playlist.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Menu_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Menu_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Movie_Active.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Movie_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Movie_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Music_Active.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Music_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Music_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Mute_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Mute_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Next_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Next_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Play_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Playlist_Active.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Playlist_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Playlist_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Previous_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Previous_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Rate_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Rate_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Settings_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Settings_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Shadow.png -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Shadow@2x.png -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Shuffle_Active.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Shuffle_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Shuffle_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Single_Loop.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Stop_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Trash_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Trash_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Volume_Icon.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Volume_Icon_Dark.svg -%%QT_EXAMPLEDIR%%/demos/mediaplayer/icons/Warning_Icon.svg +%%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.rst %%QT_EXAMPLEDIR%%/demos/mediaplayer/main.cpp +%%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.py +%%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.pyproject %%QT_EXAMPLEDIR%%/demos/photosurface/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/photosurface/doc/images/qtquick-demo-photosurface-small.png %%QT_EXAMPLEDIR%%/demos/photosurface/doc/src/photosurface.qdoc @@ -1976,8 +2006,117 @@ %%QT_EXAMPLEDIR%%/embedded/styleexample/stylewidget.h %%QT_EXAMPLEDIR%%/embedded/styleexample/stylewidget.ui %%QT_EXAMPLEDIR%%/examples.pro +%%QT_EXAMPLEDIR%%/graphs/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/axishandling/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/axishandling/axishandling.pro +%%QT_EXAMPLEDIR%%/graphs/axishandling/axishandling.qrc +%%QT_EXAMPLEDIR%%/graphs/axishandling/customformatter.cpp +%%QT_EXAMPLEDIR%%/graphs/axishandling/customformatter.h +%%QT_EXAMPLEDIR%%/graphs/axishandling/doc/images/axishandling-example.png +%%QT_EXAMPLEDIR%%/graphs/axishandling/doc/src/axishandling.qdoc +%%QT_EXAMPLEDIR%%/graphs/axishandling/main.cpp +%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/AxisDragging.qml +%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/AxisFormatting.qml +%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/Data.qml +%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/cube.mesh +%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/cubetexture.png +%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/main.qml +%%QT_EXAMPLEDIR%%/graphs/axishandling/qmldir +%%QT_EXAMPLEDIR%%/graphs/bars/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/bars/bars.pro +%%QT_EXAMPLEDIR%%/graphs/bars/bars.qrc +%%QT_EXAMPLEDIR%%/graphs/bars/doc/images/bars-example.png +%%QT_EXAMPLEDIR%%/graphs/bars/doc/src/bars.qdoc +%%QT_EXAMPLEDIR%%/graphs/bars/main.cpp +%%QT_EXAMPLEDIR%%/graphs/bars/qml/bars/Axes.qml +%%QT_EXAMPLEDIR%%/graphs/bars/qml/bars/Data.qml +%%QT_EXAMPLEDIR%%/graphs/bars/qml/bars/main.qml +%%QT_EXAMPLEDIR%%/graphs/examples.pri +%%QT_EXAMPLEDIR%%/graphs/graphs.pro +%%QT_EXAMPLEDIR%%/graphs/scatter/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/scatter/doc/images/scatter-example.png +%%QT_EXAMPLEDIR%%/graphs/scatter/doc/src/scatter.qdoc +%%QT_EXAMPLEDIR%%/graphs/scatter/main.cpp +%%QT_EXAMPLEDIR%%/graphs/scatter/qml/scatter/Data.qml +%%QT_EXAMPLEDIR%%/graphs/scatter/qml/scatter/main.qml +%%QT_EXAMPLEDIR%%/graphs/scatter/scatter.pro +%%QT_EXAMPLEDIR%%/graphs/scatter/scatter.qrc +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/datasource.cpp +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/datasource.h +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/doc/images/surfacegallery-example.png +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/doc/src/surfacegallery.qdoc +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/main.cpp +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SpectrogramData.qml +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/heightmap.png +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/heightmap.readme +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/main.qml +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/surfacegallery.pro +%%QT_EXAMPLEDIR%%/graphs/surfacegallery/surfacegallery.qrc +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/axesinputhandler.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/axesinputhandler.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/bargraph.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/bargraph.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/custominputhandler.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/custominputhandler.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/layer_1.png +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/layer_2.png +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/layer_3.png +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/license.txt +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/maptexture.jpg +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/narrowarrow.mesh +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/oilrig.mesh +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/pipe.mesh +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/raindata.txt +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/refinery.mesh +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/refinery.obj +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/topography.png +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/doc/images/widgetgraphgallery-example.png +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/graphmodifier.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/graphmodifier.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/highlightseries.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/highlightseries.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/main.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/rainfalldata.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/rainfalldata.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scatterdatamodifier.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scatterdatamodifier.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scattergraph.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scattergraph.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraph.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraph.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraphmodifier.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraphmodifier.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/topographicseries.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/topographicseries.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardatamapping.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardatamapping.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardataproxy.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardataproxy.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantdataset.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantdataset.h +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/widgetgraphgallery.pro +%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/widgetgraphgallery.qrc +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/CMakeLists.txt +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/doc/images/widgetvolumetric-example.png +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/doc/src/widgetvolumetric.qdoc +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/layer_ground.png +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/layer_magma.png +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/layer_water.png +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/main.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/volumetric.cpp +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/volumetric.h +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/widgetvolumetric.pro +%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/widgetvolumetric.qrc %%QT_EXAMPLEDIR%%/gui/CMakeLists.txt +%%QT_EXAMPLEDIR%%/gui/doc/images/rhiwindow_example.jpg %%QT_EXAMPLEDIR%%/gui/doc/src/rasterwindow.qdoc +%%QT_EXAMPLEDIR%%/gui/doc/src/rhiwindow.qdoc %%QT_EXAMPLEDIR%%/gui/gui.pro %%QT_EXAMPLEDIR%%/gui/rasterwindow/CMakeLists.txt %%QT_EXAMPLEDIR%%/gui/rasterwindow/main.cpp @@ -1985,6 +2124,21 @@ %%QT_EXAMPLEDIR%%/gui/rasterwindow/rasterwindow.h %%QT_EXAMPLEDIR%%/gui/rasterwindow/rasterwindow.pri %%QT_EXAMPLEDIR%%/gui/rasterwindow/rasterwindow.pro +%%QT_EXAMPLEDIR%%/gui/rhiwindow/CMakeLists.txt +%%QT_EXAMPLEDIR%%/gui/rhiwindow/main.cpp +%%QT_EXAMPLEDIR%%/gui/rhiwindow/rhiwindow.cpp +%%QT_EXAMPLEDIR%%/gui/rhiwindow/rhiwindow.h +%%QT_EXAMPLEDIR%%/gui/rhiwindow/rhiwindow.pri +%%QT_EXAMPLEDIR%%/gui/rhiwindow/rhiwindow.pro +%%QT_EXAMPLEDIR%%/gui/rhiwindow/rhiwindow.qrc +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/color.frag +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/color.vert +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/prebuilt/color.frag.qsb +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/prebuilt/color.vert.qsb +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/prebuilt/quad.frag.qsb +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/prebuilt/quad.vert.qsb +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/quad.frag +%%QT_EXAMPLEDIR%%/gui/rhiwindow/shaders/quad.vert %%QT_EXAMPLEDIR%%/help/CMakeLists.txt %%QT_EXAMPLEDIR%%/help/README %%QT_EXAMPLEDIR%%/help/contextsensitivehelp/CMakeLists.txt @@ -2043,8 +2197,6 @@ %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.cpp %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.h %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.pro -%%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad_fr.ts -%%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad_nl.ts %%QT_EXAMPLEDIR%%/linguist/arrowpad/main.cpp %%QT_EXAMPLEDIR%%/linguist/arrowpad/mainwindow.cpp %%QT_EXAMPLEDIR%%/linguist/arrowpad/mainwindow.h @@ -2069,7 +2221,6 @@ %%QT_EXAMPLEDIR%%/linguist/doc/src/trollprint.qdoc %%QT_EXAMPLEDIR%%/linguist/hellotr/CMakeLists.txt %%QT_EXAMPLEDIR%%/linguist/hellotr/hellotr.pro -%%QT_EXAMPLEDIR%%/linguist/hellotr/hellotr_la.ts %%QT_EXAMPLEDIR%%/linguist/hellotr/main.cpp %%QT_EXAMPLEDIR%%/linguist/i18n/CMakeLists.txt %%QT_EXAMPLEDIR%%/linguist/i18n/i18n.pro @@ -2102,13 +2253,6 @@ %%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint.pro %%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_pt.ts %%QT_EXAMPLEDIR%%/mqtt/CMakeLists.txt -%%QT_EXAMPLEDIR%%/mqtt/consolepubsub/CMakeLists.txt -%%QT_EXAMPLEDIR%%/mqtt/consolepubsub/configuration.h -%%QT_EXAMPLEDIR%%/mqtt/consolepubsub/consolepubsub.pro -%%QT_EXAMPLEDIR%%/mqtt/consolepubsub/main_pub.cpp -%%QT_EXAMPLEDIR%%/mqtt/consolepubsub/main_sub.cpp -%%QT_EXAMPLEDIR%%/mqtt/consolepubsub/qtmqtt_pub.pro -%%QT_EXAMPLEDIR%%/mqtt/consolepubsub/qtmqtt_sub.pro %%QT_EXAMPLEDIR%%/mqtt/doc/examples.qdoc %%QT_EXAMPLEDIR%%/mqtt/doc/images/quicksubscription.png %%QT_EXAMPLEDIR%%/mqtt/doc/images/simpleclient.png @@ -2223,6 +2367,7 @@ %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/CameraListPopup.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/CameraPropertyButton.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/CameraPropertyPopup.qml +%%QT_EXAMPLEDIR%%/multimedia/declarative-camera/FlashControl.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/Info.plist %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/Info.plist.in %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/PhotoCaptureControls.qml @@ -2288,6 +2433,8 @@ %%QT_EXAMPLEDIR%%/multimedia/screencapture/screencapturepreview.h %%QT_EXAMPLEDIR%%/multimedia/screencapture/screenlistmodel.cpp %%QT_EXAMPLEDIR%%/multimedia/screencapture/screenlistmodel.h +%%QT_EXAMPLEDIR%%/multimedia/screencapture/windowlistmodel.cpp +%%QT_EXAMPLEDIR%%/multimedia/screencapture/windowlistmodel.h %%QT_EXAMPLEDIR%%/multimedia/shared/shared.pri %%QT_EXAMPLEDIR%%/multimedia/spectrum/3rdparty/fftreal/Array.h %%QT_EXAMPLEDIR%%/multimedia/spectrum/3rdparty/fftreal/Array.hpp @@ -2346,6 +2493,7 @@ %%QT_EXAMPLEDIR%%/multimedia/spectrum/3rdparty/fftreal/test_settings.h %%QT_EXAMPLEDIR%%/multimedia/spectrum/3rdparty/fftreal/testapp.dpr %%QT_EXAMPLEDIR%%/multimedia/spectrum/CMakeLists.txt +%%QT_EXAMPLEDIR%%/multimedia/spectrum/Info.plist.in %%QT_EXAMPLEDIR%%/multimedia/spectrum/README.txt %%QT_EXAMPLEDIR%%/multimedia/spectrum/TODO.txt %%QT_EXAMPLEDIR%%/multimedia/spectrum/app.pro @@ -2493,6 +2641,7 @@ %%QT_EXAMPLEDIR%%/multimedia/video/recorder/doc/src/recorder.qdoc %%QT_EXAMPLEDIR%%/multimedia/video/recorder/main.cpp %%QT_EXAMPLEDIR%%/multimedia/video/recorder/main.qml +%%QT_EXAMPLEDIR%%/multimedia/video/recorder/main_no_permissions.qml %%QT_EXAMPLEDIR%%/multimedia/video/recorder/qmldir %%QT_EXAMPLEDIR%%/multimedia/video/video.pro %%QT_EXAMPLEDIR%%/multimedia/videographicsitem/CMakeLists.txt @@ -3000,10 +3149,12 @@ %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/CMakeLists.txt %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/document-open.svgz +%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-down-search.svgz %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-next-view-page.svgz %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-next-view.svgz %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-previous-view-page.svgz %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-previous-view.svgz +%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-up-search.svgz %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-fit-best.svgz %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-fit-width.svgz %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-in.svgz @@ -3016,6 +3167,8 @@ %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.ui %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pdfviewer.pro %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/resources.qrc +%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/searchresultdelegate.cpp +%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/searchresultdelegate.h %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h %%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro @@ -3031,22 +3184,60 @@ %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/main.cpp %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/simplelog.txt %%QT_EXAMPLEDIR%%/positioning/positioning.pro +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/ApplicationScreen.qml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/Button.qml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/CMakeLists.txt +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/Header.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/HelpPopup.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/LegendBox.qml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/Main.qml -%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/PositionAndStatus.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/PageButton.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/PermissionsScreen.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/PositionBox.qml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/RssiView.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/SatelliteView.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/SettingsView.qml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/SkyView.qml +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/Theme.qml %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/ViewSwitch.qml -%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/images/example-rssiview.png -%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/images/example-skyview.png +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/images/rssiview_settings.webp +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/images/skyview_tableview.webp %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/doc/src/satelliteinfo.qdoc +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/fonts/TitilliumWeb-Regular.ttf +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/fonts/TitilliumWeb-SemiBold.ttf +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/fonts/qt_attribution.json +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/checkbox.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/checkbox_blank.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/darkmode.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/filter.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/help.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/lightmode.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/place.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/qt_attribution.json +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/qtlogo_green.png +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/qtlogo_white.png +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/rssiview.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/satellite1.png +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/satellite2.png +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/satellite_small.png +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/search.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/settings.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/skyview.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/sort.svg +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/icons/tableview.svg %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/main.cpp %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/nmealog.txt %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/qmldir +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/roles.h %%QT_EXAMPLEDIR%%/positioning/satelliteinfo/satelliteinfo.pro +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/satellitemodel.cpp +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/satellitemodel.h +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/sortfiltermodel.cpp +%%QT_EXAMPLEDIR%%/positioning/satelliteinfo/sortfiltermodel.h %%QT_EXAMPLEDIR%%/positioning/shared/Info.cmake.ios.plist +%%QT_EXAMPLEDIR%%/positioning/shared/Info.cmake.macos.plist %%QT_EXAMPLEDIR%%/positioning/shared/Info.qmake.ios.plist +%%QT_EXAMPLEDIR%%/positioning/shared/Info.qmake.macos.plist %%QT_EXAMPLEDIR%%/positioning/weatherinfo/BigForecastIcon.qml %%QT_EXAMPLEDIR%%/positioning/weatherinfo/CMakeLists.txt %%QT_EXAMPLEDIR%%/positioning/weatherinfo/ForecastIcon.qml @@ -3590,6 +3781,7 @@ %%QT_EXAMPLEDIR%%/quick/draganddrop/draganddrop.qml %%QT_EXAMPLEDIR%%/quick/draganddrop/draganddrop.qmlproject %%QT_EXAMPLEDIR%%/quick/draganddrop/draganddrop.qrc +%%QT_EXAMPLEDIR%%/quick/draganddrop/external/externaldraganddrop.qml %%QT_EXAMPLEDIR%%/quick/draganddrop/main.cpp %%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DragTile.qml %%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DropTile.qml @@ -3605,15 +3797,6 @@ %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/main.qml %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/reflect.frag %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/reflect.frag.qsb -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/DragAndDropTextItem.qml -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/doc/images/qml-dnd2-example.png -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/doc/src/externaldraganddrop.qdoc -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/externaldraganddrop.pro -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/externaldraganddrop.qml -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/externaldraganddrop.qmlproject -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/externaldraganddrop.qrc -%%QT_EXAMPLEDIR%%/quick/externaldraganddrop/main.cpp %%QT_EXAMPLEDIR%%/quick/imageelements/BorderImageSelector.qml %%QT_EXAMPLEDIR%%/quick/imageelements/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/imageelements/ImageCell.qml @@ -3904,6 +4087,7 @@ %%QT_EXAMPLEDIR%%/quick/pointerhandlers/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/Button.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/CheckBox.qml +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/CorkPanel.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/FakeFlickable.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/FlashAnimation.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/LeftDrawer.qml @@ -3914,6 +4098,7 @@ %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/Slider.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/TouchpointFeedbackSprite.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/checkmark.png +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/cork.jpg %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/fingersprite.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/mixer-knob.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/mouse.png @@ -3921,6 +4106,9 @@ %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/mouse_middle.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/mouse_right.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/mouse_wheel_ridges.png +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/note-yellow.png +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/components/images/tack.png +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/corkboards.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/doc/images/pointerhandlers-example-fakeflickable.jpg %%QT_EXAMPLEDIR%%/quick/pointerhandlers/doc/images/pointerhandlers-example-fling.webp %%QT_EXAMPLEDIR%%/quick/pointerhandlers/doc/images/pointerhandlers-example-joystick.jpg @@ -3936,6 +4124,7 @@ %%QT_EXAMPLEDIR%%/quick/pointerhandlers/flingAnimation.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/images/arrowhead.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/images/balloon.png +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/images/blur-circle.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/images/cursor-airbrush.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/images/cursor-eraser.png %%QT_EXAMPLEDIR%%/quick/pointerhandlers/images/cursor-felt-marker.png @@ -3951,6 +4140,7 @@ %%QT_EXAMPLEDIR%%/quick/pointerhandlers/map.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/mixer.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/multibuttons.qml +%%QT_EXAMPLEDIR%%/quick/pointerhandlers/multiflame.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/pieMenu.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/pinchHandler.qml %%QT_EXAMPLEDIR%%/quick/pointerhandlers/pointerhandlers.pro @@ -4035,6 +4225,13 @@ %%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_opengl/rendercontrol_opengl.pro %%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp %%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.h +%%QT_EXAMPLEDIR%%/quick/responsivelayouts/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/responsivelayouts/doc/images/qtquicklayouts-example-responsivelayouts.png +%%QT_EXAMPLEDIR%%/quick/responsivelayouts/doc/src/qtquickresponsiveLayouts-examples.qdoc +%%QT_EXAMPLEDIR%%/quick/responsivelayouts/main.cpp +%%QT_EXAMPLEDIR%%/quick/responsivelayouts/responsivelayouts.pro +%%QT_EXAMPLEDIR%%/quick/responsivelayouts/responsivelayouts.qml +%%QT_EXAMPLEDIR%%/quick/responsivelayouts/responsivelayouts.qrc %%QT_EXAMPLEDIR%%/quick/scenegraph/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/scenegraph/customgeometry/beziercurve.cpp @@ -4061,7 +4258,7 @@ %%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/customrender.cpp %%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/customrender.h -%%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/doc/images/customrendernode-example.gif +%%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/doc/images/customrendernode-example.jpg %%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/doc/src/customrendernode.qdoc %%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/main.cpp %%QT_EXAMPLEDIR%%/quick/scenegraph/customrendernode/main.qml @@ -4078,17 +4275,6 @@ %%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/main.qml %%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/squircle.frag %%QT_EXAMPLEDIR%%/quick/scenegraph/d3d11underqml/squircle.vert -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/doc/images/fboitem-example.jpg -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/doc/src/fboitem.qdoc -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboinsgrenderer.cpp -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboinsgrenderer.h -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.pro -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.qrc -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.cpp -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.qml -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker.frag -%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker.frag.qsb %%QT_EXAMPLEDIR%%/quick/scenegraph/graph/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg %%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc @@ -4144,9 +4330,33 @@ %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/openglunderqml.qrc %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.cpp %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.h +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/doc/images/rhitextureitem-example.jpg +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/doc/src/rhitextureitem.qdoc +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/main.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/main.qml +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/checker.frag.qsb +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/logo.frag.qsb +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/logo.vert.qsb +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.h +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.pro +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.qrc +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/checker.frag +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/logo.frag +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/logo.vert +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/doc/images/rhiunderqml-example.jpg +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/doc/src/rhiunderqml.qdoc +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/main.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/main.qml +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/prebuilts_for_qmake/squircle_rhi.frag.qsb +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/prebuilts_for_qmake/squircle_rhi.vert.qsb +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/rhisquircle.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/rhisquircle.h +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/rhiunderqml.pro +%%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/rhiunderqml.qrc %%QT_EXAMPLEDIR%%/quick/scenegraph/scenegraph.pro -%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.cpp -%%QT_EXAMPLEDIR%%/quick/scenegraph/shared/logorenderer.h %%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.frag %%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.vert %%QT_EXAMPLEDIR%%/quick/scenegraph/threadedanimation/CMakeLists.txt @@ -4310,52 +4520,6 @@ %%QT_EXAMPLEDIR%%/quick/text/text.qml %%QT_EXAMPLEDIR%%/quick/text/text.qmlproject %%QT_EXAMPLEDIR%%/quick/text/text.qrc -%%QT_EXAMPLEDIR%%/quick/threading/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick/threading/doc/images/qml-threading-example.png -%%QT_EXAMPLEDIR%%/quick/threading/doc/src/threading.qdoc -%%QT_EXAMPLEDIR%%/quick/threading/main.cpp -%%QT_EXAMPLEDIR%%/quick/threading/threadedlistmodel/dataloader.mjs -%%QT_EXAMPLEDIR%%/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc -%%QT_EXAMPLEDIR%%/quick/threading/threadedlistmodel/threadedlistmodel.qmlproject -%%QT_EXAMPLEDIR%%/quick/threading/threadedlistmodel/timedisplay.qml -%%QT_EXAMPLEDIR%%/quick/threading/threading.pro -%%QT_EXAMPLEDIR%%/quick/threading/threading.qml -%%QT_EXAMPLEDIR%%/quick/threading/threading.qmlproject -%%QT_EXAMPLEDIR%%/quick/threading/threading.qrc -%%QT_EXAMPLEDIR%%/quick/threading/workerscript/Spinner.qml -%%QT_EXAMPLEDIR%%/quick/threading/workerscript/workerscript.mjs -%%QT_EXAMPLEDIR%%/quick/threading/workerscript/workerscript.qml -%%QT_EXAMPLEDIR%%/quick/threading/workerscript/workerscript.qmlproject -%%QT_EXAMPLEDIR%%/quick/touchinteraction/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick/touchinteraction/doc/images/qml-touchinteraction-example.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/doc/src/touchinteraction.qdoc -%%QT_EXAMPLEDIR%%/quick/touchinteraction/flickable/Panel.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/flickable/basic-flickable.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/flickable/cork.jpg -%%QT_EXAMPLEDIR%%/quick/touchinteraction/flickable/corkboards.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/flickable/note-yellow.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/flickable/tack.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/main.cpp -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/AugmentedTouchPoint.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/Bear0.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/Bear1.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/Bear2.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/Bear3.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/BearB.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/BearWhackParticleSystem.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/ParticleFlame.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/bearwhack.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/blur-circle.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/blur-circle3.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/heart-blur.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/multiflame.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/multipointtouch/title.png -%%QT_EXAMPLEDIR%%/quick/touchinteraction/pincharea/flickresize.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/pincharea/qt-logo.jpg -%%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.pro -%%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.qml -%%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.qmlproject -%%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.qrc %%QT_EXAMPLEDIR%%/quick/tutorials/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/CMakeLists.txt @@ -4553,15 +4717,16 @@ %%QT_EXAMPLEDIR%%/quick3d/customeffect/qml.qrc %%QT_EXAMPLEDIR%%/quick3d/customeffect/qt_logo_rect.png %%QT_EXAMPLEDIR%%/quick3d/customgeometry/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/customgeometry/Main.qml +%%QT_EXAMPLEDIR%%/quick3d/customgeometry/TorusMesh.qml %%QT_EXAMPLEDIR%%/quick3d/customgeometry/customgeometry.pro %%QT_EXAMPLEDIR%%/quick3d/customgeometry/doc/images/customgeometry-example.jpg %%QT_EXAMPLEDIR%%/quick3d/customgeometry/doc/src/qtquick3d-examples-customgeometry.qdoc %%QT_EXAMPLEDIR%%/quick3d/customgeometry/examplegeometry.cpp %%QT_EXAMPLEDIR%%/quick3d/customgeometry/examplegeometry.h %%QT_EXAMPLEDIR%%/quick3d/customgeometry/main.cpp -%%QT_EXAMPLEDIR%%/quick3d/customgeometry/main.qml +%%QT_EXAMPLEDIR%%/quick3d/customgeometry/qmldir %%QT_EXAMPLEDIR%%/quick3d/customgeometry/qt_logo_rect.png -%%QT_EXAMPLEDIR%%/quick3d/customgeometry/resources.qrc %%QT_EXAMPLEDIR%%/quick3d/custominstancing/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/custominstancing/cppinstancetable.cpp %%QT_EXAMPLEDIR%%/quick3d/custominstancing/cppinstancetable.h @@ -4622,22 +4787,6 @@ %%QT_EXAMPLEDIR%%/quick3d/dynamiccreation/main.qml %%QT_EXAMPLEDIR%%/quick3d/dynamiccreation/qml.qrc %%QT_EXAMPLEDIR%%/quick3d/dynamiccreation/weirdShape.mesh -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/CorkBoards.qml -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/Doors.qml -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/content/Panel.qml -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/content/cork.jpg -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/content/note-yellow.png -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/content/tack.png -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/doc/images/dynamictexture.png -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/doc/src/dynamictexture.qdoc -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/dynamictexture.pro -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/main.cpp -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/main.qml -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/meshes/door1.mesh -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/meshes/door2.mesh -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/meshes/wall.mesh -%%QT_EXAMPLEDIR%%/quick3d/dynamictexture/qml.qrc %%QT_EXAMPLEDIR%%/quick3d/hellocube/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/hellocube/doc/images/hellocube.png %%QT_EXAMPLEDIR%%/quick3d/hellocube/doc/src/hellocube.qdoc @@ -4675,20 +4824,23 @@ %%QT_EXAMPLEDIR%%/quick3d/intro/main.cpp %%QT_EXAMPLEDIR%%/quick3d/intro/main.qml %%QT_EXAMPLEDIR%%/quick3d/intro/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/lights/+windows/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quick3d/lights/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quick3d/lights/CustomCheckBox.qml -%%QT_EXAMPLEDIR%%/quick3d/lights/CustomSlider.qml %%QT_EXAMPLEDIR%%/quick3d/lights/RotatingTeaPot.qml +%%QT_EXAMPLEDIR%%/quick3d/lights/SettingsDrawer.qml %%QT_EXAMPLEDIR%%/quick3d/lights/custom.vert -%%QT_EXAMPLEDIR%%/quick3d/lights/doc/images/lights-example.png +%%QT_EXAMPLEDIR%%/quick3d/lights/doc/images/lights-example.jpg %%QT_EXAMPLEDIR%%/quick3d/lights/doc/src/qtquick3d-examples-lights.qdoc %%QT_EXAMPLEDIR%%/quick3d/lights/icon_settings.png +%%QT_EXAMPLEDIR%%/quick3d/lights/icon_settings@2x.png +%%QT_EXAMPLEDIR%%/quick3d/lights/icon_settings@3x.png +%%QT_EXAMPLEDIR%%/quick3d/lights/icon_settings@4x.png %%QT_EXAMPLEDIR%%/quick3d/lights/lights.pro %%QT_EXAMPLEDIR%%/quick3d/lights/main.cpp %%QT_EXAMPLEDIR%%/quick3d/lights/main.qml %%QT_EXAMPLEDIR%%/quick3d/lights/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/lights/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quick3d/lights/teapot.mesh -%%QT_EXAMPLEDIR%%/quick3d/lights/white.png %%QT_EXAMPLEDIR%%/quick3d/lodhelper/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/lodhelper/doc/images/lodhelper-example.jpg %%QT_EXAMPLEDIR%%/quick3d/lodhelper/doc/src/qtquick3d-example-lodhelper.qdoc @@ -4722,81 +4874,83 @@ %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/materials.qrc %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/offlineshaders.pro %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/particles3d/AlignedParticles.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/AnimatedSprite.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/AppSettings.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/AttractorShapes.qml %%QT_EXAMPLEDIR%%/quick3d/particles3d/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/particles3d/ColorfulParticles.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/CustomCheckBox.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/CustomLabel.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/CustomSelectionBox.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/CustomSlider.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/DynamicBursts.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/EmitAndBurst.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/EmitterCustomShapes.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/EmitterShapes.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/FadingInOut.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/Fire.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/HeartTrail.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/Lights.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/LineParticles.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/LoggingView.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/ModelBlendParticles.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/ModelShape.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/OceanSpider.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/QtLogoAnimation.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/SettingsView.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/Snowing.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/Sorting.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/Speedometer.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/StartupView.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/SystemPlayPause.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/TrailEmitterBurst.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/data/heart_4096.cbor +%%QT_EXAMPLEDIR%%/quick3d/particles3d/data/qt_logo_in_4096.cbor +%%QT_EXAMPLEDIR%%/quick3d/particles3d/data/qt_logo_out_4096.cbor %%QT_EXAMPLEDIR%%/quick3d/particles3d/doc/images/particles3d-loggingview.jpg %%QT_EXAMPLEDIR%%/quick3d/particles3d/doc/images/particles3d-settings.jpg %%QT_EXAMPLEDIR%%/quick3d/particles3d/doc/images/particles3d-snowing.jpg %%QT_EXAMPLEDIR%%/quick3d/particles3d/doc/images/particles3d-testbed.jpg %%QT_EXAMPLEDIR%%/quick3d/particles3d/doc/src/qtquick3d-examples-particles3d.qdoc +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/arrow_icon.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/bear_black.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/colorTable.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/color_table2.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/color_table3.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/color_table4.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/color_table5.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/dot.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/dust.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/explosion_01_strip13.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/icon_interval.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/icon_logging.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/icon_pause.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/icon_play.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/icon_settings.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/leather_n.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/license.txt +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/qt_logo.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/qt_logo2.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/qt_logo2_n.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/smoke.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/smoke_sprite.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/snowflake.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/speedometer_labels.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/sphere.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/sprite_09.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/star.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/star2.png +%%QT_EXAMPLEDIR%%/quick3d/particles3d/images/star3.png %%QT_EXAMPLEDIR%%/quick3d/particles3d/main.cpp +%%QT_EXAMPLEDIR%%/quick3d/particles3d/main.qml +%%QT_EXAMPLEDIR%%/quick3d/particles3d/meshes/meter_background.mesh +%%QT_EXAMPLEDIR%%/quick3d/particles3d/meshes/meter_edge.mesh +%%QT_EXAMPLEDIR%%/quick3d/particles3d/meshes/oldqtlogo.mesh +%%QT_EXAMPLEDIR%%/quick3d/particles3d/meshes/suzanne.mesh %%QT_EXAMPLEDIR%%/quick3d/particles3d/particles3d.pro %%QT_EXAMPLEDIR%%/quick3d/particles3d/qml.qrc -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/AlignedParticles.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/AnimatedSprite.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/AttractorShapes.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/ColorfulParticles.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/CustomCheckBox.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/CustomLabel.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/CustomSelectionBox.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/CustomSlider.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/DynamicBursts.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/EmitAndBurst.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/EmitterCustomShapes.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/EmitterShapes.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/FadingInOut.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/Fire.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/HeartTrail.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/Lights.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/LineParticles.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/LoggingView.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/ModelBlendParticles.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/ModelShape.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/OceanSpider.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/QtLogoAnimation.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/SettingsView.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/Snowing.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/Sorting.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/Speedometer.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/StartupView.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/SystemPlayPause.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/TrailEmitterBurst.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/data/heart_4096.cbor -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/data/qt_logo_in_4096.cbor -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/data/qt_logo_out_4096.cbor -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/arrow_icon.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/bear_black.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/colorTable.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/color_table2.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/color_table3.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/color_table4.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/color_table5.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/dot.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/dust.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/explosion_01_strip13.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/icon_interval.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/icon_logging.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/icon_pause.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/icon_play.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/icon_settings.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/leather_n.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/license.txt -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/qt_logo.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/qt_logo2.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/qt_logo2_n.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/smoke.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/smoke_sprite.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/snowflake.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/speedometer_labels.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/sphere.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/sprite_09.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/star.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/star2.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/images/star3.png -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/main.qml -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/meshes/meter_background.mesh -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/meshes/meter_edge.mesh -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/meshes/oldqtlogo.mesh -%%QT_EXAMPLEDIR%%/quick3d/particles3d/qml/meshes/suzanne.mesh +%%QT_EXAMPLEDIR%%/quick3d/particles3d/qmldir %%QT_EXAMPLEDIR%%/quick3d/picking/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/picking/doc/images/picking-example.png %%QT_EXAMPLEDIR%%/quick3d/picking/doc/src/qtquick3d-examples-picking.qdoc @@ -4847,14 +5001,14 @@ %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/principledmaterial.pro %%QT_EXAMPLEDIR%%/quick3d/principledmaterial/qml.qrc %%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/Main.qml %%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/doc/images/proceduraltexture-example.jpg %%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/doc/src/qtquick3d-examples-proceduraltexture.qdoc %%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/gradienttexture.cpp %%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/gradienttexture.h %%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/main.cpp -%%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/main.qml %%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/proceduraltexture.pro -%%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/qml.qrc +%%QT_EXAMPLEDIR%%/quick3d/proceduraltexture/qmldir %%QT_EXAMPLEDIR%%/quick3d/quick3d.pro %%QT_EXAMPLEDIR%%/quick3d/quickball/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick3d/quickball/doc/images/quickball-ball.png @@ -5250,6 +5404,36 @@ %%QT_EXAMPLEDIR%%/quickcontrols/eventcalendar/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols/eventcalendar/sqleventdatabase.cpp %%QT_EXAMPLEDIR%%/quickcontrols/eventcalendar/sqleventdatabase.h +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/CMakeLists.txt +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/Main.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/doc/images/qtquickcontrols-filesystemexplorer.webp +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/doc/src/qtquickcontrols-filesystemexplorer.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/filesystemexplorer.pro +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/filesystemmodel.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/filesystemmodel.h +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/app_icon.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/folder_closed.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/folder_open.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/generic_file.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/globe.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/info_sign.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/light_bulb.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/qt_logo.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/read.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/icons/resize.svg +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/linenumbermodel.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/linenumbermodel.h +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/main.cpp +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/About.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/Colors.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/Editor.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/FileSystemView.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/MyMenu.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/MyMenuBar.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/ResizeButton.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/Sidebar.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qml/WindowDragHandler.qml +%%QT_EXAMPLEDIR%%/quickcontrols/filesystemexplorer/qmldir %%QT_EXAMPLEDIR%%/quickcontrols/flatstyle/CMakeLists.txt %%QT_EXAMPLEDIR%%/quickcontrols/flatstyle/MainForm.ui.qml %%QT_EXAMPLEDIR%%/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle-creator.png @@ -5481,27 +5665,6 @@ %%QT_EXAMPLEDIR%%/quickcontrols/ios/todolist/src/main.cpp %%QT_EXAMPLEDIR%%/quickcontrols/ios/todolist/todolist.pro %%QT_EXAMPLEDIR%%/quickcontrols/quickcontrols.pro -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-landscape.png -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-portrait.png -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/doc/src/qtquickcontrols-sidepanel.qdoc -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/images/qt-logo.png -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/images/qt-logo@2x.png -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/images/qt-logo@3x.png -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/images/qt-logo@4x.png -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/qtquickcontrols2.conf -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/sidepanel.cpp -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/sidepanel.pro -%%QT_EXAMPLEDIR%%/quickcontrols/sidepanel/sidepanel.qml -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/CMakeLists.txt -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/doc/images/qtquickcontrols-swipetoremove.gif -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/doc/images/qtquickcontrols-swipetoremove.png -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/doc/src/qtquickcontrols-swipetoremove.qdoc -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/fonts/LICENSE.txt -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/fonts/fontello.ttf -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/swipetoremove.cpp -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/swipetoremove.pro -%%QT_EXAMPLEDIR%%/quickcontrols/swipetoremove/swipetoremove.qml %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/+touch/texteditor.html %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/CMakeLists.txt %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/creatorKateHighlighter.png @@ -6331,25 +6494,9 @@ %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/default.svg %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/v-slider-handle.svg %%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/main.cpp -%%QT_EXAMPLEDIR%%/svg/richtext/CMakeLists.txt -%%QT_EXAMPLEDIR%%/svg/richtext/richtext.pro -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/CMakeLists.txt -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/doc/images/textobject-example.png -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/doc/src/textobject.qdoc -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/files/heart.svg -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/main.cpp -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/resources.qrc -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/svgtextobject.cpp -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/svgtextobject.h -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/textobject.pro -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/window.cpp -%%QT_EXAMPLEDIR%%/svg/richtext/textobject/window.h -%%QT_EXAMPLEDIR%%/svg/svg.pro %%QT_EXAMPLEDIR%%/svg/svggenerator/CMakeLists.txt %%QT_EXAMPLEDIR%%/svg/svggenerator/displaywidget.cpp %%QT_EXAMPLEDIR%%/svg/svggenerator/displaywidget.h -%%QT_EXAMPLEDIR%%/svg/svggenerator/doc/images/svggenerator-example.png -%%QT_EXAMPLEDIR%%/svg/svggenerator/doc/src/svggenerator.qdoc %%QT_EXAMPLEDIR%%/svg/svggenerator/forms/window.ui %%QT_EXAMPLEDIR%%/svg/svggenerator/main.cpp %%QT_EXAMPLEDIR%%/svg/svggenerator/resources/shapes.dat @@ -6358,8 +6505,6 @@ %%QT_EXAMPLEDIR%%/svg/svggenerator/window.cpp %%QT_EXAMPLEDIR%%/svg/svggenerator/window.h %%QT_EXAMPLEDIR%%/svg/svgviewer/CMakeLists.txt -%%QT_EXAMPLEDIR%%/svg/svgviewer/doc/images/svgviewer-example.png -%%QT_EXAMPLEDIR%%/svg/svgviewer/doc/src/svgviewer.qdoc %%QT_EXAMPLEDIR%%/svg/svgviewer/exportdialog.cpp %%QT_EXAMPLEDIR%%/svg/svgviewer/exportdialog.h %%QT_EXAMPLEDIR%%/svg/svgviewer/files/bubbles.svg @@ -6372,6 +6517,15 @@ %%QT_EXAMPLEDIR%%/svg/svgviewer/svgview.h %%QT_EXAMPLEDIR%%/svg/svgviewer/svgviewer.pro %%QT_EXAMPLEDIR%%/svg/svgviewer/svgviewer.qrc +%%QT_EXAMPLEDIR%%/svg/textobject/CMakeLists.txt +%%QT_EXAMPLEDIR%%/svg/textobject/files/heart.svg +%%QT_EXAMPLEDIR%%/svg/textobject/main.cpp +%%QT_EXAMPLEDIR%%/svg/textobject/resources.qrc +%%QT_EXAMPLEDIR%%/svg/textobject/svgtextobject.cpp +%%QT_EXAMPLEDIR%%/svg/textobject/svgtextobject.h +%%QT_EXAMPLEDIR%%/svg/textobject/textobject.pro +%%QT_EXAMPLEDIR%%/svg/textobject/window.cpp +%%QT_EXAMPLEDIR%%/svg/textobject/window.h %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmDelegate.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmDialog.qml %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmModel.qml @@ -6480,6 +6634,8 @@ %%QT_EXAMPLEDIR%%/wayland/custom-extension/cpp-client/cpp-client.pro %%QT_EXAMPLEDIR%%/wayland/custom-extension/cpp-client/main.cpp %%QT_EXAMPLEDIR%%/wayland/custom-extension/custom-extension.pro +%%QT_EXAMPLEDIR%%/wayland/custom-extension/doc/images/custom-extension.png +%%QT_EXAMPLEDIR%%/wayland/custom-extension/doc/src/custom-extension.qdoc %%QT_EXAMPLEDIR%%/wayland/custom-extension/protocol/custom.xml %%QT_EXAMPLEDIR%%/wayland/custom-extension/qml-client/CMakeLists.txt %%QT_EXAMPLEDIR%%/wayland/custom-extension/qml-client/main.cpp @@ -6509,11 +6665,16 @@ %%QT_EXAMPLEDIR%%/wayland/custom-shell/doc/images/custom-shell.jpg %%QT_EXAMPLEDIR%%/wayland/custom-shell/doc/src/custom-shell.qdoc %%QT_EXAMPLEDIR%%/wayland/custom-shell/protocol/example-shell.xml -%%QT_EXAMPLEDIR%%/wayland/hwlayer-compositor/CMakeLists.txt -%%QT_EXAMPLEDIR%%/wayland/hwlayer-compositor/hwlayer-compositor.pro -%%QT_EXAMPLEDIR%%/wayland/hwlayer-compositor/hwlayer-compositor.qrc -%%QT_EXAMPLEDIR%%/wayland/hwlayer-compositor/main.cpp -%%QT_EXAMPLEDIR%%/wayland/hwlayer-compositor/main.qml +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/CMakeLists.txt +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/doc/src/fancy-compositor.qdoc +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/fancy-compositor.pro +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/fancy-compositor.qrc +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/images/background.jpg +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/main.cpp +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/qml/Chrome.qml +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/qml/CompositorScreen.qml +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/qml/Keyboard.qml +%%QT_EXAMPLEDIR%%/wayland/fancy-compositor/qml/main.qml %%QT_EXAMPLEDIR%%/wayland/ivi-compositor/CMakeLists.txt %%QT_EXAMPLEDIR%%/wayland/ivi-compositor/doc/images/ivi-compositor-1.png %%QT_EXAMPLEDIR%%/wayland/ivi-compositor/doc/images/ivi-compositor-2.png @@ -6567,16 +6728,6 @@ %%QT_EXAMPLEDIR%%/wayland/overview-compositor/main.qml %%QT_EXAMPLEDIR%%/wayland/overview-compositor/overview-compositor.pro %%QT_EXAMPLEDIR%%/wayland/overview-compositor/overview-compositor.qrc -%%QT_EXAMPLEDIR%%/wayland/pure-qml/CMakeLists.txt -%%QT_EXAMPLEDIR%%/wayland/pure-qml/doc/src/pure-qml.qdoc -%%QT_EXAMPLEDIR%%/wayland/pure-qml/images/background.jpg -%%QT_EXAMPLEDIR%%/wayland/pure-qml/main.cpp -%%QT_EXAMPLEDIR%%/wayland/pure-qml/pure-qml.pro -%%QT_EXAMPLEDIR%%/wayland/pure-qml/pure-qml.qrc -%%QT_EXAMPLEDIR%%/wayland/pure-qml/qml/Chrome.qml -%%QT_EXAMPLEDIR%%/wayland/pure-qml/qml/CompositorScreen.qml -%%QT_EXAMPLEDIR%%/wayland/pure-qml/qml/Keyboard.qml -%%QT_EXAMPLEDIR%%/wayland/pure-qml/qml/main.qml %%QT_EXAMPLEDIR%%/wayland/qtshell/CMakeLists.txt %%QT_EXAMPLEDIR%%/wayland/qtshell/doc/images/qtshell.jpg %%QT_EXAMPLEDIR%%/wayland/qtshell/doc/src/qtshell.qdoc @@ -6683,6 +6834,7 @@ %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/icons/3rdparty/qt_attribution.json %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/icons/3rdparty/view-refresh.png %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/main.cpp +%%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/quicknanobrowser.exe.manifest %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/quicknanobrowser.pro %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/resources.qrc %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/utils.h @@ -6844,6 +6996,7 @@ %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/downloadwidget.ui %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/main.cpp %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/passworddialog.ui +%%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/simplebrowser.exe.manifest %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/simplebrowser.pro %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/tabwidget.cpp %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/tabwidget.h diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile index 1461b800e309..279957ffa5eb 100644 --- a/multimedia/qt6-multimedia/Makefile +++ b/multimedia/qt6-multimedia/Makefile @@ -1,5 +1,5 @@ PORTNAME= multimedia -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= multimedia PKGNAMEPREFIX= qt6- @@ -10,9 +10,9 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++11-lang gl localbase:ldflags pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt-dist:6 USE_GL= gl opengl -USE_QT= base declarative shadertools svg +USE_QT= base declarative CXXFLAGS_powerpc64= -mvsx CFLAGS_powerpc= -DPFFFT_SIMD_DISABLE @@ -39,7 +39,7 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= FEATURE_pulseaudio Q3D_DESC= Spatial Audio via Quick3D -Q3D_USE= QT=quick3d +Q3D_USE= QT=quick3d,shadertools Q3D_CMAKE_BOOL= FEATURE_spatialaudio_quick3d V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index 3d8f7199d5a7..539677d5fb0a 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931942 -SHA256 (KDE/Qt/6.5.3/qtmultimedia-everywhere-src-6.5.3.tar.xz) = ed64f3d2bb98c20cd12df19dbf84dc0233d9fcb2078fea812adf42eef9a0ff27 -SIZE (KDE/Qt/6.5.3/qtmultimedia-everywhere-src-6.5.3.tar.xz) = 6560208 +TIMESTAMP = 1697050146 +SHA256 (KDE/Qt/6.6.0/qtmultimedia-everywhere-src-6.6.0.tar.xz) = ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782 +SIZE (KDE/Qt/6.6.0/qtmultimedia-everywhere-src-6.6.0.tar.xz) = 6575240 diff --git a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..5b783c6ccaaf --- /dev/null +++ b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt @@ -0,0 +1,14 @@ +Prevent building spatialaudio_quick3d if quick3d is installed and the feature +is disabled. + +--- src/CMakeLists.txt.orig 2023-11-08 02:47:23 UTC ++++ src/CMakeLists.txt +@@ -16,7 +16,7 @@ endif() + if(TARGET Qt::Quick) + add_subdirectory(multimediaquick) + endif() +-if(TARGET Qt::Quick3D AND QT_FEATURE_spatialaudio) ++if(TARGET Qt::Quick3D AND QT_FEATURE_spatialaudio AND QT_FEATURE_spatialaudio_quick3d) + add_subdirectory(spatialaudioquick3d) + endif() + diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake index 690fae6320f6..70bcb85ffad6 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake @@ -1,6 +1,6 @@ ---- src/multimedia/configure.cmake.orig 2022-12-12 19:36:40 UTC +--- src/multimedia/configure.cmake.orig 2023-10-03 20:42:53 UTC +++ src/multimedia/configure.cmake -@@ -73,7 +73,7 @@ qt_feature("ffmpeg" PRIVATE +@@ -76,7 +76,7 @@ qt_feature("ffmpeg" PRIVATE LABEL "FFmpeg" ENABLE INPUT_ffmpeg STREQUAL 'yes' DISABLE INPUT_ffmpeg STREQUAL 'no' diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h index e55cab937398..7b34e678c026 100644 --- a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h +++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h @@ -1,4 +1,4 @@ ---- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2022-12-12 19:36:40 UTC +--- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2023-10-03 20:42:53 UTC +++ src/plugins/multimedia/ffmpeg/qv4l2camera_p.h @@ -23,6 +23,8 @@ #include <qsocketnotifier.h> @@ -8,4 +8,4 @@ + QT_BEGIN_NAMESPACE - class QV4L2CameraDevices : public QObject, + class QV4L2CameraDevices : public QPlatformVideoDevices diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index 72103a17c95d..e0d719a3ccb1 100644 --- a/multimedia/qt6-multimedia/pkg-plist +++ b/multimedia/qt6-multimedia/pkg-plist @@ -7,10 +7,10 @@ %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioengine_pulse_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_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/qcamera_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcameradevice_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcapturablewindow_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplayer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediarecorder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h @@ -20,6 +20,7 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudioinput_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudiooutput_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformcamera_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformcapturablewindows_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformimagecapture_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformmediacapture_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformmediadevices_p.h @@ -58,6 +59,7 @@ %%QT_INCDIR%%/QtMultimedia/QCamera %%QT_INCDIR%%/QtMultimedia/QCameraDevice %%QT_INCDIR%%/QtMultimedia/QCameraFormat +%%QT_INCDIR%%/QtMultimedia/QCapturableWindow %%QT_INCDIR%%/QtMultimedia/QImageCapture %%QT_INCDIR%%/QtMultimedia/QMediaCaptureSession %%QT_INCDIR%%/QtMultimedia/QMediaDevices @@ -72,6 +74,7 @@ %%QT_INCDIR%%/QtMultimedia/QVideoFrameFormat %%QT_INCDIR%%/QtMultimedia/QVideoSink %%QT_INCDIR%%/QtMultimedia/QWaveDecoder +%%QT_INCDIR%%/QtMultimedia/QWindowCapture %%QT_INCDIR%%/QtMultimedia/QtMultimedia %%QT_INCDIR%%/QtMultimedia/QtMultimediaDepends %%QT_INCDIR%%/QtMultimedia/QtMultimediaVersion @@ -86,6 +89,7 @@ %%QT_INCDIR%%/QtMultimedia/qaudiosource.h %%QT_INCDIR%%/QtMultimedia/qcamera.h %%QT_INCDIR%%/QtMultimedia/qcameradevice.h +%%QT_INCDIR%%/QtMultimedia/qcapturablewindow.h %%QT_INCDIR%%/QtMultimedia/qimagecapture.h %%QT_INCDIR%%/QtMultimedia/qmediacapturesession.h %%QT_INCDIR%%/QtMultimedia/qmediadevices.h @@ -106,6 +110,7 @@ %%QT_INCDIR%%/QtMultimedia/qvideoframeformat.h %%QT_INCDIR%%/QtMultimedia/qvideosink.h %%QT_INCDIR%%/QtMultimedia/qwavedecoder.h +%%QT_INCDIR%%/QtMultimedia/qwindowcapture.h %%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qquickimagecapture_p.h %%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qquickimagepreviewprovider_p.h %%QT_INCDIR%%/QtMultimediaQuick/%%FULLVER%%/QtMultimediaQuick/private/qquickmediaplayer_p.h diff --git a/net/Makefile b/net/Makefile index 0cafc8732ad4..22889a2a64aa 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1185,6 +1185,7 @@ SUBDIR += qrcp SUBDIR += qt5-network SUBDIR += qt5-networkauth + SUBDIR += qt6-coap SUBDIR += qt6-networkauth SUBDIR += quagga SUBDIR += quiche diff --git a/net/py-qt6-networkauth/distinfo b/net/py-qt6-networkauth/distinfo index 272bbdf0511b..a7675b2301fe 100644 --- a/net/py-qt6-networkauth/distinfo +++ b/net/py-qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690218389 -SHA256 (PyQt6_NetworkAuth-6.5.0.tar.gz) = 7170db3f99e13aef855d9d52a00a8baa2dea92d12f9b441fed9c6dec57f83e09 -SIZE (PyQt6_NetworkAuth-6.5.0.tar.gz) = 19997 +TIMESTAMP = 1698901185 +SHA256 (PyQt6_NetworkAuth-6.6.0.tar.gz) = cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb +SIZE (PyQt6_NetworkAuth-6.6.0.tar.gz) = 20114 diff --git a/net/py-qt6-networkauth/pkg-plist b/net/py-qt6-networkauth/pkg-plist index da4d275d662a..ab45331481d9 100644 --- a/net/py-qt6-networkauth/pkg-plist +++ b/net/py-qt6-networkauth/pkg-plist @@ -1,4 +1,5 @@ %%PYQT_APIDIR%%/PyQt6-NetworkAuth.api +%%PYQT_SIPDIR%%/QtNetworkAuth/QtNetworkAuth.toml %%PYQT_SIPDIR%%/QtNetworkAuth/QtNetworkAuthmod.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qabstractoauth.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qabstractoauth2.sip @@ -9,7 +10,6 @@ %%PYQT_SIPDIR%%/QtNetworkAuth/qoauthhttpserverreplyhandler.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qoauthoobreplyhandler.sip %%PYTHON_SITELIBDIR%%/PyQt6/QtNetworkAuth.abi%%PYTHON_MAJOR_VER%%.so -%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetworkAuth/QtNetworkAuth.toml %%PYTHON_SITELIBDIR%%/PyQt6_NetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/INSTALLER %%PYTHON_SITELIBDIR%%/PyQt6_NetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/METADATA %%PYTHON_SITELIBDIR%%/PyQt6_NetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/RECORD diff --git a/net/qt6-coap/Makefile b/net/qt6-coap/Makefile new file mode 100644 index 000000000000..7b3e521da6b3 --- /dev/null +++ b/net/qt6-coap/Makefile @@ -0,0 +1,15 @@ +PORTNAME= coap +DISTVERSIONPREFIX= v +DISTVERSION= ${QT6_VERSION} +CATEGORIES= net +PKGNAMEPREFIX= qt6- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt6 CoAP client module + +USES= cmake compiler:c++17-lang qt-dist:6 +USE_GITHUB= yes +GH_TUPLE= qt:qtcoap:${DISTVERSIONFULL} +USE_QT= base + +.include <bsd.port.mk> diff --git a/net/qt6-coap/distinfo b/net/qt6-coap/distinfo new file mode 100644 index 000000000000..2fdb2ba1c8c3 --- /dev/null +++ b/net/qt6-coap/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1699369669 +SHA256 (KDE/Qt/6.6.0/qt-qtcoap-v6.6.0_GH0.tar.gz) = 9e2672bd0c59659dfe8265c68cd405d93a2247f6023a8524c20b481805c94133 +SIZE (KDE/Qt/6.6.0/qt-qtcoap-v6.6.0_GH0.tar.gz) = 183048 diff --git a/net/qt6-coap/pkg-descr b/net/qt6-coap/pkg-descr new file mode 100644 index 000000000000..68c4676ce67e --- /dev/null +++ b/net/qt6-coap/pkg-descr @@ -0,0 +1,13 @@ +Constrained Application Protocol (CoAP) is an IoT protocol that is +specifically designed for M2M data exchange between constrained devices +(such as microcontrollers) in constrained networks. + +The interaction model of CoAP is similar to the client/server model of +HTTP, but unlike HTTP, it uses datagram-oriented connectionless transport +such as UDP, which leads to a very low overhead and allows UDP broadcast +and multicast to be used for addressing. At the same time it provides +lightweight reliability mechanisms and security. + +Qt CoAP implements the client side of CoAP. By default, the transport +layer uses QUdpSocket and QDtls for security. Alternative transports can +be used by implementing the QCoapConnection interface. diff --git a/net/qt6-coap/pkg-plist b/net/qt6-coap/pkg-plist new file mode 100644 index 000000000000..d5bdd8f77102 --- /dev/null +++ b/net/qt6-coap/pkg-plist @@ -0,0 +1,58 @@ +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapclient_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapconnection_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapinternalmessage_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapinternalreply_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapinternalrequest_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapmessage_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapnamespace_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapoption_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapprotocol_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapqudpconnection_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapreply_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoaprequest_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapresource_p.h +%%QT_INCDIR%%/QtCoap/%%FULLVER%%/QtCoap/private/qcoapresourcediscoveryreply_p.h +%%QT_INCDIR%%/QtCoap/QCoapClient +%%QT_INCDIR%%/QtCoap/QCoapMessage +%%QT_INCDIR%%/QtCoap/QCoapMessageId +%%QT_INCDIR%%/QtCoap/QCoapOption +%%QT_INCDIR%%/QtCoap/QCoapPrivateKey +%%QT_INCDIR%%/QtCoap/QCoapReply +%%QT_INCDIR%%/QtCoap/QCoapRequest +%%QT_INCDIR%%/QtCoap/QCoapResource +%%QT_INCDIR%%/QtCoap/QCoapResourceDiscoveryReply +%%QT_INCDIR%%/QtCoap/QCoapSecurityConfiguration +%%QT_INCDIR%%/QtCoap/QCoapToken +%%QT_INCDIR%%/QtCoap/QtCoap +%%QT_INCDIR%%/QtCoap/QtCoapDepends +%%QT_INCDIR%%/QtCoap/QtCoapVersion +%%QT_INCDIR%%/QtCoap/qcoapclient.h +%%QT_INCDIR%%/QtCoap/qcoapglobal.h +%%QT_INCDIR%%/QtCoap/qcoapmessage.h +%%QT_INCDIR%%/QtCoap/qcoapnamespace.h +%%QT_INCDIR%%/QtCoap/qcoapoption.h +%%QT_INCDIR%%/QtCoap/qcoapreply.h +%%QT_INCDIR%%/QtCoap/qcoaprequest.h +%%QT_INCDIR%%/QtCoap/qcoapresource.h +%%QT_INCDIR%%/QtCoap/qcoapresourcediscoveryreply.h +%%QT_INCDIR%%/QtCoap/qcoapsecurityconfiguration.h +%%QT_INCDIR%%/QtCoap/qtcoapexports.h +%%QT_INCDIR%%/QtCoap/qtcoapversion.h +lib/cmake/Qt6BuildInternals/StandaloneTests/QtCoapTestsConfig.cmake +lib/cmake/Qt6Coap/Qt6CoapAdditionalTargetInfo.cmake +lib/cmake/Qt6Coap/Qt6CoapConfig.cmake +lib/cmake/Qt6Coap/Qt6CoapConfigVersion.cmake +lib/cmake/Qt6Coap/Qt6CoapConfigVersionImpl.cmake +lib/cmake/Qt6Coap/Qt6CoapDependencies.cmake +lib/cmake/Qt6Coap/Qt6CoapTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Coap/Qt6CoapTargets.cmake +lib/cmake/Qt6Coap/Qt6CoapVersionlessTargets.cmake +%%QT_LIBDIR%%/libQt6Coap.prl +%%QT_LIBDIR%%/libQt6Coap.so +%%QT_LIBDIR%%/libQt6Coap.so.6 +%%QT_LIBDIR%%/libQt6Coap.so.%%FULLVER%% +%%QT_LIBDIR%%/metatypes/qt6coap_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_MKSPECDIR%%/modules/qt_lib_coap.pri +%%QT_MKSPECDIR%%/modules/qt_lib_coap_private.pri +libdata/pkgconfig/Qt6Coap.pc +%%QT_DATADIR%%/modules/Coap.json diff --git a/net/qt6-networkauth/Makefile b/net/qt6-networkauth/Makefile index 6a52d4599ec9..5297c0593be4 100644 --- a/net/qt6-networkauth/Makefile +++ b/net/qt6-networkauth/Makefile @@ -1,6 +1,5 @@ PORTNAME= networkauth DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= net PKGNAMEPREFIX= qt6- diff --git a/net/qt6-networkauth/distinfo b/net/qt6-networkauth/distinfo index b3ff0662573f..86e6fb12d779 100644 --- a/net/qt6-networkauth/distinfo +++ b/net/qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931944 -SHA256 (KDE/Qt/6.5.3/qtnetworkauth-everywhere-src-6.5.3.tar.xz) = 36b45d75595fcd8886f54fb66253dd0db5f0bd10624360bf84a48625c008a702 -SIZE (KDE/Qt/6.5.3/qtnetworkauth-everywhere-src-6.5.3.tar.xz) = 150372 +TIMESTAMP = 1697050147 +SHA256 (KDE/Qt/6.6.0/qtnetworkauth-everywhere-src-6.6.0.tar.xz) = 20d5c0746c00eb3333f17c9869296d0acd0eed93518ea2734b98405cc6cc8830 +SIZE (KDE/Qt/6.6.0/qtnetworkauth-everywhere-src-6.6.0.tar.xz) = 152688 diff --git a/science/qt6-quick3dphysics/Makefile b/science/qt6-quick3dphysics/Makefile index 578413a0b34a..9743045f016a 100644 --- a/science/qt6-quick3dphysics/Makefile +++ b/science/qt6-quick3dphysics/Makefile @@ -1,6 +1,5 @@ PORTNAME= quick3dphysics DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= science PKGNAMEPREFIX= qt6- @@ -14,7 +13,6 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= opengl USE_LDCONFIG= yes -USE_LOCALE= C.UTF-8 USE_QT= base declarative quick3d shadertools OPTIONS_DEFINE_aarch64= SIMD diff --git a/science/qt6-quick3dphysics/distinfo b/science/qt6-quick3dphysics/distinfo index 3508c593ce69..d89ae9c7c0a1 100644 --- a/science/qt6-quick3dphysics/distinfo +++ b/science/qt6-quick3dphysics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698094915 -SHA256 (KDE/Qt/6.5.3/qtquick3dphysics-everywhere-src-6.5.3.tar.xz) = 3291301d243ff39febc96d6641eb4b44feeef43087c475cbb0b22dc910a5a4ba -SIZE (KDE/Qt/6.5.3/qtquick3dphysics-everywhere-src-6.5.3.tar.xz) = 4697400 +TIMESTAMP = 1698294812 +SHA256 (KDE/Qt/6.6.0/qtquick3dphysics-everywhere-src-6.6.0.tar.xz) = 74395b686f680cfa302e41530ff9bbe1b7e13c1d1aa9d68aa192318ecbfd7c03 +SIZE (KDE/Qt/6.6.0/qtquick3dphysics-everywhere-src-6.6.0.tar.xz) = 4700124 diff --git a/www/py-qt6-webengine/distinfo b/www/py-qt6-webengine/distinfo index 3936e02c5295..a47e084a2044 100644 --- a/www/py-qt6-webengine/distinfo +++ b/www/py-qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690218336 -SHA256 (PyQt6_WebEngine-6.5.0.tar.gz) = 8ba9db56c4c181a2a2fab1673ca35e5b63dc69113f085027ddc43c710b6d6ee9 -SIZE (PyQt6_WebEngine-6.5.0.tar.gz) = 31349 +TIMESTAMP = 1698900348 +SHA256 (PyQt6_WebEngine-6.6.0.tar.gz) = d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487 +SIZE (PyQt6_WebEngine-6.6.0.tar.gz) = 31817 diff --git a/www/py-qt6-webengine/pkg-plist b/www/py-qt6-webengine/pkg-plist index 5b1dfcdf41b0..c223a7b9147b 100644 --- a/www/py-qt6-webengine/pkg-plist +++ b/www/py-qt6-webengine/pkg-plist @@ -1,4 +1,5 @@ %%PYQT_APIDIR%%/PyQt6-WebEngine.api +%%PYQT_SIPDIR%%/QtWebEngineCore/QtWebEngineCore.toml %%PYQT_SIPDIR%%/QtWebEngineCore/QtWebEngineCoremod.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qtwebenginecoreglobal.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecertificateerror.sip @@ -10,6 +11,7 @@ %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefilesystemaccessrequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefindtextresult.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefullscreenrequest.sip +%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineglobalsettings.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginehistory.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginehttprequest.sip %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineloadinginfo.sip @@ -32,13 +34,12 @@ %%PYQT_SIPDIR%%/QtWebEngineQuick/QtWebEngineQuickmod.sip %%PYQT_SIPDIR%%/QtWebEngineQuick/qquickwebengineprofile.sip %%PYQT_SIPDIR%%/QtWebEngineQuick/qtwebenginequickglobal.sip +%%PYQT_SIPDIR%%/QtWebEngineWidgets/QtWebEngineWidgets.toml %%PYQT_SIPDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip %%PYQT_SIPDIR%%/QtWebEngineWidgets/qwebengineview.sip %%PYTHON_SITELIBDIR%%/PyQt6/QtWebEngineCore.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtWebEngineQuick.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtWebEngineWidgets.abi%%PYTHON_MAJOR_VER%%.so -%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtWebEngineCore/QtWebEngineCore.toml -%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtWebEngineWidgets/QtWebEngineWidgets.toml %%PYTHON_SITELIBDIR%%/PyQt6_WebEngine-%%PYQT_WEBENGINE_VERSION%%.dist-info/INSTALLER %%PYTHON_SITELIBDIR%%/PyQt6_WebEngine-%%PYQT_WEBENGINE_VERSION%%.dist-info/METADATA %%PYTHON_SITELIBDIR%%/PyQt6_WebEngine-%%PYQT_WEBENGINE_VERSION%%.dist-info/RECORD diff --git a/www/qt6-httpserver/Makefile b/www/qt6-httpserver/Makefile index 4a6d47a9b5db..4cea5f2efdbf 100644 --- a/www/qt6-httpserver/Makefile +++ b/www/qt6-httpserver/Makefile @@ -1,5 +1,5 @@ PORTNAME= httpserver -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -9,7 +9,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers -USES= cmake compiler:c++11-lang pkgconfig qt-dist:6 -USE_QT= base +USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 +USE_QT= base websockets .include <bsd.port.mk> diff --git a/www/qt6-httpserver/distinfo b/www/qt6-httpserver/distinfo index 512c6e8ff52f..f29fcdbe81bf 100644 --- a/www/qt6-httpserver/distinfo +++ b/www/qt6-httpserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931946 -SHA256 (KDE/Qt/6.5.3/qthttpserver-everywhere-src-6.5.3.tar.xz) = 055489552177e2182837153f52a51290213bc76ac2f1131a57f5cc341c566c47 -SIZE (KDE/Qt/6.5.3/qthttpserver-everywhere-src-6.5.3.tar.xz) = 170436 +TIMESTAMP = 1697050149 +SHA256 (KDE/Qt/6.6.0/qthttpserver-everywhere-src-6.6.0.tar.xz) = f5ae1ed7e9c8c43c5577cf0565b13c0d255b57158dd2314c3c78e43484e33c65 +SIZE (KDE/Qt/6.6.0/qthttpserver-everywhere-src-6.6.0.tar.xz) = 170956 diff --git a/www/qt6-webchannel/Makefile b/www/qt6-webchannel/Makefile index 01613b92b280..2af764fc2e92 100644 --- a/www/qt6-webchannel/Makefile +++ b/www/qt6-webchannel/Makefile @@ -1,5 +1,5 @@ PORTNAME= webchannel -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -9,7 +9,7 @@ WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers -USES= cmake compiler:c++11-lang gl pkgconfig qt-dist:6 +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 USE_GL= gl opengl USE_QT= base declarative websockets diff --git a/www/qt6-webchannel/distinfo b/www/qt6-webchannel/distinfo index 797a93d7221c..7fd499262991 100644 --- a/www/qt6-webchannel/distinfo +++ b/www/qt6-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931949 -SHA256 (KDE/Qt/6.5.3/qtwebchannel-everywhere-src-6.5.3.tar.xz) = 129f89a6aba792c47f110582967f4f586457e7b63de3465e5f1dd210ce6bf04a -SIZE (KDE/Qt/6.5.3/qtwebchannel-everywhere-src-6.5.3.tar.xz) = 214760 +TIMESTAMP = 1697050151 +SHA256 (KDE/Qt/6.6.0/qtwebchannel-everywhere-src-6.6.0.tar.xz) = fddcb38e6d5843f9c7570654f1a12aaf0086e5a01f7bf3cf170064fcc5a3f51c +SIZE (KDE/Qt/6.6.0/qtwebchannel-everywhere-src-6.6.0.tar.xz) = 214924 diff --git a/www/qt6-webchannel/pkg-plist b/www/qt6-webchannel/pkg-plist index ef59e0a97bb5..aa719f3ba65d 100644 --- a/www/qt6-webchannel/pkg-plist +++ b/www/qt6-webchannel/pkg-plist @@ -1,26 +1,32 @@ %%QT_INCDIR%%/QtWebChannel/%%FULLVER%%/QtWebChannel/private/qmetaobjectpublisher_p.h -%%QT_INCDIR%%/QtWebChannel/%%FULLVER%%/QtWebChannel/private/qqmlwebchannelattached_p.h %%QT_INCDIR%%/QtWebChannel/%%FULLVER%%/QtWebChannel/private/qwebchannel_p.h %%QT_INCDIR%%/QtWebChannel/%%FULLVER%%/QtWebChannel/private/signalhandler_p.h -%%QT_INCDIR%%/QtWebChannel/QQmlWebChannel %%QT_INCDIR%%/QtWebChannel/QWebChannel %%QT_INCDIR%%/QtWebChannel/QWebChannelAbstractTransport %%QT_INCDIR%%/QtWebChannel/QtWebChannel %%QT_INCDIR%%/QtWebChannel/QtWebChannelDepends %%QT_INCDIR%%/QtWebChannel/QtWebChannelVersion -%%QT_INCDIR%%/QtWebChannel/qqmlwebchannel.h %%QT_INCDIR%%/QtWebChannel/qtwebchannelexports.h %%QT_INCDIR%%/QtWebChannel/qtwebchannelversion.h %%QT_INCDIR%%/QtWebChannel/qwebchannel.h %%QT_INCDIR%%/QtWebChannel/qwebchannelabstracttransport.h %%QT_INCDIR%%/QtWebChannel/qwebchannelglobal.h +%%QT_INCDIR%%/QtWebChannelQuick/%%FULLVER%%/QtWebChannelQuick/private/qqmlwebchannelattached_p.h +%%QT_INCDIR%%/QtWebChannelQuick/QQmlWebChannel +%%QT_INCDIR%%/QtWebChannelQuick/QtWebChannelQuick +%%QT_INCDIR%%/QtWebChannelQuick/QtWebChannelQuickDepends +%%QT_INCDIR%%/QtWebChannelQuick/QtWebChannelQuickVersion +%%QT_INCDIR%%/QtWebChannelQuick/qqmlwebchannel.h +%%QT_INCDIR%%/QtWebChannelQuick/qtwebchannelquickexports.h +%%QT_INCDIR%%/QtWebChannelQuick/qtwebchannelquickversion.h +%%QT_INCDIR%%/QtWebChannelQuick/qwebchannelquickglobal.h lib/cmake/Qt6BuildInternals/StandaloneTests/QtWebChannelTestsConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6webchannelTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6WebChannelQuickpluginTargets.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelAdditionalTargetInfo.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelConfig.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelConfigVersion.cmake @@ -29,15 +35,32 @@ lib/cmake/Qt6WebChannel/Qt6WebChannelDependencies.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelTargets.cmake lib/cmake/Qt6WebChannel/Qt6WebChannelVersionlessTargets.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickAdditionalTargetInfo.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfig.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfigVersion.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickConfigVersionImpl.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickDependencies.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickTargets.cmake +lib/cmake/Qt6WebChannelQuick/Qt6WebChannelQuickVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebChannel.prl %%QT_LIBDIR%%/libQt6WebChannel.so %%QT_LIBDIR%%/libQt6WebChannel.so.6 %%QT_LIBDIR%%/libQt6WebChannel.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6WebChannelQuick.prl +%%QT_LIBDIR%%/libQt6WebChannelQuick.so +%%QT_LIBDIR%%/libQt6WebChannelQuick.so.6 +%%QT_LIBDIR%%/libQt6WebChannelQuick.so.%%FULLVER%% %%QT_LIBDIR%%/metatypes/qt6webchannel_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6webchannelquick_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_MKSPECDIR%%/modules/qt_lib_webchannel.pri %%QT_MKSPECDIR%%/modules/qt_lib_webchannel_private.pri -%%QT_QMLDIR%%/QtWebChannel/libwebchannelplugin.so +%%QT_MKSPECDIR%%/modules/qt_lib_webchannelquick.pri +%%QT_MKSPECDIR%%/modules/qt_lib_webchannelquick_private.pri +%%QT_QMLDIR%%/QtWebChannel/libwebchannelquickplugin.so %%QT_QMLDIR%%/QtWebChannel/plugins.qmltypes %%QT_QMLDIR%%/QtWebChannel/qmldir libdata/pkgconfig/Qt6WebChannel.pc +libdata/pkgconfig/Qt6WebChannelQuick.pc %%QT_DATADIR%%/modules/WebChannel.json +%%QT_DATADIR%%/modules/WebChannelQuick.json diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index 4a89c26c9977..39c488b1c232 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -15,7 +15,6 @@ PORTNAME= webengine DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -43,13 +42,15 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libpci.so:devel/libpci \ libpng.so:graphics/png \ libsnappy.so:archivers/snappy \ + libtiff.so:graphics/tiff \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp \ libxkbcommon.so:x11/libxkbcommon -USES= bison cmake gl gnome gperf jpeg localbase:ldflags minizip ninja:build \ - nodejs:build,lts pkgconfig python:build qt-dist:6,webengine xorg -USE_GL= gl +USES= bison cmake compiler:c++17-lang gl gnome gperf jpeg \ + localbase:ldflags minizip ninja:build nodejs:build,lts \ + pkgconfig python:build qt-dist:6,webengine xorg +USE_GL= gbm gl USE_GNOME= glib20 libxml2 libxslt USE_QT= base declarative:run positioning quick3d:build tools webchannel USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ @@ -85,7 +86,7 @@ DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 $ BINARY_ALIAS= python3=${PYTHON_CMD} DISTINFO_FILE= ${.CURDIR}/distinfo -QT6_VERSION= 6.5.3 +QT6_VERSION= 6.6.0 OPTIONS_DEFAULT= ALSA OPTIONS_SINGLE= AUDIO @@ -118,13 +119,10 @@ post-extract: ${WRKSRC}/src/3rdparty/chromium/sandbox/policy/openbsd post-patch: - @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|' \ - ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%CPPFLAGS%%|${CPPFLAGS}|;s|%%CXXFLAGS%%|${CXXFLAGS}|;s|%%LDFLAGS%%|${LDFLAGS}|' \ ${WRKSRC}/src/host/BUILD.toolchain.gn.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp \ - ${WRKSRC}/src/3rdparty/chromium/third_party/wayland/features.gni \ ${WRKSRC}/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc pre-configure: diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo index 4acf91916829..96770f6bba9f 100644 --- a/www/qt6-webengine/distinfo +++ b/www/qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695932265 -SHA256 (KDE/Qt/6.5.3/qtwebengine-everywhere-src-6.5.3.tar.xz) = 2314ce9b0dd5f75f629077daad5a5781bac164d508ecff2ebad56ff2bc8745e5 -SIZE (KDE/Qt/6.5.3/qtwebengine-everywhere-src-6.5.3.tar.xz) = 412372456 +TIMESTAMP = 1697050315 +SHA256 (KDE/Qt/6.6.0/qtwebengine-everywhere-src-6.6.0.tar.xz) = d5dc9ff05a2c57adbf99cbf0c7cb6f19527f67216caf627b0cc160a1d253b780 +SIZE (KDE/Qt/6.6.0/qtwebengine-everywhere-src-6.6.0.tar.xz) = 421117212 diff --git a/www/qt6-webengine/files/extra-patch-no-mempcpy-nasm b/www/qt6-webengine/files/extra-patch-no-mempcpy-nasm deleted file mode 100644 index b9b39c0d846a..000000000000 --- a/www/qt6-webengine/files/extra-patch-no-mempcpy-nasm +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2022-06-08 06:40:31 UTC -+++ src/3rdparty/chromium/third_party/nasm/config/config-linux.h -@@ -336,7 +336,7 @@ - #define HAVE_MEMORY_H 1 - - /* Define to 1 if you have the `mempcpy' function. */ --#define HAVE_MEMPCPY 1 -+/* #undef HAVE_MEMPCPY */ - - /* Define to 1 if you have a working `mmap' system call. */ - #define HAVE_MMAP 1 diff --git a/www/qt6-webengine/files/patch-CMakeLists.txt b/www/qt6-webengine/files/patch-CMakeLists.txt deleted file mode 100644 index 545e0c51ba5e..000000000000 --- a/www/qt6-webengine/files/patch-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -Set the actual version of www/qt6-webengine, otherwise the version of qt6-base, -which is present in the ports tree, would be assumed and used during -compilation. - ---- CMakeLists.txt.orig 2023-07-07 17:40:32 UTC -+++ CMakeLists.txt -@@ -15,7 +15,7 @@ project(QtWebEngine - find_package(Qt6 6.2 CONFIG REQUIRED COMPONENTS BuildInternals Core) - - project(QtWebEngine -- VERSION ${Qt6Core_VERSION} -+ VERSION %%DISTVERSION%% - DESCRIPTION "QtWebEngine and QtPdf modules" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake index 919c24219f0b..6d8db14848de 100644 --- a/www/qt6-webengine/files/patch-cmake_Functions.cmake +++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake @@ -1,15 +1,15 @@ ---- cmake/Functions.cmake.orig 2023-07-07 17:40:32 UTC +--- cmake/Functions.cmake.orig 2023-08-16 19:50:41 UTC +++ cmake/Functions.cmake -@@ -449,7 +449,7 @@ function(add_linker_options target buildDir completeSt - set(archives_rsp "${buildDir}/${ninjaTarget}_archives.rsp") +@@ -447,7 +447,7 @@ function(add_linker_options target buildDir completeSt set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp") + set(ldir_rsp "${buildDir}/${ninjaTarget}_ldir.rsp") set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_rsp}") - if(LINUX OR ANDROID) + if(LINUX OR ANDROID OR FREEBSD) 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") -@@ -715,6 +715,8 @@ function(get_gn_os result) +@@ -699,6 +699,8 @@ function(get_gn_os result) set(${result} "mac" PARENT_SCOPE) elseif(IOS) set(${result} "ios" PARENT_SCOPE) @@ -18,7 +18,7 @@ else() message(DEBUG "Unrecognized OS") endif() -@@ -904,7 +906,7 @@ macro(append_build_type_setup) +@@ -889,7 +891,7 @@ macro(append_build_type_setup) extend_gn_list(gnArgArg ARGS enable_precompiled_headers @@ -27,16 +27,16 @@ ) extend_gn_list(gnArgArg ARGS dcheck_always_on -@@ -952,7 +954,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -941,7 +943,7 @@ macro(append_compiler_linker_sdk_setup) use_libcxx=true ) endif() - if(DEFINED QT_FEATURE_stdlib_libcpp AND LINUX) -+ if(DEFINED QT_FEATURE_stdlib_libcpp AND (LINUX OR FREEBSD)) ++ if(DEFINED QT_FEATURE_stdlib_libcpp AND (LINUX OR FREEBSD)) extend_gn_list(gnArgArg ARGS use_libcxx CONDITION QT_FEATURE_stdlib_libcpp ) -@@ -988,7 +990,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -979,7 +981,7 @@ macro(append_compiler_linker_sdk_setup) ) endif() get_gn_arch(cpu ${TEST_architecture_arch}) @@ -45,16 +45,16 @@ extend_gn_list_cflag(gnArgArg ARG arm_tune -@@ -1055,7 +1057,7 @@ macro(append_toolchain_setup) - endmacro() - - macro(append_toolchain_setup) +@@ -1054,7 +1056,7 @@ macro(append_toolchain_setup) + ) + list(APPEND gnArgArg host_cpu="${cpu}") + endif() - if(LINUX) + if(LINUX OR FREEBSD) list(APPEND gnArgArg custom_toolchain="${buildDir}/target_toolchain:target" host_toolchain="${buildDir}/host_toolchain:host" -@@ -1087,7 +1089,7 @@ macro(append_pkg_config_setup) +@@ -1086,7 +1088,7 @@ macro(append_pkg_config_setup) macro(append_pkg_config_setup) @@ -63,28 +63,28 @@ list(APPEND gnArgArg pkg_config="${PKG_CONFIG_EXECUTABLE}" host_pkg_config="${PKG_CONFIG_HOST_EXECUTABLE}" -@@ -1165,6 +1167,20 @@ function(add_gn_build_aritfacts_to_target cmakeTarget - set_target_properties(${cmakeTarget} PROPERTIES - LINK_DEPENDS ${buildDir}/${config}/${arch}/${ninjaTarget}.stamp +@@ -1179,6 +1181,20 @@ function(add_gn_build_aritfacts_to_target) + set_target_properties(${arg_CMAKE_TARGET} PROPERTIES + LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP} ) + # For some reason when the build of QtWebEngine's "convert_dict" is + # completed the "convert_dict.stamp" isn't created. + # + # Work around this issue by creating "convert_dict.stamp" manually. -+ if(${ninjaTarget} STREQUAL "convert_dict") ++ if(${arg_NINJA_TARGET} STREQUAL "convert_dict") + add_custom_command( + POST_BUILD -+ COMMENT "Add workaround for missing ${ninjaTarget}.stamp file after build" -+ COMMAND ${CMAKE_COMMAND} -E touch ${buildDir}/${config}/${arch}/${ninjaTarget}.stamp ++ COMMENT "Add workaround for missing ${arg_NINJA_TARGET}.stamp file after build" ++ COMMAND ${CMAKE_COMMAND} -E touch ${buildDir}/${config}/${arch}/${arg_NINJA_TARGET}.stamp + TARGET ${target} + DEPENDS run_${module}_NinjaDone + USES_TERMINAL + ) + endif() if(QT_IS_MACOS_UNIVERSAL) - add_intermediate_archive(${target} ${buildDir}/${config}/${arch} ${completeStatic}) + add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC}) elseif(IOS) -@@ -1291,7 +1307,7 @@ function(check_for_ulimit) +@@ -1305,7 +1321,7 @@ function(check_for_ulimit) function(check_for_ulimit) message("-- Checking 'ulimit -n'") @@ -93,7 +93,7 @@ OUTPUT_VARIABLE ulimitOutput ) string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}") -@@ -1300,7 +1316,7 @@ function(check_for_ulimit) +@@ -1314,7 +1330,7 @@ function(check_for_ulimit) if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0") message(" -- Creating linker launcher") file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh diff --git a/www/qt6-webengine/files/patch-configure.cmake b/www/qt6-webengine/files/patch-configure.cmake index 2844cc14d498..aa59c6004ca5 100644 --- a/www/qt6-webengine/files/patch-configure.cmake +++ b/www/qt6-webengine/files/patch-configure.cmake @@ -1,6 +1,6 @@ ---- configure.cmake.orig 2023-07-07 17:40:32 UTC +--- configure.cmake.orig 2023-10-03 19:49:54 UTC +++ configure.cmake -@@ -66,7 +66,7 @@ endif() +@@ -67,7 +67,7 @@ endif() endif() #### Tests @@ -9,7 +9,7 @@ check_for_ulimit() endif() -@@ -434,7 +434,7 @@ qt_feature("webengine-ozone-x11" PRIVATE +@@ -438,7 +438,7 @@ qt_feature("webengine-ozone-x11" PRIVATE qt_feature("webengine-ozone-x11" PRIVATE LABEL "Support GLX on qpa-xcb" @@ -18,7 +18,7 @@ AND TARGET Qt::Gui AND QT_FEATURE_xcb AND X11_FOUND -@@ -471,12 +471,12 @@ add_check_for_support( +@@ -475,12 +475,12 @@ add_check_for_support( ) add_check_for_support( MODULES QtWebEngine @@ -33,12 +33,39 @@ MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android(on non-Windows hosts only)." ) if(LINUX AND CMAKE_CROSSCOMPILING) -@@ -582,6 +582,8 @@ add_check_for_support( - CONDITION - (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR - (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR +@@ -502,13 +502,6 @@ add_check_for_support( + MESSAGE "node.js version 14 or later is required." + ) + add_check_for_support( +- MODULES QtWebEngine +- CONDITION NOT (Nodejs_ARCH STREQUAL ia32) AND +- NOT (Nodejs_ARCH STREQUAL x86) AND +- NOT (Nodejs_ARCH STREQUAL arm) +- MESSAGE "32bit version of Nodejs is not supported." +-) +-add_check_for_support( + MODULES QtWebEngine QtPdf + CONDITION Python3_EXECUTABLE + MESSAGE "Python version 3.6 or later is required." +@@ -586,8 +579,8 @@ add_check_for_support( + add_check_for_support( + MODULES QtWebEngine + CONDITION MSVC OR +- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR +- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR ++ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR ++ (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR + (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) + MESSAGE + "${CMAKE_CXX_COMPILER_ID} compiler is not supported." +@@ -596,8 +589,8 @@ add_check_for_support( + add_check_for_support( + MODULES QtPdf + CONDITION MSVC OR +- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR +- (LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR + (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) OR + (FREEBSD AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR - (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL MSVC) OR - (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL Clang AND - CMAKE_CXX_SIMULATE_ID STREQUAL MSVC) OR + (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 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn index 99ae7981be8a..f22c3b6676f2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/BUILD.gn -@@ -60,7 +60,7 @@ declare_args() { +@@ -61,7 +61,7 @@ declare_args() { qtwebengine_target = "//tools/gn" } @@ -9,8 +9,8 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -435,7 +435,7 @@ if (!is_qtwebengine){ - ] +@@ -428,7 +428,7 @@ if (!is_qtwebengine){ + } } - if (is_linux || is_chromeos || is_android) { @@ -18,16 +18,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -697,7 +697,7 @@ if (!is_qtwebengine){ - host_os == "win" && !is_qtwebengine) { - deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] - } -- } else if (!is_android && !is_ios && !is_fuchsia && !is_win) { -+ } else if (!is_android && !is_ios && !is_fuchsia && !is_win && !is_bsd) { - deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] - } - -@@ -1124,7 +1124,7 @@ if (!is_ios && !is_qtwebengine) { +@@ -1098,7 +1098,7 @@ if (!is_ios && !is_qtwebengine) { ] } @@ -36,7 +27,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1219,7 +1219,7 @@ if (!is_ios && !is_qtwebengine) { +@@ -1198,7 +1198,7 @@ if (!is_ios && !is_qtwebengine) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -45,7 +36,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1228,7 +1228,7 @@ if (!is_ios && !is_qtwebengine) { +@@ -1207,7 +1207,7 @@ if (!is_ios && !is_qtwebengine) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -54,7 +45,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1672,7 +1672,7 @@ group("chromium_builder_perf") { +@@ -1675,7 +1675,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn index e40cdedb3b6d..9c2a0f9c2332 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/base/BUILD.gn -@@ -164,7 +164,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -189,7 +189,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,39 +9,15 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1050,7 +1050,7 @@ jumbo_component("base") { - "timer/hi_res_timer_manager_posix.cc", - ] - -- if (!is_nacl && !is_apple) { -+ if (!is_nacl && !is_apple && !is_bsd) { - sources += [ - "profiler/stack_base_address_posix.cc", - "profiler/stack_base_address_posix.h", -@@ -1061,6 +1061,14 @@ jumbo_component("base") { - "profiler/thread_delegate_posix.h", - ] - } -+ -+ if (is_bsd) { -+ sources += [ -+ "profiler/stack_base_address_posix.cc", -+ "profiler/stack_base_address_posix.h", -+ "profiler/stack_sampler_posix.cc", -+ ] -+ } - } - - jumbo_excluded_sources = [ -@@ -1428,7 +1436,6 @@ jumbo_component("base") { - "process/process_metrics_linux.cc", - "threading/platform_thread_linux.cc", +@@ -1009,7 +1009,6 @@ jumbo_component("base") { + "threading/thread_type_delegate.cc", + "threading/thread_type_delegate.h", ] - jumbo_excluded_sources += [ "process/memory_linux.cc" ] } if (is_linux || is_chromeos || is_android || is_fuchsia) { -@@ -1604,7 +1611,7 @@ jumbo_component("base") { +@@ -1132,7 +1131,7 @@ jumbo_component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -50,7 +26,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1658,7 +1665,7 @@ jumbo_component("base") { +@@ -1173,7 +1172,7 @@ jumbo_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -59,24 +35,25 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2236,6 +2243,42 @@ jumbo_component("base") { +@@ -2119,6 +2118,43 @@ jumbo_component("base") { } } + if (is_bsd) { + sources -= [ + "files/file_path_watcher_inotify.cc", -+ "files/file_util_linux.cc", + "files/scoped_file_linux.cc", -+ "process/memory_linux.cc", + "process/process_linux.cc", + "system/sys_info_linux.cc", + "process/process_iterator_linux.cc", + "process/process_metrics_linux.cc", -+ "process/process_handle_linux.cc" ++ "process/process_handle_linux.cc", ++ "profiler/stack_copier_signal.cc", ++ "profiler/stack_copier_signal.h", ++ "profiler/thread_delegate_posix.cc", ++ "profiler/thread_delegate_posix.h", + ] + sources += [ -+ "process/memory_stubs.cc", + "files/file_path_watcher_kqueue.cc", + "files/file_path_watcher_kqueue.h", + "files/file_path_watcher_bsd.cc", @@ -101,8 +78,8 @@ + # iOS if (is_ios) { - sources -= [ -@@ -2333,7 +2376,7 @@ jumbo_component("base") { + sources += [ +@@ -2214,7 +2250,7 @@ jumbo_component("base") { } if (dep_libevent) { @@ -111,8 +88,8 @@ } if (use_libevent) { -@@ -3601,7 +3644,7 @@ test("base_unittests") { - } +@@ -3482,7 +3518,7 @@ test("base_unittests") { + ] } - if (is_linux || is_chromeos) { @@ -120,7 +97,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3647,7 +3690,7 @@ test("base_unittests") { +@@ -3531,7 +3567,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -129,7 +106,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3658,7 +3701,7 @@ test("base_unittests") { +@@ -3542,7 +3578,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -138,7 +115,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3850,7 +3893,7 @@ test("base_unittests") { +@@ -3763,7 +3799,7 @@ test("base_unittests") { } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h new file mode 100644 index 000000000000..e0f121f10163 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/base/allocator/dispatcher/tls.h +@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator { + partition_alloc::PartitionPageSize(); + #elif BUILDFLAG(IS_APPLE) + constexpr static size_t AllocationChunkSize = 16384; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + constexpr static size_t AllocationChunkSize = 16384; + #else + constexpr static size_t AllocationChunkSize = 4096; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h index 59531486585e..0b96554c9d5b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { +@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h index 07c269860248..8c4250d7d91e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h -@@ -231,7 +231,7 @@ constexpr PA_COMPONENT_EXPORT( +@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h index 24bb1167dd4f..925000cf8eef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h @@ -25,7 +25,7 @@ // elimination. @@ -27,7 +27,7 @@ // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or // initialize cache. size_t size = page_characteristics.size.load(std::memory_order_relaxed); -@@ -141,7 +141,7 @@ SystemPageSize() { +@@ -141,7 +141,7 @@ SystemPageShift() { PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t SystemPageSize() { #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h index c5f4c4fd503e..734969897517 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -356,8 +356,12 @@ void DiscardSystemPagesInternal(uintptr_t address, siz +@@ -380,8 +380,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc index 00e9ceb91e9f..b16f589d70fe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc -@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT - setup_.configurable_pool_base_mask_ = 0; +@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() } + #endif -#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni new file mode 100644 index 000000000000..e5856f005242 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni +@@ -276,7 +276,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt + "AsanBackupRefPtr requires RawPtrHookableImpl") + + declare_args() { +- enable_pkeys = is_linux && target_cpu == "x64" ++ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" + } + assert(!enable_pkeys || (is_linux && target_cpu == "x64"), + "Pkeys are only supported on x64 linux") diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc index a76771eec9d5..3862972fb3c6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc @@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) { if (getentropy(output, output_length) == 0) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h index d0992005bcf3..de39dc518e85 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h -@@ -10,7 +10,7 @@ namespace partition_alloc::internal::base::internal { +@@ -10,7 +10,7 @@ namespace partition_alloc::internal::base::internal { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc index 06ebd5c93efe..997f5720ecc8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc @@ -17,7 +17,7 @@ #include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h index 6a529fb2e456..fd5c07ae23ed 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h @@ -1,29 +1,29 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h -@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, ""); - +@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #define PA_HAS_LINUX_KERNEL - #endif - -@@ -197,7 +197,7 @@ constexpr bool kUseLazyCommit = false; + #define PA_CONFIG_HAS_LINUX_KERNEL() \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) + // On some platforms, we implement locking by spinning in userspace, then going + // into the kernel only if there is contention. This requires platform support, +@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. --#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #define PA_HAS_ATFORK_HANDLER - #endif + #define PA_CONFIG_HAS_ATFORK_HANDLER() \ +- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) -@@ -238,7 +238,7 @@ constexpr bool kUseLazyCommit = false; - // + // PartitionAlloc uses PartitionRootEnumerator to acquire all + // PartitionRoots at BeforeFork and to release at AfterFork. +@@ -296,7 +296,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. --#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) -+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) - #define PA_PREFER_SMALLER_SLOT_SPANS - #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) + #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ +- (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))) ++ (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)) + // Enable shadow metadata. + // diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h index a77622469f07..7a6ee0bf9191 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h -@@ -91,7 +91,7 @@ PartitionPageShift() { +@@ -92,7 +92,7 @@ PartitionPageShift() { return 18; // 256 KiB } #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ @@ -9,12 +9,12 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3; - // Special-case Android and iOS, which incur test failures with larger - // pools. Regardless, allocating >8GiB with malloc() on these platforms is - // unrealistic as of 2022. --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) +@@ -296,7 +296,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; + // When pointer compression is enabled, we cannot use large pools (at most + // 8GB for each of the glued pools). + #if BUILDFLAG(HAS_64_BIT_POINTERS) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h index 50f2ba4814ff..a00532114b5f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h -@@ -25,9 +25,13 @@ namespace internal { +@@ -27,9 +27,13 @@ namespace internal { // the second one 16. We could technically return something different for // malloc() and operator new(), but this would complicate things, and most of // our allocations are presumably coming from operator new() anyway. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h index e99b5bb0ef7e..7ec258bfe64e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h @@ -1,13 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h -@@ -138,13 +138,13 @@ struct SlotSpanMetadata { - PartitionBucket<thread_safe>* const bucket = nullptr; - - // CHECK()ed in AllocNewSlotSpan(). --#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) -+#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)) - // System page size is not a constant on Apple OSes, but is either 4 or 16kiB - // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And +@@ -143,7 +143,7 @@ struct SlotSpanMetadata { // PartitionPageSize() is 4 times the OS page size. static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc index 83802fc86d20..6f8d525cdbcc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "wow64apiset.h" #endif @@ -9,16 +9,16 @@ #include <pthread.h> #endif -@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() { - if (!g_global_init_called.compare_exchange_strong(expected, true)) +@@ -245,7 +245,7 @@ void PartitionAllocMallocInitOnce() { return; + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -339,7 +339,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -734,7 +734,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions +@@ -811,7 +811,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc index 88dd101feaa5..8f34cabed102 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc @@ -1,10 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc -@@ -18,7 +18,15 @@ +@@ -18,7 +18,16 @@ - #if defined(PA_HAS_LINUX_KERNEL) + #if PA_CONFIG(HAS_LINUX_KERNEL) #include <errno.h> +#if defined(OS_OPENBSD) ++#include <sys/time.h> +#include <sys/futex.h> +#elif defined(OS_FREEBSD) +#include <sys/types.h> @@ -15,14 +16,17 @@ +#endif #include <sys/syscall.h> #include <unistd.h> - #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() { + #endif // PA_CONFIG(HAS_LINUX_KERNEL) +@@ -107,8 +116,16 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. +#if defined(OS_FREEBSD) + int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE, + kLockedContended, nullptr, nullptr); ++#elif defined(OS_OPENBSD) ++ int err = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, ++ kLockedContended, nullptr, nullptr); +#else int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, kLockedContended, nullptr, nullptr, 0); @@ -30,18 +34,20 @@ if (err) { // These are programming error, check them. -@@ -120,8 +133,14 @@ void SpinningMutex::FutexWake() { +@@ -120,8 +137,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; +#if defined(OS_FREEBSD) + long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE, + 1 /* wake up a single waiter */, nullptr, nullptr); ++#elif defined(OS_OPENBSD) ++ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, ++ 1 /* wake up a single waiter */, nullptr, nullptr); +#else long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1 /* wake up a single waiter */, nullptr, nullptr, 0); +#endif -+ PA_CHECK(retval != -1); errno = saved_errno; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc index 797bbb22cb23..1f24d9074f2f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc -@@ -17,6 +17,10 @@ +@@ -18,6 +18,10 @@ #include <pthread.h> #endif @@ -11,7 +11,7 @@ #if defined(LIBC_GLIBC) extern "C" void* __libc_stack_end; #endif -@@ -47,6 +51,36 @@ void* GetStackTop() { +@@ -48,6 +52,36 @@ void* GetStackTop() { void* GetStackTop() { return pthread_get_stackaddr_np(pthread_self()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_atomicops.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_atomicops.h index 21ef50be14b4..c38bd16de747 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_atomicops.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_atomicops.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/atomicops.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/atomicops.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/atomicops.h -@@ -56,7 +56,11 @@ typedef intptr_t Atomic64; +@@ -71,7 +71,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc index ad985e66d7cb..9c6eeff5a03a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/base_paths_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/base_paths_posix.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc index 9a0d716b5fd3..49bcb7b5ac66 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/base_switches.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/base_switches.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/base_switches.cc @@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h index 5533d2a27058..21d5313d8ecf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/base_switches.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/base_switches.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/base_switches.h -@@ -60,7 +60,7 @@ extern const char kForceFieldTrialParams[]; +@@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_cpu.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_cpu.h deleted file mode 100644 index 8bbfdc517838..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_cpu.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/cpu.h.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/base/cpu.h -@@ -115,7 +115,7 @@ class BASE_EXPORT CPU final { - const std::string& cpu_brand() const { return cpu_brand_; } - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - enum class CoreType { - kUnknown = 0, - kOther, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc index 24b9b70744a6..1b1d4b71fa31 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_debugger__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/debug/debugger_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/debug/debugger_posix.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/base/debug/debugger_posix.cc @@ -35,6 +35,10 @@ #include <sys/sysctl.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc index d642ce8536b9..d4a4722204fd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/debug/elf_reader.cc @@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc index 3d569c38d512..be4f9db8864a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/debug/proc_maps_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/debug/proc_maps_linux.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/debug/proc_maps_linux.cc @@ -13,7 +13,7 @@ #include "base/strings/string_split.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc new file mode 100644 index 000000000000..32b3b209e47c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace.cc @@ -0,0 +1,21 @@ +--- src/3rdparty/chromium/base/debug/stack_trace.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/base/debug/stack_trace.cc +@@ -273,7 +273,9 @@ void StackTrace::Print() const { + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if !BUILDFLAG(IS_BSD) + OutputToStreamWithPrefix(os, nullptr); ++#endif + } + + std::string StackTrace::ToString() const { +@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const { + } + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc index a2273dc371e2..c4a64e564a43 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ + // execinfo.h and backtrace(3) are really only present in glibc and in macOS + // libc. + #if BUILDFLAG(IS_APPLE) || \ +- (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX)) ++ (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX) && !BUILDFLAG(IS_BSD)) + #define HAVE_BACKTRACE + #include <execinfo.h> + #endif +@@ -59,7 +59,7 @@ #include <AvailabilityMacros.h> #endif @@ -9,7 +18,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -699,6 +699,9 @@ class SandboxSymbolizeHelper { +@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -19,7 +28,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -716,6 +719,7 @@ class SandboxSymbolizeHelper { +@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,12 +36,3 @@ } // Opens all object files and caches their file descriptors. -@@ -872,7 +876,7 @@ size_t CollectStackTrace(void** trace, size_t count) { - // If we do not have unwind tables, then try tracing using frame pointers. - return base::debug::TraceStackFramePointers(const_cast<const void**>(trace), - count, 0); --#elif !defined(__UCLIBC__) && !defined(_AIX) -+#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. - return base::saturated_cast<size_t>( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h index b158034323d3..19452aceb4d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/dir_reader_linux.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/files/dir_reader_linux.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/files/dir_reader_linux.h @@ -16,10 +16,16 @@ #include "base/logging.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__posix.h index 346c0b31951c..a53355faf2e1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__posix.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/dir_reader_posix.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/files/dir_reader_posix.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/base/files/dir_reader_posix.h @@ -17,7 +17,7 @@ // seems worse than falling back to enumerating all file descriptors so we will @@ -9,7 +9,7 @@ #include "base/files/dir_reader_linux.h" #else #include "base/files/dir_reader_fallback.h" -@@ -25,7 +25,7 @@ namespace base { +@@ -25,7 +25,7 @@ namespace base { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.h new file mode 100644 index 000000000000..cd668f6b508d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/files/file_path_watcher.h.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/base/files/file_path_watcher.h +@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher { + Type type = Type::kNonRecursive; + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // The callback will return the full path to a changed file instead of + // the watched path supplied as |path| when Watch is called. + // So the full path can be different from the watched path when a folder is diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc index d3094ca92b49..2bd433b2f522 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher_bsd.cc.orig 2023-04-16 12:42:58 UTC +--- src/3rdparty/chromium/base/files/file_path_watcher_bsd.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/base/files/file_path_watcher_bsd.cc @@ -0,0 +1,54 @@ +// Copyright 2021 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h index fbf5cc1c59e7..2c5cde0740ef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h @@ -5,6 +5,7 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc index 94890c1c97d7..f483c647acfb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/files/file_util_posix.cc @@ -700,32 +700,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_important__file__writer__cleaner.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_important__file__writer__cleaner.cc index 063f8293078f..d4d2e7a6d24a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_important__file__writer__cleaner.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_important__file__writer__cleaner.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/files/important_file_writer_cleaner.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/files/important_file_writer_cleaner.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/files/important_file_writer_cleaner.cc -@@ -25,7 +25,8 @@ base::Time GetUpperBoundTime() { +@@ -25,7 +25,8 @@ namespace base { namespace { base::Time GetUpperBoundTime() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc index 50056d5e8fe5..c9f4e70ddabc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_scoped__file.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/scoped_file.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/files/scoped_file.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/files/scoped_file.cc @@ -31,7 +31,7 @@ void ScopedFDCloseTraits::Free(int fd) { int ret = IGNORE_EINTR(close(fd)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_functional_unretained__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_functional_unretained__traits.h new file mode 100644 index 000000000000..b08589c10ba7 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_functional_unretained__traits.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/functional/unretained_traits.h.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/base/functional/unretained_traits.h +@@ -130,7 +130,7 @@ struct TypeSupportsUnretained { + // official builds, and then in non-test code as well. + #if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) ++ BUILDFLAG(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) + static_assert(IsCompleteTypeV<T> || + IsIncompleteTypeSafeForUnretained<std::remove_cv_t<T>>, + "T must be fully defined."); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc index 1130bbc4ebee..a38478c3c072 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -51,7 +51,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -347,7 +347,7 @@ void InitializeIcuTimeZone() { +@@ -344,7 +344,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc index 956ed07fd09a..5d034a4c4d1f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/linux_util.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/linux_util.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/linux_util.cc @@ -15,6 +15,7 @@ @@ -8,7 +8,7 @@ #include "base/base_export.h" #include "base/files/dir_reader_posix.h" -@@ -135,6 +136,9 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t +@@ -135,6 +136,9 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc index 77cb03561f88..8c4175412515 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/memory/discardable_memory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/memory/discardable_memory.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/base/memory/discardable_memory.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -52,7 +52,7 @@ namespace { +@@ -52,7 +52,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> namespace { @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -101,7 +101,7 @@ DiscardableMemoryBacking GetDiscardableMemoryBacking() +@@ -101,7 +101,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h index 462981a0b037..6448b063189b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory__internal.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/memory/discardable_memory_internal.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/memory/discardable_memory_internal.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/memory/discardable_memory_internal.h @@ -10,7 +10,7 @@ #include "base/metrics/field_trial_params.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc index 84339546e1ec..47133357042d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc @@ -299,6 +299,10 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h index f47f4dd4bfdb..bdc1f9a4b417 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/base/memory/platform_shared_memory_region.h @@ -16,7 +16,7 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region__posix.cc index 325071a534b2..e1acc2bacf25 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc @@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -171,7 +171,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -168,7 +168,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -200,7 +200,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -197,7 +197,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc index 348dcad52e36..52157b1be2e5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/message_loop/message_pump_glib.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/message_loop/message_pump_glib.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" -@@ -51,9 +56,13 @@ bool RunningOnMainThread() { +@@ -51,9 +56,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti } bool RunningOnMainThread() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc index 0acba5af54f8..c73d57bb3323 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/native_library_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/native_library_posix.cc.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/base/native_library_posix.cc @@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_can__lower__nice__to.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_can__lower__nice__to.cc index 270777905182..737b02c2c0c1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_can__lower__nice__to.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_can__lower__nice__to.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/posix/can_lower_nice_to.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/posix/can_lower_nice_to.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/posix/can_lower_nice_to.cc @@ -11,8 +11,12 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc index 12d3e780a0a2..555f62b3f294 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/posix/unix_domain_socket.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/posix/unix_domain_socket.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/posix/unix_domain_socket.cc -@@ -51,7 +51,7 @@ bool UnixDomainSocket::EnableReceiveProcessId(int fd) +@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h index 015d759eefad..c804a54c0a53 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/kill.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/kill.h.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/base/process/kill.h -@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetKnownDeadTerminationS +@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill__posix.cc index dc14a22cf5e5..47dda45a443b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_kill__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/kill_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/kill_posix.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/process/kill_posix.cc -@@ -158,7 +158,7 @@ void EnsureProcessTerminated(Process process) { +@@ -157,7 +157,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), Seconds(2))); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h index 0c7747bafe9e..0d027a49424e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/launch.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/process/launch.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/base/process/launch.h @@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc index 9def56c95cf1..baefd731e0ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/process/launch_posix.cc @@ -64,6 +64,9 @@ #error "macOS should use launch_mac.cc" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc deleted file mode 100644 index ff9b3978d26a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/process/memory.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/base/process/memory.cc -@@ -28,7 +28,7 @@ namespace base { - // Defined in memory_mac.mm for macOS + use_allocator="none". In case of - // USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system - // default calloc of macOS. --#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) -+#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) - - bool UncheckedCalloc(size_t num_items, size_t size, void** result) { - const size_t alloc_size = num_items * size; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory__linux.cc new file mode 100644 index 000000000000..b2512dc2cf87 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory__linux.cc @@ -0,0 +1,44 @@ +--- src/3rdparty/chromium/base/process/memory_linux.cc.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/base/process/memory_linux.cc +@@ -20,6 +20,7 @@ + + namespace base { + ++#if !BUILDFLAG(IS_BSD) + namespace { + + void ReleaseReservationOrTerminate() { +@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() { + } + + } // namespace ++#endif + + void EnableTerminationOnHeapCorruption() { + // On Linux, there nothing to do AFAIK. + } + + void EnableTerminationOnOutOfMemory() { ++#if !BUILDFLAG(IS_BSD) + // Set the new-out of memory handler. + std::set_new_handler(&ReleaseReservationOrTerminate); + // If we're using glibc's allocator, the above functions will override +@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() { + #if BUILDFLAG(USE_ALLOCATOR_SHIM) + allocator_shim::SetCallNewHandlerOnMallocFailure(true); + #endif ++#endif + } + ++#if !BUILDFLAG(IS_BSD) + // ScopedAllowBlocking() has private constructor and it can only be used in + // friend classes/functions. Declaring a class is easier in this situation to + // avoid adding more dependency to thread_restrictions.h because of the +@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr + bool AdjustOOMScore(ProcessId process, int score) { + return AdjustOOMScoreHelper::AdjustOOMScore(process, score); + } ++#endif + + bool UncheckedMalloc(size_t size, void** result) { + #if BUILDFLAG(USE_ALLOCATOR_SHIM) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.cc index 0f2a80612543..f5b6d46a9371 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_handle.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_handle.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/process/process_handle.cc @@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { : UniqueProcId(GetCurrentProcId()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h index f5a6b19c4b4e..6deac6b605b4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_handle.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_handle.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/process/process_handle.h -@@ -106,7 +106,7 @@ BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); +@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc index e0455095d172..971c1f5333d9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_handle_freebsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_handle_freebsd.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/base/process/process_handle_freebsd.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <limits.h> #include <stddef.h> -@@ -15,10 +16,13 @@ ProcessId GetParentProcessId(ProcessHandle process) { +@@ -15,10 +16,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc index f971d0aefa77..0df34cb4a047 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_handle_openbsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_handle_openbsd.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/base/process/process_handle_openbsd.cc @@ -3,8 +3,11 @@ // found in the LICENSE file. @@ -12,7 +12,7 @@ #include <sys/sysctl.h> #include <sys/types.h> #include <unistd.h> -@@ -12,39 +15,59 @@ ProcessId GetParentProcessId(ProcessHandle process) { +@@ -12,39 +15,59 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc index 6e8674f4c371..8e5f1e5f45b9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/base/process/process_iterator_freebsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_iterator_freebsd.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/process/process_iterator_freebsd.cc -@@ -20,7 +20,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* - : index_of_kinfo_proc_(), - filter_(filter) { +@@ -18,7 +18,7 @@ namespace base { + ProcessIterator::ProcessIterator(const ProcessFilter* filter) + : filter_(filter) { - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid() }; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid() }; bool done = false; int try_num = 1; -@@ -39,7 +39,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -37,7 +37,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* num_of_kinfo_proc += 16; kinfo_procs_.resize(num_of_kinfo_proc); len = num_of_kinfo_proc * sizeof(struct kinfo_proc); @@ -18,7 +18,7 @@ // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { -@@ -49,7 +49,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -47,7 +47,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right @@ -27,7 +27,7 @@ kinfo_procs_.resize(num_of_kinfo_proc); done = true; } -@@ -71,18 +71,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -68,18 +68,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__openbsd.cc index f2275b45715a..a74f523e9d2a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_iterator_openbsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_iterator_openbsd.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/process/process_iterator_openbsd.cc @@ -6,6 +6,9 @@ @@ -10,10 +10,10 @@ #include <sys/sysctl.h> #include "base/logging.h" -@@ -18,12 +21,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter* - : index_of_kinfo_proc_(), - filter_(filter) { +@@ -16,12 +19,13 @@ namespace base { + ProcessIterator::ProcessIterator(const ProcessFilter* filter) + : filter_(filter) { - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(), + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()), sizeof(struct kinfo_proc), 0 }; @@ -25,7 +25,7 @@ do { size_t len = 0; -@@ -32,7 +36,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -30,7 +34,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* kinfo_procs_.resize(0); done = true; } else { @@ -34,7 +34,7 @@ // Leave some spare room for process table growth (more could show up // between when we check and now) num_of_kinfo_proc += 16; -@@ -48,7 +52,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -46,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc index d31161157c33..d78f3991d67a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/process/process_metrics.cc -@@ -17,7 +17,7 @@ namespace { +@@ -17,7 +17,7 @@ namespace base { namespace { #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,16 +18,16 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { - Value res(Value::Type::DICTIONARY); +@@ -73,7 +73,7 @@ Value::Dict SystemMetrics::ToDict() const { + Value::Dict res; - res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); + res.Set("committed_memory", static_cast<int>(committed_memory_)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - Value meminfo = memory_info_.ToValue(); - Value vmstat = vmstat_info_.ToValue(); - meminfo.MergeDictionary(&vmstat); -@@ -99,7 +99,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + Value::Dict meminfo = memory_info_.ToDict(); + meminfo.Merge(vmstat_info_.ToDict()); + res.Set("meminfo", std::move(meminfo)); +@@ -98,7 +98,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } @@ -35,7 +35,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( double ProcessMetrics::GetPlatformIndependentCPUUsage() { return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); } @@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) { -@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { +@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h index 00542d09acba..90733ad68e8c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_metrics.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/process/process_metrics.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/process/process_metrics.h -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ #include <string> #include <utility> #include <vector> -@@ -52,7 +52,7 @@ struct IoCounters; +@@ -50,7 +50,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -18,7 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -107,7 +107,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -165,7 +165,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -248,7 +248,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,16 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -280,7 +280,7 @@ class BASE_EXPORT ProcessMetrics { - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - CPU::CoreType GetCoreType(uint32_t core_index); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || - // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -294,9 +294,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -263,9 +263,7 @@ class BASE_EXPORT ProcessMetrics { // Used to store the previous times and CPU usage counts so we can // compute the CPU usage between calls. TimeTicks last_cpu_time_; @@ -73,7 +64,7 @@ #if BUILDFLAG(IS_WIN) TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -304,7 +302,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -273,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -82,7 +73,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -347,7 +345,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -91,7 +82,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -382,7 +380,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -100,7 +91,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -397,7 +395,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -109,7 +100,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -434,7 +432,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -118,7 +109,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -622,7 +620,7 @@ class BASE_EXPORT SystemMetrics { +@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc index 2955a234322d..8f5186c3a203 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/process/process_metrics_freebsd.cc @@ -3,20 +3,39 @@ // found in the LICENSE file. @@ -72,10 +72,12 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const { return false; } -@@ -67,4 +83,221 @@ size_t GetSystemCommitCharge() { - return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); - } +@@ -65,6 +81,230 @@ size_t GetSystemCommitCharge() { + pagesize = getpagesize(); + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); ++} ++ +int64_t GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + @@ -243,54 +245,61 @@ + +SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; + -+Value SystemDiskInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ ++Value::Dict SystemDiskInfo::ToDict() const { ++ Value::Dict res; ++ + // Write out uint64_t variables as doubles. + // Note: this may discard some precision, but for JS there's no other option. -+ res.SetDoubleKey("reads", static_cast<double>(reads)); -+ res.SetDoubleKey("reads_merged", static_cast<double>(reads_merged)); -+ res.SetDoubleKey("sectors_read", static_cast<double>(sectors_read)); -+ res.SetDoubleKey("read_time", static_cast<double>(read_time)); -+ res.SetDoubleKey("writes", static_cast<double>(writes)); -+ res.SetDoubleKey("writes_merged", static_cast<double>(writes_merged)); -+ res.SetDoubleKey("sectors_written", static_cast<double>(sectors_written)); -+ res.SetDoubleKey("write_time", static_cast<double>(write_time)); -+ res.SetDoubleKey("io", static_cast<double>(io)); -+ res.SetDoubleKey("io_time", static_cast<double>(io_time)); -+ res.SetDoubleKey("weighted_io_time", static_cast<double>(weighted_io_time)); ++ res.Set("reads", static_cast<double>(reads)); ++ res.Set("reads_merged", static_cast<double>(reads_merged)); ++ res.Set("sectors_read", static_cast<double>(sectors_read)); ++ res.Set("read_time", static_cast<double>(read_time)); ++ res.Set("writes", static_cast<double>(writes)); ++ res.Set("writes_merged", static_cast<double>(writes_merged)); ++ res.Set("sectors_written", static_cast<double>(sectors_written)); ++ res.Set("write_time", static_cast<double>(write_time)); ++ res.Set("io", static_cast<double>(io)); ++ res.Set("io_time", static_cast<double>(io_time)); ++ res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); + ++ NOTIMPLEMENTED(); ++ + return res; +} + -+Value SystemMemoryInfoKB::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ -+ res.SetIntKey("total", total); -+ res.SetIntKey("free", free); -+ res.SetIntKey("available", available); -+ res.SetIntKey("buffers", buffers); -+ res.SetIntKey("cached", cached); -+ res.SetIntKey("active_anon", active_anon); -+ res.SetIntKey("inactive_anon", inactive_anon); -+ res.SetIntKey("active_file", active_file); -+ res.SetIntKey("inactive_file", inactive_file); -+ res.SetIntKey("swap_total", swap_total); -+ res.SetIntKey("swap_free", swap_free); -+ res.SetIntKey("swap_used", swap_total - swap_free); -+ res.SetIntKey("dirty", dirty); -+ res.SetIntKey("reclaimable", reclaimable); ++Value::Dict SystemMemoryInfoKB::ToDict() const { ++ Value::Dict res; ++ res.Set("total", total); ++ res.Set("free", free); ++ res.Set("available", available); ++ res.Set("buffers", buffers); ++ res.Set("cached", cached); ++ res.Set("active_anon", active_anon); ++ res.Set("inactive_anon", inactive_anon); ++ res.Set("active_file", active_file); ++ res.Set("inactive_file", inactive_file); ++ res.Set("swap_total", swap_total); ++ res.Set("swap_free", swap_free); ++ res.Set("swap_used", swap_total - swap_free); ++ res.Set("dirty", dirty); ++ res.Set("reclaimable", reclaimable); ++ ++ NOTIMPLEMENTED(); + + return res; +} + -+Value VmStatInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); ++Value::Dict VmStatInfo::ToDict() const { ++ Value::Dict res; ++ // TODO(crbug.com/1334256): Make base::Value able to hold uint64_t and remove ++ // casts below. ++ res.Set("pswpin", static_cast<int>(pswpin)); ++ res.Set("pswpout", static_cast<int>(pswpout)); ++ res.Set("pgmajfault", static_cast<int>(pgmajfault)); + -+ res.SetIntKey("pswpin", pswpin); -+ res.SetIntKey("pswpout", pswpout); -+ res.SetIntKey("pgmajfault", pgmajfault); ++ NOTIMPLEMENTED(); + + return res; -+} + } + } // namespace base diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc index bd523db97e4f..cd614ca55016 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/process/process_metrics_openbsd.cc @@ -6,14 +6,23 @@ @@ -124,22 +124,6 @@ + return false; +} + -+SystemDiskInfo::SystemDiskInfo() { -+ reads = 0; -+ reads_merged = 0; -+ sectors_read = 0; -+ read_time = 0; -+ writes = 0; -+ writes_merged = 0; -+ sectors_written = 0; -+ write_time = 0; -+ io = 0; -+ io_time = 0; -+ weighted_io_time = 0; -+} -+ -+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; -+ +bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { + NOTIMPLEMENTED(); + return false; @@ -155,57 +139,73 @@ + return 0; +} + -+Value SystemMemoryInfoKB::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ res.SetIntKey("total", total); -+ res.SetIntKey("free", free); -+ res.SetIntKey("available", available); -+ res.SetIntKey("buffers", buffers); -+ res.SetIntKey("cached", cached); -+ res.SetIntKey("active_anon", active_anon); -+ res.SetIntKey("inactive_anon", inactive_anon); -+ res.SetIntKey("active_file", active_file); -+ res.SetIntKey("inactive_file", inactive_file); -+ res.SetIntKey("swap_total", swap_total); -+ res.SetIntKey("swap_free", swap_free); -+ res.SetIntKey("swap_used", swap_total - swap_free); -+ res.SetIntKey("dirty", dirty); -+ res.SetIntKey("reclaimable", reclaimable); ++Value::Dict SystemMemoryInfoKB::ToDict() const { ++ Value::Dict res; ++ res.Set("total", total); ++ res.Set("free", free); ++ res.Set("available", available); ++ res.Set("buffers", buffers); ++ res.Set("cached", cached); ++ res.Set("active_anon", active_anon); ++ res.Set("inactive_anon", inactive_anon); ++ res.Set("active_file", active_file); ++ res.Set("inactive_file", inactive_file); ++ res.Set("swap_total", swap_total); ++ res.Set("swap_free", swap_free); ++ res.Set("swap_used", swap_total - swap_free); ++ res.Set("dirty", dirty); ++ res.Set("reclaimable", reclaimable); + + NOTIMPLEMENTED(); + + return res; +} + -+Value VmStatInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); -+ res.SetIntKey("pswpin", pswpin); -+ res.SetIntKey("pswpout", pswpout); -+ res.SetIntKey("pgmajfault", pgmajfault); ++Value::Dict VmStatInfo::ToDict() const { ++ Value::Dict res; ++ res.Set("pswpin", static_cast<int>(pswpin)); ++ res.Set("pswpout", static_cast<int>(pswpout)); ++ res.Set("pgmajfault", static_cast<int>(pgmajfault)); + + NOTIMPLEMENTED(); + + return res; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; +} + -+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo&) = default; + -+Value SystemDiskInfo::ToValue() const { -+ Value res(Value::Type::DICTIONARY); ++SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; + ++Value::Dict SystemDiskInfo::ToDict() const { ++ Value::Dict res; ++ + // Write out uint64_t variables as doubles. + // Note: this may discard some precision, but for JS there's no other option. -+ res.SetDoubleKey("reads", static_cast<double>(reads)); -+ res.SetDoubleKey("reads_merged", static_cast<double>(reads_merged)); -+ res.SetDoubleKey("sectors_read", static_cast<double>(sectors_read)); -+ res.SetDoubleKey("read_time", static_cast<double>(read_time)); -+ res.SetDoubleKey("writes", static_cast<double>(writes)); -+ res.SetDoubleKey("writes_merged", static_cast<double>(writes_merged)); -+ res.SetDoubleKey("sectors_written", static_cast<double>(sectors_written)); -+ res.SetDoubleKey("write_time", static_cast<double>(write_time)); -+ res.SetDoubleKey("io", static_cast<double>(io)); -+ res.SetDoubleKey("io_time", static_cast<double>(io_time)); -+ res.SetDoubleKey("weighted_io_time", static_cast<double>(weighted_io_time)); ++ res.Set("reads", static_cast<double>(reads)); ++ res.Set("reads_merged", static_cast<double>(reads_merged)); ++ res.Set("sectors_read", static_cast<double>(sectors_read)); ++ res.Set("read_time", static_cast<double>(read_time)); ++ res.Set("writes", static_cast<double>(writes)); ++ res.Set("writes_merged", static_cast<double>(writes_merged)); ++ res.Set("sectors_written", static_cast<double>(sectors_written)); ++ res.Set("write_time", static_cast<double>(write_time)); ++ res.Set("io", static_cast<double>(io)); ++ res.Set("io_time", static_cast<double>(io_time)); ++ res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); + + NOTIMPLEMENTED(); + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc index a6fd4d5e5663..8ef51d87848b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/process/process_metrics_posix.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc index 4f95cb1be2a1..c24ad3485633 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/base/process/process_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/process/process_posix.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/process/process_posix.cc -@@ -25,10 +25,15 @@ +@@ -23,10 +23,15 @@ + #include "base/trace_event/base_tracing.h" #include "build/build_config.h" - #include "third_party/abseil-cpp/absl/types/optional.h" -#if BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) @@ -17,7 +17,7 @@ #if BUILDFLAG(CLANG_PROFILING) #include "base/test/clang_profiling.h" #endif -@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, +@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, return ret_pid > 0; } @@ -26,7 +26,7 @@ // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha +@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha const bool exited = (parent_pid < 0); if (!exited && parent_pid != our_pid) { @@ -35,7 +35,7 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -392,7 +397,55 @@ int Process::GetPriority() const { +@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const { int Process::GetPriority() const { DCHECK(IsValid()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc index 95515e2d778f..58412582057f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/profiler/module_cache.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/profiler/module_cache.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/profiler/module_cache.cc -@@ -34,7 +34,7 @@ std::string TransformModuleIDToBreakpadFormat(StringPi - - std::string TransformModuleIDToBreakpadFormat(StringPiece module_id) { - std::string mangled_id(module_id); --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri + // Android and Linux Chrome builds use the "breakpad" format to index their + // build id, so we transform the build id for these platforms. All other + // platforms keep their symbols indexed by the original build ID. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux ELF module IDs are 160bit integers, which we need to mangle // down to 128bit integers to match the id that Breakpad outputs. // Example on version '66.0.3359.170' x64: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc index 77661639ec48..37c6158abd0e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc @@ -6,7 +6,7 @@ @@ -9,7 +9,7 @@ #include <pthread.h> #include "base/profiler/stack_base_address_posix.h" -@@ -19,7 +19,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent +@@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent PlatformThreadId id = PlatformThread::CurrentId(); #if BUILDFLAG(IS_ANDROID) return {id, pthread_self()}; @@ -17,4 +17,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) absl::optional<uintptr_t> maybe_stack_base = GetThreadStackBaseAddress(id, pthread_self()); - // GetThreadStackBaseAddress should only return nullopt on Android, so + return {id, maybe_stack_base}; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h index f0ee0b6b063b..1197b0cac097 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ #if BUILDFLAG(IS_ANDROID) #include <pthread.h> @@ -9,7 +9,7 @@ #include <stdint.h> #endif -@@ -25,7 +25,7 @@ struct SamplingProfilerThreadToken { +@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken { PlatformThreadId id; #if BUILDFLAG(IS_ANDROID) pthread_t pthread_id; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc index a0b102dcb67f..86354ac4bb69 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/profiler/stack_base_address_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/profiler/stack_base_address_posix.cc.orig 2023-02-08 16:09:26 UTC +++ src/3rdparty/chromium/base/profiler/stack_base_address_posix.cc -@@ -15,6 +15,10 @@ +@@ -17,6 +17,10 @@ #include "base/files/scoped_file.h" #endif @@ -11,9 +11,9 @@ #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -42,15 +46,30 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr - #endif +@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas + #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { +#if BUILDFLAG(IS_OPENBSD) + stack_t ss; @@ -26,17 +26,23 @@ +#else pthread_attr_t attr; +#if BUILDFLAG(IS_FREEBSD) ++ int result; + pthread_attr_init(&attr); + pthread_attr_get_np(pthread_id, &attr); +#else - // This will crash on ChromeOS & Linux if we are in the sandbox and pthread_id - // refers to a different thread, due to the use of sched_getaffinity(). - pthread_getattr_np(pthread_id, &attr); - // See crbug.com/617730 for limitations of this approach on Linux. + // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox + // and pthread_id refers to a different thread, due to the use of + // sched_getaffinity(). +@@ -58,12 +76,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr + << logging::SystemErrorCodeToString(result); + // See crbug.com/617730 for limitations of this approach on Linux-like + // systems. +#endif void* address; size_t size; - pthread_attr_getstack(&attr, &address, &size); + result = pthread_attr_getstack(&attr, &address, &size); + CHECK_EQ(result, 0) << "pthread_attr_getstack returned " + << logging::SystemErrorCodeToString(result); pthread_attr_destroy(&attr); +#endif const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc index 63c4f2a444fb..e4ed87ae163a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc -@@ -39,7 +39,7 @@ +@@ -33,7 +33,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc index 87cab01208a1..ea57e9cf2177 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc @@ -13,7 +13,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "base/profiler/stack_base_address_posix.h" #endif -@@ -22,7 +22,7 @@ std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePos +@@ -22,7 +22,7 @@ namespace base { std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create( SamplingProfilerThreadToken thread_token) { absl::optional<uintptr_t> base_address; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h index 9407ed679042..df6405773e53 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/rand_util.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/rand_util.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/base/rand_util.h @@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc index 2e1dead06e24..1461de852fc8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/rand_util_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/rand_util_posix.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/base/rand_util_posix.cc @@ -22,7 +22,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. -@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC +@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY; static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; #endif @@ -30,7 +30,7 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -176,6 +178,7 @@ void RandBytes(void* output, size_t output_length, boo +@@ -176,6 +178,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytes(void* output, size_t output_length, bool avoid_allocation) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h index fd2924bef935..c8e47824e0de 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/synchronization/lock_impl.h -@@ -107,6 +107,10 @@ void LockImpl::Unlock() { +@@ -104,6 +104,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -127,6 +131,9 @@ void LockImpl::Unlock() { +@@ -124,6 +128,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc index f6f23ed3d628..34f268efc1b1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_syslog__logging.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/syslog_logging.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/syslog_logging.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/syslog_logging.cc @@ -15,7 +15,7 @@ #include "base/strings/string_util.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc index 2fe203de668c..5ae54d0bdd4e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/system/sys_info.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/system/sys_info.cc -@@ -101,7 +101,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( +@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h index 5917259116fe..226b5a530701 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/system/sys_info.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/base/system/sys_info.h -@@ -233,6 +233,8 @@ class BASE_EXPORT SysInfo { +@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo { static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); #endif @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -243,7 +245,7 @@ class BASE_EXPORT SysInfo { +@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc index 166701801e23..d90e079eddc5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2022-09-01 17:22:07 UTC +++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc @@ -9,30 +9,106 @@ #include <sys/sysctl.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc index c64e27190053..f960daeacd85 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/system/sys_info_openbsd.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/system/sys_info_openbsd.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/base/system/sys_info_openbsd.cc @@ -11,6 +11,7 @@ #include <sys/sysctl.h> @@ -8,7 +8,7 @@ namespace { -@@ -26,9 +27,15 @@ namespace base { +@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { @@ -25,7 +25,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -40,10 +47,26 @@ uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { +@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() { // static uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc index 7520de47f3c9..9b5a1d6262b0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/base/system/sys_info_posix.cc -@@ -182,12 +182,12 @@ absl::optional<int> NumberOfPhysicalProcessors() { +@@ -165,12 +165,12 @@ int NumberOfProcessors() { } // namespace internal @@ -15,7 +15,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -277,6 +277,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -260,6 +260,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; @@ -24,10 +24,3 @@ } else if (std::string(info.sysname) == "AIX") { arch = "ppc64"; } -@@ -300,4 +302,4 @@ void SysInfo::SetIsCpuSecurityMitigationsEnabled(bool - - #endif // BUILDFLAG(IS_MAC) - --} // namespace base -\ No newline at end of file -+} // namespace base diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc index e79b61285bf0..49b9ce7d6fbe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/test/test_file_util_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/test/test_file_util_linux.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/test/test_file_util_linux.cc @@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const FilePath& file) { return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc index 13a0395396b3..c2fb6bd5a8ec 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/test/test_file_util_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/test/test_file_util_posix.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/test/test_file_util_posix.cc @@ -88,7 +88,7 @@ void SyncPageCacheToDisk() { } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h deleted file mode 100644 index dd787a6a4d6f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/base/threading/platform_thread.h -@@ -253,7 +253,7 @@ class BASE_EXPORT PlatformThread { - // Returns a realtime period provided by `delegate`. - static TimeDelta GetRealtimePeriod(Delegate* delegate); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Toggles a specific thread's type at runtime. This can be used to - // change the priority of a thread in a different process and will fail - // if the calling process does not have proper permissions. The diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc index 537aff5e4b60..e7a0ef2e0396 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_linux.cc -@@ -29,7 +29,9 @@ +@@ -30,7 +30,9 @@ #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #include <pthread.h> @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -134,7 +136,7 @@ long sched_setattr(pid_t pid, +@@ -139,7 +141,7 @@ long sched_setattr(pid_t pid, #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #endif // BUILDFLAG(IS_CHROMEOS) @@ -19,7 +19,7 @@ const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -306,7 +308,7 @@ namespace { +@@ -313,7 +315,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th namespace internal { namespace { @@ -28,7 +28,7 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -332,7 +334,7 @@ bool CanSetThreadTypeToRealtimeAudio() { +@@ -340,7 +342,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue }; bool CanSetThreadTypeToRealtimeAudio() { @@ -37,16 +37,16 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -344,7 +346,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread +@@ -352,7 +354,7 @@ bool CanSetThreadTypeToRealtimeAudio() { bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, MessagePumpType pump_type_hint) { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // For legacy schedtune interface - SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); + const PlatformThreadId tid = PlatformThread::CurrentId(); -@@ -363,7 +365,7 @@ GetCurrentThreadPriorityForPlatformForTest() { + if (g_thread_type_delegate && +@@ -378,7 +380,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread absl::optional<ThreadPriorityForTest> GetCurrentThreadPriorityForPlatformForTest() { @@ -55,7 +55,7 @@ int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -382,7 +384,7 @@ void PlatformThread::SetName(const std::string& name) +@@ -397,7 +399,7 @@ GetCurrentThreadPriorityForPlatformForTest() { void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,14 +64,21 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -412,8 +414,10 @@ void PlatformThread::SetThreadType(ProcessId process_i - // priority. - CHECK_NE(thread_id, process_id); +@@ -417,7 +419,7 @@ void PlatformThread::SetName(const std::string& name) + #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) + } -+#if !BUILDFLAG(IS_BSD) - // For legacy schedtune interface - SetThreadCgroupsForThreadType(thread_id, thread_type); -+#endif +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + // static + void PlatformThread::SetThreadTypeDelegate(ThreadTypeDelegate* delegate) { + // A component cannot override a delegate set by another component, thus +@@ -428,7 +430,7 @@ void PlatformThread::SetThreadTypeDelegate(ThreadTypeD + } + #endif - #if BUILDFLAG(IS_CHROMEOS) - // For upstream uclamp interface. We try both legacy (schedtune, as done +-#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) + // static + void PlatformThread::SetThreadType(ProcessId process_id, + PlatformThreadId thread_id, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc index eeae01ef75bd..ab57809e0ac0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_posix.cc -@@ -78,7 +78,7 @@ void* ThreadFunc(void* params) { +@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); --#if !BUILDFLAG(IS_NACL) -+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(STARSCAN) +-#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) ++#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) && !BUILDFLAG(IS_BSD) partition_alloc::internal::PCScan::NotifyThreadCreated( partition_alloc::internal::GetStackPointer()); -@@ -380,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, + #endif +@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc index f04ae1389c8c..6f4bb60c70b9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -@@ -24,6 +24,8 @@ +@@ -25,6 +25,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -186,7 +188,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -357,6 +359,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -358,6 +360,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc index 93166ce3be49..650f145f5d7c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_memory__dump__manager.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/trace_event/memory_dump_manager.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/trace_event/memory_dump_manager.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/base/trace_event/memory_dump_manager.cc @@ -82,7 +82,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP #if defined(MALLOC_MEMORY_TRACING_SUPPORTED) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc index 9a7231973df2..788383fa3e2c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/base/trace_event/process_memory_dump.cc @@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden #if BUILDFLAG(IS_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.cc index 526d789c7248..98973fbf100f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/tracing/trace_time.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/tracing/trace_time.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/tracing/trace_time.cc @@ -8,13 +8,17 @@ #include "build/build_config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.h index 318465a602b4..5f7ad47f7a79 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_tracing_trace__time.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/tracing/trace_time.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/tracing/trace_time.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/base/tracing/trace_time.h -@@ -12,7 +12,7 @@ namespace tracing { +@@ -12,7 +12,7 @@ namespace base { namespace tracing { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn index 1288584c3620..b1f5f44f2f80 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/build/config/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/build/config/BUILD.gn -@@ -219,13 +219,17 @@ config("default_libs") { +@@ -222,13 +222,17 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn index f72c9ecebf9a..a7e1736e9cce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -230,6 +231,10 @@ if (host_toolchain == "") { +@@ -235,6 +236,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -274,6 +279,8 @@ if (target_os == "android") { +@@ -278,6 +283,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -308,7 +315,11 @@ is_ios = current_os == "ios" +@@ -312,7 +319,11 @@ is_ios = current_os == "ios" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn index 829c2e111257..85c5c8963128 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn -@@ -225,13 +225,16 @@ config("no_unresolved_symbols") { +@@ -243,13 +243,16 @@ config("no_unresolved_symbols") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -494,6 +497,10 @@ config("compiler") { +@@ -513,6 +516,10 @@ config("compiler") { } } @@ -29,7 +29,16 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -979,7 +986,7 @@ config("compiler_cpu_abi") { +@@ -882,7 +889,7 @@ config("compiler") { + # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode + # lldb doesn't have the needed changes yet. + # TODO(crbug.com/1379070): Remove if the upstream default ever changes. +- if (is_clang && !is_nacl && !is_win && !is_apple) { ++ if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) { + cflags_cc += [ "-gsimple-template-names" ] + } + +@@ -1065,7 +1072,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -38,7 +47,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -997,7 +1004,7 @@ config("compiler_cpu_abi") { +@@ -1083,7 +1090,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -47,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1335,7 +1342,7 @@ config("compiler_deterministic") { +@@ -1418,7 +1425,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -56,7 +65,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1387,7 +1394,7 @@ config("clang_revision") { +@@ -1470,7 +1477,7 @@ config("clang_revision") { } config("clang_revision") { @@ -65,7 +74,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1792,7 +1799,7 @@ config("default_warnings") { +@@ -1872,7 +1879,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -74,7 +83,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1971,7 +1978,7 @@ config("no_chromium_code") { +@@ -2054,7 +2061,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -83,7 +92,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2501,7 +2508,7 @@ config("afdo") { +@@ -2570,7 +2577,7 @@ config("afdo") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -92,8 +101,8 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2517,7 +2524,7 @@ config("afdo") { - cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] +@@ -2589,7 +2596,7 @@ config("afdo") { + } inputs = [ _clang_sample_profile ] } - } else if (auto_profile_path != "" && is_a_target_toolchain) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_freetype_freetype.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_freetype_freetype.gni new file mode 100644 index 000000000000..ab30256825eb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_freetype_freetype.gni @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/build/config/freetype/freetype.gni.orig 2023-08-23 22:56:29 UTC ++++ src/3rdparty/chromium/build/config/freetype/freetype.gni +@@ -10,7 +10,5 @@ declare_args() { + # than version 2.7.1 and have color bitmap support compiled in. WARNING: + # System FreeType configurations other than as described WILL INTRODUCE TEXT + # RENDERING AND SECURITY REGRESSIONS. +- use_system_freetype = false +- use_qt_freetype = false +- qt_freetype_config = "" ++ use_system_freetype = true + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py index e3e4ef50330e..564aa1a88b7b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/build/config/linux/pkg-config.py -@@ -109,7 +109,7 @@ def main(): +@@ -108,7 +108,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni index 559d79420b16..122af743c6f6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/ozone.gni.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/build/config/ozone.gni.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/build/config/ozone.gni @@ -90,7 +90,15 @@ declare_args() { } else if (is_chromeos_lacros) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni index fd99482f7381..c0ed80bc9866 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/rust.gni.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/build/config/rust.gni.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/build/config/rust.gni -@@ -124,7 +124,7 @@ if (enable_rust) { +@@ -135,7 +135,7 @@ if (enable_rust) { rust_sysroot = "//third_party/rust-toolchain" use_unverified_rust_toolchain = false } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_v8__target__cpu.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_v8__target__cpu.gni index e3643d74e9df..f2892f35533c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_v8__target__cpu.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_v8__target__cpu.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/v8_target_cpu.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/config/v8_target_cpu.gni.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/build/config/v8_target_cpu.gni -@@ -36,6 +36,10 @@ if (v8_target_cpu == "") { +@@ -36,6 +36,10 @@ declare_args() { if (v8_target_cpu == "") { if (current_toolchain == "//build/toolchain/linux:clang_x64_v8_arm64") { v8_target_cpu = "arm64" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_detect__host__arch.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_detect__host__arch.py index 348493fc1237..2b2a66c83af7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_detect__host__arch.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_detect__host__arch.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/detect_host_arch.py.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/build/detect_host_arch.py.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/build/detect_host_arch.py -@@ -21,6 +21,8 @@ def HostArch(): +@@ -20,6 +20,8 @@ def HostArch(): host_arch = 'ia32' elif host_arch in ['x86_64', 'amd64']: host_arch = 'x64' diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_gn__run__binary.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_gn__run__binary.py index 12c9c8ac0b55..982e06ca7e64 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_gn__run__binary.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_gn__run__binary.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/gn_run_binary.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/gn_run_binary.py.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/build/gn_run_binary.py -@@ -24,7 +24,7 @@ args = [path] + sys.argv[2:] +@@ -23,7 +23,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_chrome.map b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_chrome.map index f20740c0619c..1fa579cab621 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_chrome.map +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_chrome.map @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/linux/chrome.map.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/linux/chrome.map.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/build/linux/chrome.map @@ -20,6 +20,10 @@ global: # Program entry point. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_strip__binary.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_strip__binary.py index cdb2ec675e75..50091e3aa55a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_strip__binary.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_strip__binary.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/linux/strip_binary.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/linux/strip_binary.py.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/build/linux/strip_binary.py -@@ -10,6 +10,7 @@ def main(): +@@ -10,6 +10,7 @@ import sys def main(): diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_icu.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_icu.gn new file mode 100644 index 000000000000..a53a8e58f942 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_icu.gn @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/build/linux/unbundle/icu.gn.orig 2023-04-13 18:16:16 UTC ++++ src/3rdparty/chromium/build/linux/unbundle/icu.gn +@@ -17,6 +17,15 @@ config("icu_config") { + "USING_SYSTEM_ICU=1", + "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", + ++ # As of icu 73 C++ nullptr, char16_t, override, final and noexcept are used ++ # instead of defines. These definitions can be removed when the bundled icu ++ # gets updated to 73. For more details, see: ++ # https://unicode-org.atlassian.net/browse/ICU-21833 and ++ # https://github.com/unicode-org/icu/commit/28643799377ecf654564f6f31854b02788cebe33 ++ "U_FINAL=final", ++ "U_NOEXCEPT=noexcept", ++ "U_OVERRIDE=override", ++ + # U_EXPORT (defined in unicode/platform.h) is used to set public visibility + # on classes through the U_COMMON_API and U_I18N_API macros (among others). + # When linking against the system ICU library, we want its symbols to have diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libevent.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libevent.gn index eee516c78456..e6b82fd67b32 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libevent.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libevent.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/linux/unbundle/libevent.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/linux/unbundle/libevent.gn.orig 2022-05-28 07:21:18 UTC +++ src/3rdparty/chromium/build/linux/unbundle/libevent.gn @@ -9,7 +9,12 @@ shim_headers("libevent_shim") { headers = [ "event.h" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gn index edd8eefd6aac..0e8b7f3eb7b2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/linux/unbundle/libusb.gn.orig 2022-11-06 11:50:49 UTC +--- src/3rdparty/chromium/build/linux/unbundle/libusb.gn.orig 2021-04-15 08:12:30 UTC +++ src/3rdparty/chromium/build/linux/unbundle/libusb.gn @@ -0,0 +1,24 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py index fc819618c82b..e8c33a90dee5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py -@@ -53,6 +53,7 @@ REPLACEMENTS = { +@@ -54,6 +54,7 @@ REPLACEMENTS = { + 'libevent': 'third_party/libevent/BUILD.gn', 'libjpeg': 'third_party/libjpeg.gni', - 'libjxl' : 'third_party/libjxl/BUILD.gn', 'libpng': 'third_party/libpng/BUILD.gn', + 'libusb': 'third_party/libusb/BUILD.gn', 'libvpx': 'third_party/libvpx/BUILD.gn', diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_freebsd_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_freebsd_BUILD.gn new file mode 100644 index 000000000000..5d5427e3137 |