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..5d5427e3137e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_freebsd_BUILD.gn @@ -0,0 +1,69 @@ +--- src/3rdparty/chromium/build/toolchain/freebsd/BUILD.gn.orig 2022-02-07 13:39:41 UTC ++++ src/3rdparty/chromium/build/toolchain/freebsd/BUILD.gn +@@ -0,0 +1,66 @@ ++# Copyright 2013 The Chromium Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++import("//build/config/sysroot.gni") ++import("//build/toolchain/gcc_toolchain.gni") ++ ++clang_toolchain("clang_x86") { ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "freebsd" ++ } ++} ++ ++gcc_toolchain("x86") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "freebsd" ++ is_clang = false ++ } ++} ++ ++clang_toolchain("clang_x64") { ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "freebsd" ++ } ++} ++ ++gcc_toolchain("x64") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "freebsd" ++ is_clang = false ++ } ++} ++ ++clang_toolchain("clang_arm") { ++ toolchain_args = { ++ current_cpu = "arm64" ++ current_os = "freebsd" ++ } ++} ++ ++clang_toolchain("clang_arm64") { ++ toolchain_args = { ++ current_cpu = "arm64" ++ current_os = "freebsd" ++ } ++} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__solink__wrapper.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__solink__wrapper.py index 5860530ca083..eef3ab0190d9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__solink__wrapper.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__solink__wrapper.py @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/toolchain/gcc_solink_wrapper.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/toolchain/gcc_solink_wrapper.py.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/build/toolchain/gcc_solink_wrapper.py @@ -39,7 +39,7 @@ def CollectDynSym(args): """Replaces: nm --format=posix -g -D -p $sofile | cut -f1-2 -d' '""" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni index d6504ba8584c..d55a846d49d9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -794,22 +801,12 @@ template("clang_toolchain") { +@@ -833,22 +840,12 @@ template("clang_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_openbsd_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_openbsd_BUILD.gn new file mode 100644 index 000000000000..cbfab4f709da --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_openbsd_BUILD.gn @@ -0,0 +1,69 @@ +--- src/3rdparty/chromium/build/toolchain/openbsd/BUILD.gn.orig 2022-02-07 13:39:41 UTC ++++ src/3rdparty/chromium/build/toolchain/openbsd/BUILD.gn +@@ -0,0 +1,66 @@ ++# Copyright 2013 The Chromium Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++import("//build/config/sysroot.gni") ++import("//build/toolchain/gcc_toolchain.gni") ++ ++clang_toolchain("clang_x86") { ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "openbsd" ++ } ++} ++ ++gcc_toolchain("x86") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x86" ++ current_os = "openbsd" ++ is_clang = false ++ } ++} ++ ++clang_toolchain("clang_x64") { ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "openbsd" ++ } ++} ++ ++gcc_toolchain("x64") { ++ cc = "gcc" ++ cxx = "g++" ++ ++ readelf = "readelf" ++ nm = "nm" ++ ar = "ar" ++ ld = cxx ++ ++ toolchain_args = { ++ current_cpu = "x64" ++ current_os = "openbsd" ++ is_clang = false ++ } ++} ++ ++clang_toolchain("clang_arm") { ++ toolchain_args = { ++ current_cpu = "arm64" ++ current_os = "openbsd" ++ } ++} ++ ++clang_toolchain("clang_arm64") { ++ toolchain_args = { ++ current_cpu = "arm64" ++ current_os = "openbsd" ++ } ++} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn new file mode 100644 index 000000000000..36c7ea079dde --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/cc/BUILD.gn.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/cc/BUILD.gn +@@ -668,7 +668,7 @@ cc_test_static_library("test_support") { + if (enable_vulkan) { + deps += [ "//gpu/vulkan/init" ] + } +- if (!is_android) { ++ if (!is_android && !is_bsd) { + data_deps = [ "//third_party/mesa_headers" ] + } + } +@@ -913,7 +913,6 @@ cc_test("cc_unittests") { + data = [ "//components/viz/test/data/" ] + data_deps = [ + "//testing/buildbot/filters:cc_unittests_filters", +- "//third_party/mesa_headers", + ] + + if (is_android && enable_chrome_android_internal) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc new file mode 100644 index 000000000000..77d0b039dee3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc +@@ -118,7 +118,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const + + bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( + content::BrowserContext* context) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Profile* profile = Profile::FromBrowserContext(context); + if (!profile) { + return false; +@@ -145,7 +145,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny + bool IsGetDisplayMediaSetSelectAllScreensAllowed( + content::BrowserContext* context, + const GURL& url) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Profile* profile = Profile::FromBrowserContext(context); + if (!profile) + return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc new file mode 100644 index 000000000000..c53c86c51fbd --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -0,0 +1,47 @@ +--- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc +@@ -20,7 +20,7 @@ + #if BUILDFLAG(IS_CHROMEOS_ASH) + #include "ash/shell.h" + #include "ui/aura/window.h" +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/functional/callback.h" + #include "content/public/browser/desktop_capture.h" + #endif +@@ -31,7 +31,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru + root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER; + } // namespace + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace { + base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit + g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER; +@@ -77,7 +77,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( + return stream_devices_set; + } + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + blink::mojom::StreamDevicesSetPtr EnumerateScreens( + blink::mojom::MediaStreamType stream_type) { + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); +@@ -128,7 +128,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( + root_windows_for_testing_.Get() = std::move(root_windows); + } + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ChromeScreenEnumerator::SetDesktopCapturerForTesting( + std::unique_ptr<webrtc::DesktopCapturer> capturer) { + g_desktop_capturer_for_testing.Get() = std::move(capturer); +@@ -144,7 +144,7 @@ void ChromeScreenEnumerator::EnumerateScreens( + DCHECK(base::FeatureList::IsEnabled( + features::kGetDisplayMediaSetAutoSelectAllScreens)); + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(::EnumerateScreens, stream_type), + base::BindOnce( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.h new file mode 100644 index 000000000000..16e1ca835c5a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.h +@@ -21,7 +21,7 @@ namespace aura { + class Window; + } + +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace webrtc { + class DesktopCapturer; + } +@@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu + + #if BUILDFLAG(IS_CHROMEOS_ASH) + static void SetRootWindowsForTesting(std::vector<aura::Window*> root_windows); +-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + static void SetDesktopCapturerForTesting( + std::unique_ptr<webrtc::DesktopCapturer> capturer); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 4b4a2f98acb5..226274e7a074 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome_ChromeOS"; +@@ -43,7 +43,7 @@ const char kProduct[] = "Chrome_ChromeOS"; const char kProduct[] = "Chrome_Mac"; #elif BUILDFLAG(IS_CHROMEOS_ASH) const char kProduct[] = "Chrome_ChromeOS"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc index 247e50dd00d3..647f9df48f94 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -364,6 +364,10 @@ void WebRtcLogUploader::SetupMultipart( +@@ -365,6 +365,10 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_ChromeOS"; #elif BUILDFLAG(IS_FUCHSIA) const char product[] = "Chrome_Fuchsia"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc index 6f3d583a13ee..fdebe744f962 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -24,10 +24,10 @@ +@@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -282,7 +282,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -278,7 +278,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -328,7 +328,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -323,7 +323,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h index 5c35dc7bfde4..1ba821af9e7a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -137,7 +137,7 @@ class WebRtcLoggingController size_t web_app_id, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc deleted file mode 100644 index 3552614669fa..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ /dev/null @@ -1,92 +0,0 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -320,7 +320,7 @@ - #include "chrome/browser/ui/webui/app_launcher_page_ui.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" - #endif - -@@ -346,17 +346,17 @@ - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/discards/discards_ui.h" - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" - #endif - -@@ -713,7 +713,7 @@ bool IsAboutUI(const GURL& url) { - #if !BUILDFLAG(IS_ANDROID) - || url.host_piece() == chrome::kChromeUITermsHost - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost - #endif - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1150,7 +1150,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - #endif // !defined(USE_REAL_DBUS_CLIENTS) - #endif // !defined(OFFICIAL_BUILD) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) - return &NewWebUI<WebUIJsErrorUI>; - #endif -@@ -1211,7 +1211,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - if (url.host_piece() == chrome::kChromeUINaClHost) - return &NewWebUI<NaClUI>; - #endif --#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - defined(TOOLKIT_VIEWS)) || \ - defined(USE_AURA) - if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1273,27 +1273,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - } - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUISandboxHost) { - return &NewWebUI<SandboxInternalsUI>; - } - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIConnectorsInternalsHost) - return &NewWebUI<enterprise_connectors::ConnectorsInternalsUI>; - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIDiscardsHost) - return &NewWebUI<DiscardsUI>; - #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) - return &NewWebUI<BrowserSwitchUI>; - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) - return &NewWebUI<WebAppSettingsUI>; - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc index 1eec33618c04..d77fe97d96d2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc -@@ -483,18 +483,18 @@ const char kOsUIVersionURL[] = "os://version"; +@@ -514,18 +514,18 @@ const char kOsUIVersionURL[] = "os://version"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -509,14 +509,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -540,14 +540,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -532,7 +532,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta +@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -610,7 +610,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -644,7 +644,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -831,7 +831,7 @@ const char* const kChromeDebugURLs[] = { +@@ -880,7 +880,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h index c61e67d36445..595b89b1194f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.h -@@ -409,24 +409,24 @@ extern const char kOsUIVersionURL[]; +@@ -433,24 +433,24 @@ extern const char kOsUIVersionURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -441,14 +441,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -465,14 +465,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -461,7 +461,7 @@ extern const char kChromeUIProfilePickerStartupQuery[] +@@ -486,7 +486,7 @@ extern const char kChromeUIProfilePickerStartupQuery[] extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp new file mode 100644 index 000000000000..2b6ae7227567 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill_payments_strings.grdp.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/components/autofill_payments_strings.grdp +@@ -118,7 +118,7 @@ + <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> + Save card + </message> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar."> + Do you want to save this card to your Google Account? diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc new file mode 100644 index 000000000000..2b1ac7181e5a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc +@@ -2253,7 +2253,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) + // This option should only be shown for users that have not enabled the Sync + // Feature and that have server credit cards available. + if (!sync_service_ || sync_service_->IsSyncFeatureEnabled() || diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc new file mode 100644 index 000000000000..175dce1c3881 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc +@@ -270,7 +270,7 @@ const base::FeatureParam<int> + bool ShouldShowImprovedUserConsentForCreditCardSave() { + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + // The new user consent UI is fully launched on MacOS, Windows and Linux. + return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc new file mode 100644 index 000000000000..45ed3e6c7a57 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc +@@ -156,7 +156,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value + + bool ShouldAutoselectFirstSuggestionOnArrowDown() { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd new file mode 100644 index 000000000000..33e63f90895e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/components_chromium_strings.grd.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/components/components_chromium_strings.grd +@@ -220,7 +220,7 @@ + </message> + </if> + <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> + Go to + the Chromium menu > diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd new file mode 100644 index 000000000000..d3c31feb7f34 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/components_google_chrome_strings.grd.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/components/components_google_chrome_strings.grd +@@ -220,7 +220,7 @@ + </message> + </if> + <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> + Go to + the Chrome menu > diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc new file mode 100644 index 000000000000..7eaa096997ba --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.cc.orig 2022-02-28 16:54:41 UTC ++++ src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.cc +@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re + #if BUILDFLAG(IS_WIN) + if (!(platform & PLATFORM_WINDOWS)) + return nullptr; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!(platform & PLATFORM_LINUX)) + return nullptr; + #elif BUILDFLAG(IS_MAC) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc new file mode 100644 index 000000000000..974af99fc813 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2022-02-28 16:54:41 UTC ++++ src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc +@@ -12,7 +12,7 @@ + namespace cookie_config { + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + namespace { + + // Use the operating system's mechanisms to encrypt cookies before writing diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn index ba75ae6bcfe2..0a45f6bb117d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/components/crash/core/app/BUILD.gn @@ -52,7 +52,7 @@ static_library("app") { "crashpad.h", @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -223,11 +227,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_chrome__crashpad__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_chrome__crashpad__handler.cc deleted file mode 100644 index bbf84d24aff1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_chrome__crashpad__handler.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/components/crash/core/app/chrome_crashpad_handler.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/components/crash/core/app/chrome_crashpad_handler.cc -@@ -6,5 +6,9 @@ int main(int argc, char* argv[]) { - extern "C" int CrashpadHandlerMain(int argc, char* argv[]); - - int main(int argc, char* argv[]) { -+#if defined(__OpenBSD__) || defined(__FreeBSD__) -+ return -1; -+#else - return CrashpadHandlerMain(argc, argv); -+#endif - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc deleted file mode 100644 index c304b9c6a721..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- src/3rdparty/chromium/components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/components/crash/core/browser/crash_upload_list_crashpad.cc -@@ -37,7 +37,9 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra - - std::vector<UploadList::UploadInfo> CrashUploadListCrashpad::LoadUploadList() { - std::vector<crash_reporter::Report> reports; -+#if !defined(OS_BSD) - crash_reporter::GetReports(&reports); -+#endif - - std::vector<UploadInfo> uploads; - for (const crash_reporter::Report& report : reports) { -@@ -51,9 +53,13 @@ void CrashUploadListCrashpad::ClearUploadList(const ba - - void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, - const base::Time& end) { -+#if !defined(OS_BSD) - crash_reporter::ClearReportsBetween(begin, end); -+#endif - } - - void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) { -+#if !defined(OS_BSD) - crash_reporter::RequestSingleCrashUpload(local_id); -+#endif - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn index 47db051503ba..f1bbd08b7b3a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn -@@ -8,7 +8,7 @@ declare_args() { +@@ -8,7 +8,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn declare_args() { # If set to true, this will stub out and disable the entire crash key system. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_discardable__memory_service_discardable__shared__memory__manager.cc new file mode 100644 index 000000000000..a4dbb7fae0f3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2022-08-31 12:19:35 UTC ++++ src/3rdparty/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc +@@ -171,7 +171,7 @@ uint64_t GetDefaultMemoryLimit() { + // Limits the number of FDs used to 32, assuming a 4MB allocation size. + uint64_t max_default_memory_limit = 128 * kMegabyte; + #else +- uint64_t max_default_memory_limit = 512 * kMegabyte; ++ uint64_t max_default_memory_limit = 128 * kMegabyte; + #endif + + // Use 1/8th of discardable memory on low-end devices. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc new file mode 100644 index 000000000000..56dd7feeee6c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2022-07-22 17:30:31 UTC ++++ src/3rdparty/chromium/components/flags_ui/flags_state.cc +@@ -672,7 +672,7 @@ unsigned short FlagsState::GetCurrentPlatform() { + return kOsCrOS; + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + return kOsLacros; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return kOsLinux; + #elif BUILDFLAG(IS_ANDROID) + return kOsAndroid; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc index 4990280afce5..d4aadea8dca0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig 2021-04-14 18:40:59 UTC +++ src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc new file mode 100644 index 000000000000..76142e0ff3bf --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/components/metrics/metrics_log.cc.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/components/metrics/metrics_log.cc +@@ -53,7 +53,7 @@ + #include "base/win/current_module.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #endif +@@ -123,7 +123,7 @@ void RecordCurrentTime( + } + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( + base::nix::SessionType session_type) { + switch (session_type) { +@@ -375,7 +375,7 @@ void MetricsLog::RecordCoreSystemProfile( + // OperatingSystemVersion refers to the ChromeOS release version. + #if BUILDFLAG(IS_CHROMEOS_ASH) + os->set_kernel_version(base::SysInfo::KernelVersion()); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Linux operating system version is copied over into kernel version to be + // consistent. + os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); +@@ -392,7 +392,7 @@ void MetricsLog::RecordCoreSystemProfile( + os->set_build_number(base::SysInfo::GetIOSBuildNumber()); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<base::Environment> env = base::Environment::Create(); + os->set_xdg_session_type(ToProtoSessionType(base::nix::GetSessionType(*env))); + os->set_xdg_current_desktop( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_motherboard.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_motherboard.cc new file mode 100644 index 000000000000..da39c9642286 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_motherboard.cc @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/components/metrics/motherboard.cc.orig 2022-10-24 13:33:33 UTC ++++ src/3rdparty/chromium/components/metrics/motherboard.cc +@@ -1,6 +1,7 @@ + // Copyright 2022 The Chromium Authors + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. ++// CHECK + + #include "components/metrics/motherboard.h" + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_connection__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_connection__info.h new file mode 100644 index 000000000000..ed1281ea2ffb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_connection__info.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/named_mojo_ipc_server/connection_info.h.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/components/named_mojo_ipc_server/connection_info.h +@@ -13,7 +13,7 @@ + #include "base/win/scoped_handle.h" + #elif BUILDFLAG(IS_MAC) + #include <bsm/libbsm.h> +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <sys/socket.h> + #endif + +@@ -32,7 +32,7 @@ struct ConnectionInfo { + absl::optional<base::win::ScopedHandle> impersonation_token{}; + #elif BUILDFLAG(IS_MAC) + audit_token_t audit_token{}; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ucred credentials{}; + #endif + }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc new file mode 100644 index 000000000000..1054198b46a2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc +@@ -22,7 +22,7 @@ namespace named_mojo_ipc_server { + // static + mojo::PlatformChannelEndpoint ConnectToServer( + const mojo::NamedPlatformChannel::ServerName& server_name) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return mojo::NamedPlatformChannel::ConnectToServer(server_name); + #elif BUILDFLAG(IS_MAC) + mojo::PlatformChannelEndpoint endpoint = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js new file mode 100644 index 000000000000..772fc06ecc8a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/components/neterror/resources/neterror.js +@@ -137,7 +137,7 @@ function detailsButtonClick() { + + let primaryControlOnLeft = true; + // clang-format off +-// <if expr="is_macosx or is_ios or is_linux or is_chromeos or is_android"> ++// <if expr="is_macosx or is_ios or is_posix or is_chromeos or is_android"> + // clang-format on + primaryControlOnLeft = false; + // </if> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc new file mode 100644 index 000000000000..63b224579fe1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc +@@ -807,7 +807,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C + } + #endif // #if !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE; + #else + return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_new__or__sad__tab__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_new__or__sad__tab__strings.grdp new file mode 100644 index 000000000000..07be6389be6a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_new__or__sad__tab__strings.grdp @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/new_or_sad_tab_strings.grdp.orig 2022-07-22 17:30:31 UTC ++++ src/3rdparty/chromium/components/new_or_sad_tab_strings.grdp +@@ -66,7 +66,7 @@ + Close other tabs or apps + </message> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer."> + Close other tabs or programs + </message> +@@ -76,7 +76,7 @@ + Close other apps + </message> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux)."> + Close other programs + </message> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_keyring__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_keyring__util__linux.cc index 4a0bea7ab0fe..dc3bd7fb17c4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_keyring__util__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_keyring__util__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/os_crypt/keyring_util_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/os_crypt/keyring_util_linux.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/components/os_crypt/keyring_util_linux.cc @@ -68,12 +68,12 @@ bool GnomeKeyringLoader::LoadGnomeKeyring() { if (keyring_loaded) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc index c3cf9b4cb53b..5d331a6d8dcb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc @@ -102,13 +102,13 @@ bool LibsecretLoader::LoadLibsecret() { if (libsecret_loaded_) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h index 24b1e83d064d..948a26a809bc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/os_crypt/os_crypt.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/components/os_crypt/os_crypt.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/components/os_crypt/os_crypt.h -@@ -15,7 +15,7 @@ +@@ -14,7 +14,7 @@ #include "build/build_config.h" #include "build/chromecast_buildflags.h" @@ -9,7 +9,7 @@ class KeyStorageLinux; #endif // BUILDFLAG(IS_LINUX) -@@ -24,7 +24,7 @@ class PrefService; +@@ -23,7 +23,7 @@ class PrefRegistrySimple; class PrefService; #endif @@ -18,7 +18,7 @@ namespace crypto { class SymmetricKey; } -@@ -37,7 +37,7 @@ namespace OSCrypt { +@@ -36,7 +36,7 @@ struct Config; // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions // of what each function does. namespace OSCrypt { @@ -27,7 +27,7 @@ COMPONENT_EXPORT(OS_CRYPT) void SetConfig(std::unique_ptr<os_crypt::Config> config); #endif // BUILDFLAG(IS_LINUX) -@@ -82,7 +82,7 @@ COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting() +@@ -81,7 +81,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy); COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyStorageForTesting( base::OnceCallback<std::unique_ptr<KeyStorageLinux>()> -@@ -109,7 +109,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -108,7 +108,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { // Returns singleton instance of OSCryptImpl. static OSCryptImpl* GetInstance(); @@ -45,7 +45,7 @@ // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -201,7 +201,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -200,7 +200,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { void ResetStateForTesting(); #endif @@ -54,7 +54,7 @@ // For unit testing purposes, inject methods to be used. // |storage_provider_factory| provides the desired |KeyStorage| // implementation. If the provider returns |nullptr|, a hardcoded password -@@ -226,13 +226,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -225,13 +225,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { crypto::SymmetricKey* GetEncryptionKey(); #endif // BUILDFLAG(IS_APPLE) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_common_proto_paint__preview.proto b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_common_proto_paint__preview.proto new file mode 100644 index 000000000000..e7ff347af1c9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_common_proto_paint__preview.proto @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/components/paint_preview/common/proto/paint_preview.proto.orig 2021-12-14 11:45:03 UTC ++++ src/3rdparty/chromium/components/paint_preview/common/proto/paint_preview.proto +@@ -82,8 +82,8 @@ message PaintPreviewFrameProto { + // Stores Chrome version. + // NEXT_TAG = 5 + message ChromeVersionProto { +- optional uint64 major = 1; +- optional uint64 minor = 2; ++ optional uint64 gmajor = 1; ++ optional uint64 gminor = 2; + optional uint64 build = 3; + optional uint64 patch = 4; + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc new file mode 100644 index 000000000000..6e905d43147c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.cc +@@ -76,7 +76,7 @@ BASE_FEATURE(kFillOnAccountSelect, + "fill-on-account-select", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // When enabled, initial sync will be forced during startup if the password + // store has encryption service failures. + BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, +@@ -197,7 +197,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, + "PasswordStrengthIndicator", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Displays at least the decryptable and never saved logins in the password + // manager + BASE_FEATURE(kSkipUndecryptablePasswords, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h new file mode 100644 index 000000000000..01f51114dce4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h +@@ -35,7 +35,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear + BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFencedFrame); + BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites); + BASE_DECLARE_FEATURE(kFillOnAccountSelect); +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); + #endif + BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); +@@ -67,7 +67,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop + BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble); + #endif +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords); + #endif + #if BUILDFLAG(IS_ANDROID) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h new file mode 100644 index 000000000000..4b534d0d55ea --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/performance_manager/public/features.h.orig 2022-11-30 08:12:58 UTC ++++ src/3rdparty/chromium/components/performance_manager/public/features.h +@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThread); + + #if !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false + #else + #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_security__interstitials_content_utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_security__interstitials_content_utils.cc new file mode 100644 index 000000000000..1836675b3ee2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_security__interstitials_content_utils.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/security_interstitials/content/utils.cc.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/components/security_interstitials/content/utils.cc +@@ -38,7 +38,7 @@ void LaunchDateAndTimeSettings() { + #if BUILDFLAG(IS_ANDROID) + JNIEnv* env = base::android::AttachCurrentThread(); + Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + struct ClockCommand { + const char* const pathname; + const char* const argument; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc index 0f98a6d4ffa7..23f0ffd45cb3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc -@@ -36,6 +36,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi + } } - screen_ai::StoreComponentBinaryPath(library_path); +#if !BUILDFLAG(IS_BSD) auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -59,6 +60,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -76,6 +77,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h index 21845961df92..4a345456a725 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h @@ -5,7 +5,13 @@ #ifndef COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn new file mode 100644 index 000000000000..516f089d4638 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/components/storage_monitor/BUILD.gn +@@ -75,7 +75,7 @@ jumbo_static_library("storage_monitor") { + deps += [ "//services/device/public/mojom" ] + } + } else if (is_linux || is_chromeos_lacros) { +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ + "mtab_watcher_linux.cc", + "mtab_watcher_linux.h", +@@ -179,7 +179,7 @@ source_set("unit_tests") { + "storage_monitor_chromeos_unittest.cc", + ] + } +- } else if (is_linux || is_chromeos_lacros) { ++ } else if ((is_linux || is_chromeos_lacros) && !is_bsd) { + if (use_udev) { + sources += [ "storage_monitor_linux_unittest.cc" ] + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.cc new file mode 100644 index 000000000000..c5ce5fae2f1b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/storage_monitor/removable_device_constants.cc.orig 2022-02-28 16:54:41 UTC ++++ src/3rdparty/chromium/components/storage_monitor/removable_device_constants.cc +@@ -10,7 +10,7 @@ namespace storage_monitor { + const char kFSUniqueIdPrefix[] = "UUID:"; + const char kVendorModelSerialPrefix[] = "VendorModelSerial:"; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kVendorModelVolumeStoragePrefix[] = "VendorModelVolumeStorage:"; + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.h new file mode 100644 index 000000000000..1d11562e131e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_removable__device__constants.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/storage_monitor/removable_device_constants.h.orig 2022-02-28 16:54:41 UTC ++++ src/3rdparty/chromium/components/storage_monitor/removable_device_constants.h +@@ -14,7 +14,7 @@ namespace storage_monitor { + extern const char kFSUniqueIdPrefix[]; + extern const char kVendorModelSerialPrefix[]; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kVendorModelVolumeStoragePrefix[]; + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc new file mode 100644 index 000000000000..844f2cc5b7d5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc +@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() { + // The ideal fix would be to change the omnibox font used for Thai. In + // that case, the Linux-only list should be revisited and potentially + // removed. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + "[ทนบพรหเแ๐ดลปฟม]", + #else + "[บพเแ๐]", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_common_gpu_dawn__context__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_common_gpu_dawn__context__provider.cc new file mode 100644 index 000000000000..b67426e510f3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_common_gpu_dawn__context__provider.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/viz/common/gpu/dawn_context_provider.cc.orig 2022-02-28 16:54:41 UTC ++++ src/3rdparty/chromium/components/viz/common/gpu/dawn_context_provider.cc +@@ -20,7 +20,7 @@ namespace { + wgpu::BackendType GetDefaultBackendType() { + #if BUILDFLAG(IS_WIN) + return wgpu::BackendType::D3D12; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return wgpu::BackendType::Vulkan; + #else + NOTREACHED(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.cc new file mode 100644 index 000000000000..7dca4b47e567 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/viz/host/host_display_client.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/components/viz/host/host_display_client.cc +@@ -67,7 +67,7 @@ void HostDisplayClient::AddChildWindowToBrowser( + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { + NOTIMPLEMENTED(); + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.h new file mode 100644 index 000000000000..74fb0259fae8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_host__display__client.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/viz/host/host_display_client.h.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/components/viz/host/host_display_client.h +@@ -54,7 +54,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override; + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_renderer__settings__creation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_renderer__settings__creation.cc new file mode 100644 index 000000000000..b6ddc3aeb62c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_renderer__settings__creation.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/viz/host/renderer_settings_creation.cc.orig 2022-02-28 16:54:41 UTC ++++ src/3rdparty/chromium/components/viz/host/renderer_settings_creation.cc +@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() { + renderer_settings.partial_swap_enabled = + !command_line->HasSwitch(switches::kUIDisablePartialSwap); + +-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Simple frame rate throttling only works on macOS and Linux + renderer_settings.apply_simple_frame_rate_throttling = + features::IsSimpleFrameRateThrottlingEnabled(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc new file mode 100644 index 000000000000..d94d56e6ed9a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc +@@ -1259,7 +1259,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor + ->GetDeviceQueue() + ->GetVulkanPhysicalDevice(), + VK_IMAGE_TILING_OPTIMAL, ycbcr_info); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Textures that were allocated _on linux_ with ycbcr info came from + // VaapiVideoDecoder, which exports using DRM format modifiers. + return GrBackendFormat::MakeVk(gr_ycbcr_info, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.cc new file mode 100644 index 000000000000..6bfb70ab849c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.cc.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.cc +@@ -98,7 +98,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: + now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + if (needs_swap_size_notifications_) + client_->DidSwapWithSize(pixel_size); + #endif +@@ -125,7 +125,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void SoftwareOutputSurface::SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) { + needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.h new file mode 100644 index 000000000000..4ab14b893dc9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_software__output__surface.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.h.orig 2022-07-22 17:30:31 UTC ++++ src/3rdparty/chromium/components/viz/service/display_embedder/software_output_surface.h +@@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + gfx::OverlayTransform GetDisplayTransform() override; + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) override; + #endif +@@ -69,7 +69,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + bool needs_swap_size_notifications_ = false; + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc new file mode 100644 index 000000000000..01be933c151f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc +@@ -1149,7 +1149,7 @@ void SkiaRenderer::ClearFramebuffer() { + if (current_frame()->current_render_pass->has_transparent_background) { + ClearCanvas(SkColors::kTransparent); + } else { +-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) ++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // On DEBUG builds, opaque render passes are cleared to blue + // to easily see regions that were not drawn on the screen. + // ClearCavas() call causes slight pixel difference, so linux-ref and diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc new file mode 100644 index 000000000000..e8f179652c9a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc +@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create( + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // For X11, we need notify client about swap completion after resizing, so the + // client can use it for synchronize with X11 WM. + output_surface->SetNeedsSwapSizeNotifications(true); +@@ -585,7 +585,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw + display_client_->DidCompleteSwapWithSize(pixel_size); + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + if (display_client_ && pixel_size != last_swap_pixel_size_) { + last_swap_pixel_size_ = pixel_size; + display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h new file mode 100644 index 000000000000..817f9307c9f1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h +@@ -200,7 +200,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + gfx::Size last_swap_pixel_size_; + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc index 0a1f73221cd8..9df54ad2e565 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/app/content_main.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/app/content_main.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/app/content_main.cc -@@ -228,7 +228,7 @@ RunContentProcess(ContentMainParams params, +@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params, base::EnableTerminationOnOutOfMemory(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc index 2939640226a5..453c8ae225c4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/app/content_main_runner_impl.cc -@@ -135,13 +135,13 @@ - #include "base/posix/global_descriptors.h" +@@ -139,13 +139,13 @@ + #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" -#if !BUILDFLAG(IS_MAC) @@ -13,10 +13,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" - #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -165,6 +165,11 @@ +@@ -170,6 +170,11 @@ #include "content/public/common/content_client.h" #endif @@ -27,8 +27,8 @@ + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -183,6 +188,10 @@ + #if BUILDFLAG(USE_ZYGOTE) +@@ -189,6 +194,10 @@ #endif #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,25 +39,35 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -388,7 +397,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -377,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess( } - #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) + #endif // BUILDFLAG(USE_ZYGOTE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -424,7 +433,7 @@ void PreloadLibraryCdms() { +@@ -413,15 +422,17 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) --#if BUILDFLAG(USE_ZYGOTE_HANDLE) -+#if BUILDFLAG(USE_ZYGOTE_HANDLE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(USE_ZYGOTE) ++#if BUILDFLAG(USE_ZYGOTE) || BUILDFLAG(IS_BSD) void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -449,6 +458,11 @@ void PreSandboxInit() { + CRYPTO_pre_sandbox_init(); + ++#if !BUILDFLAG(IS_BSD) + // Pre-read /proc/sys/fs/inotify/max_user_watches so it doesn't have to be + // allowed by the sandbox. + base::GetMaxNumberOfInotifyWatches(); ++#endif + + #if BUILDFLAG(ENABLE_PPAPI) + // Ensure access to the Pepper plugins before the sandbox is turned on. +@@ -442,6 +453,11 @@ void PreSandboxInit() { } #endif @@ -69,7 +79,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -631,7 +645,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -629,7 +645,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -78,7 +88,7 @@ PreSandboxInit(); #endif -@@ -825,11 +839,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -832,11 +848,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -92,7 +102,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1017,6 +1030,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1033,6 +1048,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -108,9 +118,9 @@ + delegate_->SandboxInitialized(process_type); - #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1080,7 +1103,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { - process_type); + #if BUILDFLAG(USE_ZYGOTE) +@@ -1100,7 +1125,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { + ->ReconfigureAfterFeatureListInit(process_type); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -118,7 +128,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1113,6 +1136,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1138,6 +1163,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn index c7733903a55f..cfc7edccc312 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/browser/BUILD.gn -@@ -2501,6 +2501,13 @@ jumbo_source_set("browser") { +@@ -2360,6 +2360,13 @@ source_set("browser") { ] } @@ -12,5 +12,5 @@ + } + if (is_chromeos) { - deps += [ "//components/value_store:value_store" ] sources += [ + "handwriting/handwriting_recognition_service_impl_cros.cc", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_audio_audio__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_audio_audio__service.cc new file mode 100644 index 000000000000..59bfb4d8fa95 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_audio_audio__service.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/audio/audio_service.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/content/browser/audio/audio_service.cc +@@ -33,7 +33,7 @@ + #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) + #include "ui/display/util/edid_parser.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/display/display_util.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -225,7 +225,7 @@ audio::mojom::AudioService& GetAudioService() { + ->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&ScanEdidBitstreams), + base::BindOnce(&LaunchAudioService, std::move(receiver))); +-#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + LaunchAudioService( + std::move(receiver), + ConvertEdidBitstreams(display::DisplayUtil::GetAudioFormats())); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc index 2f1c82b88a0c..0c89457a2238 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc @@ -316,6 +316,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc index d908feb5ac68..517ac077bc56 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/browser/browser_main_loop.cc -@@ -247,6 +247,12 @@ +@@ -250,6 +250,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -531,6 +537,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -562,7 +574,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -580,7 +592,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc index e17e6744a9e4..5b1da7855c20 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc @@ -20,7 +20,9 @@ #include "content/public/common/result_codes.h" @@ -10,15 +10,46 @@ #include "sandbox/policy/linux/sandbox_linux.h" namespace content { -@@ -74,6 +76,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -45,14 +47,20 @@ ChildProcessLauncherHelper::GetFilesToMap() { + } + + bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { ++#if !BUILDFLAG(IS_BSD) + return !GetZygoteForLaunch(); ++#else ++ return true; ++#endif + } + + bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( + PosixFileDescriptorInfo& files_to_register, + base::LaunchOptions* options) { + if (options) { ++#if !BUILDFLAG(IS_BSD) + DCHECK(!GetZygoteForLaunch()); ++#endif + // Convert FD mapping to FileHandleMappingVector + options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( + base::GlobalDescriptors::kBaseDescriptor); +@@ -64,7 +72,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche + + options->environment = delegate_->GetEnvironment(); + } else { ++#if !BUILDFLAG(IS_BSD) + DCHECK(GetZygoteForLaunch()); ++#endif + // Environment variables could be supported in the future, but are not + // currently supported when launching with the zygote. + DCHECK(delegate_->GetEnvironment().empty()); +@@ -81,6 +91,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; Process process; +#if !BUILDFLAG(IS_BSD) - ZygoteHandle zygote_handle = - base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) - ? nullptr -@@ -87,7 +90,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr + ZygoteCommunication* zygote_handle = GetZygoteForLaunch(); + if (zygote_handle) { + // TODO(crbug.com/569191): If chrome supported multiple zygotes they could +@@ -91,7 +102,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -26,7 +57,7 @@ if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; -@@ -96,15 +98,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -100,15 +110,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr oom_score = content::kLowestRendererOomScore; ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score); } @@ -36,7 +67,7 @@ process.zygote = zygote_handle; } else { +#endif - process.process = base::LaunchProcess(*command_line(), options); + process.process = base::LaunchProcess(*command_line(), *options); *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS : LAUNCH_RESULT_FAILURE; +#if !BUILDFLAG(IS_BSD) @@ -45,7 +76,7 @@ #if BUILDFLAG(IS_CHROMEOS) if (GetProcessType() == switches::kRendererProcess) { -@@ -124,10 +128,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper +@@ -130,10 +142,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -60,7 +91,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -151,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -157,13 +173,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. @@ -77,4 +108,18 @@ +#endif } - void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( + void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread( +@@ -174,11 +194,13 @@ void ChildProcessLauncherHelper::SetProcessBackgrounde + process.SetProcessBackgrounded(is_background); + } + ++#if !BUILDFLAG(IS_BSD) + ZygoteCommunication* ChildProcessLauncherHelper::GetZygoteForLaunch() { + return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) + ? nullptr + : delegate_->GetZygote(); + } ++#endif + + base::File OpenFileToShare(const base::FilePath& path, + base::MemoryMappedFile::Region* region) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc index 6e46723b4a88..3d0d2bcbdf8f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc -@@ -118,7 +118,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -116,7 +116,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc index cc465ce6628c..47562eb7d940 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc @@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS + // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. - #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !defined(NDEBUG)) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || defined(USE_OZONE) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !defined(NDEBUG)) || \ ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && !defined(NDEBUG)) || \ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_OZONE) static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 3; #else - static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 1; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_download_download__manager__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_download_download__manager__impl.cc deleted file mode 100644 index eae10fecc726..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_download_download__manager__impl.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/content/browser/download/download_manager_impl.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/content/browser/download/download_manager_impl.cc -@@ -92,7 +92,7 @@ - #include "third_party/blink/public/common/storage_key/storage_key.h" - #include "url/origin.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/nix/xdg_util.h" - #endif - -@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl - } - }; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::FilePath GetTemporaryDownloadDirectory() { - std::unique_ptr<base::Environment> env(base::Environment::Create()); - return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -655,7 +655,7 @@ base::FilePath DownloadManagerImpl::GetDefaultDownload - - base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { - base::FilePath default_download_directory; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // TODO(thomasanderson,crbug.com/784010): Remove this when all Linux - // distros with versions of GTK lower than 3.14.7 are no longer - // supported. This should happen when support for Ubuntu Trusty and diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc index b22c42788c11..f14b624decaf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_font__access_font__enumeration__data__source.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/font_access/font_enumeration_data_source.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/font_access/font_enumeration_data_source.cc.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/content/browser/font_access/font_enumeration_data_source.cc @@ -16,7 +16,7 @@ #include "content/browser/font_access/font_enumeration_data_source_win.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc index 502ae5228b67..aea5c4af3bbd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_compositor__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/gpu/compositor_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/gpu/compositor_util.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/content/browser/gpu/compositor_util.cc @@ -148,7 +148,7 @@ const GpuFeatureData GetGpuFeatureData( {"video_decode", @@ -6,10 +6,10 @@ gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux), - #else - command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), -@@ -160,7 +160,7 @@ const GpuFeatureData GetGpuFeatureData( + !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || + #endif // BUILDFLAG(IS_LINUX) + command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), +@@ -159,7 +159,7 @@ const GpuFeatureData GetGpuFeatureData( {"video_encode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc index f99cde31d1cc..7d86c8262770 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc -@@ -257,6 +257,7 @@ static const char* const kSwitchNames[] = { +@@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, + switches::kDisableUnveil, - switches::kEnableDeJelly, - switches::kDeJellyScreenWidth, switches::kDoubleBufferCompositing, -@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = { + switches::kHeadless, + switches::kLoggingLevel, +@@ -283,7 +284,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc index 5babd3a55a1d..6d49b8fe66c9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc @@ -16,7 +16,7 @@ #include "media/mojo/mojom/renderer_extensions.mojom.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h index c45505395d1b..4ca5904fc35d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h @@ -19,7 +19,7 @@ #include "mojo/public/cpp/bindings/receiver_set.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc index 4b83c959e344..d7025daf2fd0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc @@ -73,7 +73,7 @@ #include "media/mojo/services/mojo_renderer_service.h" // nogncheck diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc index 43b9c826924d..c4ec45daf0d9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc @@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc new file mode 100644 index 000000000000..3f3775cc4b05 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/network_service_instance_impl.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/content/browser/network_service_instance_impl.cc +@@ -76,7 +76,7 @@ + #include "content/browser/network/network_service_process_tracker_win.h" + #endif + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/browser/system_dns_resolution/system_dns_resolver.h" + #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" + #endif +@@ -404,7 +404,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS + } + #endif // BUILDFLAG(IS_POSIX) + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (GetContentClient() + ->browser() + ->ShouldRunOutOfProcessSystemDnsResolution() && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc index 41626e1343d9..df7462069e8b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc @@ -8,7 +8,7 @@ @@ -9,7 +9,7 @@ #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif -@@ -17,7 +17,7 @@ void PpapiPluginProcessHost::BindHostReceiver( +@@ -17,7 +17,7 @@ namespace content { void PpapiPluginProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_back__forward__cache__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_back__forward__cache__impl.cc new file mode 100644 index 000000000000..80adf88d5161 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_back__forward__cache__impl.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/content/browser/renderer_host/back_forward_cache_impl.cc +@@ -56,7 +56,7 @@ BASE_FEATURE(kBackForwardCacheSize, + // Sets the BackForwardCache size for desktop. + // See crbug.com/1291435. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc index f44ad7adda96..db196c7b2f00 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc -@@ -289,7 +289,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_input_input__device__change__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_input_input__device__change__observer.cc index e51fe54fa6f0..3bf14eb4f76f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_input_input__device__change__observer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_input_input__device__change__observer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/input/input_device_change_observer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/input/input_device_change_observer.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/input/input_device_change_observer.cc @@ -9,7 +9,7 @@ @@ -18,7 +18,7 @@ ui::DeviceDataManager::GetInstance()->AddObserver(this); #elif BUILDFLAG(IS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); -@@ -31,7 +31,7 @@ InputDeviceChangeObserver::~InputDeviceChangeObserver( +@@ -31,7 +31,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R InputDeviceChangeObserver::~InputDeviceChangeObserver() { #if BUILDFLAG(IS_WIN) ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc index 377137c8132c..4a338656e54c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc @@ -455,7 +455,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.cc deleted file mode 100644 index 10091c345c4d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc -@@ -66,7 +66,7 @@ - #if BUILDFLAG(IS_MAC) - #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/linux_util.h" - #include "base/threading/platform_thread.h" - #endif -@@ -130,7 +130,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( - document_token); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadTypeOnWorkerThread( - base::PlatformThreadId ns_tid, - base::ThreadType thread_type) { -@@ -151,7 +151,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( - } - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadType(int32_t ns_tid, - base::ThreadType thread_type) { - constexpr base::TaskTraits kTraits = { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.h deleted file mode 100644 index 922fc458ba21..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.h +++ /dev/null @@ -1,18 +0,0 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h -@@ -78,13 +78,13 @@ class RenderMessageFilter - void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; - void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; - void HasGpuProcess(HasGpuProcessCallback callback) override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override; - #endif - - void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadTypeOnWorkerThread(base::PlatformThreadId ns_tid, - base::ThreadType thread_type); - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc index f627cbaa3b5c..7721b63b40fe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc -@@ -210,7 +210,7 @@ +@@ -212,7 +212,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1140,7 +1140,7 @@ size_t GetPlatformProcessLimit() { +@@ -1148,7 +1148,7 @@ size_t GetPlatformProcessLimit() { // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1227,7 +1227,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1240,7 +1240,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,16 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -2132,7 +2132,7 @@ void RenderProcessHostImpl::ReinitializeLogging( +@@ -1329,7 +1329,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public + std::unique_ptr<service_manager::BinderRegistry> binders_; + mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> + video_encode_accelerator_factory_remote_; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -2168,7 +2168,7 @@ void RenderProcessHostImpl::ReinitializeLogging( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -35,16 +44,16 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { - if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3294,6 +3294,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin + DCHECK_CURRENTLY_ON(BrowserThread::UI); +@@ -3356,6 +3356,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, + switches::kDisableUseMojoVideoDecoderForPepper, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, - switches::kDisableWebGLImageChromium, -@@ -4778,7 +4779,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4847,7 +4848,7 @@ void RenderProcessHostImpl::ResetIPC() { coordinator_connector_receiver_.reset(); tracing_registration_.reset(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h index e467621b530b..9595b09fccf6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h -@@ -83,7 +83,7 @@ +@@ -85,7 +85,7 @@ #include "content/public/browser/android/child_process_importance.h" #endif @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -485,7 +485,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -495,7 +495,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,7 +18,7 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -684,7 +684,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -704,7 +704,7 @@ class CONTENT_EXPORT RenderProcessHostImpl mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override; @@ -27,7 +27,7 @@ void CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) override; -@@ -1144,7 +1144,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1181,7 +1181,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // RenderProcessHost. This is destroyed early in ResetIPC() method. std::unique_ptr<PermissionServiceContext> permission_service_context_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc index edd16277024d..cf2fc7e43e27 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc -@@ -253,7 +253,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -250,7 +250,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc index a9f4919da1b0..bf643fd9f732 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -118,7 +118,7 @@ +@@ -119,7 +119,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -451,7 +451,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1589,7 +1589,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1588,7 +1588,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2415,7 +2415,7 @@ bool RenderWidgetHostViewAura::NeedsMouseCapture() { +@@ -2420,7 +2420,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2592,7 +2592,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2597,7 +2597,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h index 32e4b62bb3aa..287bb394b0e3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h -@@ -245,7 +245,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc index be50278c4424..92d32cbb737a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc @@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc index 7fe25abf6c69..6a3e81247fd9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/sandbox_host_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/sandbox_host_linux.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/content/browser/sandbox_host_linux.cc @@ -45,6 +45,7 @@ void SandboxHostLinux::Init() { // Instead, it replies on a temporary socket provided by the caller. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 4e49b69fa2de..5943ba589267 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc @@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(IS_OZONE) task_execution_metadata_.clear(); #endif - return; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.cc index a437a0f47af8..6d5f4a32c242 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/browser/scheduler/responsiveness/native_event_observer.cc @@ -15,7 +15,7 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.h index e085afa52d22..f2988d00b204 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_native__event__observer.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/scheduler/responsiveness/native_event_observer.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/scheduler/responsiveness/native_event_observer.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/browser/scheduler/responsiveness/native_event_observer.h -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/window_event_dispatcher_observer.h" #endif -@@ -40,7 +40,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -41,7 +41,7 @@ namespace responsiveness { class CONTENT_EXPORT NativeEventObserver #if BUILDFLAG(IS_MAC) : public NativeEventProcessorObserver @@ -18,7 +18,7 @@ : public aura::WindowEventDispatcherObserver #elif BUILDFLAG(IS_WIN) : public base::MessagePumpForUI::Observer -@@ -57,7 +57,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -58,7 +58,7 @@ class CONTENT_EXPORT NativeEventObserver NativeEventObserver(WillRunEventCallback will_run_event_callback, DidRunEventCallback did_run_event_callback); @@ -27,7 +27,7 @@ NativeEventObserver(const NativeEventObserver&) = delete; NativeEventObserver& operator=(const NativeEventObserver&) = delete; -@@ -73,7 +73,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -74,7 +74,7 @@ class CONTENT_EXPORT NativeEventObserver // Exposed for tests. void WillRunNativeEvent(const void* opaque_identifier) override; void DidRunNativeEvent(const void* opaque_identifier) override; @@ -36,12 +36,12 @@ // aura::WindowEventDispatcherObserver overrides: void OnWindowEventDispatcherStartedProcessing( aura::WindowEventDispatcher* dispatcher, -@@ -90,7 +90,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -91,7 +91,7 @@ class CONTENT_EXPORT NativeEventObserver void RegisterObserver(); void DeregisterObserver(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct EventInfo { - const void* unique_id; + raw_ptr<const void> unique_id; }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc index b8c92fe52466..314f93bed1bb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc @@ -10,7 +10,7 @@ #include "content/public/browser/content_browser_client.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif -@@ -19,7 +19,7 @@ void UtilityProcessHost::BindHostReceiver( +@@ -19,7 +19,7 @@ namespace content { void UtilityProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc index 430519fa0889..1b208bccaa05 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc -@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif @@ -12,8 +12,12 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: +@@ -117,10 +117,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // unsandboxed zygote and then apply their actual sandboxes in the forked // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || @@ -21,4 +25,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc index ee98cbbf4550..13036dd9b8ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_v8__snapshot__files.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/browser/v8_snapshot_files.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/v8_snapshot_files.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/browser/v8_snapshot_files.cc -@@ -10,7 +10,7 @@ std::map<std::string, base::FilePath> GetV8SnapshotFil - namespace content { - - std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { +@@ -13,7 +13,7 @@ namespace content { + std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> + GetV8SnapshotFilesToPreload() { + std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(USE_V8_CONTEXT_SNAPSHOT) - return {{kV8ContextSnapshotDataDescriptor, - base::FilePath(FILE_PATH_LITERAL(V8_CONTEXT_SNAPSHOT_FILENAME))}}; + #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT) + files[kV8ContextSnapshotDataDescriptor] = base::FilePath( + FILE_PATH_LITERAL(BUILDFLAG(V8_CONTEXT_SNAPSHOT_FILENAME))); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc index 78286805e88a..d24e69eab48d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc -@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -259,7 +259,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -261,7 +261,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1366,7 +1366,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1371,7 +1371,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc index b6caefbcabad..ba73c6926ab2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc @@ -13,7 +13,7 @@ #include "content/public/browser/navigation_handle.h" @@ -6,10 +6,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/callback_helpers.h" #include "base/feature_list.h" + #include "base/functional/callback_helpers.h" #include "base/logging.h" -@@ -31,7 +31,7 @@ namespace { +@@ -31,7 +31,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ // Remove the pieces of the URL we don't want to send back with the error // reports. In particular, do not send query or fragments as those can have // privacy-sensitive information in them. -@@ -55,7 +55,7 @@ WebUIMainFrameObserver::~WebUIMainFrameObserver() = de +@@ -55,7 +55,7 @@ WebUIMainFrameObserver::WebUIMainFrameObserver(WebUIIm WebUIMainFrameObserver::~WebUIMainFrameObserver() = default; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h index f022dc0e77d6..4c644b960cf2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h @@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc index eed42e5dae6b..d19b0171311b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc @@ -19,8 +19,10 @@ #include "build/chromeos_buildflags.h" @@ -11,7 +11,7 @@ #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" -@@ -38,6 +40,7 @@ namespace { +@@ -38,6 +40,7 @@ namespace content { namespace { @@ -27,7 +27,7 @@ } // namespace -@@ -68,9 +72,13 @@ ZygoteHostImpl::ZygoteHostImpl() +@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -41,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -83,6 +91,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -83,6 +91,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h index 8df40557f39d..75d341774085 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.h @@ -47,12 +47,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, @@ -7,10 +7,10 @@ +#if !BUILDFLAG(IS_BSD) void AdjustRendererOOMScore(base::ProcessHandle process_handle, int score) override; - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) void ReinitializeLogging(uint32_t logging_dest, base::PlatformFile log_file_fd) override; - #endif + #endif // BUILDFLAG(IS_CHROMEOS) +#endif bool HasZygote() { return !zygote_pids_.empty(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc index 535d83ca20fa..39e9f408b7dc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/child/child_process.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/child/child_process.cc.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/content/child/child_process.cc -@@ -68,7 +68,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr +@@ -68,7 +68,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); g_lazy_child_process_tls.Pointer()->Set(this); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn index 60f91715af3c..22c49257a7b5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/common/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/common/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/common/BUILD.gn -@@ -447,6 +447,9 @@ if (is_linux || is_chromeos) { +@@ -449,6 +449,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] @@ -10,3 +10,12 @@ } } +@@ -497,7 +500,7 @@ mojom("mojo_bindings") { + if (enable_ipc_logging) { + enabled_features += [ "ipc_logging" ] + } +- if (is_linux || is_chromeos) { ++ if (!is_bsd && (is_linux || is_chromeos)) { + enabled_features += [ "supports_thread_types" ] + } + if (use_clang_profiling_inside_sandbox) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc index 68d1801937dd..87c9e5153a70 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_mojo__core__library__support.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/common/mojo_core_library_support.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/common/mojo_core_library_support.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/common/mojo_core_library_support.cc -@@ -15,7 +15,7 @@ absl::optional<base::FilePath> GetMojoCoreSharedLibrar +@@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() { } absl::optional<base::FilePath> GetMojoCoreSharedLibraryPath() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc index 8f25e0f1b6dd..56bde1b9e8bb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/common/user_agent.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/common/user_agent.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/common/user_agent.cc -@@ -41,7 +41,7 @@ std::string GetUserAgentPlatform() { +@@ -45,7 +45,7 @@ std::string GetUserAgentPlatform() { return ""; #elif BUILDFLAG(IS_MAC) return "Macintosh; "; @@ -9,16 +9,16 @@ return "X11; "; // strange, but that's what Firefox uses #elif BUILDFLAG(IS_ANDROID) return "Linux; "; -@@ -63,7 +63,7 @@ std::string GetUnifiedPlatform() { +@@ -71,7 +71,7 @@ std::string GetUnifiedPlatform() { return "Windows NT 10.0; Win64; x64"; #elif BUILDFLAG(IS_FUCHSIA) return "Fuchsia"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return "X11; Linux x86_64"; - #else - #error Unsupported platform -@@ -275,6 +275,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons + #elif BUILDFLAG(IS_IOS) + if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { +@@ -296,6 +296,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons "Android %s", os_version.c_str() #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia" @@ -32,6 +32,6 @@ +#endif + unixinfo.sysname, // e.g. Linux + cpu_type.c_str() // e.g. i686 - #elif BUILDFLAG(IS_POSIX) - "%s %s", - unixinfo.sysname, // e.g. Linux + #elif BUILDFLAG(IS_IOS) + "CPU %s OS %s like Mac OS X", cpu_type.c_str(), + os_version.c_str() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc index 778068f004dc..f50f4c5dfade 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/gpu/gpu_main.cc -@@ -87,7 +87,7 @@ +@@ -89,7 +89,7 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "sandbox/policy/linux/sandbox_linux.h" #include "sandbox/policy/sandbox_type.h" -@@ -109,7 +109,7 @@ namespace { +@@ -110,7 +110,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -171,7 +171,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -268,7 +268,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -270,7 +270,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -403,7 +403,7 @@ namespace { +@@ -405,7 +405,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc index 4b38f3bb7f48..6920209bd382 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc @@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions( - permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath)); + } } +#if !defined(OS_BSD) void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -445,8 +446,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -484,8 +485,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -488,6 +491,7 @@ void LoadArmGpuLibraries() { +@@ -530,6 +533,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -555,12 +559,14 @@ void LoadChromecastV4L2Libraries() { +@@ -597,12 +601,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -588,6 +594,7 @@ bool LoadLibrariesForGpu( +@@ -629,6 +635,7 @@ bool LoadLibrariesForGpu( return true; } @@ -50,7 +50,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const sandbox::policy::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -610,13 +617,17 @@ bool BrokerProcessPreSandboxHook( +@@ -652,13 +659,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc index 68e9a2737b83..d5e6a99f12c2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -20,7 +20,7 @@ @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "mojo/public/cpp/bindings/pending_remote.h" #endif -@@ -35,7 +35,7 @@ PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { +@@ -35,7 +35,7 @@ typedef struct CGFont* CGFontRef; namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; ChildThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -53,7 +53,7 @@ blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetS +@@ -53,7 +53,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { void PpapiBlinkPlatformImpl::Shutdown() {} blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h index d34dc52e4d2d..de15ece47ec6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -12,7 +12,7 @@ #include "build/build_config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc index 69f7e9530ccc..58b3d3f9e158 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc -@@ -53,6 +53,11 @@ +@@ -54,6 +54,11 @@ #include "gin/v8_initializer.h" #endif @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -146,7 +151,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -148,7 +153,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h index cc3c7d8a00df..cf9b4383ff71 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/public/browser/render_process_host.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/public/browser/render_process_host.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/public/browser/render_process_host.h @@ -53,7 +53,7 @@ #include "content/public/browser/android/child_process_importance.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -620,7 +620,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S +@@ -643,7 +643,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h index 1be6cf6f4185..41f219482bef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/public/browser/zygote_host/zygote_host_linux.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/public/browser/zygote_host/zygote_host_linux.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/public/browser/zygote_host/zygote_host_linux.h @@ -35,11 +35,13 @@ class ZygoteHost { // after the first render has been forked. @@ -12,5 +12,5 @@ int score) = 0; +#endif - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) // Reinitialize logging for the Zygote processes. Needed on ChromeOS, which diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h index 612513bfeddb..37d5f65f805d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h -@@ -125,7 +125,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) +@@ -113,7 +113,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc index 49a2b0cd078d..d592aeeaf729 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/public/common/content_features.cc -@@ -46,7 +46,7 @@ CONSTINIT const base::Feature kAudioServiceOutOfProces +@@ -39,7 +39,7 @@ CONSTINIT const base::Feature kAudioServiceOutOfProces "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -58,7 +58,7 @@ CONSTINIT const base::Feature kAudioServiceSandbox( +@@ -51,7 +51,7 @@ CONSTINIT const base::Feature kAudioServiceSandbox( // kAudioServiceOutOfProcess feature is enabled. CONSTINIT const base::Feature kAudioServiceSandbox( "AudioServiceSandbox", @@ -18,16 +18,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1242,7 +1242,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, - "WebAssemblyCodeProtection", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -547,7 +547,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ + // (activated by kUserAgentClientHint) + BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - // Use memory protection keys in userspace (PKU) (if available) to protect code - // JITed for WebAssembly. Fall back to traditional memory protection if - // WebAssemblyCodeProtection is also enabled. -@@ -1284,7 +1284,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler( +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Supports proxying thread type changes of renderer processes to browser + // process and having browser process handle adjusting thread properties (nice + // value, c-group, latency sensitivity...) for renderers which have sandbox +@@ -1367,7 +1367,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler( CONSTINIT const base::Feature kWebAssemblyTrapHandler( "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1359,7 +1359,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, +@@ -1425,7 +1425,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h index c8f4f5159187..de357c63ced2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/public/common/content_features.h.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/content/public/common/content_features.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/public/common/content_features.h -@@ -275,7 +275,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodePr - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAppWindowControlsOverlay); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyBaseline); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtection); --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtectionPku); - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && - // defined(ARCH_CPU_X86_64) +@@ -115,7 +115,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleRendererThreadTypeChangesInBrowser); + #endif + CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc index d41d34162e7d..535f44c60e96 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.cc -@@ -367,6 +367,8 @@ const char kEnableLogging[] = "enable- +@@ -368,6 +368,8 @@ const char kEnableLogging[] = "enable- // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -996,7 +998,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -997,7 +999,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h index cf1b4f593902..ba30c2a1a589 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.h -@@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableLogging[]; - CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; +@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableLogging[]; + CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; +CONTENT_EXPORT extern const char kDisableUnveil[]; CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -271,7 +272,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -269,7 +270,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_zygote_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_zygote_features.gni index bdb2a743c0f0..7a64e4450d80 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_zygote_features.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_zygote_features.gni @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/public/common/zygote/features.gni.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/content/public/common/zygote/features.gni.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/public/common/zygote/features.gni @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. --use_zygote_handle = is_posix && !is_android && !is_mac -+use_zygote_handle = is_posix && !is_android && !is_mac && !is_bsd +-use_zygote = is_posix && !is_android && !is_apple ++use_zygote = is_posix && !is_android && !is_mac && !is_bsd diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn new file mode 100644 index 000000000000..4410e83b82ca --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/content/renderer/BUILD.gn.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/content/renderer/BUILD.gn +@@ -201,6 +201,13 @@ target(link_target_type, "renderer") { + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "renderer_thread_type_handler.cc", ++ "renderer_thread_type_handler.h", ++ ] ++ } ++ + if (is_mac) { + sources += [ + "renderer_main_platform_delegate_mac.mm", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_render__media__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_render__media__client.cc deleted file mode 100644 index 93ae87847818..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_render__media__client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/content/renderer/media/render_media_client.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/content/renderer/media/render_media_client.cc -@@ -22,7 +22,7 @@ namespace { - // when it's needed synchronously. - #if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \ - (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_MAC)) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) - #define NEEDS_PROFILE_UPDATER 1 - #else - #define NEEDS_PROFILE_UPDATER 0 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc index be57763d1d59..14d4ad1a1c8d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/renderer/render_process_impl.cc @@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,16 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -154,7 +154,7 @@ RenderProcessImpl::RenderProcessImpl() - SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, - "--no-wasm-write-protect-code-memory"); - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, - "--wasm-memory-protection-keys"); - SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -223,7 +223,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, "--no-wasm-dynamic-tiering"); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc index f2c1fb4e1831..ffa541d18f0a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc @@ -1,38 +1,38 @@ ---- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc -@@ -193,7 +193,7 @@ +@@ -201,6 +201,8 @@ - #if BUILDFLAG(IS_MAC) + #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> --#else -+#elif !BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_BSD) ++#include <stdlib.h> + #else #include <malloc.h> #endif - -@@ -658,7 +658,7 @@ void RenderThreadImpl::Init() { - base::DiscardableMemoryAllocator::SetInstance( - discardable_memory_allocator_.get()); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - render_message_filter()->SetThreadType( - ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); - #endif -@@ -1029,7 +1029,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = - -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && - #else + #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1040,7 +1040,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = - -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && +@@ -1863,7 +1865,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create + bool enable_video_encode_accelerator) { + mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> + vea_provider; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoEncoding)) { + BindHostReceiver(vea_provider.InitWithNewPipeAndPassReceiver()); + } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc index fe5ae23de6cc..3bfa097f2559 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc -@@ -110,7 +110,7 @@ +@@ -111,7 +111,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -180,7 +180,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -190,7 +190,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,16 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -261,7 +261,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( - /*terminate_sync_load_event=*/nullptr); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id, - base::ThreadType thread_type) { - if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -272,7 +272,7 @@ blink::WebSandboxSupport* RendererBlinkPlatformImpl::G +@@ -245,7 +245,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h index 5633753e49cd..2789c4d5a798 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h -@@ -30,7 +30,7 @@ +@@ -32,7 +32,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -9,16 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -175,7 +175,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - const blink::WebURL& top_document_web_url) override; - gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; - blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadType(base::PlatformThreadId thread_id, - base::ThreadType) override; - #endif -@@ -241,7 +241,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -245,7 +245,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -27,7 +18,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -261,7 +261,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -265,7 +265,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mutable base::WaitableEvent io_thread_id_ready_event_; base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc index e1a8fa66741c..1ebfc9a23937 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc @@ -44,6 +44,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { // any renderer has been started. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn index fbcae9772a76..a7caeb229c6f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/shell/BUILD.gn -@@ -905,7 +905,7 @@ group("content_shell_crash_test") { +@@ -968,7 +968,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc index f46ea0661c09..228b6a2a1272 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc -@@ -213,7 +213,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -221,7 +221,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc index faaa52d7aef3..7525d17da90a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/utility/shell_content_utility_client.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/shell/utility/shell_content_utility_client.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/content/shell/utility/shell_content_utility_client.cc -@@ -33,7 +33,7 @@ +@@ -38,7 +38,7 @@ #include "sandbox/policy/sandbox.h" #include "services/test/echo/echo_service.h" @@ -9,10 +9,10 @@ #include "content/test/sandbox_status_service.h" #endif -@@ -146,7 +146,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -187,7 +187,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), - base::ThreadTaskRunnerHandle::Get()); + base::SingleThreadTaskRunner::GetCurrentDefault()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (register_sandbox_status_helper_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn index 09d34533521a..d395863a26de 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/test/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/test/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/test/BUILD.gn -@@ -2120,7 +2120,7 @@ static_library("run_all_unittests") { +@@ -2129,7 +2129,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3182,7 +3182,7 @@ test("content_unittests") { +@@ -3162,7 +3162,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc index 50bbf0bf81b0..3466a1eababe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc @@ -1,24 +1,24 @@ ---- src/3rdparty/chromium/content/utility/services.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/utility/services.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/content/utility/services.cc -@@ -66,7 +66,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -64,7 +64,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" - #include "sandbox/policy/sandbox_type.h" -@@ -88,7 +88,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck + #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && -@@ -211,7 +211,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -215,7 +215,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -27,21 +27,37 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -326,7 +326,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -319,7 +319,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - auto RunStableVideoDecoderFactoryService( - mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory> -@@ -380,7 +380,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + auto RunStableVideoDecoderFactoryProcessService( + mojo::PendingReceiver< +@@ -330,7 +330,7 @@ auto RunStableVideoDecoderFactoryProcessService( + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && + // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + auto RunVideoEncodeAcceleratorProviderFactory( + mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> + receiver) { +@@ -388,13 +388,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - services.Add(RunStableVideoDecoderFactoryService); + services.Add(RunStableVideoDecoderFactoryProcessService); #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && + // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + services.Add(RunVideoEncodeAcceleratorProviderFactory); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc index 5fd834a2bfc7..b1621e77c011 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.cc @@ -1,17 +1,17 @@ ---- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.cc @@ -12,11 +12,14 @@ #include "sandbox/linux/syscall_broker/broker_command.h" #include "sandbox/linux/syscall_broker/broker_file_permission.h" -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) using sandbox::syscall_broker::BrokerFilePermission; using sandbox::syscall_broker::MakeBrokerCommandSet; +#endif namespace speech { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) namespace { // Gets the file permissions required by the Speech On-Device API (SODA). @@ -23,8 +23,8 @@ bool SpeechRecognitionPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { -+#if !defined(OS_BSD) - #if BUILDFLAG(ENABLE_SODA) ++#if !BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_SODA_INTEGRATION_TESTS) base::FilePath test_binary_path = GetSodaTestBinaryPath(); DVLOG(0) << "SODA test binary path: " << test_binary_path.value().c_str(); @@ -77,6 +82,7 @@ bool SpeechRecognitionPreSandboxHook( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h index cb7221f9666a..47ea1e2db86d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.h @@ -5,7 +5,11 @@ #ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc index f0e68b225a11..6d1f254912d1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc @@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -17,7 +17,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: +@@ -17,7 +17,7 @@ namespace content { UtilityBlinkPlatformWithSandboxSupportImpl:: UtilityBlinkPlatformWithSandboxSupportImpl() { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::GetSandbox +@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h index 0814f478ee4d..2f75ecf9db8d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h @@ -10,7 +10,7 @@ #include "build/build_config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc index 30518135a4a3..ec6534574ccd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc @@ -1,12 +1,15 @@ ---- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/utility/utility_main.cc -@@ -31,17 +31,19 @@ +@@ -31,7 +31,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" + #include "gpu/config/gpu_info_collector.h" + #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" +@@ -42,15 +42,21 @@ #if BUILDFLAG(ENABLE_PRINTING) #include "printing/sandbox/print_backend_sandbox_hook_linux.h" #endif @@ -19,11 +22,7 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" - -@@ -50,6 +52,10 @@ - #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_BSD) @@ -31,9 +30,31 @@ +#endif + #if BUILDFLAG(IS_CHROMEOS_ASH) - #include "ash/services/ime/ime_sandbox_hook.h" #include "chromeos/ash/components/assistant/buildflags.h" -@@ -130,7 +136,7 @@ int UtilityMain(MainFunctionParams parameters) { + #include "chromeos/ash/services/ime/ime_sandbox_hook.h" +@@ -62,7 +68,7 @@ + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + + #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))) + #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck + #endif + +@@ -83,10 +89,10 @@ namespace { + + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { + const bool obtain_gpu_info = +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; +@@ -168,7 +174,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -42,7 +63,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -162,7 +168,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -200,7 +206,7 @@ int UtilityMain(MainFunctionParams parameters) { #endif break; #endif @@ -51,7 +72,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -185,10 +191,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -227,6 +233,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -59,12 +80,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) { - // The kHardwareVideoDecoding sandbox needs to know the GPU type in order - // to select the right policy. -@@ -201,6 +208,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -235,6 +242,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_BUILD.gn index f9cb975a5b13..66eeb011c4a1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/zygote/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/zygote/BUILD.gn.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/content/zygote/BUILD.gn -@@ -5,7 +5,7 @@ import("//content/public/common/zygote/features.gni") +@@ -5,7 +5,7 @@ import("//build/config/nacl/config.gni") import("//content/public/common/zygote/features.gni") diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc index d1b0f33ac909..89dbfd1880d8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -696,3 +697,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -706,3 +707,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc index 41130f218cc3..c3951e0b9545 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc new file mode 100644 index 000000000000..55b7424dad44 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/bluetooth/bluetooth_adapter.cc.orig 2022-07-28 06:05:58 UTC ++++ src/3rdparty/chromium/device/bluetooth/bluetooth_adapter.cc +@@ -32,7 +32,7 @@ BluetoothAdapter::ServiceOptions::ServiceOptions() = d + BluetoothAdapter::ServiceOptions::~ServiceOptions() = default; + + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_MAC) && \ +- !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) ++ !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // static + scoped_refptr<BluetoothAdapter> BluetoothAdapter::CreateAdapter() { + return nullptr; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_cast__bluetooth.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_cast__bluetooth.gni new file mode 100644 index 000000000000..e5ac108dced5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_cast__bluetooth.gni @@ -0,0 +1,9 @@ +--- src/3rdparty/chromium/device/bluetooth/cast_bluetooth.gni.orig 2022-08-31 12:19:35 UTC ++++ src/3rdparty/chromium/device/bluetooth/cast_bluetooth.gni +@@ -2,5 +2,5 @@ import("//build/config/features.gni") + + declare_args() { + force_cast_bluetooth = false +- use_bluez = (is_linux && !is_castos && use_dbus) || is_chromeos ++ use_bluez = use_dbus && !is_bsd + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_BUILD.gn new file mode 100644 index 000000000000..72388af02332 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/gamepad/BUILD.gn.orig 2022-11-30 08:12:58 UTC ++++ src/3rdparty/chromium/device/gamepad/BUILD.gn +@@ -98,7 +98,7 @@ component("gamepad") { + "hid_writer_linux.cc", + "hid_writer_linux.h", + ] +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ + "gamepad_device_linux.cc", + "gamepad_device_linux.h", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc new file mode 100644 index 000000000000..b1615ce9a8d9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/device/gamepad/gamepad_provider.cc +@@ -219,7 +219,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep + + if (!polling_thread_) + polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // On Linux, the data fetcher needs to watch file descriptors, so the message + // loop needs to be a libevent loop. + const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc new file mode 100644 index 000000000000..7f08b64c2125 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc.orig 2022-02-28 16:54:41 UTC ++++ src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <unistd.h> ++ + #include "device/gamepad/hid_writer_linux.h" + + #include <unistd.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc new file mode 100644 index 000000000000..0bf6af43124a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc +@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt + MessageService::GetFactoryInstance(); + MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt(); + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + NetworkingPrivateEventRouterFactory::GetInstance(); + #endif + OffscreenDocumentManager::GetFactory(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc index ee6fbbb315bd..572556abc8fb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc -@@ -74,7 +74,7 @@ const char kReceivingEndDoesntExistError[] = +@@ -70,7 +70,7 @@ const char kReceivingEndDoesntExistError[] = const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -442,7 +442,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -468,7 +468,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc index b93b80ded361..15803e1f8aa5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc @@ -14,7 +14,7 @@ #include "extensions/browser/api/networking_private/networking_private_chromeos.h" @@ -9,7 +9,7 @@ #include "extensions/browser/api/networking_private/networking_private_linux.h" #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #include "components/wifi/wifi_service.h" -@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS +@@ -68,7 +68,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS delegate = new NetworkingPrivateChromeOS(browser_context); #elif BUILDFLAG(IS_CHROMEOS_LACROS) delegate = new NetworkingPrivateLacros(browser_context); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc deleted file mode 100644 index 9c1c3f0670d0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc -@@ -99,7 +99,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - #endif // !defined(TOOLKIT_QT) - ManagementAPI::GetFactoryInstance(); - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - NetworkingPrivateEventRouterFactory::GetInstance(); - #endif - OffscreenDocumentManager::GetFactory(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc index cda2bc3a19d8..07b7480a08cf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/extensions/browser/extension_prefs.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/browser/extension_prefs.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/extensions/browser/extension_prefs.cc -@@ -2289,7 +2289,7 @@ void ExtensionPrefs::RegisterProfilePrefs( - registry->RegisterDictionaryPref(kInstallSignature); - registry->RegisterListPref(kExternalUninstalls); +@@ -2230,7 +2230,7 @@ void ExtensionPrefs::RegisterProfilePrefs( + registry->RegisterListPref( + pref_names::kExtendedBackgroundLifetimeForPortConnectionsToUrls); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false); #endif - registry->RegisterBooleanPref(pref_names::kU2fSecurityKeyApiEnabled, false); + registry->RegisterBooleanPref( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc index 5b8919326279..9bd3fbe3ec8d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/extensions/browser/pref_names.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/browser/pref_names.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/extensions/browser/pref_names.cc -@@ -48,7 +48,7 @@ const char kDeletedComponentExtensions[] = - const char kDeletedComponentExtensions[] = - "extensions.deleted_component_extensions"; +@@ -53,7 +53,7 @@ const char kManifestV2Availability[] = "extensions.man + const char kPinnedExtensions[] = "extensions.pinned_extensions"; + const char kStorageGarbageCollect[] = "extensions.storage.garbagecollect"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled"; #endif - const char kU2fSecurityKeyApiEnabled[] = + const char kChromeAppsWebViewPermissiveBehaviorAllowed[] = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h index db6a2c871ee3..8d538f1e7198 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/extensions/browser/pref_names.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/browser/pref_names.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/extensions/browser/pref_names.h -@@ -98,7 +98,7 @@ extern const char kDeletedComponentExtensions[]; - extern const char kDeletedComponentExtensions[]; +@@ -114,7 +114,7 @@ extern const char kPinnedExtensions[]; + extern const char kStorageGarbageCollect[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json index d83e7355f3ee..6666f58735d2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/common/api/_permission_features.json.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/common/api/_permission_features.json.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/extensions/common/api/_permission_features.json @@ -134,7 +134,7 @@ { @@ -9,7 +9,7 @@ "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -433,7 +433,7 @@ +@@ -427,7 +427,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -475,7 +475,7 @@ +@@ -469,7 +469,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json index 8cc9e3c5abda..a2bd4cf5a954 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/common/api/runtime.json.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/common/api/runtime.json.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/extensions/common/api/runtime.json @@ -86,7 +86,8 @@ "cros", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc index 8d1749ea8ffe..cd2f112b6bbb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/common/command.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/common/command.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/extensions/common/command.cc @@ -280,7 +280,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc index ae39dc90f94f..4711f762b9c2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/common/features/feature.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/common/features/feature.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/extensions/common/features/feature.cc @@ -34,6 +34,8 @@ Feature::Platform Feature::GetCurrentPlatform() { return WIN_PLATFORM; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc index bacd111e5b41..17ce24fdf7f7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc @@ -132,7 +132,7 @@ std::string GetPlatformString() { return "lacros"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_argument__spec.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_argument__spec.cc index 40e732d5e633..9db76147e8c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_argument__spec.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_argument__spec.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/renderer/bindings/argument_spec.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/renderer/bindings/argument_spec.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/extensions/renderer/bindings/argument_spec.cc @@ -18,6 +18,8 @@ #include "gin/data_object_builder.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc index a3223665bcd1..73b8d7d4a181 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc @@ -42,7 +42,7 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc index 134fac4ecc86..20c2b082fae7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc -@@ -45,7 +45,7 @@ bool ShellRuntimeAPIDelegate::GetPlatformInfo(Platform +@@ -44,7 +44,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { #if BUILDFLAG(IS_CHROMEOS_ASH) info->os = api::runtime::PLATFORM_OS_CROS; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__browser__main__parts.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__browser__main__parts.cc index a688fed8a4bb..a70346f212cf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__browser__main__parts.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/shell/browser/shell_browser_main_parts.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/extensions/shell/browser/shell_browser_main_parts.cc @@ -150,7 +150,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( switches::kAppShellAllowRoaming)) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc index 0b54715f96d5..4d16ec0ac0ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc @@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h index 8ae5507fbc65..6fc003f13ba3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h @@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC const override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc new file mode 100644 index 000000000000..534926c686b0 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/google_apis/gcm/engine/heartbeat_manager.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/google_apis/gcm/engine/heartbeat_manager.cc +@@ -33,7 +33,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; + // Minimum time spent sleeping before we force a new heartbeat. + const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // The period at which to check if the heartbeat time has passed. Used to + // protect against platforms where the timer is delayed by the system being + // suspended. Only needed on linux because the other OSes provide a standard +@@ -193,7 +193,7 @@ void HeartbeatManager::RestartTimer() { + base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered, + weak_ptr_factory_.GetWeakPtr())); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified + // when the system is suspending or resuming. The only one that does not is + // Linux so we need to poll to check for missed heartbeats. +@@ -218,7 +218,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() { + return; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Otherwise check again later. + io_task_runner_->PostDelayedTask( + FROM_HERE, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc index 5181fb9c566c..773d8d038c0b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,18 +1,18 @@ ---- src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -144,7 +144,7 @@ uint32_t GetPlatformSpecificTextureTarget() { +@@ -173,7 +173,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) return macos_specific_texture_target; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return GL_TEXTURE_EXTERNAL_OES; - #elif BUILDFLAG(IS_FUCHSIA) + #elif BUILDFLAG(IS_IOS) return GL_TEXTURE_2D; -@@ -176,7 +176,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -208,7 +208,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { - #if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Always use GL_TEXTURE_2D as the target for RGB textures. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc new file mode 100644 index 000000000000..738ed7fdf341 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-09-11 15:16:04 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc +@@ -3462,7 +3462,7 @@ GLES2Decoder* GLES2Decoder::Create( + // Fix for Qt WebEngine Crash when QSG_RHI_BACKEND=opengl + // Allow linux to run fuzzers. + #if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return new GLES2DecoderImpl(client, command_buffer_service, outputter, group); + #else + LOG(FATAL) << "Validating command decoder is not supported."; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index 340c77aee7cb..bbacacb8268a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -94,7 +94,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan - // TODO(penghuang): verify the scanout is the right usage for video playback. - // crbug.com/1280798 - constexpr auto kSupportedUsages = +@@ -20,7 +20,7 @@ namespace { + // TODO(penghuang): verify the scanout is the right usage for video playback. + // crbug.com/1280798 + constexpr uint32_t kSupportedUsage = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - SHARED_IMAGE_USAGE_SCANOUT | + SHARED_IMAGE_USAGE_SCANOUT | #endif - SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT | + SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT | diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index d693169cc12b..8182d2c3594c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -32,7 +32,7 @@ +@@ -36,7 +36,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,12 +9,12 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -570,7 +570,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma - MemoryTypeTracker* tracker, +@@ -534,7 +534,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma WGPUDevice wgpuDevice, - WGPUBackendType backend_type) { + WGPUBackendType backend_type, + std::vector<WGPUTextureFormat> view_formats) { -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - auto wgpu_format = viz::ToWGPUFormat(format()); + auto wgpu_format = ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc deleted file mode 100644 index 975aac44a50c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc -@@ -345,7 +345,7 @@ void GLTextureImageBacking::CreateEGLImage() { - } - - void GLTextureImageBacking::CreateEGLImage() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) - SharedContextState* shared_context_state = factory()->GetSharedContextState(); - ui::ScopedMakeCurrent smc(shared_context_state->context(), - shared_context_state->surface()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc deleted file mode 100644 index 5888e1fac79a..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc -@@ -164,7 +164,7 @@ bool GLTextureImageBackingFactory::IsSupported( - // Linux and ChromeOS support WebGPU/Compat on GL. All other platforms - // do not support WebGPU on GL. - if (usage & SHARED_IMAGE_USAGE_WEBGPU) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) - if (use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { - return false; - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc new file mode 100644 index 000000000000..c27a0d5a303c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc +@@ -481,7 +481,7 @@ bool SharedImageManager::SupportsScanoutImages() { + return true; + #elif BUILDFLAG(IS_ANDROID) + return base::AndroidHardwareBufferCompat::IsSupportAvailable(); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return ui::OzonePlatform::GetInstance() + ->GetPlatformRuntimeProperties() + .supports_native_pixmaps; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc new file mode 100644 index 000000000000..e5577a041f70 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc +@@ -181,7 +181,7 @@ bool WrappedSkImageBacking::Initialize() { + for (int plane = 0; plane < num_planes; ++plane) { + auto& texture = textures_[plane]; + gfx::Size plane_size = format().GetPlaneSize(plane, size()); +-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) ++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // Blue for single-planar and magenta-ish for multi-planar. + SkColor4f fallback_color = + format().is_single_plane() ? SkColors::kBlue : SkColors::kWhite; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc deleted file mode 100644 index ed4390a2a4fb..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc -@@ -238,7 +238,7 @@ class WrappedSkImage : public ClearTrackingSharedImage - : GrMipMapped::kNo; - const std::string label = "WrappedSkImageBackingFactory_Initialize" + - CreateLabelForSharedImageUsage(usage()); --#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) -+#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // Initializing to bright green makes it obvious if the pixels are not - // properly set before they are displayed (e.g. https://crbug.com/956555). - // We don't do this on release builds because there is a slight overhead. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc index e85cc52aae02..26146461e135 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1199,7 +1199,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1225,7 +1225,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc index 12fdc081ae8a..4389712ef599 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/gpu/config/gpu_control_list.cc -@@ -302,7 +302,7 @@ GpuControlList::GLType GpuControlList::More::GetDefaul +@@ -302,7 +302,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc index f17bcf3a5c1d..614aa738dd8e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/gpu/config/gpu_finch_features.cc @@ -57,7 +57,7 @@ CONSTINIT const base::Feature kUseGles2ForOopR( CONSTINIT const base::Feature kUseGles2ForOopR( @@ -12,7 +12,7 @@ @@ -135,7 +135,8 @@ CONSTINIT const base::Feature kDefaultEnableGpuRasteri CONSTINIT const base::Feature kDefaultEnableGpuRasterization( "DefaultEnableGpuRasterization", - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ + #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc index 2784395698cf..69b66e8cf45d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/config/gpu_test_config.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/config/gpu_test_config.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/gpu/config/gpu_test_config.cc @@ -29,7 +29,7 @@ GPUTestConfig::OS GetCurrentOS() { #if BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc index 02b017cf373d..2fd265e348df 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc @@ -21,7 +21,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif --#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif @@ -13,8 +13,8 @@ return gfx::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) return gfx::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::DXGI_SHARED_HANDLE; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h index 66f95a284544..b72358947503 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.h @@ -18,7 +18,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) namespace gfx { class ClientNativePixmapFactory; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc index 690329dc2a9f..735eb8c1d624 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc -@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - - if (gl_initialized && gl_use_swiftshader_ && - !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " - << "on Linux"; - return false; -@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -18,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -412,7 +412,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -27,6 +18,15 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. +@@ -442,7 +442,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + + if (gl_initialized && gl_use_swiftshader_ && + !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " + << "on Linux"; + return false; @@ -493,7 +493,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -553,7 +553,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -579,7 +579,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -687,7 +687,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -707,7 +707,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,8 +54,8 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -742,7 +742,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } +@@ -759,7 +759,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + gl_use_swiftshader_ = true; } } -#if BUILDFLAG(IS_LINUX) || \ @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -892,7 +892,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -903,7 +903,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -72,7 +72,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -961,7 +961,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -973,7 +973,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc index c6c29b3f7e0d..8754ec71a134 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_memory_buffer_factory.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( +@@ -36,7 +36,7 @@ GpuMemoryBufferFactory::CreateNativeType( return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif BUILDFLAG(IS_ANDROID) return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h index 64d3eacaab40..c53ca709d947 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_x__util.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/ipc/service/x_util.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/ipc/service/x_util.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/gpu/ipc/service/x_util.h @@ -11,11 +11,11 @@ #include "build/build_config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py index df010b36be30..76b73961ae24 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/vulkan/generate_bindings.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/vulkan/generate_bindings.py.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/gpu/vulkan/generate_bindings.py @@ -259,7 +259,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc index 0cce4d8e39e9..1755a836be13 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc @@ -89,7 +89,7 @@ bool VulkanDeviceQueue::Initialize( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h index 1765533099f8..d3f545db878e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h @@ -158,7 +158,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc index 521031b045e3..bdc303a1f776 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc @@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h index 5e41b33b77a5..4e7be2fb3567 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h @@ -305,7 +305,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.cc index b460b8f7fc94..d00fc83963f5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_image.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_image.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_image.cc -@@ -324,7 +324,7 @@ bool VulkanImage::InitializeWithExternalMemory( +@@ -392,7 +392,7 @@ bool VulkanImage::InitializeWithExternalMemory( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.h index a7778c678d2e..65741e656c87 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_image.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_image.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_image.h -@@ -86,7 +86,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -87,7 +87,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageUsageFlags usage, VkImageCreateFlags flags); @@ -9,7 +9,7 @@ static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers( VulkanDeviceQueue* device_queue, const gfx::Size& size, -@@ -170,7 +170,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -199,7 +199,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageTiling image_tiling, uint32_t queue_family_index); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc index d7c5cc07605f..8ff623025c71 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc -@@ -195,7 +195,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan +@@ -199,7 +199,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__browser__main__parts__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__browser__main__parts__posix.cc new file mode 100644 index 000000000000..fc98746712ee --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__browser__main__parts__posix.cc @@ -0,0 +1,39 @@ +--- src/3rdparty/chromium/headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/headless/lib/browser/headless_browser_main_parts_posix.cc +@@ -19,13 +19,13 @@ + #include "content/public/browser/browser_thread.h" + #include "headless/lib/browser/headless_browser_impl.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/command_line.h" + #include "components/os_crypt/key_storage_config_linux.h" + #include "components/os_crypt/os_crypt.h" + #include "headless/public/switches.h" + +-#if defined(USE_DBUS) ++#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD) + #include "device/bluetooth/dbus/bluez_dbus_manager.h" + #endif + +@@ -120,7 +120,7 @@ class BrowserShutdownHandler { + + } // namespace + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kProductName[] = "HeadlessChrome"; + #endif + +@@ -128,9 +128,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo + BrowserShutdownHandler::Install( + base::BindOnce(&HeadlessBrowserImpl::Shutdown, browser_->GetWeakPtr())); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + +-#if defined(USE_DBUS) ++#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD) + bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr); + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.h new file mode 100644 index 000000000000..fb0b4ee124b9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__content__browser__client.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/headless/lib/browser/headless_content_browser_client.h.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/headless/lib/browser/headless_content_browser_client.h +@@ -45,7 +45,7 @@ class HeadlessContentBrowserClient : public content::C + CreateDevToolsManagerDelegate() override; + content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( + content::BrowserContext* context) override; +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) + void GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc new file mode 100644 index 000000000000..6cd50c8d80d8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__request__context__manager.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.cc.orig 2022-06-17 14:20:10 UTC ++++ src/3rdparty/chromium/headless/lib/browser/headless_request_context_manager.cc +@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p + return; + done_once = true; + +-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) + // The OSCrypt keys are process bound, so if network service is out of + // process, send it the required key if it is available. + if (content::IsOutOfProcessNetworkService() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc new file mode 100644 index 000000000000..00c2637191db --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc +@@ -61,7 +61,7 @@ namespace headless { + namespace { + + void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + content::UpdateFontRendererPreferencesFromSystemSettings(prefs); + #endif + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc new file mode 100644 index 000000000000..8205206723ff --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc +@@ -327,7 +327,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( + if (process_type != ::switches::kZygoteProcess) { + g_headless_crash_client.Pointer()->set_crash_dumps_dir( + command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); +-#if !BUILDFLAG(IS_WIN) ++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) + crash_reporter::InitializeCrashpad(process_type.empty(), process_type); + #endif // !BUILDFLAG(IS_WIN) + crash_keys::SetSwitchesFromCommandLine(command_line, nullptr); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h index cfc7f39496b9..b788e631fe3a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ipc/ipc_channel.h -@@ -234,7 +234,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -233,7 +233,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__common.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__common.cc index 8a46e4ccb31c..df21c9d33938 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__common.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__common.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_channel_common.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ipc/ipc_channel_common.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ipc/ipc_channel_common.cc -@@ -11,7 +11,7 @@ namespace IPC { +@@ -10,7 +10,7 @@ namespace IPC { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__mojo.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__mojo.cc index 2a09401aff99..87a824e0d1e0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__mojo.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_channel_mojo.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ipc/ipc_channel_mojo.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ipc/ipc_channel_mojo.cc -@@ -112,7 +112,7 @@ base::ProcessId GetSelfPID() { +@@ -105,7 +105,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe }; base::ProcessId GetSelfPID() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc index 81f0473fe9ce..36e6fd9f3df8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/ipc/ipc_message_utils.cc @@ -359,7 +359,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h index c65db52dda52..3d888396fc42 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ipc/ipc_message_utils.h.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/ipc/ipc_message_utils.h.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ipc/ipc_message_utils.h @@ -214,7 +214,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn index 75ced7794ecf..b74a242be8ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/media/BUILD.gn -@@ -86,6 +86,9 @@ config("media_config") { +@@ -96,6 +96,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn index e765496ad281..0aa9a075cc2d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/media/audio/BUILD.gn -@@ -257,9 +257,20 @@ source_set("audio") { +@@ -264,9 +264,20 @@ source_set("audio") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc index 54780872e1f1..7d8504b18dbe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_alsa_audio__manager__alsa.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc @@ -88,7 +88,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc index dbea102e5656..7763c850bf22 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/media/audio/audio_input_device.cc @@ -259,7 +259,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc index 04c631ea436e..3551f31d9207 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc.orig 2023-04-16 16:16:00 UTC +--- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc @@ -0,0 +1,181 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.h index 922c7e716913..62b61fb32aa0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h.orig 2022-11-14 07:13:51 UTC +--- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h @@ -0,0 +1,66 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc index 2d355fd5fb9b..bb502dad81a3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc @@ -1,11 +1,10 @@ ---- src/3rdparty/chromium/media/audio/sndio/sndio_input.cc.orig 2022-11-14 07:14:34 UTC +--- src/3rdparty/chromium/media/audio/sndio/sndio_input.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/media/audio/sndio/sndio_input.cc -@@ -0,0 +1,201 @@ +@@ -0,0 +1,200 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + -+#include "base/bind.h" +#include "base/logging.h" +#include "media/base/audio_timestamp_helper.h" +#include "media/audio/sndio/audio_manager_sndio.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.h index c6ae0b72a95e..810bab84a0ad 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/sndio/sndio_input.h.orig 2022-11-14 07:14:36 UTC +--- src/3rdparty/chromium/media/audio/sndio/sndio_input.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/media/audio/sndio/sndio_input.h @@ -0,0 +1,91 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc index 5db7f4b56604..5ee661707307 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/sndio/sndio_output.cc.orig 2022-11-14 07:14:51 UTC +--- src/3rdparty/chromium/media/audio/sndio/sndio_output.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/media/audio/sndio/sndio_output.cc @@ -0,0 +1,187 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -165,7 +165,7 @@ + // Get data to play + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); -+ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); ++ count = source->OnMoreData(delay, base::TimeTicks::Now(), {}, audio_bus.get()); + audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer)); + if (count == 0) { + // We have to submit something to the device diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.h index 954797964bba..9b3f4a9377ca 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/sndio/sndio_output.h.orig 2022-11-14 07:14:53 UTC +--- src/3rdparty/chromium/media/audio/sndio/sndio_output.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/media/audio/sndio/sndio_output.h @@ -0,0 +1,88 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc index 5bf2853c1d8f..4545e09a6086 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/media/base/audio_latency.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/base/audio_latency.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/base/audio_latency.cc @@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // On Linux, MacOS and Fuchsia, the low level IO implementations on the diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc index 3aef872fb739..82fd131702ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/media_switches.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/base/media_switches.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/media/base/media_switches.cc -@@ -10,7 +10,7 @@ +@@ -12,7 +12,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" #include "media/media_buildflags.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -485,7 +485,7 @@ CONSTINIT const base::Feature kGlobalMediaControls( +@@ -586,7 +586,7 @@ CONSTINIT const base::Feature kGlobalMediaControls( // Show toolbar button that opens dialog for controlling media sessions. CONSTINIT const base::Feature kGlobalMediaControls( "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -526,7 +526,7 @@ CONSTINIT const base::Feature kGlobalMediaControlsPict +@@ -634,7 +634,7 @@ CONSTINIT const base::Feature kGlobalMediaControlsPict CONSTINIT const base::Feature kGlobalMediaControlsPictureInPicture( "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -570,7 +570,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -678,7 +678,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -36,9 +36,9 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -1061,14 +1061,14 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod - "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -1198,14 +1198,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn + base::FEATURE_DISABLED_BY_DEFAULT); + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h index ecc1109cab7a..a9a8002374ce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/media/base/media_switches.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/base/media_switches.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/base/media_switches.h -@@ -214,7 +214,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); +@@ -277,7 +277,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiIgnoreDriverChecks); -@@ -319,11 +319,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kDeprecateLowUsageCo - MEDIA_EXPORT BASE_DECLARE_FEATURE(kDeprecateLowUsageCodecs); +@@ -396,11 +396,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE( + kAllowClearDolbyVisionInMseWhenPlatformEncryptedDvEnabled); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h index 413962d7ee9d..c1555a9ae943 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_scopedfd__helper.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/base/scopedfd_helper.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/base/scopedfd_helper.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/media/base/scopedfd_helper.h @@ -15,7 +15,7 @@ namespace media { // but since the only current user is V4L2 we are limiting the scope to OS_LINUX diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_supported__types.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_supported__types.cc deleted file mode 100644 index 346a0b6c5998..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_supported__types.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/base/supported_types.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/media/base/supported_types.cc -@@ -206,7 +206,7 @@ bool IsHevcProfileSupported(const VideoType& type) { - - #if BUILDFLAG(ENABLE_PLATFORM_HEVC) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_CHROMEOS_LACROS) - // TODO(b/171813538): For Lacros, the supplemental profile cache will be - // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc index 20c1ae556fca..f5821433164b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.cc.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/media/base/video_frame.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/base/video_frame.cc -@@ -75,7 +75,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -90,7 +90,7 @@ bool VideoFrame::IsStorageTypeMappable(VideoFrame::Sto +@@ -95,7 +95,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -285,7 +285,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -307,7 +307,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -614,7 +614,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -660,7 +660,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -877,7 +877,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -902,7 +902,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1264,7 +1264,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1302,7 +1302,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1376,7 +1376,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1415,7 +1415,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h index 81d36499e9b2..d764548e57fc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/base/video_frame.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/base/video_frame.h -@@ -41,7 +41,7 @@ +@@ -44,7 +44,7 @@ #include "base/mac/scoped_cftyperef.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -84,7 +84,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -113,7 +113,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,7 +18,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -279,7 +279,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -308,7 +308,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -548,7 +548,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -36,7 +36,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -755,7 +755,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -809,7 +809,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_create__video__capture__device__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_create__video__capture__device__factory.cc index fad263702994..1c2bb92fa122 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_create__video__capture__device__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_create__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" @@ -9,7 +9,7 @@ #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif BUILDFLAG(IS_CHROMEOS_ASH) #include "media/capture/video/chromeos/public/cros_features.h" -@@ -55,7 +55,7 @@ CreatePlatformSpecificVideoCaptureDeviceFactory( +@@ -56,7 +56,7 @@ CreateFakeVideoCaptureDeviceFactory() { std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc index e4e295de890a..3a78d3db1cd3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc @@ -213,7 +213,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( int entry_index = 0; @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE; - #elif BUILDFLAG(IS_MAC) - VideoCaptureApi::MACOSX_AVFOUNDATION; + #elif BUILDFLAG(IS_IOS) + VideoCaptureApi::UNKNOWN; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc index 695b1ff97c2c..8617d9fbb13c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc @@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo( VideoCaptureApi::WIN_DIRECT_SHOW; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc index 45c07f80bb18..caba3e655650 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc -@@ -426,7 +426,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -486,7 +486,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h index 2fd224fc6e83..62da82dbf905 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.h.orig 2022-03-01 11:59:41 UTC +++ src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.h @@ -8,7 +8,13 @@ #include <map> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc index 36c5fe7e9180..a67fe37b61e0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -28,10 +30,10 @@ using media::mojom::MeteringMode; +@@ -29,10 +31,10 @@ using media::mojom::MeteringMode; @@ -24,7 +24,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -667,7 +669,7 @@ V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; +@@ -728,7 +730,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -33,7 +33,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -677,7 +679,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -738,7 +740,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -42,3 +42,22 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } +@@ -778,6 +780,10 @@ bool V4L2CaptureDelegate::IsControllableControl(int co + } + + void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { ++// these ioctls are not implemented on *BSDs ++#if BUILDFLAG(IS_BSD) ++ NOTIMPLEMENTED(); ++#else + constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, + V4L2_CID_AUTO_WHITE_BALANCE, + V4L2_CID_BRIGHTNESS, +@@ -805,6 +811,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript + << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; + } + } ++#endif + } + + mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h index 3ecb106388ff..725ca9301f3b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h -@@ -86,10 +86,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // device file descriptor or (re)starting streaming, can fail but works after // retrying (https://crbug.com/670262). Returns false if the |request| ioctl // fails too many times. @@ -11,5 +11,5 @@ - int DoIoctl(int request, void* argp); + int DoIoctl(unsigned int request, void* argp); - // Creates a mojom::RangePtr with the (min, max, current, step) values of the - // control associated with |control_id|. Returns an empty Range otherwise. + // Check whether the control is controllable (and not changed automatically). + bool IsControllableControl(int control_id); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device.h index 9ca4e9c6585a..62bab60735a5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device.h @@ -21,7 +21,7 @@ class CAPTURE_EXPORT V4L2CaptureDevice public: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.cc index 2e05b3a29138..622d27139cb1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device_impl.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device_impl.cc @@ -22,7 +22,7 @@ int V4L2CaptureDeviceImpl::close(int fd) { return ::close(fd); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.h index b0f92d5748e2..b4e9cc8445c5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__device__impl.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device_impl.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device_impl.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_device_impl.h @@ -19,7 +19,7 @@ class CAPTURE_EXPORT V4L2CaptureDeviceImpl : public V4 public: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc index dd0ef56ee5a7..cd743a293f11 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc -@@ -72,6 +72,9 @@ class DevVideoFilePathsDeviceProvider - : public VideoCaptureDeviceFactoryLinux::DeviceProvider { +--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.cc +@@ -75,6 +75,9 @@ class DevVideoFilePathsDeviceProvider + : public VideoCaptureDeviceFactoryV4L2::DeviceProvider { public: void GetDeviceIds(std::vector<std::string>* target_container) override { +#if defined(OS_OPENBSD) @@ -10,7 +10,7 @@ const base::FilePath path("/dev/"); base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES, "video*"); -@@ -79,9 +82,13 @@ class DevVideoFilePathsDeviceProvider +@@ -82,9 +85,13 @@ class DevVideoFilePathsDeviceProvider const base::FileEnumerator::FileInfo info = enumerator.GetInfo(); target_container->emplace_back(path.value() + info.GetName().value()); } @@ -24,7 +24,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); std::string usb_id; const std::string vid_path = -@@ -99,6 +106,9 @@ class DevVideoFilePathsDeviceProvider +@@ -104,6 +111,9 @@ class DevVideoFilePathsDeviceProvider } std::string GetDeviceDisplayName(const std::string& device_id) override { @@ -34,12 +34,12 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); const std::string interface_path = base::StringPrintf(kInterfacePathTemplate, file_name.c_str()); -@@ -213,7 +223,7 @@ void VideoCaptureDeviceFactoryLinux::GetDevicesInfo( +@@ -219,7 +229,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( std::move(callback).Run(std::move(devices_info)); } --int VideoCaptureDeviceFactoryLinux::DoIoctl(int fd, int request, void* argp) { -+int VideoCaptureDeviceFactoryLinux::DoIoctl(int fd, unsigned int request, void* argp) { +-int VideoCaptureDeviceFactoryV4L2::DoIoctl(int fd, int request, void* argp) { ++int VideoCaptureDeviceFactoryV4L2::DoIoctl(int fd, unsigned int request, void* argp) { return HANDLE_EINTR(v4l2_->ioctl(fd, request, argp)); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.h index 42de82677a8a..3c19edbc63b4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.h -@@ -52,7 +52,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryLinux +--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.h.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.h +@@ -51,7 +51,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryV4L2 private: // Simple wrapper to do HANDLE_EINTR(v4l2_->ioctl(fd, ...)). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc index 7921f196e4b7..69f741431c9f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc -@@ -317,7 +317,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -322,7 +322,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc index 6dea92ca5027..2bc969973e5a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/media/gpu/buffer_validation.cc @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/size.h" @@ -9,7 +9,7 @@ #include <sys/types.h> #include <unistd.h> #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -23,7 +23,7 @@ bool GetFileSize(const int fd, size_t* size) { +@@ -23,7 +23,7 @@ namespace media { bool GetFileSize(const int fd, size_t* size) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc index 071185233c89..3eb5fcdfe8ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,20 +1,37 @@ ---- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc -@@ -767,7 +767,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -213,7 +213,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr + #if BUILDFLAG(USE_VAAPI) + create_decoder_function_cb = base::BindOnce(&VaapiVideoDecoder::Create); + #elif BUILDFLAG(USE_V4L2_CODEC) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) + create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create); + #else + return nullptr; +@@ -860,14 +860,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_VAAPI) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_VAAPI) // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -789,7 +789,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( - #error "Unsupported platform" - #endif + CHECK(main_frame_pool_->AsPlatformVideoFramePool()); + main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( + *allocator); +-#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC) + // Linux w/ V4L2 should not use a custom allocator + // Only tested with video_decode_accelerator_tests + // TODO(wenst@) Test with full Chromium Browser +@@ -997,7 +997,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( + << " VideoFrames"; + auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // viable_candidate should always be set unless using L1 protected content, - // which isn't an option on linux. - CHECK(viable_candidate); + auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( + *allocator); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc index f06c45e21a93..84730e3c08b2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -111,7 +111,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -121,7 +121,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 29cdb49ddab6..b054db0ad44b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc -@@ -14,12 +14,15 @@ +@@ -15,7 +15,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" #endif @@ -8,19 +8,37 @@ using sandbox::syscall_broker::BrokerFilePermission; +#endif + // TODO(b/195769334): the hardware video decoding sandbox is really only useful + // when building with VA-API or V4L2 (otherwise, we're not really doing hardware +@@ -31,6 +33,7 @@ using sandbox::syscall_broker::BrokerFilePermission; namespace media { + namespace { ++#if !BUILDFLAG(IS_BSD) + void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, + bool include_sys_dev_char, + bool read_write) { +@@ -160,6 +163,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + return false; + #endif // BUILDFLAG(USE_V4L2_CODEC) + } ++#endif + + } // namespace + +@@ -175,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { +#if !BUILDFLAG(IS_BSD) - sandbox::syscall_broker::BrokerCommandSet command_set; - std::vector<BrokerFilePermission> permissions; - -@@ -126,6 +129,7 @@ bool HardwareVideoDecodingPreSandboxHook( - dlopen("/usr/lib/libv4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); - #endif // defined(__aarch64__) - #endif // BUILDFLAG(USE_VAAPI) + using HardwareVideoDecodingProcessPolicy = + sandbox::policy::HardwareVideoDecodingProcessPolicy; + using PolicyType = +@@ -212,6 +217,7 @@ bool HardwareVideoDecodingPreSandboxHook( + sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( + command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), + options); +#endif - return true; } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h index 4dbe454d222e..4063da78a1f8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h @@ -5,7 +5,13 @@ #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc new file mode 100644 index 000000000000..973bd9244d1a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc @@ -0,0 +1,30 @@ +--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc +@@ -18,12 +18,15 @@ + #include "media/gpu/v4l2/v4l2_device.h" + #endif + ++#if !BUILDFLAG(IS_BSD) + using sandbox::syscall_broker::BrokerFilePermission; ++#endif + + namespace media { + + bool HardwareVideoEncodingPreSandboxHook( + sandbox::policy::SandboxLinux::Options options) { ++#if !BUILDFLAG(IS_BSD) + sandbox::syscall_broker::BrokerCommandSet command_set; + std::vector<BrokerFilePermission> permissions; + +@@ -125,8 +128,8 @@ bool HardwareVideoEncodingPreSandboxHook( + #endif // defined(__aarch64__) + } + #endif +- ++#endif + return true; + } + +-} // namespace media +\ No newline at end of file ++} // namespace media diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h new file mode 100644 index 000000000000..02783baff405 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h @@ -0,0 +1,23 @@ +--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h +@@ -5,7 +5,13 @@ + #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ + #define MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/openbsd/sandbox_openbsd.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace media { + +@@ -14,4 +20,4 @@ bool HardwareVideoEncodingPreSandboxHook( + + } // namespace media + +-#endif // MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ +\ No newline at end of file ++#endif // MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc index 3911eacbfc64..3ac879eb290b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-10-03 19:49:54 UTC +++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc -@@ -767,7 +767,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -772,7 +772,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni index 825c17b49f3b..13d6f8e6fee3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/media_options.gni.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/media_options.gni.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/media/media_options.gni -@@ -175,12 +175,15 @@ declare_args() { +@@ -196,12 +196,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -12,12 +12,12 @@ # # TODO(crbug.com/1336055): Remove legacy target_cpu hack used for targeting # desktop Chromecast builds. -- if (is_posix && !is_android && !is_mac && -+ if (is_posix && !is_android && !is_mac && !is_bsd && +- if (is_posix && !is_android && !is_apple && ++ if (is_posix && !is_android && !is_apple && !is_bsd && (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -196,6 +199,10 @@ declare_args() { +@@ -217,6 +220,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index 7081ca7369b7..929095529690 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -42,7 +42,7 @@ media::stable::mojom::VideoFrameDataPtr MakeVideoFrame +@@ -39,7 +39,7 @@ gfx::GpuMemoryBufferHandle GetVideoFrameGpuMemoryBuffe gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle = input->GetGpuMemoryBuffer()->CloneHandle(); @@ -9,7 +9,7 @@ CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP); CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty()); #else -@@ -747,7 +747,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -751,7 +751,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -18,7 +18,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -768,7 +768,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -772,7 +772,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index 94bb55d4b74e..58c76e3dad1f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h @@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem static const gfx::GpuMemoryBufferId& id( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc index c365ea3d17a6..8bcc8e3f5105 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc @@ -22,7 +22,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc index 943a3aa6a269..6ec1a163f695 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc @@ -9,7 +9,7 @@ #include "media/base/format_utils.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc index 2c3f95cea897..4ceffe452896 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -732,7 +732,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1160,7 +1160,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1158,7 +1158,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1179,7 +1179,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1177,7 +1177,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc index 2f731a97e7ce..3975d337f8cb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc -@@ -130,7 +130,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -140,7 +140,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,9 +9,9 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -441,7 +441,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -465,7 +465,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), - supported_rc_modes_); + supported_rc_modes_, required_encoder_type_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc index d36c75ef98ff..6ac94ed8b548 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc -@@ -435,7 +435,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -449,7 +449,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc index 93935a42d72e..ed73da8388ec 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/webrtc/audio_processor.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/media/webrtc/audio_processor.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/media/webrtc/audio_processor.cc -@@ -487,7 +487,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -513,7 +513,7 @@ absl::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_helpers.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_helpers.cc new file mode 100644 index 000000000000..67645995d34d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_helpers.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/media/webrtc/helpers.cc.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/media/webrtc/helpers.cc +@@ -40,7 +40,7 @@ void ConfigAutomaticGainControl(const AudioProcessingS + apm_config.gain_controller2.enabled = false; + return; + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Use the Hybrid AGC setup, which combines the AGC1 input volume controller + // and the AGC2 digital adaptive controller. + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__features.cc deleted file mode 100644 index 1f36939968c9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__features.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/media/webrtc/webrtc_features.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/media/webrtc/webrtc_features.cc -@@ -9,7 +9,7 @@ namespace { - - namespace features { - namespace { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr base::FeatureState kWebRtcHybridAgcState = - base::FEATURE_ENABLED_BY_DEFAULT; - #else -@@ -19,7 +19,7 @@ constexpr base::FeatureState kWebRtcHybridAgcState = - } // namespace - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - constexpr base::FeatureState kWebRtcAnalogAgcClippingControlState = - base::FEATURE_ENABLED_BY_DEFAULT; - #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn index dccd9f63ed63..3c99434c12d2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/core/BUILD.gn.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/mojo/core/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/mojo/core/BUILD.gn -@@ -163,7 +163,7 @@ template("core_impl_source_set") { +@@ -164,7 +164,7 @@ template("core_impl_source_set") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc index adcb24cc2b28..8ea42f93e5f3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/core/channel.cc.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/mojo/core/channel.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/mojo/core/channel.cc -@@ -72,7 +72,11 @@ const size_t kMaxAttachedHandles = 64; +@@ -75,7 +75,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h index d63a9bcaa6b0..9ed0dc06fcdd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/core/embedder/features.h.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/mojo/core/embedder/features.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/mojo/core/embedder/features.h -@@ -14,7 +14,7 @@ namespace core { +@@ -14,7 +14,7 @@ namespace mojo { namespace core { #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MAC) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc index 6066c84fc732..66cd31a21d90 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/mojo/public/c/system/thunks.cc @@ -23,7 +23,7 @@ #include "mojo/public/c/system/message_pipe.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni index d4eadfaec1fc..ddad9b308a12 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni -@@ -693,6 +693,16 @@ template("mojom") { - enabled_features += [ "is_win" ] +@@ -722,6 +722,16 @@ template("mojom") { + enabled_features += [ "is_apple" ] } + if (is_openbsd) { @@ -15,5 +15,5 @@ + } + action(parser_target_name) { - script = mojom_parser_script - inputs = mojom_parser_sources + [ build_metadata_filename ] + allow_remote = true + custom_processor = "mojom_parser" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn index f076eb5c7ea3..3b132db0a7d7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/net/BUILD.gn -@@ -107,7 +107,7 @@ net_configs = [ +@@ -108,7 +108,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1218,6 +1218,15 @@ component("net") { +@@ -1228,6 +1228,15 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -25,7 +25,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1352,7 +1361,7 @@ component("net") { +@@ -1360,7 +1369,7 @@ component("net") { } } @@ -34,7 +34,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1385,7 +1394,7 @@ component("net") { +@@ -1393,7 +1402,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,8 +43,8 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4397,7 +4406,7 @@ test("net_unittests") { - ] +@@ -2837,7 +2846,7 @@ test("net_unittests") { + sources += [ "proxy_resolution/proxy_config_service_linux_unittest.cc" ] } - if (is_linux || is_chromeos) { @@ -52,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4473,6 +4482,10 @@ test("net_unittests") { +@@ -2909,6 +2918,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -63,7 +63,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -4540,7 +4553,7 @@ test("net_unittests") { +@@ -2976,7 +2989,7 @@ test("net_unittests") { ] } @@ -72,7 +72,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -4680,7 +4693,7 @@ test("net_unittests") { +@@ -3101,7 +3114,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc index 6a19e9a29a3b..614239a8ac70 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/net/base/network_change_notifier.cc @@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_posix.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -321,6 +321,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -327,6 +327,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc index 74dfb5aa761a..19b2300e0bba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/base/network_change_notifier_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/base/network_change_notifier_posix.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/net/base/network_change_notifier_posix.cc -@@ -92,7 +92,7 @@ NetworkChangeNotifierPosix::NetworkChangeCalculatorPar +@@ -92,7 +92,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt NetworkChangeNotifier::NetworkChangeCalculatorParams NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() { NetworkChangeCalculatorParams params; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.h index 495a9f3f589e..495ee6fd1ac3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/base/network_interfaces_posix.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/base/network_interfaces_posix.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/net/base/network_interfaces_posix.h @@ -8,6 +8,8 @@ // This file provides some basic functionality shared between diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc index 4b8b327217ad..f0995c98ef14 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/base/sockaddr_util_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/base/sockaddr_util_posix.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/net/base/sockaddr_util_posix.cc @@ -41,7 +41,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc index a8e5f60dfa0f..75371fc06d21 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/cert/cert_verifier.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/cert/cert_verifier.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/net/cert/cert_verifier.cc @@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc index 1711302d27c0..5da70a7c4a36 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/cert/cert_verify_proc.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/cert/cert_verify_proc.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/net/cert/cert_verify_proc.cc -@@ -506,7 +506,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -414,7 +414,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h index a202df5dc700..d2ff3390f0eb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/net/cert/cert_verify_proc.h -@@ -81,7 +81,7 @@ class NET_EXPORT CertVerifyProc - kMaxValue = kOther +@@ -68,7 +68,7 @@ class NET_EXPORT CertVerifyProc + kMaxValue = kChainLengthOne }; -#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h index 9266e4b0d094..f9ae7455c2f3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h @@ -153,7 +153,9 @@ struct RankingsNode { }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc index 7d11de1a1d73..d187aa443a46 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc -@@ -29,7 +29,17 @@ SimpleFileTracker::SimpleFileTracker(int file_limit) +@@ -29,7 +29,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn index 7f6c5db13047..93250dcd0367 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/dns/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/net/dns/BUILD.gn -@@ -116,7 +116,7 @@ source_set("dns") { +@@ -124,7 +124,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -157,6 +157,7 @@ source_set("dns") { +@@ -165,6 +165,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -418,9 +419,9 @@ source_set("tests") { +@@ -428,9 +429,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc index a2031e36154f..6e159df9c59f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/net/dns/address_sorter_posix.cc @@ -18,6 +18,7 @@ #include <ifaddrs.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc index 5ef3e9152f98..2832b990039f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/dns_config_service_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/dns/dns_config_service_posix.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/net/dns/dns_config_service_posix.cc @@ -34,6 +34,11 @@ #include "net/dns/dns_config_watcher_mac.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc index af07944515f3..a318a821f432 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc @@ -1,18 +1,10 @@ ---- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/net/dns/dns_reloader.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ - !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) +@@ -10,6 +10,7 @@ + // - there's not guarantee it exists at all. :( + #if BUILDFLAG(IS_POSIX) ++#include <netinet/in.h> #include <resolv.h> -@@ -113,5 +113,5 @@ void DnsReloaderMaybeReload() { - - } // namespace net --#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) -+#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && - // && !BUILDFLAG(IS_ANDROID) + // This code only works on systems where the C library provides res_ninit(3) and diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.h deleted file mode 100644 index 4cdd254cb2fb..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/3rdparty/chromium/net/dns/dns_reloader.h.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/net/dns/dns_reloader.h -@@ -7,7 +7,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) - namespace net { - - // Call on the network thread before calling DnsReloaderMaybeReload() anywhere. -@@ -18,6 +18,6 @@ void DnsReloaderMaybeReload(); - void DnsReloaderMaybeReload(); - - } // namespace net --#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) -+#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) - - #endif // NET_DNS_DNS_RELOADER_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__util.cc index 2ac72d07510a..89daa1d3b714 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__util.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/net/dns/dns_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/dns_util.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/net/dns/dns_util.cc -@@ -28,6 +28,8 @@ +@@ -29,6 +29,8 @@ + #include "net/dns/public/util.h" #include "net/third_party/uri_template/uri_template.h" - #include "third_party/abseil-cpp/absl/types/optional.h" +#include <sys/socket.h> + #if BUILDFLAG(IS_POSIX) - #include <netinet/in.h> #include <net/if.h> + #include <netinet/in.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc index 41903d3bf3ef..d44f4b34ddc7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/host_resolver_proc.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/dns/host_resolver_proc.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/net/dns/host_resolver_proc.cc @@ -15,10 +15,6 @@ #include "net/base/net_errors.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__system__task.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__system__task.cc deleted file mode 100644 index 535261422915..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__system__task.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/net/dns/host_resolver_system_task.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/net/dns/host_resolver_system_task.cc -@@ -310,8 +310,8 @@ void EnsureSystemHostResolverCallReady() { - } - - void EnsureSystemHostResolverCallReady() { --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ -- !BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ -+ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) - EnsureDnsReloaderInit(); - #elif BUILDFLAG(IS_WIN) - EnsureWinsockInit(); -@@ -397,7 +397,7 @@ int SystemHostResolverCall(const std::string& host, - base::BlockingType::WILL_BLOCK); - - #if BUILDFLAG(IS_POSIX) && \ -- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) -+ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) - DnsReloaderMaybeReload(); - #endif - auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn index 403b7b608822..ebd3292f4857 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/public/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/dns/public/BUILD.gn.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/net/dns/public/BUILD.gn @@ -76,7 +76,7 @@ source_set("tests") { "doh_provider_entry_unittest.cc", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_resolv__reader.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_resolv__reader.h index 32298bf5a4a0..f04131117c2b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_resolv__reader.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_resolv__reader.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/public/resolv_reader.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/public/resolv_reader.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/net/dns/public/resolv_reader.h @@ -5,6 +5,7 @@ #ifndef NET_DNS_PUBLIC_RESOLV_READER_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h index b76ca4b95a1e..cb41d167b23e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_scoped__res__state.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/public/scoped_res_state.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/public/scoped_res_state.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/net/dns/public/scoped_res_state.h @@ -5,6 +5,7 @@ #ifndef NET_DNS_PUBLIC_SCOPED_RES_STATE_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc index 1ba24c0c86a2..981b7ed99ffb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc @@ -368,8 +368,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h index a8acc18ab658..35e61fbb0b0a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h @@ -21,6 +21,9 @@ #if BUILDFLAG(IS_APPLE) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc index dba44f0be0d4..dbfcd54c2350 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/http/http_network_session.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/http/http_network_session.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/net/http/http_network_session.cc -@@ -20,7 +20,9 @@ +@@ -19,7 +19,9 @@ #include "build/build_config.h" #include "net/base/features.h" #include "net/dns/host_resolver.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service.cc index 1c86a83317ae..745564ada383 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/net/proxy_resolution/proxy_config_service.cc -@@ -18,20 +18,20 @@ +@@ -19,20 +19,20 @@ #include "net/proxy_resolution/proxy_config_service_ios.h" #elif BUILDFLAG(IS_MAC) #include "net/proxy_resolution/proxy_config_service_mac.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc index bbe230e0940e..bed4b7b584a5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -502,6 +504,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -504,6 +506,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1030,6 +1033,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1032,6 +1035,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr<base::SequencedTaskRunner> file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1246,9 +1250,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1248,9 +1252,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc index 86258b032d58..0f58425e5a8a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/socket/socket_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/socket/socket_posix.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/net/socket/socket_posix.cc -@@ -516,7 +516,7 @@ int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { +@@ -516,7 +516,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc index 281300e86b21..38040ec27a24 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/net/socket/socks5_client_socket.cc @@ -19,6 +19,9 @@ #include "net/log/net_log_event_type.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc index f12635a534f0..a2eb5a7980c2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/net/socket/tcp_socket_posix.cc -@@ -100,6 +100,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { +@@ -99,6 +99,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc index 15bb82606589..d6ad69879dbd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/net/socket/udp_socket_posix.cc -@@ -558,7 +558,7 @@ void UDPSocketPosix::SetMsgConfirm(bool confirm) { +@@ -577,7 +577,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -579,7 +579,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -598,7 +598,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -892,7 +892,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -911,7 +911,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn index 1487847c8380..cff74e16d5e5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/third_party/quiche/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/third_party/quiche/BUILD.gn.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/net/third_party/quiche/BUILD.gn -@@ -28,7 +28,7 @@ import("//third_party/protobuf/proto_library.gni") +@@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni") import("//testing/libfuzzer/fuzzer_test.gni") import("//third_party/protobuf/proto_library.gni") diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc index 10fd90e07a06..92fd48113d9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc @@ -35,7 +35,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -127,7 +127,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr +@@ -127,7 +127,7 @@ class CertVerifyImpl { std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc index 8a7a765f2b79..21a600136e64 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -60,7 +60,7 @@ void SetUpOnNetworkThread( +@@ -61,7 +61,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -217,7 +217,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr +@@ -222,7 +222,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher, RootStoreType root_store_type) { @@ -27,7 +27,7 @@ if (impl_name == "platform") { if (root_store_type != RootStoreType::kSystem) { std::cerr << "WARNING: platform verifier not supported with " -@@ -474,7 +474,7 @@ int main(int argc, char** argv) { +@@ -534,7 +534,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_net__watcher_net__watcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_net__watcher_net__watcher.cc new file mode 100644 index 000000000000..6da6297b8a26 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_net__watcher_net__watcher.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/net/tools/net_watcher/net_watcher.cc.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/net/tools/net_watcher/net_watcher.cc +@@ -32,7 +32,7 @@ + #include "net/proxy_resolution/proxy_config_service.h" + #include "net/proxy_resolution/proxy_config_with_annotation.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "net/base/network_change_notifier_linux.h" + #endif + +@@ -44,7 +44,7 @@ namespace { + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Flag to specifies which network interfaces to ignore. Interfaces should + // follow as a comma seperated list. + const char kIgnoreNetifFlag[] = "ignore-netif"; +@@ -163,7 +163,7 @@ int main(int argc, char* argv[]) { + + NetWatcher net_watcher; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + std::string ignored_netifs_str = + command_line->GetSwitchValueASCII(kIgnoreNetifFlag); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h index d179e5d2a70e..6137b2d6afab 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h @@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc index f7b2c74f9b86..f4330b86cbaf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context.cc -@@ -110,7 +110,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -109,7 +109,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h index 738a9a1f2d0e..4dfeee5c61ad 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context.h -@@ -87,7 +87,7 @@ class NET_EXPORT URLRequestContext final { +@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc index 20960ca1a473..89ac3cd25dc2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context_builder.cc @@ -443,7 +443,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc new file mode 100644 index 000000000000..150ef4b2664b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc +@@ -84,7 +84,7 @@ + #include "gin/public/cppgc.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "pdf/pdfium/pdfium_font_linux.h" + #endif + +@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon + + FPDF_InitLibraryWithConfig(&config); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + g_font_mapping_mode = font_mapping_mode; + InitializeLinuxFontMapper(); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__helper.cc new file mode 100644 index 000000000000..5a90544a5b4f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__helper.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/printing/backend/cups_helper.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/printing/backend/cups_helper.cc +@@ -127,7 +127,7 @@ void GetResolutionSettings(ppd_file_t* ppd, + // found. + #if BUILDFLAG(IS_MAC) + constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr gfx::Size kDefaultMissingDpi(kPixelsPerInch, kPixelsPerInch); + #else + constexpr gfx::Size kDefaultMissingDpi(kDefaultPdfDpi, kDefaultPdfDpi); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc new file mode 100644 index 000000000000..a0de02e92b31 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc +@@ -210,7 +210,7 @@ void ExtractResolutions(const CupsOptionProvider& prin + // Provide a default DPI if no valid DPI is found. + #if BUILDFLAG(IS_MAC) + constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr gfx::Size kDefaultMissingDpi(kPixelsPerInch, kPixelsPerInch); + #else + constexpr gfx::Size kDefaultMissingDpi(kDefaultPdfDpi, kDefaultPdfDpi); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc index d3d7739b1506..f7f14d9a11f0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h" @@ -9,7 +9,7 @@ #include "mojo/public/mojom/base/values.mojom.h" #endif -@@ -147,7 +147,7 @@ bool StructTraits< +@@ -150,7 +150,7 @@ bool StructTraits< } out->set_pages_per_sheet(data.pages_per_sheet()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h index 3097e1c3f685..aa26b6bb7df4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h @@ -158,7 +158,7 @@ struct StructTraits<printing::mojom::PrintSettingsData return s.pages_per_sheet(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc index 6a28ff6d4712..363d83e8e5d5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/printing/print_settings.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/printing/print_settings.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/printing/print_settings.cc -@@ -272,7 +272,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -312,7 +312,7 @@ void PrintSettings::Clear() { +@@ -405,7 +405,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h index e3c168fa375d..bf497f113add 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/printing/print_settings.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/printing/print_settings.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/printing/print_settings.h -@@ -18,7 +18,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -9,8 +9,8 @@ #include <map> #include "base/values.h" -@@ -66,7 +66,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { - } +@@ -74,7 +74,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { + std::string vendor_id; }; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ using AdvancedSettings = std::map<std::string, base::Value>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -221,7 +221,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -241,7 +241,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -27,7 +27,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -322,7 +322,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -372,7 +372,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc index 2f214f2c04dd..124d6ab84e9d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/printing/print_settings_conversion.cc -@@ -256,7 +256,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -277,7 +277,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } --#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && defined(USE_CUPS)) -+#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS)) +-#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)) ++#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS)) const base::Value::Dict* advanced_settings = job_settings.FindDict(kSettingAdvancedSettings); if (advanced_settings) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc index 0607527c038b..5849f4064098 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/printing_context_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/printing/printing_context_linux.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/printing/printing_context_linux.cc @@ -19,7 +19,7 @@ #include "printing/units.h" @@ -18,7 +18,7 @@ if (!ui::LinuxUi::instance()) return mojom::ResultCode::kSuccess; -@@ -81,7 +81,7 @@ gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceU +@@ -84,7 +84,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett } gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { @@ -27,7 +27,7 @@ if (ui::LinuxUi::instance()) return ui::LinuxUi::instance()->GetPdfPaperSize(this); #endif -@@ -94,7 +94,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS +@@ -97,7 +97,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS DCHECK(!printer_settings.show_system_dialog); DCHECK(!in_print_job_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc index 06cc87cd50a3..3abb9b1db71f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc -@@ -9,21 +9,28 @@ - #include "base/files/file_util.h" +@@ -10,21 +10,28 @@ #include "base/path_service.h" #include "build/build_config.h" + #include "printing/buildflags/buildflags.h" +#if !BUILDFLAG(IS_BSD) #include "sandbox/linux/syscall_broker/broker_command.h" #include "sandbox/linux/syscall_broker/broker_file_permission.h" @@ -14,7 +14,7 @@ +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#endif - #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) + #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) #include "printing/backend/cups_connection_pool.h" #endif @@ -29,7 +29,7 @@ namespace { sandbox::syscall_broker::BrokerCommandSet GetPrintBackendBrokerCommandSet() { -@@ -84,9 +91,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP +@@ -85,9 +92,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP } } // namespace @@ -38,10 +38,10 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { +#if !BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) + #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) // Create the socket connections to the CUPS server before engaging the // sandbox, since new connections cannot be made after that. -@@ -100,6 +109,7 @@ bool PrintBackendPreSandboxHook( +@@ -101,6 +110,7 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h index 1d88162006bc..562558862c61 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.h @@ -5,8 +5,13 @@ #ifndef PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn index 8d1bacfa2508..a9f2a18dd4d7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/BUILD.gn.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/sandbox/BUILD.gn @@ -49,7 +49,7 @@ group("sandbox") { "//sandbox/mac:system_services", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_features.gni index 0162339bd470..eb3639cd4918 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_features.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_features.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/features.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/features.gni.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/sandbox/features.gni @@ -6,7 +6,7 @@ # currently. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn index d3f6ea5fb390..ee65ecf8a3a5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/linux/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/linux/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/sandbox/linux/BUILD.gn -@@ -12,12 +12,12 @@ declare_args() { +@@ -12,11 +12,11 @@ if (is_android) { } declare_args() { @@ -10,18 +10,15 @@ - compile_credentials = is_linux || is_chromeos + compile_credentials = (is_linux || is_chromeos) && !is_bsd - # On Android, use plain GTest. -- use_base_test_suite = is_linux || is_chromeos -+ use_base_test_suite = (is_linux || is_chromeos) && !is_bsd - } +- compile_syscall_broker = is_linux || is_chromeos ++ compile_syscall_broker = (is_linux || is_chromeos) && !is_bsd - # We have two principal targets: sandbox and sandbox_linux_unittests -@@ -367,6 +367,39 @@ component("sandbox_services") { - sources += [ - "services/libc_interceptor.cc", + # On Android, use plain GTest. + use_base_test_suite = is_linux || is_chromeos +@@ -379,6 +379,17 @@ component("sandbox_services") { "services/libc_interceptor.h", -+ ] -+ } + ] + } + + if (is_bsd) { + sources -= [ @@ -31,28 +28,8 @@ + "services/syscall_wrappers.h", + "services/yama.cc", + "services/yama.h", -+ "syscall_broker/broker_channel.cc", -+ "syscall_broker/broker_channel.h", -+ "syscall_broker/broker_client.cc", -+ "syscall_broker/broker_client.h", -+ "syscall_broker/broker_command.cc", -+ "syscall_broker/broker_command.h", -+ "syscall_broker/broker_file_permission.cc", -+ "syscall_broker/broker_file_permission.h", -+ "syscall_broker/broker_host.cc", -+ "syscall_broker/broker_host.h", -+ "syscall_broker/broker_permission_list.cc", -+ "syscall_broker/broker_permission_list.h", -+ "syscall_broker/broker_process.cc", -+ "syscall_broker/broker_process.h", -+ "syscall_broker/broker_sandbox_config.cc", -+ "syscall_broker/broker_sandbox_config.h", -+ "syscall_broker/broker_simple_message.cc", -+ "syscall_broker/broker_simple_message.h", -+ "syscall_broker/remote_syscall_arg_handler.cc", -+ "syscall_broker/remote_syscall_arg_handler.h", -+ "syscall_broker/syscall_dispatcher.cc", -+ "syscall_broker/syscall_dispatcher.h", - ] - } ++ ] ++ } } + + source_set("sandbox_services_headers") { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_init__process__reaper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_init__process__reaper.cc index 3fd40e239853..0d270be6a9ee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_init__process__reaper.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_init__process__reaper.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/linux/services/init_process_reaper.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/linux/services/init_process_reaper.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/sandbox/linux/services/init_process_reaper.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc index 0578081e9409..1007bb73db43 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc @@ -12,7 +12,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -161,7 +163,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -167,7 +169,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn index 096bbf1db18d..3f5ef1a4abdd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/sandbox/policy/BUILD.gn -@@ -5,6 +5,8 @@ import("//build/config/chromeos/ui_mode.gni") - import("//build/buildflag_header.gni") - import("//build/config/chromecast_build.gni") - import("//build/config/chromeos/ui_mode.gni") -+# Import ozone_platform_x11, required for QtPDF to get a successful build -+import("//build/config/ozone.gni") - import("//build/config/sanitizers/sanitizers.gni") - import("//chromeos/ash/components/assistant/assistant.gni") - import("//components/services/screen_ai/buildflags/features.gni") -@@ -35,7 +37,7 @@ component("policy") { +@@ -35,7 +35,7 @@ component("policy") { "//sandbox/policy/mojom", ] public_deps = [ "//sandbox:common" ] @@ -18,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -94,6 +96,28 @@ component("policy") { +@@ -103,6 +103,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", @@ -35,8 +26,7 @@ + ] + libs = [ "util" ] + } -+ # The use of ozone_platform_x11 is required to avoid assertion errors during build of QtPDF -+ if (is_freebsd && ozone_platform_x11) { ++ if (is_freebsd) { + sources += [ + "freebsd/sandbox_freebsd.cc", + "freebsd/sandbox_freebsd.h", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc index c06e5c1afb75..c85e54bcce00 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/sandbox/policy/features.cc -@@ -15,7 +15,11 @@ BASE_FEATURE(kNetworkServiceSandbox, +@@ -15,7 +15,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkService is enabled.) BASE_FEATURE(kNetworkServiceSandbox, "NetworkServiceSandbox", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc index 8202703f9950..94591e3949bb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2022-11-17 06:20:46 UTC +--- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.cc -@@ -0,0 +1,253 @@ +@@ -0,0 +1,239 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -21,8 +21,6 @@ +#include <string> +#include <vector> + -+#include "base/bind.h" -+#include "base/callback_helpers.h" +#include "base/command_line.h" +#include "base/debug/stack_trace.h" +#include "base/feature_list.h" @@ -60,11 +58,8 @@ +#include "crypto/nss_util.h" +#endif + -+#include "ui/gfx/x/connection.h" +#include "ui/gfx/font_util.h" + -+#include <X11/Xlib.h> -+ +#define MAXTOKENS 3 + +#define _UNVEIL_MAIN "/etc/chromium/unveil.main"; @@ -125,15 +120,6 @@ + crypto::EnsureNSSInit(); +#endif + -+ // cache the XErrorDB by forcing a read on it -+ { -+ auto* connection = x11::Connection::Get(); -+ auto* display = connection->GetXlibDisplay().display(); -+ -+ char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); -+ } -+ + if (process_type.empty()) { + base::FilePath cache_directory, local_directory; + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h index 2a94ace5ef8e..63c091d8eaab 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig 2023-04-16 15:58:20 UTC +--- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h @@ -0,0 +1,278 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom index 4bd54ffa0237..8534b0cee625 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom -@@ -72,6 +72,12 @@ enum Sandbox { - [EnableIf=is_fuchsia] - kVideoCapture, +@@ -76,6 +76,12 @@ enum Sandbox { + [EnableIf=is_win] + kFileUtil, + [EnableIf=is_openbsd] + kVideoCapture, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc index 04e1995a9981..79833e898578 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-11-17 06:21:59 UTC +--- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,413 @@ +@@ -0,0 +1,399 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -22,8 +22,6 @@ +#include <string> +#include <vector> + -+#include "base/bind.h" -+#include "base/callback_helpers.h" +#include "base/command_line.h" +#include "base/debug/stack_trace.h" +#include "base/feature_list.h" @@ -63,11 +61,8 @@ + +#include "third_party/boringssl/src/include/openssl/crypto.h" + -+#include "ui/gfx/x/connection.h" +#include "ui/gfx/font_util.h" + -+#include <X11/Xlib.h> -+ +#define MAXTOKENS 3 + +#define _UNVEIL_MAIN "/etc/chromium/unveil.main"; @@ -133,15 +128,6 @@ + if (process_type.empty()) + CRYPTO_pre_sandbox_init(); + -+ // cache the XErrorDB by forcing a read on it -+ { -+ auto* connection = x11::Connection::Get(); -+ auto* display = connection->GetXlibDisplay().display(); -+ -+ char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); -+ } -+ + if (process_type.empty()) { + base::FilePath cache_directory, local_directory; + @@ -330,7 +316,7 @@ + // flock needed by sqlite3 locking + SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL); + } else if (process_type == switches::kGpuProcess) { -+ SetPledge("stdio rpath cpath wpath getpw drm prot_exec recvfd sendfd tmppath", NULL); ++ SetPledge("stdio rpath flock cpath wpath getpw drm prot_exec recvfd sendfd tmppath", NULL); + } else if (process_type == switches::kPpapiPluginProcess) { + // prot_exec needed by v8 + SetPledge("stdio rpath prot_exec recvfd sendfd", NULL); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h index dac2d242e687..139a14b50a96 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.h.orig 2023-04-16 15:58:20 UTC +--- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.h @@ -0,0 +1,282 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc index 804129ecd7a9..227228695db7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox.cc @@ -18,6 +18,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" #endif // BUILDFLAG(IS_MAC) -@@ -31,7 +35,7 @@ namespace policy { +@@ -31,7 +35,7 @@ namespace sandbox { namespace policy { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h index 24c9df2ea9fb..cd61caa4672c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/sandbox.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox.h @@ -12,6 +12,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" @@ -11,7 +11,7 @@ namespace sandbox { namespace mojom { enum class Sandbox; -@@ -32,7 +36,7 @@ class SANDBOX_POLICY_EXPORT Sandbox { +@@ -32,7 +36,7 @@ namespace policy { class SANDBOX_POLICY_EXPORT Sandbox { public: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc index 743d8f71b1b1..19c190830793 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox_type.cc -@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif case Sandbox::kAudio: return false; @@ -9,7 +9,7 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kMirroring: case Sandbox::kNaClLoader: #endif @@ -18,7 +18,16 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -126,7 +126,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -72,7 +72,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { + case Sandbox::kLibassistant: + #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) + #endif // // BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | BUILDFLAG(IS_BSD) + case Sandbox::kZygoteIntermediateSandbox: + case Sandbox::kHardwareVideoEncoding: + #endif +@@ -128,7 +128,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -27,16 +36,38 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -137,7 +137,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi - case Sandbox::kMediaFoundationCdm: +@@ -140,10 +140,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kWindowsSystemProxyResolver: + case Sandbox::kFileUtil: #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoEncoding: + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -256,7 +256,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kNaClLoader: + break; + #endif // BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kZygoteIntermediateSandbox: + break; + #endif +@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( + if (process_type == switches::kNaClBrokerProcess) + return Sandbox::kNoSandbox; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Intermediate process gains a sandbox later. + if (process_type == switches::kZygoteProcessType) + return Sandbox::kZygoteIntermediateSandbox; +@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -45,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -286,7 +286,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -54,7 +85,21 @@ case Sandbox::kHardwareVideoDecoding: return switches::kHardwareVideoDecodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -374,11 +374,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoEncoding: + return switches::kHardwareVideoEncodingSandbox; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -320,7 +320,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + #if BUILDFLAG(IS_MAC) + case Sandbox::kNaClLoader: + #endif // BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kZygoteIntermediateSandbox: + #endif + NOTREACHED(); +@@ -391,11 +391,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc index bf2dd097369d..0bd48e0c9d4e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/switches.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.cc -@@ -54,7 +54,7 @@ const char kMirroringSandbox[] = "mirroring"; +@@ -54,10 +54,10 @@ const char kFileUtilSandbox[] = "file_util"; const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -8,8 +8,12 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -101,7 +101,9 @@ const char kNoSandbox[] = "no-sandbox"; +@@ -104,7 +104,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h index 2858fcfbc2b4..7b40176617d3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/switches.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.h -@@ -56,7 +56,7 @@ SANDBOX_POLICY_EXPORT extern const char kMirroringSand +@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kFileUtilSandb SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -8,8 +8,12 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -78,7 +78,8 @@ SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; +@@ -82,7 +82,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc index a5c7cd9f212f..faadfc71d1b0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc @@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions( } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h index 683c1e6ebe39..14582b531ce2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.h @@ -5,7 +5,11 @@ #ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc index 3945428be32d..133b559de600 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc @@ -12,7 +12,7 @@ #include "net/cert_net/cert_net_fetcher_url_request.h" @@ -18,7 +18,7 @@ verify_proc = net::CreateCertVerifyProcBuiltin( std::move(cert_net_fetcher), net::CreateSslSystemTrustStore()); #else -@@ -212,6 +212,7 @@ bool IsUsingCertNetFetcher() { +@@ -226,6 +226,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_BUILD.gn new file mode 100644 index 000000000000..bf4c1ec35216 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/device/BUILD.gn.orig 2022-11-30 08:12:58 UTC ++++ src/3rdparty/chromium/services/device/BUILD.gn +@@ -16,7 +16,7 @@ if (is_android) { + } + + is_serial_enabled_platform = +- is_win || ((is_linux || is_chromeos) && use_udev) || is_mac ++ is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac + + source_set("lib") { + # This should be visible only to embedders of the Device Service, and the diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc new file mode 100644 index 000000000000..401ce80fbf17 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc.orig 2022-11-30 08:12:58 UTC ++++ src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc +@@ -29,6 +29,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { + #elif BUILDFLAG(IS_MAC) + return CpuProbeMac::Create(); + #else ++ NOTIMPLEMENTED(); + return nullptr; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc index a1030b49a303..c62c8e44c171 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig 2022-11-08 21:18:48 UTC +--- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc -@@ -164,7 +164,7 @@ LocationArbitrator::NewSystemLocationProvider() { +@@ -162,7 +162,7 @@ LocationArbitrator::NewSystemLocationProvider() { std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn new file mode 100644 index 000000000000..5d27502e2a44 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn @@ -0,0 +1,30 @@ +--- src/3rdparty/chromium/services/device/hid/BUILD.gn.orig 2022-11-30 08:12:58 UTC ++++ src/3rdparty/chromium/services/device/hid/BUILD.gn +@@ -35,7 +35,26 @@ source_set("hid") { + "//services/device/public/mojom", + ] + +- if ((is_linux || is_chromeos) && use_udev) { ++ if (is_openbsd) { ++ sources += [ ++ "hid_connection_fido.cc", ++ "hid_connection_fido.h", ++ "hid_service_fido.cc", ++ "hid_service_fido.h", ++ ] ++ libs = ["fido2", "cbor", "usbhid", "crypto", "util"] ++ } ++ ++ if (is_freebsd) { ++ sources += [ ++ "hid_connection_freebsd.cc", ++ "hid_connection_freebsd.h", ++ "hid_service_freebsd.cc", ++ "hid_service_freebsd.h", ++ ] ++ } ++ ++ if ((is_linux || is_chromeos) && !is_bsd && use_udev) { + sources += [ + "hid_connection_linux.cc", + "hid_connection_linux.h", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.cc new file mode 100644 index 000000000000..3fc5d8364bc9 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.cc @@ -0,0 +1,219 @@ +--- src/3rdparty/chromium/services/device/hid/hid_connection_fido.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_connection_fido.cc +@@ -0,0 +1,216 @@ ++// Copyright 2014 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "services/device/hid/hid_connection_fido.h" ++ ++#include <errno.h> ++#include <sys/ioctl.h> ++ ++#include <memory> ++#include <string> ++#include <utility> ++ ++#include "base/files/file_descriptor_watcher_posix.h" ++#include "base/memory/ref_counted_memory.h" ++#include "base/posix/eintr_wrapper.h" ++#include "base/threading/scoped_blocking_call.h" ++#include "components/device_event_log/device_event_log.h" ++#include "services/device/hid/hid_service.h" ++ ++namespace device { ++ ++class HidConnectionFido::BlockingTaskRunnerHelper { ++ public: ++ BlockingTaskRunnerHelper(base::ScopedFD fd, ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::WeakPtr<HidConnectionFido> connection) ++ : fd_(std::move(fd)), ++ connection_(connection), ++ origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { ++ DETACH_FROM_SEQUENCE(sequence_checker_); ++ // Report buffers must always have room for the report ID. ++ report_buffer_size_ = device_info->max_input_report_size() + 1; ++ has_report_id_ = device_info->has_report_id(); ++ } ++ ++ BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete; ++ BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete; ++ ++ ~BlockingTaskRunnerHelper() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ } ++ ++ // Starts the FileDescriptorWatcher that reads input events from the device. ++ // Must be called on a thread that has a base::MessageLoopForIO. ++ void Start() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ++ file_watcher_ = base::FileDescriptorWatcher::WatchReadable( ++ fd_.get(), base::BindRepeating( ++ &BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking, ++ base::Unretained(this))); ++ } ++ ++ void Write(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ ++ auto data = buffer->front(); ++ size_t size = buffer->size(); ++ // if report id is 0, it shouldn't be included ++ if (data[0] == 0) { ++ data++; ++ size--; ++ } ++ ++ ssize_t result = ++ HANDLE_EINTR(write(fd_.get(), data, size)); ++ if (result < 0) { ++ HID_PLOG(EVENT) << "Write failed"; ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), false)); ++ } else { ++ if (static_cast<size_t>(result) != size) { ++ HID_LOG(EVENT) << "Incomplete HID write: " << result ++ << " != " << buffer->size(); ++ } ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), true)); ++ } ++ } ++ ++ void GetFeatureReport(uint8_t report_id, ++ scoped_refptr<base::RefCountedBytes> buffer, ++ ReadCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ HID_PLOG(EVENT) << "GendFeatureReport not implemented on OpenBSD"; ++ origin_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(std::move(callback), false, nullptr, 0)); ++ } ++ ++ void SendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ HID_PLOG(EVENT) << "SendFeatureReport not implemented on OpenBSD"; ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), false)); ++ } ++ ++ private: ++ void OnFileCanReadWithoutBlocking() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ++ auto buffer = ++ base::MakeRefCounted<base::RefCountedBytes>(report_buffer_size_); ++ uint8_t* data = buffer->front(); ++ size_t length = report_buffer_size_; ++ if (!has_report_id_) { ++ // Fido will not prefix the buffer with a report ID if report IDs are not ++ // used by the device. Prefix the buffer with 0. ++ *data++ = 0; ++ length--; ++ } ++ ++ ssize_t bytes_read = HANDLE_EINTR(read(fd_.get(), data, length)); ++ if (bytes_read < 0) { ++ if (errno != EAGAIN) { ++ HID_PLOG(EVENT) << "Read failed"; ++ // This assumes that the error is unrecoverable and disables reading ++ // from the device until it has been re-opened. ++ // TODO(reillyg): Investigate starting and stopping the file descriptor ++ // watcher in response to pending read requests so that per-request ++ // errors can be returned to the client. ++ file_watcher_.reset(); ++ } ++ return; ++ } ++ if (!has_report_id_) { ++ // Behave as if the byte prefixed above as the the report ID was read. ++ bytes_read++; ++ } ++ ++ origin_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&HidConnectionFido::ProcessInputReport, ++ connection_, buffer, bytes_read)); ++ } ++ ++ SEQUENCE_CHECKER(sequence_checker_); ++ base::ScopedFD fd_; ++ size_t report_buffer_size_; ++ bool has_report_id_; ++ base::WeakPtr<HidConnectionFido> connection_; ++ const scoped_refptr<base::SequencedTaskRunner> origin_task_runner_; ++ std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_; ++}; ++ ++HidConnectionFido::HidConnectionFido( ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::ScopedFD fd, ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, ++ bool allow_protected_reports, ++ bool allow_fido_reports) ++ : HidConnection(device_info, allow_protected_reports, allow_fido_reports), ++ helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner)), ++ blocking_task_runner_(std::move(blocking_task_runner)) { ++ helper_.reset(new BlockingTaskRunnerHelper(std::move(fd), device_info, ++ weak_factory_.GetWeakPtr())); ++ blocking_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start, ++ base::Unretained(helper_.get()))); ++} ++ ++HidConnectionFido::~HidConnectionFido() {} ++ ++void HidConnectionFido::PlatformClose() { ++ // By closing the device on the blocking task runner 1) the requirement that ++ // base::ScopedFD is destroyed on a thread where I/O is allowed is satisfied ++ // and 2) any tasks posted to this task runner that refer to this file will ++ // complete before it is closed. ++ helper_.reset(); ++} ++ ++void HidConnectionFido::PlatformWrite( ++ scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ // Fido expects the first byte of the buffer to always be a report ID so the ++ // buffer can be used directly. ++ blocking_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Write, ++ base::Unretained(helper_.get()), buffer, ++ std::move(callback))); ++} ++ ++void HidConnectionFido::PlatformGetFeatureReport(uint8_t report_id, ++ ReadCallback callback) { ++ // The first byte of the destination buffer is the report ID being requested ++ // and is overwritten by the feature report. ++ DCHECK_GT(device_info()->max_feature_report_size(), 0u); ++ auto buffer = base::MakeRefCounted<base::RefCountedBytes>( ++ device_info()->max_feature_report_size() + 1); ++ buffer->data()[0] = report_id; ++ ++ blocking_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport, ++ base::Unretained(helper_.get()), report_id, ++ buffer, std::move(callback))); ++} ++ ++void HidConnectionFido::PlatformSendFeatureReport( ++ scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ // Fido expects the first byte of the buffer to always be a report ID so the ++ // buffer can be used directly. ++ blocking_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::SendFeatureReport, ++ base::Unretained(helper_.get()), buffer, ++ std::move(callback))); ++} ++ ++} // namespace device diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.h new file mode 100644 index 000000000000..721ad2743480 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__fido.h @@ -0,0 +1,63 @@ +--- src/3rdparty/chromium/services/device/hid/hid_connection_fido.h.orig 2022-10-28 16:39:00 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_connection_fido.h +@@ -0,0 +1,60 @@ ++// Copyright 2014 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_ ++#define SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_ ++ ++#include <stddef.h> ++#include <stdint.h> ++ ++#include "base/files/scoped_file.h" ++#include "base/memory/weak_ptr.h" ++#include "base/task/sequenced_task_runner.h" ++#include "services/device/hid/hid_connection.h" ++ ++namespace base { ++class SequencedTaskRunner; ++} ++ ++namespace device { ++ ++class HidConnectionFido : public HidConnection { ++ public: ++ HidConnectionFido( ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::ScopedFD fd, ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, ++ bool allow_protected_reports, ++ bool allow_fido_reports); ++ HidConnectionFido(HidConnectionFido&) = delete; ++ HidConnectionFido& operator=(HidConnectionFido&) = delete; ++ ++ private: ++ friend class base::RefCountedThreadSafe<HidConnectionFido>; ++ class BlockingTaskRunnerHelper; ++ ++ ~HidConnectionFido() override; ++ ++ // HidConnection implementation. ++ void PlatformClose() override; ++ void PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) override; ++ void PlatformGetFeatureReport(uint8_t report_id, ++ ReadCallback callback) override; ++ void PlatformSendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) override; ++ ++ // |helper_| lives on the sequence to which |blocking_task_runner_| posts ++ // tasks so all calls must be posted there including this object's ++ // destruction. ++ std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_; ++ ++ const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; ++ ++ base::WeakPtrFactory<HidConnectionFido> weak_factory_{this}; ++}; ++ ++} // namespace device ++ ++#endif // SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.cc new file mode 100644 index 000000000000..70bbc4592b92 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.cc @@ -0,0 +1,243 @@ +--- src/3rdparty/chromium/services/device/hid/hid_connection_freebsd.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_connection_freebsd.cc +@@ -0,0 +1,240 @@ ++// Copyright (c) 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "services/device/hid/hid_connection_freebsd.h" ++ ++#include <dev/usb/usbhid.h> ++#include <dev/usb/usb_ioctl.h> ++ ++#include "base/files/file_descriptor_watcher_posix.h" ++#include "base/location.h" ++#include "base/numerics/safe_math.h" ++#include "base/posix/eintr_wrapper.h" ++#include "base/strings/stringprintf.h" ++#include "base/task/single_thread_task_runner.h" ++#include "base/threading/scoped_blocking_call.h" ++#include "base/threading/thread_restrictions.h" ++#include "components/device_event_log/device_event_log.h" ++#include "services/device/hid/hid_service.h" ++ ++namespace device { ++ ++class HidConnectionFreeBSD::BlockingTaskRunnerHelper { ++ public: ++ BlockingTaskRunnerHelper(base::ScopedFD fd, ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::WeakPtr<HidConnectionFreeBSD> connection) ++ : fd_(std::move(fd)), ++ connection_(connection), ++ origin_task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { ++ DETACH_FROM_SEQUENCE(sequence_checker_); ++ // Report buffers must always have room for the report ID. ++ report_buffer_size_ = device_info->max_input_report_size() + 1; ++ has_report_id_ = device_info->has_report_id(); ++ } ++ ++ BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete; ++ BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete; ++ ++ ~BlockingTaskRunnerHelper() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); } ++ ++ // Starts the FileDescriptorWatcher that reads input events from the device. ++ // Must be called on a thread that has a base::MessageLoopForIO. ++ void Start() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::internal::AssertBlockingAllowed(); ++ ++ file_watcher_ = base::FileDescriptorWatcher::WatchReadable( ++ fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking, ++ base::Unretained(this))); ++ } ++ ++ void Write(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ ++ auto data = buffer->front(); ++ size_t size = buffer->size(); ++ // if report id is 0, it shouldn't be included ++ if (data[0] == 0) { ++ data++; ++ size--; ++ } ++ ++ ssize_t result = HANDLE_EINTR(write(fd_.get(), data, size)); ++ if (result < 0) { ++ HID_PLOG(EVENT) << "Write failed"; ++ origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), false)); ++ } else { ++ if (static_cast<size_t>(result) != size) ++ HID_LOG(EVENT) << "Incomplete HID write: " << result << " != " << size; ++ origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), true)); ++ } ++ } ++ ++ void GetFeatureReport(uint8_t report_id, ++ scoped_refptr<base::RefCountedBytes> buffer, ++ ReadCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ struct usb_gen_descriptor ugd; ++ ugd.ugd_report_type = UHID_FEATURE_REPORT; ++ ugd.ugd_data = buffer->front(); ++ ugd.ugd_maxlen = buffer->size(); ++ int result = HANDLE_EINTR( ++ ioctl(fd_.get(), USB_GET_REPORT, &ugd)); ++ if (result < 0) { ++ HID_PLOG(EVENT) << "Failed to get feature report"; ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), false, nullptr, 0)); ++ } else if (result == 0) { ++ HID_LOG(EVENT) << "Get feature result too short."; ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), false, nullptr, 0)); ++ } else { ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), true, buffer, result)); ++ } ++ } ++ ++ void SendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ struct usb_gen_descriptor ugd; ++ ugd.ugd_report_type = UHID_FEATURE_REPORT; ++ ugd.ugd_data = buffer->front(); ++ ugd.ugd_maxlen = buffer->size(); ++ // FreeBSD does not require report id if it's not used ++ if (buffer->front()[0] == 0) { ++ ugd.ugd_data = buffer->front() + 1; ++ ugd.ugd_maxlen = buffer->size() - 1; ++ } else { ++ ugd.ugd_data = buffer->front(); ++ ugd.ugd_maxlen = buffer->size(); ++ } ++ int result = HANDLE_EINTR( ++ ioctl(fd_.get(), USB_SET_REPORT, &ugd)); ++ if (result < 0) { ++ HID_PLOG(EVENT) << "Failed to send feature report"; ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), false)); ++ } else { ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), true)); ++ } ++ } ++ ++ private: ++ void OnFileCanReadWithoutBlocking() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ++ scoped_refptr<base::RefCountedBytes> buffer(new base::RefCountedBytes(report_buffer_size_)); ++ unsigned char* data = buffer->front(); ++ size_t length = report_buffer_size_; ++ if (!has_report_id_) { ++ // FreeBSD will not prefix the buffer with a report ID if report IDs are not ++ // used by the device. Prefix the buffer with 0. ++ *data++ = 0; ++ length--; ++ } ++ ++ ssize_t bytes_read = HANDLE_EINTR(read(fd_.get(), data, length)); ++ if (bytes_read < 0) { ++ if (errno != EAGAIN) { ++ HID_PLOG(EVENT) << "Read failed"; ++ // This assumes that the error is unrecoverable and disables reading ++ // from the device until it has been re-opened. ++ // TODO(reillyg): Investigate starting and stopping the file descriptor ++ // watcher in response to pending read requests so that per-request ++ // errors can be returned to the client. ++ file_watcher_.reset(); ++ } ++ return; ++ } ++ if (!has_report_id_) { ++ // Behave as if the byte prefixed above as the the report ID was read. ++ bytes_read++; ++ } ++ ++ origin_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&HidConnectionFreeBSD::ProcessInputReport, ++ connection_, buffer, bytes_read)); ++ } ++ ++ SEQUENCE_CHECKER(sequence_checker_); ++ base::ScopedFD fd_; ++ size_t report_buffer_size_; ++ bool has_report_id_; ++ base::WeakPtr<HidConnectionFreeBSD> connection_; ++ const scoped_refptr<base::SequencedTaskRunner> origin_task_runner_; ++ std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_; ++}; ++ ++HidConnectionFreeBSD::HidConnectionFreeBSD( ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::ScopedFD fd, ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, ++ bool allow_protected_reports, ++ bool allow_fido_reports) ++ : HidConnection(device_info, allow_protected_reports, allow_fido_reports), ++ helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner)), ++ blocking_task_runner_(std::move(blocking_task_runner)) { ++ helper_.reset(new BlockingTaskRunnerHelper(std::move(fd), device_info, ++ weak_factory_.GetWeakPtr())); ++ blocking_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start, ++ base::Unretained(helper_.get()))); ++} ++ ++HidConnectionFreeBSD::~HidConnectionFreeBSD() {} ++ ++void HidConnectionFreeBSD::PlatformClose() { ++ // By closing the device on the blocking task runner 1) the requirement that ++ // base::ScopedFD is destroyed on a thread where I/O is allowed is satisfied ++ // and 2) any tasks posted to this task runner that refer to this file will ++ // complete before it is closed. ++ blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release()); ++} ++ ++void HidConnectionFreeBSD::PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ ++ blocking_task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&BlockingTaskRunnerHelper::Write, base::Unretained(helper_.get()), ++ buffer, std::move(callback))); ++} ++ ++void HidConnectionFreeBSD::PlatformGetFeatureReport(uint8_t report_id, ++ ReadCallback callback) { ++ // The first byte of the destination buffer is the report ID being requested ++ // and is overwritten by the feature report. ++ DCHECK_GT(device_info()->max_feature_report_size(), 0u); ++ scoped_refptr<base::RefCountedBytes> buffer( ++ new base::RefCountedBytes(device_info()->max_feature_report_size() + 1)); ++ if (report_id != 0) ++ buffer->data()[0] = report_id; ++ ++ blocking_task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport, ++ base::Unretained(helper_.get()), report_id, ++ buffer, std::move(callback))); ++} ++ ++void HidConnectionFreeBSD::PlatformSendFeatureReport( ++ scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ blocking_task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&BlockingTaskRunnerHelper::SendFeatureReport, ++ base::Unretained(helper_.get()), buffer, std::move(callback))); ++} ++ ++} // namespace device diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.h new file mode 100644 index 000000000000..137aec76fd38 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__connection__freebsd.h @@ -0,0 +1,70 @@ +--- src/3rdparty/chromium/services/device/hid/hid_connection_freebsd.h.orig 2022-02-07 13:39:41 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_connection_freebsd.h +@@ -0,0 +1,67 @@ ++// Copyright (c) 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef DEVICE_HID_HID_CONNECTION_FREEBSD_H_ ++#define DEVICE_HID_HID_CONNECTION_FREEBSD_H_ ++ ++#include <stddef.h> ++#include <stdint.h> ++ ++#include "base/files/scoped_file.h" ++#include "base/memory/weak_ptr.h" ++#include "base/memory/ref_counted_memory.h" ++#include "base/task/sequenced_task_runner.h" ++#include "services/device/hid/hid_connection.h" ++ ++namespace base { ++class SequencedTaskRunner; ++} ++ ++namespace net { ++class IOBuffer; ++} ++ ++namespace device { ++ ++class HidConnectionFreeBSD : public HidConnection { ++ public: ++ HidConnectionFreeBSD( ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::ScopedFD fd, ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, ++ bool allow_protected_reports, ++ bool allow_fido_reports); ++ ++ private: ++ friend class base::RefCountedThreadSafe<HidConnectionFreeBSD>; ++ class BlockingTaskRunnerHelper; ++ ++ HidConnectionFreeBSD(const HidConnectionFreeBSD&) = delete; ++ HidConnectionFreeBSD& operator=(const HidConnectionFreeBSD&) = delete; ++ ++ ~HidConnectionFreeBSD() override; ++ ++ // HidConnection implementation. ++ void PlatformClose() override; ++ void PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) override; ++ void PlatformGetFeatureReport(uint8_t report_id, ++ ReadCallback callback) override; ++ void PlatformSendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) override; ++ ++ // |helper_| lives on the sequence to which |blocking_task_runner_| posts ++ // tasks so all calls must be posted there including this object's ++ // destruction. ++ std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_; ++ ++ const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; ++ const scoped_refptr<base::SequencedTaskRunner> task_runner_; ++ ++ base::WeakPtrFactory<HidConnectionFreeBSD> weak_factory_{this}; ++}; ++ ++} // namespace device ++ ++#endif // DEVICE_HID_HID_CONNECTION_FREEBSD_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service.cc new file mode 100644 index 000000000000..03c1704d920e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service.cc @@ -0,0 +1,24 @@ +--- src/3rdparty/chromium/services/device/hid/hid_service.cc.orig 2022-11-30 08:12:58 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_service.cc +@@ -20,6 +20,10 @@ + + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) + #include "services/device/hid/hid_service_linux.h" ++#elif BUILDFLAG(IS_OPENBSD) ++#include "services/device/hid/hid_service_fido.h" ++#elif BUILDFLAG(IS_FREEBSD) ++#include "services/device/hid/hid_service_freebsd.h" + #elif BUILDFLAG(IS_MAC) + #include "services/device/hid/hid_service_mac.h" + #elif BUILDFLAG(IS_WIN) +@@ -68,6 +72,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr + std::unique_ptr<HidService> HidService::Create() { + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) + return std::make_unique<HidServiceLinux>(); ++#elif BUILDFLAG(IS_OPENBSD) ++ return std::make_unique<HidServiceFido>(); ++#elif BUILDFLAG(IS_FREEBSD) ++ return std::make_unique<HidServiceFreeBSD>(); + #elif BUILDFLAG(IS_MAC) + return std::make_unique<HidServiceMac>(); + #elif BUILDFLAG(IS_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__fido.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__fido.cc new file mode 100644 index 000000000000..9705bc8e8038 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__fido.cc @@ -0,0 +1,399 @@ +--- src/3rdparty/chromium/services/device/hid/hid_service_fido.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_service_fido.cc +@@ -0,0 +1,396 @@ ++// Copyright 2014 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "services/device/hid/hid_service_fido.h" ++ ++#include <fcntl.h> ++#include <poll.h> ++#include <stdint.h> ++ ++#include <dlfcn.h> ++#include <fido.h> ++ ++#include <limits> ++#include <memory> ++#include <string> ++#include <utility> ++ ++#include "base/files/file.h" ++#include "base/files/file_path.h" ++#include "base/files/file_util.h" ++#include "base/files/scoped_file.h" ++#include "base/location.h" ++#include "base/sequence_checker.h" ++#include "base/strings/string_number_conversions.h" ++#include "base/strings/string_split.h" ++#include "base/strings/string_util.h" ++#include "base/task/sequenced_task_runner.h" ++#include "base/task/thread_pool.h" ++#include "base/threading/scoped_blocking_call.h" ++#include "build/build_config.h" ++#include "build/chromeos_buildflags.h" ++#include "components/device_event_log/device_event_log.h" ++#include "device/udev_linux/scoped_udev.h" ++#include "device/udev_linux/udev_watcher.h" ++#include "services/device/hid/hid_connection_fido.h" ++ ++namespace device { ++ ++namespace { ++ ++bool terrible_ping_kludge(int fd, const std::string &path) { ++ u_char data[256]; ++ int i, n; ++ struct pollfd pfd; ++ ++ for (i = 0; i < 4; i++) { ++ memset(data, 0, sizeof(data)); ++ /* broadcast channel ID */ ++ data[1] = 0xff; ++ data[2] = 0xff; ++ data[3] = 0xff; ++ data[4] = 0xff; ++ /* Ping command */ ++ data[5] = 0x81; ++ /* One byte ping only, Vasili */ ++ data[6] = 0; ++ data[7] = 1; ++ HID_LOG(EVENT) << "send ping " << i << " " << path; ++ if (write(fd, data, 64) == -1) { ++ HID_PLOG(ERROR) << "write " << path; ++ return false; ++ } ++ HID_LOG(EVENT) << "wait reply " << path; ++ memset(&pfd, 0, sizeof(pfd)); ++ pfd.fd = fd; ++ pfd.events = POLLIN; ++ if ((n = poll(&pfd, 1, 100)) == -1) { ++ HID_PLOG(EVENT) << "poll " << path; ++ return false; ++ } else if (n == 0) { ++ HID_LOG(EVENT) << "timed out " << path; ++ continue; ++ } ++ if (read(fd, data, 64) == -1) { ++ HID_PLOG(ERROR) << "read " << path; ++ return false; ++ } ++ /* ++ * Ping isn't always supported on the broadcast channel, ++ * so we might get an error, but we don't care - we're ++ * synched now. ++ */ ++ HID_LOG(EVENT) << "got reply " << path; ++ return true; ++ } ++ HID_LOG(ERROR) << "no response " << path; ++ return false; ++} ++ ++// HID report descriptor for U2F interface. Copied from: ++// https://chromium.googlesource.com/chromiumos/platform2/+/c6c7e4e54fce11932fedaa3ea10236bf75d85a2b%5E%21/u2fd/u2fhid.cc ++// Apparently Chromium wants to see these bytes, but OpenBSD fido(4) ++// devices prohibit USB_GET_REPORT_DESC ioctl that could be used to ++// get the bytes from the USB device. ++constexpr uint8_t kU2fReportDesc[] = { ++ 0x06, 0xD0, 0xF1, /* Usage Page (FIDO Alliance), FIDO_USAGE_PAGE */ ++ 0x09, 0x01, /* Usage (U2F HID Auth. Device) FIDO_USAGE_U2FHID */ ++ 0xA1, 0x01, /* Collection (Application), HID_APPLICATION */ ++ 0x09, 0x20, /* Usage (Input Report Data), FIDO_USAGE_DATA_IN */ ++ 0x15, 0x00, /* Logical Minimum (0) */ ++ 0x26, 0xFF, 0x00, /* Logical Maximum (255) */ ++ 0x75, 0x08, /* Report Size (8) */ ++ 0x95, 0x40, /* Report Count (64), HID_INPUT_REPORT_BYTES */ ++ 0x81, 0x02, /* Input (Data, Var, Abs), Usage */ ++ 0x09, 0x21, /* Usage (Output Report Data), FIDO_USAGE_DATA_OUT */ ++ 0x15, 0x00, /* Logical Minimum (0) */ ++ 0x26, 0xFF, 0x00, /* Logical Maximum (255) */ ++ 0x75, 0x08, /* Report Size (8) */ ++ 0x95, 0x40, /* Report Count (64), HID_OUTPUT_REPORT_BYTES */ ++ 0x91, 0x02, /* Output (Data, Var, Abs), Usage */ ++ 0xC0 /* End Collection */ ++}; ++ ++} // namespace ++ ++struct HidServiceFido::ConnectParams { ++ ConnectParams(scoped_refptr<HidDeviceInfo> device_info, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback callback) ++ : device_info(std::move(device_info)), ++ allow_protected_reports(allow_protected_reports), ++ allow_fido_reports(allow_fido_reports), ++ callback(std::move(callback)), ++ task_runner(base::SequencedTaskRunner::GetCurrentDefault()), ++ blocking_task_runner( ++ base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} ++ ~ConnectParams() {} ++ ++ scoped_refptr<HidDeviceInfo> device_info; ++ bool allow_protected_reports; ++ bool allow_fido_reports; ++ ConnectCallback callback; ++ scoped_refptr<base::SequencedTaskRunner> task_runner; ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner; ++ base::ScopedFD fd; ++}; ++ ++class HidServiceFido::BlockingTaskRunnerHelper : public UdevWatcher::Observer { ++ public: ++ BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFido> service) ++ : service_(std::move(service)), ++ task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { ++ DETACH_FROM_SEQUENCE(sequence_checker_); ++ } ++ ++ BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete; ++ BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete; ++ ++ ~BlockingTaskRunnerHelper() override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ } ++ ++ void Start() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ++ void *library = dlopen("libudev.so", RTLD_NOW | RTLD_LOCAL); ++ if (library) { ++ dlclose(library); ++ watcher_ = UdevWatcher::StartWatching(this); ++ watcher_->EnumerateExistingDevices(); ++ } else { ++ HID_LOG(ERROR) << "No udev available, failling back to single enumeration"; ++ WalkFidoDevices(nullptr); ++ } ++ ++ task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&HidServiceFido::FirstEnumerationComplete, service_)); ++ } ++ ++ private: ++ void WalkFidoDevices(const char *name) { ++ fido_dev_info_t *devlist = NULL; ++ fido_dev_t *dev = NULL; ++ size_t devlist_len = 0, i; ++ const char *path; ++ int r; ++ const int MAX_FIDO_DEVICES = 256; ++ ++ if ((devlist = fido_dev_info_new(MAX_FIDO_DEVICES)) == NULL) { ++ HID_LOG(ERROR) << "fido_dev_info_new failed"; ++ goto out; ++ } ++ if ((r = fido_dev_info_manifest(devlist, MAX_FIDO_DEVICES, &devlist_len)) != ++ FIDO_OK) { ++ HID_LOG(ERROR) << "fido_dev_info_manifest: " << fido_strerr(r); ++ goto out; ++ } ++ ++ HID_LOG(EVENT) << "fido_dev_info_manifest found " << devlist_len ++ << " device(s)"; ++ ++ for (i = 0; i < devlist_len; i++) { ++ const fido_dev_info_t *di = fido_dev_info_ptr(devlist, i); ++ ++ if (di == NULL) { ++ HID_LOG(ERROR) << "fido_dev_info_ptr " << i << " failed"; ++ continue; ++ } ++ ++ if ((path = fido_dev_info_path(di)) == NULL) { ++ HID_LOG(ERROR) << "fido_dev_info_path " << i << " failed"; ++ continue; ++ } ++ ++ if (name != nullptr && !strcmp(path, name)) { ++ HID_LOG(EVENT) << "hotplug device " << i << ": " << path; ++ OnFidoDeviceAdded(di); ++ break; ++ } ++ ++ HID_LOG(EVENT) << "trying device " << i << ": " << path; ++ if ((dev = fido_dev_new()) == NULL) { ++ HID_LOG(ERROR) << "fido_dev_new failed"; ++ continue; ++ } ++ ++ if ((r = fido_dev_open(dev, path)) != FIDO_OK) { ++ HID_LOG(ERROR) << "fido_dev_open failed " << path; ++ fido_dev_free(&dev); ++ continue; ++ } ++ ++ fido_dev_close(dev); ++ fido_dev_free(&dev); ++ ++ OnFidoDeviceAdded(di); ++ } ++ out: ++ if (devlist != NULL) ++ fido_dev_info_free(&devlist, MAX_FIDO_DEVICES); ++ } ++ ++ void OnFidoDeviceAdded(const fido_dev_info_t *di) { ++ auto null_as_empty = [](const char *r) -> std::string { ++ return (r != nullptr) ? r : ""; ++ }; ++ std::string device_node(null_as_empty(fido_dev_info_path(di))); ++ std::vector<uint8_t> report_descriptor( ++ kU2fReportDesc, kU2fReportDesc + sizeof(kU2fReportDesc)); ++ ++ auto device_info = base::MakeRefCounted<HidDeviceInfo>( ++ device_node, /*physical_device_id*/"", fido_dev_info_vendor(di), ++ fido_dev_info_product(di), null_as_empty(fido_dev_info_product_string(di)), ++ null_as_empty(fido_dev_info_manufacturer_string(di)), ++ device::mojom::HidBusType::kHIDBusTypeUSB, report_descriptor, ++ device_node); ++ ++ task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&HidServiceFido::AddDevice, service_, device_info)); ++ } ++ ++ // UdevWatcher::Observer ++ void OnDeviceAdded(ScopedUdevDevicePtr device) override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ ++ const char* subsystem = udev_device_get_subsystem(device.get()); ++ if (!subsystem || strcmp(subsystem, "fido") != 0) ++ return; ++ ++ const char* device_path = udev_device_get_syspath(device.get()); ++ if (!device_path) ++ return; ++ ++ WalkFidoDevices(device_path); ++ } ++ ++ void OnDeviceRemoved(ScopedUdevDevicePtr device) override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ ++ const char* device_path = udev_device_get_syspath(device.get()); ++ if (device_path) { ++ task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&HidServiceFido::RemoveDevice, service_, ++ std::string(device_path))); ++ } ++ } ++ ++ void OnDeviceChanged(ScopedUdevDevicePtr) override {} ++ ++ SEQUENCE_CHECKER(sequence_checker_); ++ std::unique_ptr<UdevWatcher> watcher_; ++ ++ // This weak pointer is only valid when checked on this task runner. ++ base::WeakPtr<HidServiceFido> service_; ++ scoped_refptr<base::SequencedTaskRunner> task_runner_; ++}; ++ ++HidServiceFido::HidServiceFido() ++ : blocking_task_runner_( ++ base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)), ++ helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner_)) { ++ // We need to properly initialize |blocking_task_helper_| here because we need ++ // |weak_factory_| to be created first. ++ helper_.reset(new BlockingTaskRunnerHelper(weak_factory_.GetWeakPtr())); ++ blocking_task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start, ++ base::Unretained(helper_.get()))); ++} ++ ++HidServiceFido::~HidServiceFido() = default; ++ ++base::WeakPtr<HidService> HidServiceFido::GetWeakPtr() { ++ return weak_factory_.GetWeakPtr(); ++} ++ ++void HidServiceFido::Connect(const std::string& device_guid, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ++ const auto& map_entry = devices().find(device_guid); ++ if (map_entry == devices().end()) { ++ base::SequencedTaskRunner::GetCurrentDefault()->PostTask( ++ FROM_HERE, base::BindOnce(std::move(callback), nullptr)); ++ return; ++ } ++ scoped_refptr<HidDeviceInfo> device_info = map_entry->second; ++ ++ auto params = ++ std::make_unique<ConnectParams>(device_info, allow_protected_reports, ++ allow_fido_reports, std::move(callback)); ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner = ++ params->blocking_task_runner; ++ blocking_task_runner->PostTask( ++ FROM_HERE, base::BindOnce(&HidServiceFido::OpenOnBlockingThread, ++ std::move(params))); ++} ++ ++// static ++void HidServiceFido::OpenOnBlockingThread( ++ std::unique_ptr<ConnectParams> params) { ++ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, ++ base::BlockingType::MAY_BLOCK); ++ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; ++ ++ base::FilePath device_path(params->device_info->device_node()); ++ base::File device_file; ++ int flags = ++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; ++ device_file.Initialize(device_path, flags); ++ if (!device_file.IsValid()) { ++ base::File::Error file_error = device_file.error_details(); ++ ++ if (file_error == base::File::FILE_ERROR_ACCESS_DENIED) { ++ HID_LOG(EVENT) ++ << "Access denied opening device read-write, trying read-only."; ++ flags = base::File::FLAG_OPEN | base::File::FLAG_READ; ++ device_file.Initialize(device_path, flags); ++ } ++ } ++ if (!device_file.IsValid()) { ++ HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node() ++ << "': " ++ << base::File::ErrorToString(device_file.error_details()); ++ task_runner->PostTask(FROM_HERE, ++ base::BindOnce(std::move(params->callback), nullptr)); ++ return; ++ } ++ if (!terrible_ping_kludge(device_file.GetPlatformFile(), params->device_info->device_node())) { ++ HID_LOG(EVENT) << "Failed to ping " << params->device_info->device_node(); ++ task_runner->PostTask(FROM_HERE, base::BindOnce(std::move(params->callback), nullptr)); ++ return; ++ } ++ params->fd.reset(device_file.TakePlatformFile()); ++ ++ task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFido::FinishOpen, ++ std::move(params))); ++} ++ ++// static ++void HidServiceFido::FinishOpen(std::unique_ptr<ConnectParams> params) { ++ DCHECK(params->fd.is_valid()); ++ ++ if (!base::SetNonBlocking(params->fd.get())) { ++ HID_PLOG(DEBUG) << "Failed to set the non-blocking flag on the device fd"; ++ std::move(params->callback).Run(nullptr); ++ return; ++ } ++ ++ std::move(params->callback) ++ .Run(base::MakeRefCounted<HidConnectionFido>( ++ std::move(params->device_info), std::move(params->fd), ++ std::move(params->blocking_task_runner), ++ params->allow_protected_reports, params->allow_fido_reports)); ++} ++ ++} // namespace device diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__fido.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__fido.h new file mode 100644 index 000000000000..66df5a44d568 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__fido.h @@ -0,0 +1,68 @@ +--- src/3rdparty/chromium/services/device/hid/hid_service_fido.h.orig 2022-10-28 16:39:00 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_service_fido.h +@@ -0,0 +1,65 @@ ++// Copyright 2014 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_ ++#define SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_ ++ ++#include <memory> ++ ++#include "base/compiler_specific.h" ++#include "base/files/scoped_file.h" ++#include "base/memory/weak_ptr.h" ++#include "base/task/sequenced_task_runner.h" ++#include "build/build_config.h" ++#include "build/chromeos_buildflags.h" ++#include "services/device/hid/hid_device_info.h" ++#include "services/device/hid/hid_service.h" ++ ++namespace device { ++ ++class HidServiceFido : public HidService { ++ public: ++ HidServiceFido(); ++ HidServiceFido(HidServiceFido&) = delete; ++ HidServiceFido& operator=(HidServiceFido&) = delete; ++ ~HidServiceFido() override; ++ ++ // HidService: ++ void Connect(const std::string& device_id, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback callback) override; ++ base::WeakPtr<HidService> GetWeakPtr() override; ++ ++ private: ++ struct ConnectParams; ++ class BlockingTaskRunnerHelper; ++ ++// These functions implement the process of locating, requesting access to and ++// opening a device. Because this operation crosses multiple threads these ++// functions are static and the necessary parameters are passed as a single ++// struct. ++#if BUILDFLAG(IS_CHROMEOS_ASH) ++ static void OnPathOpenComplete(std::unique_ptr<ConnectParams> params, ++ base::ScopedFD fd); ++ static void OnPathOpenError(const std::string& device_path, ++ ConnectCallback callback, ++ const std::string& error_name, ++ const std::string& error_message); ++#else ++ static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params); ++#endif ++ static void FinishOpen(std::unique_ptr<ConnectParams> params); ++ ++ const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; ++ ++ // |helper_| lives on the sequence |blocking_task_runner_| posts to and holds ++ // a weak reference back to the service that owns it. ++ std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_; ++ base::WeakPtrFactory<HidServiceFido> weak_factory_{this}; ++}; ++ ++} // namespace device ++ ++#endif // SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__freebsd.cc new file mode 100644 index 000000000000..888fba7bc134 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__freebsd.cc @@ -0,0 +1,398 @@ +--- src/3rdparty/chromium/services/device/hid/hid_service_freebsd.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_service_freebsd.cc +@@ -0,0 +1,395 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "services/device/hid/hid_service_freebsd.h" ++ ++#include <dev/usb/usb_ioctl.h> ++#include <stdint.h> ++#include <sys/socket.h> ++#include <sys/un.h> ++ ++#include <set> ++#include <string> ++#include <vector> ++ ++#include "base/files/file_descriptor_watcher_posix.h" ++#include "base/files/file_enumerator.h" ++#include "base/files/file_util.h" ++#include "base/files/file.h" ++#include "base/location.h" ++#include "base/logging.h" ++#include "base/posix/eintr_wrapper.h" ++#include "base/stl_util.h" ++#include "base/strings/pattern.h" ++#include "base/strings/stringprintf.h" ++#include "base/strings/sys_string_conversions.h" ++#include "base/strings/string_util.h" ++#include "base/strings/string_split.h" ++#include "base/task/single_thread_task_runner.h" ++#include "base/task/thread_pool.h" ++#include "base/threading/scoped_blocking_call.h" ++#include "base/threading/thread_restrictions.h" ++#include "components/device_event_log/device_event_log.h" ++#include "services/device/hid/hid_connection_freebsd.h" ++ ++const int kMaxPermissionChecks = 5; ++ ++namespace device { ++ ++struct HidServiceFreeBSD::ConnectParams { ++ ConnectParams(scoped_refptr<HidDeviceInfo> device_info, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback callback) ++ : device_info(std::move(device_info)), ++ allow_protected_reports(allow_protected_reports), ++ allow_fido_reports(allow_fido_reports), ++ callback(std::move(callback)), ++ task_runner(base::SequencedTaskRunner::GetCurrentDefault()), ++ blocking_task_runner( ++ base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} ++ ~ConnectParams() {} ++ ++ scoped_refptr<HidDeviceInfo> device_info; ++ bool allow_protected_reports; ++ bool allow_fido_reports; ++ ConnectCallback callback; ++ scoped_refptr<base::SequencedTaskRunner> task_runner; ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner; ++ base::ScopedFD fd; ++}; ++ ++class HidServiceFreeBSD::BlockingTaskRunnerHelper { ++ public: ++ BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFreeBSD> service) ++ : service_(std::move(service)), ++ task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { ++ DETACH_FROM_SEQUENCE(sequence_checker_); ++ ++ timer_.reset(new base::RepeatingTimer()); ++ devd_buffer_ = new net::IOBufferWithSize(1024); ++ } ++ ++ BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete; ++ BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete; ++ ++ ~BlockingTaskRunnerHelper() { ++ } ++ ++ void Start() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ++ const base::FilePath kDevRoot("/dev"); ++ const std::string kUHIDPattern("/dev/uhid*"); ++ ++ base::FileEnumerator enumerator(kDevRoot, false, base::FileEnumerator::FILES); ++ do { ++ const base::FilePath next_device_path(enumerator.Next()); ++ const std::string next_device = next_device_path.value(); ++ if (next_device.empty()) ++ break; ++ ++ if (base::MatchPattern(next_device, kUHIDPattern)) ++ OnDeviceAdded(next_device.substr(5)); ++ } while (true); ++ ++ SetupDevdMonitor(); ++ ++ task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&HidServiceFreeBSD::FirstEnumerationComplete, service_)); ++ } ++ ++ bool HaveReadWritePermissions(std::string device_id) { ++ std::string device_node = "/dev/" + device_id; ++ base::internal::AssertBlockingAllowed(); ++ ++ base::FilePath device_path(device_node); ++ base::File device_file; ++ int flags = ++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; ++ device_file.Initialize(device_path, flags); ++ if (!device_file.IsValid()) ++ return false; ++ ++ return true; ++ } ++ ++ void OnDeviceAdded(std::string device_id) { ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ std::string device_node = "/dev/" + device_id; ++ uint16_t vendor_id = 0xffff; ++ uint16_t product_id = 0xffff; ++ std::string product_name = ""; ++ std::string serial_number = ""; ++ ++ std::vector<uint8_t> report_descriptor; ++ ++ base::internal::AssertBlockingAllowed(); ++ ++ base::FilePath device_path(device_node); ++ base::File device_file; ++ int flags = ++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; ++ device_file.Initialize(device_path, flags); ++ if (!device_file.IsValid()) { ++ HID_LOG(ERROR) << "Failed to open '" << device_node ++ << "': " ++ << base::File::ErrorToString(device_file.error_details()); ++ return; ++ } ++ ++ base::ScopedFD fd; ++ fd.reset(device_file.TakePlatformFile()); ++ ++ struct usb_gen_descriptor ugd; ++ ugd.ugd_data = NULL; ++ ugd.ugd_maxlen = 0xffff; ++ int result = HANDLE_EINTR( ++ ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd)); ++ ++ if (result < 0) { ++ HID_LOG(ERROR) << "Failed to get report descriptor size"; ++ return; ++ } ++ ++ report_descriptor.resize(ugd.ugd_actlen); ++ ++ ugd.ugd_data = report_descriptor.data(); ++ ugd.ugd_maxlen = ugd.ugd_actlen; ++ result = HANDLE_EINTR( ++ ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd)); ++ ++ if (result < 0) { ++ HID_LOG(ERROR) << "Failed to get report descriptor"; ++ return; ++ } ++ ++ scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo( ++ device_id, ++ /*physical_device_id*/"", ++ vendor_id, ++ product_id, ++ product_name, ++ serial_number, ++ device::mojom::HidBusType::kHIDBusTypeUSB, ++ report_descriptor, ++ device_node)); ++ ++ task_runner_->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::AddDevice, ++ service_, device_info)); ++ } ++ ++ void OnDeviceRemoved(std::string device_id) { ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&HidServiceFreeBSD::RemoveDevice, service_, ++ device_id)); ++ } ++ ++ private: ++ ++ void CheckPendingPermissionChange() { ++ base::internal::AssertBlockingAllowed(); ++ std::map<std::string, int>::iterator it; ++ for (it = permissions_checks_attempts_.begin(); it != permissions_checks_attempts_.end();) { ++ std::string device_name = it->first; ++ bool keep = true; ++ if (HaveReadWritePermissions(device_name)) { ++ OnDeviceAdded(device_name); ++ keep = false; ++ } ++ else if (it->second-- <= 0) { ++ HID_LOG(ERROR) << "Still don't have write permissions to '" << device_name ++ << "' after " << kMaxPermissionChecks << " attempts"; ++ keep = false; ++ } ++ ++ if (keep) ++ ++it; ++ else ++ permissions_checks_attempts_.erase(it++); ++ } ++ ++ if (permissions_checks_attempts_.empty()) ++ timer_->Stop(); ++ } ++ ++ void SetupDevdMonitor() { ++ base::internal::AssertBlockingAllowed(); ++ ++ int devd_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); ++ if (devd_fd < 0) ++ return; ++ ++ struct sockaddr_un sa; ++ ++ sa.sun_family = AF_UNIX; ++ strlcpy(sa.sun_path, "/var/run/devd.seqpacket.pipe", sizeof(sa.sun_path)); ++ if (connect(devd_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) { ++ close(devd_fd); ++ return; ++ } ++ ++ devd_fd_.reset(devd_fd); ++ file_watcher_ = base::FileDescriptorWatcher::WatchReadable( ++ devd_fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnDevdMessageCanBeRead, ++ base::Unretained(this))); ++ } ++ ++ void OnDevdMessageCanBeRead() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ssize_t bytes_read = HANDLE_EINTR(recv(devd_fd_.get(), devd_buffer_->data(), ++ devd_buffer_->size() - 1, MSG_WAITALL)); ++ if (bytes_read < 0) { ++ if (errno != EAGAIN) { ++ HID_LOG(ERROR) << "Read failed"; ++ file_watcher_.reset(); ++ } ++ return; ++ } ++ ++ devd_buffer_->data()[bytes_read] = 0; ++ char *data = devd_buffer_->data(); ++ // It may take some time for devd to change permissions ++ // on /dev/uhidX node. So do not fail immediately if ++ // open fail. Retry each second for kMaxPermissionChecks ++ // times before giving up entirely ++ if (base::StartsWith(data, "+uhid", base::CompareCase::SENSITIVE)) { ++ std::vector<std::string> parts = base::SplitString( ++ data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); ++ if (!parts.empty()) { ++ std::string device_name = parts[0].substr(1); // skip '+' ++ if (HaveReadWritePermissions(device_name)) ++ OnDeviceAdded(parts[0].substr(1)); ++ else { ++ // Do not re-add to checks ++ if (permissions_checks_attempts_.find(device_name) == permissions_checks_attempts_.end()) { ++ permissions_checks_attempts_.insert(std::pair<std::string, int>(device_name, kMaxPermissionChecks)); ++ timer_->Start(FROM_HERE, base::Seconds(1), ++ this, &BlockingTaskRunnerHelper::CheckPendingPermissionChange); ++ } ++ } ++ } ++ } ++ ++ if (base::StartsWith(data, "-uhid", base::CompareCase::SENSITIVE)) { ++ std::vector<std::string> parts = base::SplitString( ++ data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); ++ if (!parts.empty()) { ++ std::string device_name = parts[0].substr(1); // skip '-' ++ auto it = permissions_checks_attempts_.find(device_name); ++ if (it != permissions_checks_attempts_.end()) { ++ permissions_checks_attempts_.erase(it); ++ if (permissions_checks_attempts_.empty()) ++ timer_->Stop(); ++ } ++ OnDeviceRemoved(parts[0].substr(1)); ++ } ++ } ++ } ++ ++ SEQUENCE_CHECKER(sequence_checker_); ++ ++ // This weak pointer is only valid when checked on this task runner. ++ base::WeakPtr<HidServiceFreeBSD> service_; ++ scoped_refptr<base::SequencedTaskRunner> task_runner_; ++ std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_; ++ std::unique_ptr<base::RepeatingTimer> timer_; ++ base::ScopedFD devd_fd_; ++ scoped_refptr<net::IOBufferWithSize> devd_buffer_; ++ std::map<std::string, int> permissions_checks_attempts_; ++}; ++ ++HidServiceFreeBSD::HidServiceFreeBSD() ++ : blocking_task_runner_( ++ base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)), ++ helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner_)) { ++ helper_.reset(new BlockingTaskRunnerHelper(weak_factory_.GetWeakPtr())); ++ blocking_task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&BlockingTaskRunnerHelper::Start, base::Unretained(helper_.get()))); ++} ++ ++HidServiceFreeBSD::~HidServiceFreeBSD() { ++ blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release()); ++} ++ ++base::WeakPtr<HidService> HidServiceFreeBSD::GetWeakPtr() { ++ return weak_factory_.GetWeakPtr(); ++} ++ ++// static ++void HidServiceFreeBSD::OpenOnBlockingThread( ++ std::unique_ptr<ConnectParams> params) { ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; ++ ++ base::FilePath device_path(params->device_info->device_node()); ++ base::File device_file; ++ int flags = ++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; ++ device_file.Initialize(device_path, flags); ++ if (!device_file.IsValid()) { ++ HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node() ++ << "': " ++ << base::File::ErrorToString(device_file.error_details()); ++ task_runner->PostTask(FROM_HERE, ++ base::BindOnce(std::move(params->callback), nullptr)); ++ return; ++ } ++ params->fd.reset(device_file.TakePlatformFile()); ++ task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::FinishOpen, ++ std::move(params))); ++} ++ ++void HidServiceFreeBSD::Connect(const std::string& device_guid, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback callback) { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ ++ const auto& map_entry = devices().find(device_guid); ++ if (map_entry == devices().end()) { ++ base::SequencedTaskRunner::GetCurrentDefault()->PostTask( ++ FROM_HERE, base::BindOnce(std::move(callback), nullptr)); ++ return; ++ } ++ ++ scoped_refptr<HidDeviceInfo> device_info = map_entry->second; ++ ++ auto params = std::make_unique<ConnectParams>(device_info, ++ allow_protected_reports, ++ allow_fido_reports, ++ std::move(callback)); ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner = ++ params->blocking_task_runner; ++ ++ blocking_task_runner->PostTask( ++ FROM_HERE, base::BindOnce(&HidServiceFreeBSD::OpenOnBlockingThread, ++ std::move(params))); ++} ++ ++// static ++void HidServiceFreeBSD::FinishOpen(std::unique_ptr<ConnectParams> params) { ++ DCHECK(params->fd.is_valid()); ++ ++ if (!base::SetNonBlocking(params->fd.get())) { ++ HID_PLOG(ERROR) << "Failed to set the non-blocking flag on the device fd"; ++ std::move(params->callback).Run(nullptr); ++ } ++ ++ std::move(params->callback).Run(base::MakeRefCounted<HidConnectionFreeBSD>( ++ std::move(params->device_info), ++ std::move(params->fd), ++ std::move(params->blocking_task_runner), ++ params->allow_protected_reports, ++ params->allow_fido_reports ++ )); ++} ++ ++} // namespace device diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__freebsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__freebsd.h new file mode 100644 index 000000000000..40f84176a6b1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_hid__service__freebsd.h @@ -0,0 +1,52 @@ +--- src/3rdparty/chromium/services/device/hid/hid_service_freebsd.h.orig 2022-02-07 13:39:41 UTC ++++ src/3rdparty/chromium/services/device/hid/hid_service_freebsd.h +@@ -0,0 +1,49 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef DEVICE_HID_HID_SERVICE_FREEBSD_H_ ++#define DEVICE_HID_HID_SERVICE_FREEBSD_H_ ++ ++#include <string> ++ ++#include "base/memory/ref_counted.h" ++#include "base/memory/weak_ptr.h" ++#include "base/timer/timer.h" ++#include "services/device/hid/hid_service.h" ++#include "net/base/io_buffer.h" ++ ++namespace device { ++ ++class HidServiceFreeBSD : public HidService { ++ public: ++ HidServiceFreeBSD(); ++ ++ HidServiceFreeBSD(const HidServiceFreeBSD&) = delete; ++ HidServiceFreeBSD& operator=(const HidServiceFreeBSD&) = delete; ++ ++ ~HidServiceFreeBSD() override; ++ ++ void Connect(const std::string& device_guid, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback connect) override; ++ base::WeakPtr<HidService> GetWeakPtr() override; ++ ++ private: ++ struct ConnectParams; ++ class BlockingTaskRunnerHelper; ++ ++ static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params); ++ static void FinishOpen(std::unique_ptr<ConnectParams> params); ++ ++ const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; ++ // |helper_| lives on the sequence |blocking_task_runner_| posts to and holds ++ // a weak reference back to the service that owns it. ++ std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_; ++ base::WeakPtrFactory<HidServiceFreeBSD> weak_factory_{this}; ++}; ++ ++} // namespace device ++ ++#endif // DEVICE_HID_HID_SERVICE_FREEBSD_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn new file mode 100644 index 000000000000..0699fae497ce --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/device/public/mojom/BUILD.gn.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/services/device/public/mojom/BUILD.gn +@@ -90,7 +90,7 @@ mojom("device_service") { + cpp_only = true + + enabled_features = [] +- if ((is_linux || is_chromeos) && use_udev) { ++ if ((is_linux || is_chromeos) && !is_bsd && use_udev) { + enabled_features += [ "enable_input_device_manager" ] + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc new file mode 100644 index 000000000000..bb7e24c66c52 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc +@@ -131,7 +131,11 @@ class TimeZoneMonitorLinuxImpl + // false positives are harmless, assuming the false positive rate is + // reasonable. + const char* const kFilesToWatch[] = { ++#if defined(OS_BSD) ++ "/etc/localtime", ++#else + "/etc/localtime", "/etc/timezone", "/etc/TZ", ++#endif + }; + for (size_t index = 0; index < std::size(kFilesToWatch); ++index) { + file_path_watchers_.push_back(std::make_unique<base::FilePathWatcher>()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn index 2d2392386c38..4911a73de228 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn @@ -1,11 +1,52 @@ ---- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig 2022-10-29 13:32:26 UTC +++ src/3rdparty/chromium/services/device/usb/BUILD.gn -@@ -152,7 +152,7 @@ static_library("usb") { +@@ -103,15 +103,17 @@ static_library("usb") { + deps += [ "//third_party/re2" ] + } + +- if (is_mac) { +- sources += [ +- "usb_device_handle_mac.cc", +- "usb_device_handle_mac.h", +- "usb_device_mac.cc", +- "usb_device_mac.h", +- "usb_service_mac.cc", +- "usb_service_mac.h", +- ] ++ if (is_mac || is_openbsd) { ++ if (is_mac) { ++ sources += [ ++ "usb_device_handle_mac.cc", ++ "usb_device_handle_mac.h", ++ "usb_device_mac.cc", ++ "usb_device_mac.h", ++ "usb_service_mac.cc", ++ "usb_service_mac.h", ++ ] ++ } + + # These sources and deps are required for libusb. + # TODO(https://crbug.com/1096743) Remove these sources. +@@ -135,6 +137,13 @@ static_library("usb") { + deps += [ "//third_party/libusb" ] + } + ++ if (is_freebsd) { ++ sources += [ ++ "usb_service_fake.cc", ++ "usb_service_fake.h", ++ ] ++ } ++ + if (is_linux || is_chromeos) { + sources += [ + "usb_device_linux.cc", +@@ -152,7 +161,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } - if (is_android || is_chromeos || is_linux) { -+ if ((is_android || is_chromeos || is_linux) && !is_bsd) { ++ if (is_android || is_chromeos || is_linux && !is_bsd) { sources += [ "usb_device_handle_usbfs.cc", "usb_device_handle_usbfs.h", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service.cc new file mode 100644 index 000000000000..9906616b750b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service.cc @@ -0,0 +1,39 @@ +--- src/3rdparty/chromium/services/device/usb/usb_service.cc.orig 2022-11-30 08:12:58 UTC ++++ src/3rdparty/chromium/services/device/usb/usb_service.cc +@@ -22,13 +22,17 @@ + + #if BUILDFLAG(IS_ANDROID) + #include "services/device/usb/usb_service_android.h" +-#elif defined(USE_UDEV) ++#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD) + #include "services/device/usb/usb_service_linux.h" + #elif BUILDFLAG(IS_MAC) + #include "services/device/usb/usb_service_impl.h" + #include "services/device/usb/usb_service_mac.h" + #elif BUILDFLAG(IS_WIN) + #include "services/device/usb/usb_service_win.h" ++#elif BUILDFLAG(IS_OPENBSD) ++#include "services/device/usb/usb_service_impl.h" ++#elif BUILDFLAG(IS_FREEBSD) ++#include "services/device/usb/usb_service_fake.h" + #endif + + namespace device { +@@ -51,7 +55,7 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr + std::unique_ptr<UsbService> UsbService::Create() { + #if BUILDFLAG(IS_ANDROID) + return base::WrapUnique(new UsbServiceAndroid()); +-#elif defined(USE_UDEV) ++#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD) + return base::WrapUnique(new UsbServiceLinux()); + #elif BUILDFLAG(IS_WIN) + return base::WrapUnique(new UsbServiceWin()); +@@ -60,6 +64,8 @@ std::unique_ptr<UsbService> UsbService::Create() { + return base::WrapUnique(new UsbServiceMac()); + else + return base::WrapUnique(new UsbServiceImpl()); ++#elif BUILDFLAG(IS_BSD) ++ return base::WrapUnique(new UsbServiceImpl()); + #else + return nullptr; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service__fake.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service__fake.cc new file mode 100644 index 000000000000..861a404cb395 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service__fake.cc @@ -0,0 +1,52 @@ +--- src/3rdparty/chromium/services/device/usb/usb_service_fake.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/services/device/usb/usb_service_fake.cc +@@ -0,0 +1,49 @@ ++// Copyright 2014 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "services/device/usb/usb_service_fake.h" ++ ++#include <stdint.h> ++ ++#include <list> ++#include <memory> ++#include <set> ++#include <utility> ++ ++#include "base/barrier_closure.h" ++#include "base/containers/contains.h" ++#include "base/location.h" ++#include "base/memory/ref_counted_memory.h" ++#include "base/memory/weak_ptr.h" ++#include "base/strings/string_number_conversions.h" ++#include "base/strings/utf_string_conversions.h" ++#include "base/task/sequenced_task_runner.h" ++#include "base/task/single_thread_task_runner.h" ++#include "base/task/thread_pool.h" ++#include "base/threading/scoped_blocking_call.h" ++#include "build/build_config.h" ++#include "components/device_event_log/device_event_log.h" ++#include "services/device/usb/usb_device_handle.h" ++#include "services/device/usb/usb_error.h" ++#include "services/device/usb/webusb_descriptors.h" ++ ++namespace device { ++ ++UsbServiceImpl::UsbServiceImpl() ++ : task_runner_(base::SequencedTaskRunner::GetCurrentDefault()) { ++ NOTIMPLEMENTED(); ++} ++ ++UsbServiceImpl::~UsbServiceImpl() { ++ NOTIMPLEMENTED(); ++ NotifyWillDestroyUsbService(); ++} ++ ++void UsbServiceImpl::GetDevices(GetDevicesCallback callback) { ++ NOTIMPLEMENTED(); ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ UsbService::GetDevices(std::move(callback)); ++} ++ ++} // namespace device diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service__fake.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service__fake.h new file mode 100644 index 000000000000..91abd5127dba --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_usb__service__fake.h @@ -0,0 +1,51 @@ +--- src/3rdparty/chromium/services/device/usb/usb_service_fake.h.orig 2022-10-29 13:32:26 UTC ++++ src/3rdparty/chromium/services/device/usb/usb_service_fake.h +@@ -0,0 +1,48 @@ ++// Copyright 2015 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_ ++#define SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_ ++ ++#include "services/device/usb/usb_service.h" ++ ++#include <stddef.h> ++ ++#include <map> ++#include <set> ++#include <string> ++#include <vector> ++ ++#include "base/containers/queue.h" ++#include "base/memory/weak_ptr.h" ++#include "build/build_config.h" ++#include "services/device/usb/usb_context.h" ++#include "services/device/usb/usb_device_impl.h" ++#include "third_party/abseil-cpp/absl/types/optional.h" ++ ++namespace device { ++ ++class UsbDeviceImpl; ++ ++class UsbServiceImpl final : public UsbService { ++ public: ++ UsbServiceImpl(); ++ ++ UsbServiceImpl(const UsbServiceImpl&) = delete; ++ UsbServiceImpl& operator=(const UsbServiceImpl&) = delete; ++ ++ ~UsbServiceImpl() override; ++ ++ private: ++ // device::UsbService implementation ++ void GetDevices(GetDevicesCallback callback) override; ++ ++ void OnUsbContext(scoped_refptr<UsbContext> context); ++ ++ scoped_refptr<base::SequencedTaskRunner> task_runner_; ++}; ++ ++} // namespace device ++ ++#endif // SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn new file mode 100644 index 000000000000..8b746237f99b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/services/network/BUILD.gn.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/services/network/BUILD.gn +@@ -339,7 +339,6 @@ if (is_linux || is_chromeos) { + ] + deps = [ + "//base:base", +- "//sandbox/linux:sandbox_services", + "//sandbox/policy:policy", + ] + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc index bf4e1a868e2c..ea09515f2353 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc.orig 2022-03-19 12:56:15 UTC +++ src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc @@ -26,12 +26,15 @@ sandbox::syscall_broker::BrokerCommandSet GetNetworkBr }); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h index 8348e8d9a64c..ebc2e1117b38 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/services/network/network_sandbox_hook_linux.h @@ -10,7 +10,11 @@ #include "base/component_export.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc new file mode 100644 index 000000000000..41b2a15c06f6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/network/network_service.cc.orig 2023-10-03 19:49:54 UTC ++++ src/3rdparty/chromium/services/network/network_service.cc +@@ -92,7 +92,7 @@ + #include "third_party/boringssl/src/include/openssl/cpu.h" + #endif + +-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ ++#if ((BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) + + #include "components/os_crypt/key_storage_config_linux.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 5980bb3ad6ee..3b7b3cff2c06 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc @@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn index 254d10fa563e..7a5ee75672b2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn -@@ -29,8 +29,12 @@ component("memory_instrumentation") { +@@ -33,8 +33,12 @@ component("memory_instrumentation") { sources += [ "os_metrics_win.cc" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index 035cd1b73bc6..999dacdfcd3d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h @@ -45,7 +45,7 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc index 0fe3701e7ad4..950265931f9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig 2022-11-07 21:32:28 UTC +--- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc @@ -0,0 +1,58 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_BUILD.gn new file mode 100644 index 000000000000..0b9fccf625a5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/service_manager/BUILD.gn.orig 2021-12-31 00:57:38 UTC ++++ src/3rdparty/chromium/services/service_manager/BUILD.gn +@@ -67,7 +67,7 @@ source_set("service_manager") { + ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ "//sandbox/linux:sandbox_services" ] + } + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_public_cpp_service__executable_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_public_cpp_service__executable_BUILD.gn new file mode 100644 index 000000000000..5aab2b0f89d3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_service__manager_public_cpp_service__executable_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2021-04-14 18:41:08 UTC ++++ src/3rdparty/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn +@@ -22,7 +22,7 @@ source_set("support") { + "//services/service_manager/public/mojom", + ] + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ + "//sandbox/linux:sandbox", + "//sandbox/linux:sandbox_services", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc new file mode 100644 index 000000000000..98424621078e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc +@@ -39,7 +39,7 @@ + #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h" + #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h" + +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + #include "base/profiler/thread_delegate_posix.h" + #define INITIALIZE_THREAD_DELEGATE_POSIX 1 + #else // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_public_mojom_video__capture__service.mojom b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_public_mojom_video__capture__service.mojom new file mode 100644 index 000000000000..9b94a026919c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_public_mojom_video__capture__service.mojom @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/services/video_capture/public/mojom/video_capture_service.mojom.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/services/video_capture/public/mojom/video_capture_service.mojom +@@ -25,10 +25,10 @@ interface AcceleratorFactory { + pending_receiver<chromeos_camera.mojom.MjpegDecodeAccelerator> jda); + }; + +-[EnableIf=is_fuchsia] ++[EnableIf=is_openbsd] + const sandbox.mojom.Sandbox kVideoCaptureSandbox + = sandbox.mojom.Sandbox.kVideoCapture; +-[EnableIfNot=is_fuchsia] ++[EnableIfNot=is_openbsd] + const sandbox.mojom.Sandbox kVideoCaptureSandbox + = sandbox.mojom.Sandbox.kNoSandbox; + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp index 56dc4b437c54..55bfcd8fe428 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp.orig 2022-11-06 21:41:22 UTC +--- src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp @@ -79,7 +79,7 @@ static void* malloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedMalloc but currently it diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h index 388a93a87803..d0ca2bd9ca3f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h @@ -460,7 +460,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // POSIX.1-2001. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc new file mode 100644 index 000000000000..ade86489b072 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/raw_logging.cc +@@ -52,10 +52,12 @@ + // ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall + // syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len); + // for low level operations that want to avoid libc. +-#if (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && \ ++#if (defined(__linux__) || defined(__FreeBSD__)) && \ + !defined(__ANDROID__) + #include <sys/syscall.h> + #define ABSL_HAVE_SYSCALL_WRITE 1 ++#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 ++#elif defined(__OpenBSD__) + #define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 + #else + #undef ABSL_HAVE_SYSCALL_WRITE diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 26cdd5cba645..8b5c784ee738 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,7 +30,7 @@ #include <sys/syscall.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index af41c292182a..44235736ba9a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h @@ -33,7 +33,7 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc index f67870ae705a..4db0493638ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc @@ -19,7 +19,7 @@ #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn index da8e39441588..a611e87d0332 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -265,7 +265,6 @@ config("extra_warnings") { +@@ -280,7 +280,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,16 +8,16 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -443,7 +442,7 @@ angle_static_library("angle_common") { - all_dependent_configs = [ ":angle_disable_pool_alloc" ] - } +@@ -451,7 +450,7 @@ template("angle_common_lib") { + all_dependent_configs = [ ":angle_disable_pool_alloc" ] + } -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - libs = [ "dl" ] - } +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + libs = [ "dl" ] + } -@@ -574,6 +573,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -606,6 +605,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -27,21 +27,3 @@ } if (angle_use_wayland && angle_has_build) { -@@ -1094,12 +1096,12 @@ if (angle_use_wayland) { - "wayland-client", - "wayland-egl", - ] -+ } else { -+ include_dirs = [ -+ "$wayland_dir/egl", -+ "$wayland_dir/src", -+ ] - } -- -- include_dirs = [ -- "$wayland_dir/egl", -- "$wayland_dir/src", -- ] - } - - group("angle_wayland") { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_platform.h index dd70978715ad..99b5a2655f1f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_platform.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/angle/src/common/platform.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/common/platform.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/angle/src/common/platform.h @@ -26,7 +26,15 @@ #elif defined(__linux__) || defined(EMSCRIPTEN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h index 37a61ca7b1af..74ed5951c3cb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2022-02-23 19:25:59 UTC +++ src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_internal.h -@@ -14,6 +14,13 @@ namespace angle +@@ -14,6 +14,13 @@ namespace angle { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp index eed12c6d7610..54df02d354c4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2022-02-23 19:25:59 UTC +++ src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp @@ -12,6 +12,11 @@ #include <pci/pci.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp index 7677d46dcdd5..667a13c429f2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2022-02-23 19:25:59 UTC +++ src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp -@@ -71,6 +71,24 @@ bool GetSystemInfo(SystemInfo *info) +@@ -71,6 +71,24 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo bool GetSystemInfo(SystemInfo *info) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp index 00299a64a0ff..530783df06ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2022-02-23 20:48:53 UTC +++ src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp @@ -8,6 +8,10 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp index 519ace30ae35..67f708c8ae60 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS) # include "libANGLE/renderer/gl/apple/DisplayApple_api.h" -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # include "libANGLE/renderer/gl/egl/DisplayEGL.h" - # if defined(ANGLE_USE_GBM) - # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -331,7 +331,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # if defined(ANGLE_USE_X11) + # include "libANGLE/renderer/gl/glx/DisplayGLX.h" +@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -374,7 +374,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -387,7 +387,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -425,7 +425,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -436,7 +436,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2011,7 +2011,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2046,7 +2046,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp index a244824655b2..d4a68f0b4eed 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-04-20 13:16:39 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp -@@ -1481,7 +1481,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1486,7 +1486,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h index 689450279265..c83f0e5a4fb5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -200,7 +200,7 @@ inline bool IsLinux() +@@ -206,7 +206,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp index 45b74226747f..27c39055ce40 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_gl_glx_FunctionsGLX.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp @@ -144,10 +144,10 @@ bool FunctionsGLX::initialize(Display *xDisplay, int s // which a GLXWindow was ever created. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h index b7a8469a75c8..e78048789abe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h -@@ -23,7 +23,7 @@ DisplayImpl *CreateVulkanWin32Display(const egl::Displ +@@ -23,7 +23,7 @@ bool IsVulkanWin32DisplayAvailable(); DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); #endif // defined(ANGLE_PLATFORM_WINDOWS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn index b1372e7ea709..bdcc8380c778 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/util/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/angle/util/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/third_party/angle/util/BUILD.gn -@@ -246,7 +246,7 @@ foreach(is_shared_library, +@@ -292,7 +292,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc index f67952920b0a..2498eff5ae1c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/common/privacy_budget/active_sampling.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/common/privacy_budget/active_sampling.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/third_party/blink/common/privacy_budget/active_sampling.cc -@@ -24,7 +24,7 @@ bool IdentifiabilityActiveSampler::IsFontFamilyAvailab +@@ -24,7 +24,7 @@ namespace blink { bool IdentifiabilityActiveSampler::IsFontFamilyAvailable(const char* family, SkFontMgr* fm) { base::ScopedAllowBaseSyncPrimitives allow; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc index 4fad9004815b..633d3d8166d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc @@ -64,7 +64,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat if (!data.ReadAcceptLanguages(&out->accept_languages)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h index faa8a2d1cfa7..db513ac3f494 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h @@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { bool webrtc_allow_legacy_tls_protocols{false}; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index fab07a753b55..e4805d43e10b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h @@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT return data.accept_languages; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h index 5a88876f07d4..3b10091dc9cc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/public/platform/platform.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/public/platform/platform.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/public/platform/platform.h @@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h index 9b37cbc4fdb1..e2eb5ca637f1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h @@ -81,7 +81,7 @@ class WebVector { // The vector can be populated using reserve() and emplace_back(). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py index fcc8bcb3596f..dabfca29a684 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py @@ -28,7 +28,7 @@ def init(root_src_dir, enable_style_format=True): root_src_dir = os.path.abspath(root_src_dir) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_run__with__pythonpath.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_run__with__pythonpath.py index 957c6c7cadad..e32084057366 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_run__with__pythonpath.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_run__with__pythonpath.py @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/run_with_pythonpath.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/run_with_pythonpath.py.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/build/scripts/run_with_pythonpath.py @@ -22,6 +22,7 @@ def main(): existing_pp = ( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc index 3283c4703a2e..6bca1da72ea0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc -@@ -73,12 +73,12 @@ - #include "third_party/blink/renderer/controller/oom_intervention_impl.h" +@@ -74,12 +74,12 @@ + #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -15,16 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -173,7 +173,7 @@ void InitializeCommon(Platform* platform, mojo::Binder - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. - if (UserLevelMemoryPressureSignalGenerator::Enabled()) - UserLevelMemoryPressureSignalGenerator::Instance(); -@@ -244,7 +244,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -222,7 +222,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -33,3 +24,12 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), +@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterMemoryWatchers() { + #endif + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. + UserLevelMemoryPressureSignalGenerator::Initialize(main_thread_task_runner); + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 744fc9eb5de9..5feca7d63c91 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::SetProcFiles(base::File +@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.h index 4312f477857c..ce465c6ba978 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h @@ -13,7 +13,7 @@ #include "third_party/blink/renderer/controller/controller_export.h" @@ -9,7 +9,7 @@ #include "third_party/blink/public/mojom/memory_usage_monitor_linux.mojom-blink.h" #endif -@@ -22,7 +22,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitorPosix +@@ -22,7 +22,7 @@ namespace blink { // MemoryUsageMonitor implementation for Android and Linux. class CONTROLLER_EXPORT MemoryUsageMonitorPosix : public MemoryUsageMonitor diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc index 64d7bd92619f..8114b1262190 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -280,7 +280,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -284,7 +284,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_execution__context_navigator__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_execution__context_navigator__base.cc index 73184081789d..ff4187a018a7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_execution__context_navigator__base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_execution__context_navigator__base.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/execution_context/navigator_base.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/execution_context/navigator_base.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/execution_context/navigator_base.cc @@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() { return "Win32"; @@ -7,5 +7,5 @@ -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return "Linux x86_64"; - #else - #error Unsupported platform + #elif BUILDFLAG(IS_IOS) + return "iPhone"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc index 3acd798d6018..3504310a3820 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3278,7 +3278,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3344,7 +3344,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc index 43bc3cf53d8e..fb2c5dc7e1f3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6414,7 +6414,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { - MoveCaretStaysHorizontallyAlignedWhenMoved - #endif - // TODO(crbug.com/1317375): Build these tests on all platforms. --#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) { - RegisterMockedHttpURLLoad("move_caret.html"); +@@ -6439,7 +6439,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { + } -@@ -6811,7 +6811,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionNo + #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. + // TODO(crbug.com/1317375): Build these tests on all platforms. + #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ +@@ -6847,7 +6847,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 6954accfcdb4..911e3e5bdf4d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -45,7 +45,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 5f39573e7d76..400c6dcc4bf6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -190,7 +190,7 @@ Vector<String> InspectorMemoryAgent::Symbolize( +@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( const WebVector<void*>& addresses) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc index 06cfdde6302f..bc56f72530fd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc -@@ -68,7 +68,7 @@ +@@ -67,7 +67,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -367,7 +367,7 @@ void LayoutView::UpdateLayout() { +@@ -365,7 +365,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc index 79e796f786c4..c621e73fe9ec 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc -@@ -112,7 +112,7 @@ namespace { +@@ -114,7 +114,7 @@ namespace blink { namespace { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 71dad65679ce..9b232d22a2f2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc index 9a74f99961ef..290296619c85 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc -@@ -35,7 +35,7 @@ AudioDeviceFactory* g_factory_override = nullptr; +@@ -35,7 +35,7 @@ namespace { AudioDeviceFactory* g_factory_override = nullptr; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index d373fc47e553..96842118dc7d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc @@ -722,7 +722,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni new file mode 100644 index 000000000000..f80bb2c5bc70 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni @@ -0,0 +1,9 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni +@@ -7,5 +7,5 @@ declare_args() { + # This enables building WebNN with XNNPACK. Currently only available for + # Windows on x64 or x86. + build_webnn_with_xnnpack = +- is_win && (current_cpu == "x64" || current_cpu == "x86") ++ !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86")) + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc new file mode 100644 index 000000000000..1bad3278c937 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc +@@ -177,7 +177,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount + + ~SharedXnnpackContext() { + base::AutoLock auto_lock(SharedXnnpackContextLock()); +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + // For Linux and ChromeOS, cpuinfo needs to parse /proc/cpuinfo to + // initialize in pre sandbox stage. Calling xnn_deinitialize() here will + // deinitialize cpuinfo within sandbox and cannot access /proc/cpuinfo diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 5128061b5a32..f786e2c56e04 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -278,7 +278,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -290,7 +290,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) static const int kExpectedBufferSize = kHardwareSampleRate / 100; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index f2bf2f7eb4ca..b0176d7066ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -379,7 +379,7 @@ class AudioWorkletThreadPriorityTest +@@ -380,7 +380,7 @@ class AudioWorkletThreadPriorityTest // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 8144a1e009b6..0bb8db1053a4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6165,7 +6165,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6231,7 +6231,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc index f34c0fb9de9b..1f3d5b2d4492 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -101,7 +101,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin +@@ -102,7 +102,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -8,4 +8,4 @@ + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(jie.a.chen@intel.com): Add Linux support. return false; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc new file mode 100644 index 000000000000..4a16beaf548c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc +@@ -707,7 +707,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( + // platform requires interop supported. According to the bug, this change will + // be a long time task. So disable using webgpu mailbox texture uploading path + // on linux platform. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + use_webgpu_mailbox_texture = false; + unaccelerated_image = image->MakeUnaccelerated(); + image = unaccelerated_image.get(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn index 9e8742478e81..9e67a519c9bb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn -@@ -1942,7 +1942,7 @@ jumbo_static_library("test_support") { +@@ -1976,7 +1976,7 @@ jumbo_static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc index c218d06050a8..62b9add21a53 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -72,7 +72,7 @@ SkFontMgr* FontCache::static_font_manager_ = nullptr; +@@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,12 +9,12 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -139,7 +139,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( - FontPlatformData* FontCache::SystemFontPlatformData( +@@ -119,7 +119,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) if (family.empty() || family == font_family_names::kSystemUi) return nullptr; #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h index 485eca3ccd4a..14048654d8b4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h @@ -57,7 +57,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -181,7 +181,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -180,7 +180,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -265,7 +265,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -264,7 +264,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -345,7 +345,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -344,7 +344,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc index 8b3e80f5d33d..6e59b05a818a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -270,7 +270,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc index bc50b265edde..8f4468acf708 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_metrics.cc -@@ -39,7 +39,7 @@ namespace blink { +@@ -39,7 +39,7 @@ namespace blink { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc index a8bb26ef0e76..65b7bf46d0b1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc @@ -51,7 +51,7 @@ namespace { namespace blink { @@ -9,7 +9,7 @@ // Getting the system font render style takes a significant amount of time on // Linux because looking up fonts using fontconfig can be very slow. We fetch // the render style for each font family and text size, while it's very -@@ -160,7 +160,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t +@@ -164,7 +164,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc index 28311a0e4a33..0c26a3f7c8da 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc @@ -9,7 +9,7 @@ #if BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h" #elif BUILDFLAG(IS_WIN) #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h" -@@ -24,7 +24,7 @@ FontUniqueNameLookup::GetPlatformUniqueNameLookup() { +@@ -24,7 +24,7 @@ std::unique_ptr<FontUniqueNameLookup> FontUniqueNameLookup::GetPlatformUniqueNameLookup() { #if BUILDFLAG(IS_ANDROID) return std::make_unique<FontUniqueNameLookupAndroid>(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index a8c2bc8ad00c..041279edd07b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -236,7 +236,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -235,7 +235,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -18,7 +18,7 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -263,7 +263,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -262,7 +262,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon std::string name; sk_sp<SkTypeface> typeface; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc index 3685e650683a..495ee9e234ce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc -@@ -76,8 +76,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe +@@ -77,8 +77,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe // Once we are using RAF, this thread is driving user interactive display // updates. Update priority accordingly. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 9c92b2f4835d..53474e91ff22 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -347,7 +347,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -358,7 +358,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames // are reported as failures all the time. bool presentation_failure = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc new file mode 100644 index 000000000000..20af11b5c67f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc +@@ -24,6 +24,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory + bool PartitionAllocMemoryDumpProvider::OnMemoryDump( + const base::trace_event::MemoryDumpArgs& args, + base::trace_event::ProcessMemoryDump* memory_dump) { ++#if !BUILDFLAG(IS_BSD) + using base::trace_event::MemoryDumpLevelOfDetail; + + MemoryDumpLevelOfDetail level_of_detail = args.level_of_detail; +@@ -49,6 +50,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( + "size", "bytes", partition_stats_dumper.total_active_bytes()); + memory_dump->AddOwnershipEdge(allocated_objects_dump->guid(), + partitions_dump->guid()); ++#endif + + return true; + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index 514cd7f0b68f..1ae8befc0f50 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -174,12 +174,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -197,12 +197,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); @@ -8,7 +8,7 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_WIN) const bool kShouldAddH264Cbp = - media::IsMediaFoundationH264CbpEncodingEnabled() && + base::FeatureList::IsEnabled(kMediaFoundationH264CbpEncoding) && profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 index 217e80816681..89970e0e44de 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -36,7 +36,7 @@ - // shipped stable can have its runtime flag removed soon after. - status: { - valid_values: ["stable", "experimental", "test"], -- valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux"] -+ valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux", "OpenBSD", "FreeBSD"] - }, - - // "implied_by" or "depends_on" specifies relationship to other features: -@@ -1205,7 +1205,7 @@ +@@ -1531,7 +1531,7 @@ depends_on: ["FileSystemAccessLocal"], status: {"Android": "test", "default": "stable"}, origin_trial_feature_name: "FileHandling", @@ -18,25 +9,16 @@ base_feature: "FileHandlingAPI", }, { -@@ -2671,7 +2671,7 @@ - { - name: "U2FSecurityKeyAPI", - origin_trial_feature_name: "U2FSecurityKeyAPI", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - origin_trial_type: "deprecation", - }, - { -@@ -2686,7 +2686,7 @@ - { +@@ -3358,7 +3358,7 @@ name: "UnrestrictedSharedArrayBuffer", + base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], }, { name: "URLPatternCompareComponent", -@@ -2706,7 +2706,7 @@ +@@ -3379,7 +3379,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. @@ -45,9 +27,9 @@ base_feature: "ReduceUserAgent", }, { -@@ -2834,12 +2834,12 @@ - name: "WebAppUrlHandling", +@@ -3553,12 +3553,12 @@ status: "experimental", + base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", - origin_trial_os: ["win", "mac", "linux"], + origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], @@ -58,5 +40,5 @@ - origin_trial_os: ["win", "mac", "linux", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], status: "stable", + base_feature: "none", }, - { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc index b0b8b6553c4a..cab2808e46a6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc @@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() { std::make_unique<scheduler::CompositorThread>(params); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc index 23f2b54b6b02..b80eab4f0b29 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc -@@ -241,7 +241,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre +@@ -242,7 +242,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre "CompositorTileWorkerBackground", thread_options, this, background_thread_prio_categories, &has_task_for_background_priority_thread_cv_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_container__annotations.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_container__annotations.h index 253152822928..103af99b3e7b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_container__annotations.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_container__annotations.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/container_annotations.h @@ -12,7 +12,7 @@ // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h index d977fb1573d0..54822740990c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h @@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) { return g * (1.0f / 400.0f); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc index 341ffd8905ea..c1d05653e567 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT +@@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif @@ -18,10 +18,10 @@ return 512 * 1024; +#elif BUILDFLAG(IS_OPENBSD) + return 512 * 1024; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -147,6 +154,13 @@ void* GetStackStart() { +@@ -148,6 +155,13 @@ void* GetStackStart() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast<void*>(highLimit); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni index 14ae68b2d4cf..f23df4066ad8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni @@ -1,19 +1,14 @@ --- src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni.orig 2023-09-07 16:02:00 UTC +++ src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni -@@ -78,10 +78,12 @@ crypto_sources = [ - "src/crypto/cpu_aarch64_apple.c", +@@ -87,6 +87,7 @@ crypto_sources = [ + "src/crypto/cpu_aarch64_freebsd.c", "src/crypto/cpu_aarch64_fuchsia.c", "src/crypto/cpu_aarch64_linux.c", + "src/crypto/cpu_aarch64_openbsd.c", "src/crypto/cpu_aarch64_win.c", "src/crypto/cpu_arm.c", - "src/crypto/cpu_arm_linux.c", - "src/crypto/cpu_arm_linux.h", -+ "src/crypto/cpu_arm_freebsd.c", - "src/crypto/cpu_intel.c", - "src/crypto/cpu_ppc64le.c", - "src/crypto/crypto.c", -@@ -184,6 +186,7 @@ crypto_sources = [ + "src/crypto/cpu_arm_freebsd.c", +@@ -193,6 +194,7 @@ crypto_sources = [ "src/crypto/rand_extra/deterministic.c", "src/crypto/rand_extra/forkunsafe.c", "src/crypto/rand_extra/fuchsia.c", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn index f80332acf8ba..7bc990a32f49 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/boringssl/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/boringssl/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/boringssl/BUILD.gn @@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { public_configs = [ ":no_asm_config" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl new file mode 100644 index 000000000000..0d7a6c505632 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl +@@ -78,6 +78,7 @@ $code.=<<___; + + .extern OPENSSL_ia32cap_P + ++.rodata + .align 64 + .Lzero: + .long 0,0,0,0 +@@ -107,6 +108,7 @@ $code.=<<___; + .Lsixteen: + .long 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16 + .asciz "ChaCha20 for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + + sub AUTOLOAD() # thunk [simplified] 32-bit style perlasm diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl new file mode 100644 index 000000000000..23fc58a63e69 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl +@@ -32,7 +32,7 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""; + *STDOUT=*OUT; + + $code.=<<___; +-.data ++.rodata + + .align 16 + one: +@@ -66,6 +66,7 @@ con3: + .byte -1,-1,-1,-1,-1,-1,-1,-1,4,5,6,7,4,5,6,7 + and_mask: + .long 0,0xffffffff, 0xffffffff, 0xffffffff ++.previous + ___ + + $code.=<<___; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl new file mode 100644 index 000000000000..a3bb3e648f9a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl +@@ -42,6 +42,7 @@ $code.=<<___; + + chacha20_poly1305_constants: + ++.rodata + .align 64 + .Lchacha20_consts: + .byte 'e','x','p','a','n','d',' ','3','2','-','b','y','t','e',' ','k' +@@ -79,6 +80,7 @@ chacha20_poly1305_constants: + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00 + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00 + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff ++.previous + ___ + + my ($oup,$inp,$inl,$adp,$keyp,$itr1,$itr2,$adl)=("%rdi","%rsi","%rbx","%rcx","%r9","%rcx","%r8","%r8"); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c index b37a8b3a89de..60fd01169810 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2022-11-06 22:06:35 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c @@ -0,0 +1,57 @@ +/* Copyright (c) 2022, Robert Nagy <robert@openbsd.org> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__arm__freebsd.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__arm__freebsd.c deleted file mode 100644 index adc47e13ece5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__arm__freebsd.c +++ /dev/null @@ -1,55 +0,0 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/cpu_arm_freebsd.c.orig 2023-06-03 08:17:28 UTC -+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/cpu_arm_freebsd.c -@@ -0,0 +1,52 @@ -+/* Copyright (c) 2016, Google Inc. -+ * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -+ -+#include "internal.h" -+ -+#if defined(OPENSSL_ARM) && defined(OPENSSL_FREEBSD) && \ -+ !defined(OPENSSL_STATIC_ARMCAP) -+#include <sys/types.h> -+#include <sys/auxv.h> -+ -+#include <openssl/arm_arch.h> -+#include <openssl/mem.h> -+ -+extern uint32_t OPENSSL_armcap_P; -+ -+void OPENSSL_cpuid_setup(void) { -+ unsigned long hwcap = 0, hwcap2 = 0; -+ -+ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); -+ elf_aux_info(AT_HWCAP2, &hwcap2, sizeof hwcap2); -+ -+ // Matching OpenSSL, only report other features if NEON is present. -+ if (hwcap & HWCAP_NEON) { -+ OPENSSL_armcap_P |= ARMV7_NEON; -+ -+ if (hwcap2 & HWCAP2_AES) { -+ OPENSSL_armcap_P |= ARMV8_AES; -+ } -+ if (hwcap2 & HWCAP2_PMULL) { -+ OPENSSL_armcap_P |= ARMV8_PMULL; -+ } -+ if (hwcap2 & HWCAP2_SHA1) { -+ OPENSSL_armcap_P |= ARMV8_SHA1; -+ } -+ if (hwcap2 & HWCAP2_SHA2) { -+ OPENSSL_armcap_P |= ARMV8_SHA256; -+ } -+ } -+} -+ -+#endif // OPENSSL_ARM && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl new file mode 100644 index 000000000000..eec96103d4ec --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl +@@ -3778,6 +3778,7 @@ ___ + } + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -3800,6 +3801,7 @@ $code.=<<___; + + .asciz "AES for Intel AES-NI, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl new file mode 100644 index 000000000000..a12e445991f2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl +@@ -1288,6 +1288,7 @@ _vpaes_preheat: + ## ## + ######################################################## + .type _vpaes_consts,\@object ++.rodata + .align 64 + _vpaes_consts: + .Lk_inv: # inv, inva diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl new file mode 100644 index 000000000000..f7ef4e8e55ba --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl +@@ -3576,11 +3576,13 @@ $code.=<<___; + ___ + } + $code.=<<___; ++.rodata + .align 64 + .Linc: + .long 0,0, 1,1 + .long 2,2, 2,2 + .asciz "Montgomery Multiplication with scatter/gather for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl new file mode 100644 index 000000000000..383c6889b710 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl +@@ -62,6 +62,7 @@ $code.=<<___; + .extern OPENSSL_ia32cap_P + + # The polynomial ++.rodata + .align 64 + .Lpoly: + .quad 0xffffffffffffffff, 0x00000000ffffffff, 0x0000000000000000, 0xffffffff00000001 +@@ -80,6 +81,7 @@ $code.=<<___; + .quad 0xf3b9cac2fc632551, 0xbce6faada7179e84, 0xffffffffffffffff, 0xffffffff00000000 + .LordK: + .quad 0xccd1c8aaee00bc4f ++.previous + ___ + + { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl new file mode 100644 index 000000000000..e28864dfceb4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl +@@ -1053,6 +1053,7 @@ $code.=<<___; + ___ + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -1066,6 +1067,7 @@ $code.=<<___; + .byte 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + .asciz "AES-NI GCM module for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + }}} else {{{ + $code=<<___; # assembler is too old diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl new file mode 100644 index 000000000000..2cea056c5b0c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl +@@ -331,6 +331,7 @@ $code .= <<____; + .seh_endproc + .size gcm_ghash_ssse3,.-gcm_ghash_ssse3 + ++.rodata + .align 16 + # .Lreverse_bytes is a permutation which, if applied with pshufb, reverses the + # bytes in an XMM register. +@@ -339,6 +340,7 @@ $code .= <<____; + # .Llow4_mask is an XMM mask which selects the low four bits of each byte. + .Llow4_mask: + .quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f ++.previous + ____ + + print $code; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl new file mode 100644 index 000000000000..4124a866436a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl +@@ -1297,6 +1297,7 @@ ___ + } + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -1308,6 +1309,7 @@ $code.=<<___; + + .asciz "GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + $code =~ s/\`([^\`]*)\`/eval($1)/gem; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h index 8b8b3bd51d08..29b0a6683006 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h @@ -27,7 +27,8 @@ extern "C" { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl new file mode 100644 index 000000000000..387ba2cba7af --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl +@@ -1815,6 +1815,7 @@ ___ + } + } + $code.=<<___; ++.rodata + .align 64 + K_XX_XX: + .long 0x5a827999,0x5a827999,0x5a827999,0x5a827999 # K_00_19 +@@ -1833,6 +1834,7 @@ ___ + $code.=<<___; + .asciz "SHA1 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl new file mode 100644 index 000000000000..49553e42ba57 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl @@ -0,0 +1,30 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl +@@ -404,6 +404,7 @@ ___ + + if ($SZ==4) { + $code.=<<___; ++.rodata + .align 64 + .type $TABLE,\@object + $TABLE: +@@ -447,9 +448,11 @@ $TABLE: + .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908 + .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908 + .asciz "SHA256 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + } else { + $code.=<<___; ++.rodata + .align 64 + .type $TABLE,\@object + $TABLE: +@@ -537,6 +540,7 @@ $TABLE: + .quad 0x0001020304050607,0x08090a0b0c0d0e0f + .quad 0x0001020304050607,0x08090a0b0c0d0e0f + .asciz "SHA512 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_rand__extra_arc4random.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_rand__extra_arc4random.c index a80411a3c1d7..0c920ae35733 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_rand__extra_arc4random.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_rand__extra_arc4random.c @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/rand_extra/arc4random.c.orig 2022-11-06 22:06:35 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/rand_extra/arc4random.c.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/crypto/rand_extra/arc4random.c @@ -0,0 +1,33 @@ +/* Copyright (c) 2018, Robert Nagy <robert@openbsd.org> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c index 0b6485d245fc..25cae0821ee0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c @@ -22,6 +22,9 @@ #include <stdatomic.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h index fc7ce7529efa..209350e7f0a6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h -@@ -154,6 +154,11 @@ extern "C" { +@@ -151,6 +151,11 @@ extern "C" { #define OPENSSL_FUCHSIA #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_thread.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_thread.h index 7914aff5974b..b62795e17f60 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_thread.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_thread.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/thread.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/thread.h.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/include/openssl/thread.h @@ -78,6 +78,7 @@ typedef union crypto_mutex_st { void *handle; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py new file mode 100644 index 000000000000..3759a6f23805 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py @@ -0,0 +1,34 @@ +--- src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py +@@ -785,10 +785,10 @@ def main(platforms): + ] + + # Generate err_data.c +- with open('err_data.c', 'w+') as err_data: +- subprocess.check_call(['go', 'run', 'err_data_generate.go'], +- cwd=os.path.join('src', 'crypto', 'err'), +- stdout=err_data) ++# with open('err_data.c', 'w+') as err_data: ++# subprocess.check_call(['go', 'run', 'err_data_generate.go'], ++# cwd=os.path.join('src', 'crypto', 'err'), ++# stdout=err_data) + crypto_c_files.append('err_data.c') + crypto_c_files.sort() + +@@ -801,11 +801,11 @@ def main(platforms): + crypto_test_files = [] + if EMBED_TEST_DATA: + # Generate crypto_test_data.cc +- with open('crypto_test_data.cc', 'w+') as out: +- subprocess.check_call( +- ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], +- cwd='src', +- stdout=out) ++# with open('crypto_test_data.cc', 'w+') as out: ++# subprocess.check_call( ++# ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], ++# cwd='src', ++# stdout=out) + crypto_test_files += ['crypto_test_data.cc'] + + crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_brotli_common_platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_brotli_common_platform.h new file mode 100644 index 000000000000..18392c68a190 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_brotli_common_platform.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/brotli/common/platform.h.orig 2022-02-07 13:39:41 UTC ++++ src/3rdparty/chromium/third_party/brotli/common/platform.h +@@ -28,7 +28,7 @@ + #include <brotli/port.h> + #include <brotli/types.h> + +-#if defined(OS_LINUX) || defined(OS_CYGWIN) || defined(__EMSCRIPTEN__) ++#if defined(OS_LINUX) || defined(OS_CYGWIN) || defined(__EMSCRIPTEN__) || defined(OS_BSD) + #include <endian.h> + #elif defined(OS_FREEBSD) + #include <machine/endian.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_build_crashpad__buildconfig.gni deleted file mode 100644 index acba0daa41f3..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_build_crashpad__buildconfig.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/build/crashpad_buildconfig.gni -@@ -58,7 +58,7 @@ if (crashpad_is_in_chromium) { - crashpad_is_mac = is_mac - crashpad_is_ios = is_ios - crashpad_is_win = is_win -- crashpad_is_linux = is_linux || is_chromeos -+ crashpad_is_linux = (is_linux || is_chromeos) && !is_bsd - crashpad_is_android = is_android - crashpad_is_fuchsia = is_fuchsia - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_BUILD.gn deleted file mode 100644 index 73ec7145a4cd..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/client/BUILD.gn.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/client/BUILD.gn -@@ -130,6 +130,13 @@ static_library("common") { - if (crashpad_is_win) { - sources += [ "crash_report_database_win.cc" ] - } -+ -+ if (crashpad_is_posix) { -+ sources += [ -+ "crashpad_client_posix.cc", -+ ] -+ } -+ - if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) { - sources += [ - "crash_report_database_generic.cc", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_crashpad__client__posix.cc deleted file mode 100644 index 867f508aa7fe..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_crashpad__client__posix.cc +++ /dev/null @@ -1,43 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2022-11-08 06:37:22 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/client/crashpad_client_posix.cc -@@ -0,0 +1,40 @@ -+// Copyright 2017 The Crashpad Authors. All rights reserved. -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// http://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+ -+#include "client/crashpad_client.h" -+ -+#include "base/logging.h" -+#include "base/notreached.h" -+ -+namespace crashpad { -+ -+CrashpadClient::CrashpadClient() {} -+ -+CrashpadClient::~CrashpadClient() {} -+ -+bool CrashpadClient::StartHandler( -+ const base::FilePath& handler, -+ const base::FilePath& database, -+ const base::FilePath& metrics_dir, -+ const std::string& url, -+ const std::map<std::string, std::string>& annotations, -+ const std::vector<std::string>& arguments, -+ bool restartable, -+ bool asynchronous_start, -+ const std::vector<base::FilePath>& attachments) { -+ NOTREACHED(); // TODO(scottmg): https://crashpad.chromium.org/bug/196 -+ return false; -+} -+ -+} // namespace crashpad diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc deleted file mode 100644 index 284d8ae60c37..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc -@@ -159,6 +159,10 @@ std::string MinidumpMiscInfoDebugBuildString() { - static constexpr char kOS[] = "win"; - #elif BUILDFLAG(IS_FUCHSIA) - static constexpr char kOS[] = "fuchsia"; -+#elif defined(OS_OPENBSD) -+ static constexpr char kOS[] = "openbsd"; -+#elif defined(OS_FREEBSD) -+ static constexpr char kOS[] = "freebsd"; - #else - #error define kOS for this operating system - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_address__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_address__types.h deleted file mode 100644 index 9ca03418a9cc..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_address__types.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/address_types.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/address_types.h -@@ -25,7 +25,7 @@ - #include <mach/mach_types.h> - #elif BUILDFLAG(IS_WIN) - #include "util/win/address_types.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "util/linux/address_types.h" - #elif BUILDFLAG(IS_FUCHSIA) - #include <zircon/types.h> -@@ -55,7 +55,7 @@ using VMSize = WinVMSize; - using VMAddress = WinVMAddress; - using VMSize = WinVMSize; - --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - - using VMAddress = LinuxVMAddress; - using VMSize = LinuxVMSize; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_capture__context.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_capture__context.h deleted file mode 100644 index ae71f08b90e1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_capture__context.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h -@@ -21,7 +21,8 @@ - #include <mach/mach.h> - #elif BUILDFLAG(IS_WIN) - #include <windows.h> --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -+ BUILDFLAG(IS_FREEBSD) - #include <ucontext.h> - #elif BUILDFLAG(IS_FUCHSIA) - #include <signal.h> -@@ -38,7 +39,8 @@ using NativeCPUContext = CONTEXT; - #elif BUILDFLAG(IS_WIN) - using NativeCPUContext = CONTEXT; - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) - using NativeCPUContext = ucontext_t; - #endif // BUILDFLAG(IS_APPLE) - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_metrics.cc deleted file mode 100644 index d0d825f2d518..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_metrics.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/metrics.cc -@@ -25,7 +25,7 @@ - #define METRICS_OS_NAME "Win" - #elif BUILDFLAG(IS_ANDROID) - #define METRICS_OS_NAME "Android" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #define METRICS_OS_NAME "Linux" - #elif BUILDFLAG(IS_FUCHSIA) - #define METRICS_OS_NAME "Fuchsia" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc deleted file mode 100644 index e52f2a09acc7..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc -@@ -101,7 +101,7 @@ bool UUID::InitializeWithNew() { - InitializeFromBytes(uuid); - return true; - #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // Linux, Android, and Fuchsia do not provide a UUID generator in a - // widely-available system library. On Linux and Android, uuid_generate() - // from libuuid is not available everywhere. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc deleted file mode 100644 index 27359c2a678e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/close_multiple.cc -@@ -72,7 +72,7 @@ bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, in - // This is an advantage over looping over all possible file descriptors, because - // no attempt needs to be made to close file descriptors that are not open. - bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - static constexpr char kFDDir[] = "/dev/fd"; - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) - static constexpr char kFDDir[] = "/proc/self/fd"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_drop__privileges.cc deleted file mode 100644 index cd5e4fd1ad2b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_drop__privileges.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc -@@ -25,7 +25,7 @@ void DropPrivileges() { - gid_t gid = getgid(); - uid_t uid = getuid(); - --#if BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and - // setregid(), setreuid() and setregid() alone should be sufficient to drop - // privileges. The standard specifies that the saved ID should be set to the diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc deleted file mode 100644 index 53dc37af150e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc +++ /dev/null @@ -1,33 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals.cc -@@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = { - #if defined(SIGEMT) - SIGEMT, - #endif // defined(SIGEMT) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - SIGXCPU, - SIGXFSZ, - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -91,7 +91,7 @@ constexpr int kTerminateSignals[] = { - SIGXCPU, - SIGXFSZ, - #endif // BUILDFLAG(IS_APPLE) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - SIGIO, - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - }; -@@ -251,8 +251,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi - // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c - // psignal_internal(). - (code > 0 && -+#if defined(SI_ASYNCIO) - code != SI_ASYNCIO && -+#endif -+#if defined(SI_MESGQ) - code != SI_MESGQ && -+#endif - code != SI_QUEUE && - code != SI_TIMER && - code != SI_USER && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc deleted file mode 100644 index 9ad90d2bd84e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc -@@ -67,7 +67,7 @@ constexpr const char* kSignalNames[] = { - "INFO", - "USR1", - "USR2", --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #if defined(ARCH_CPU_MIPS_FAMILY) - "HUP", - "INT", -@@ -138,7 +138,7 @@ constexpr const char* kSignalNames[] = { - #endif // defined(ARCH_CPU_MIPS_FAMILY) - #endif - }; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // NSIG is 64 to account for real-time signals. - static_assert(std::size(kSignalNames) == 32, "kSignalNames length"); - #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn new file mode 100644 index 000000000000..43f6c7e72760 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/crc32c/BUILD.gn.orig 2022-02-07 13:39:41 UTC ++++ src/3rdparty/chromium/third_party/crc32c/BUILD.gn +@@ -47,7 +47,7 @@ config("crc32c_config") { + } + + # Android added <sys/auxv.h> in API level 18. +- if (is_linux || is_chromeos || is_android) { ++ if (is_linux || is_chromeos || is_android && !is_bsd) { + defines += [ + "HAVE_STRONG_GETAUXVAL=1", + "HAVE_WEAK_GETAUXVAL=1", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h index 2bd15367f315..790f62477c31 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h @@ -82,7 +82,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h index 62486c8381be..e0342ffbbd1b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h -@@ -45,6 +45,11 @@ +@@ -46,6 +46,11 @@ #error "Unsupported Windows platform." #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp index 25e9b392976a..257094dbc4d8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp @@ -42,7 +42,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_distributed__point__functions_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_distributed__point__functions_BUILD.gn new file mode 100644 index 000000000000..eece499a99dd --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_distributed__point__functions_BUILD.gn @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/third_party/distributed_point_functions/BUILD.gn.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/distributed_point_functions/BUILD.gn +@@ -61,6 +61,9 @@ source_set("distributed_point_functions") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + ++ # XXX clang13 crashes with optimizations ++ configs += [ "//build/config/compiler:no_optimize" ] ++ + public_configs = [ ":distributed_point_functions_includes" ] + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_reference__drivers_random.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_reference__drivers_random.cc new file mode 100644 index 000000000000..07420a924166 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_reference__drivers_random.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/third_party/ipcz/src/reference_drivers/random.cc.orig 2022-09-24 10:57:32 UTC ++++ src/3rdparty/chromium/third_party/ipcz/src/reference_drivers/random.cc +@@ -15,7 +15,7 @@ + #include <limits> + #elif BUILDFLAG(IS_FUCHSIA) + #include <zircon/syscalls.h> +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include <asm/unistd.h> + #include <errno.h> + #include <sys/syscall.h> +@@ -78,7 +78,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { + ABSL_ASSERT(ok); + #elif BUILDFLAG(IS_FUCHSIA) + zx_cprng_draw(destination.data(), destination.size()); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + while (!destination.empty()) { + ssize_t result = + syscall(__NR_getrandom, destination.data(), destination.size(), 0); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_standalone_base_logging.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_standalone_base_logging.cc new file mode 100644 index 000000000000..ef8f04ad0054 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_standalone_base_logging.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/third_party/ipcz/src/standalone/base/logging.cc.orig 2022-05-19 14:06:27 UTC ++++ src/3rdparty/chromium/third_party/ipcz/src/standalone/base/logging.cc +@@ -50,6 +50,9 @@ LogMessage::LogMessage(const char* file, int line, Lev + #elif BUILDFLAG(IS_ANDROID) + stream_ << getpid() << ":" << gettid() << ":"; + const char* trimmed_file = strrchr(file, '/') + 1; ++#elif BUILDFLAG(IS_BSD) ++ stream_ << getpid() << ":" << pthread_self() << ":"; ++ const char* trimmed_file = strrchr(file, '/') + 1; + #elif BUILDFLAG(IS_WIN) + const char* trimmed_file = file; + stream_ << (::GetCurrentProcessId()) << ":" << ::GetCurrentThreadId() << ":"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc new file mode 100644 index 000000000000..c42f7036b5ad --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc +@@ -318,7 +318,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: + + Status ChromiumWritableFile::SyncParent() { + TRACE_EVENT0("leveldb", "SyncParent"); +-#if defined(OS_POSIX) || defined(OS_FUCHSIA) ++// pledge violation (directory passed as fd) ++#if (defined(OS_POSIX) || defined(OS_FUCHSIA)) && !defined(OS_OPENBSD) + FilePath path = FilePath::FromUTF8Unsafe(parent_dir_); + FileErrorOr<base::File> result = filesystem_->OpenFile( + path, base::File::FLAG_OPEN | base::File::FLAG_READ); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_include_sync_sync.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_include_sync_sync.h index 61f316ffdc88..4cbca5dd570b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_include_sync_sync.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_include_sync_sync.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h @@ -22,7 +22,9 @@ #include <sys/cdefs.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c index 3221990acf2f..4506da637606 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/libsync/src/sync.c.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/libsync/src/sync.c.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/third_party/libsync/src/sync.c @@ -17,7 +17,9 @@ */ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn index ed22b6e751bb..ac5cca70bae0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/nasm/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/nasm/BUILD.gn.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/third_party/nasm/BUILD.gn -@@ -59,6 +59,13 @@ config("nasm_config") { +@@ -63,6 +63,13 @@ config("nasm_config") { defines = [ "HAVE_CONFIG_H" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h index 9743c202f927..51ee60839711 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h @@ -1,14 +1,5 @@ ---- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/third_party/nasm/config/config-linux.h -@@ -139,7 +139,7 @@ - #define HAVE_ACCESS 1 - - /* Define to 1 if you have the `canonicalize_file_name' function. */ --#define HAVE_CANONICALIZE_FILE_NAME 1 -+/* #undef HAVE_CANONICALIZE_FILE_NAME */ - - /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ - /* #undef HAVE_CPU_TO_LE16 */ @@ -160,7 +160,7 @@ /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp index 63ad5c741177..841874419cc8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp @@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp index 6ff22dd92a2e..8d7454a898c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp @@ -37,6 +37,11 @@ double GetLocalTZA() { return 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni new file mode 100644 index 000000000000..5a5ccd520ed8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/pdfium/pdfium.gni.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/third_party/pdfium/pdfium.gni +@@ -42,7 +42,7 @@ declare_args() { + pdf_use_cxx20 = is_win && is_component_build + + # Build PDFium with PartitionAlloc as the memory allocator. +- pdf_use_partition_alloc = pdf_use_partition_alloc_override ++ pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc + + # Build PDFium to use Skia (experimental) for all PDFium graphics. + # If enabled, coexists in build with AGG graphics and the default diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp index d1a248843c9a..b6189b391b6a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp @@ -6,12 +6,16 @@ @@ -17,7 +17,7 @@ #if BUILDFLAG(IS_WIN) #define TIMEZONE _timezone -@@ -24,9 +28,21 @@ CXFA_TimeZoneProvider::CXFA_TimeZoneProvider() { +@@ -24,9 +28,21 @@ static bool g_bProviderTimeZoneSet = false; CXFA_TimeZoneProvider::CXFA_TimeZoneProvider() { if (!g_bProviderTimeZoneSet) { g_bProviderTimeZoneSet = true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_build__config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_build__config.h index 3ca3067e56aa..8903f2c097ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_build__config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_build__config.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/build_config.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/build_config.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/build_config.h @@ -27,6 +27,7 @@ #if defined(__ANDROID__) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h index 73c4439ce2ba..c4b8c00aa897 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -35,6 +35,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre +@@ -34,6 +34,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre #include <sys/syscall.h> #include <sys/types.h> #include <unistd.h> @@ -8,7 +8,7 @@ #else #include <pthread.h> #endif -@@ -46,6 +47,11 @@ inline PlatformThreadId GetThreadId() { +@@ -45,6 +46,11 @@ namespace base { using PlatformThreadId = pid_t; inline PlatformThreadId GetThreadId() { return gettid(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h index 5c9ccdd2b916..3f893c193d95 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h -@@ -142,6 +142,9 @@ inline TimeNanos GetBootTimeNs() { +@@ -157,6 +157,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -149,6 +152,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -164,6 +167,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,3 +18,17 @@ } inline TimeNanos GetWallTimeNs() { +@@ -171,7 +175,13 @@ inline TimeNanos GetWallTimeNs() { + } + + inline TimeNanos GetWallTimeRawNs() { ++#if defined(__OpenBSD__) ++ return GetTimeInternalNs(CLOCK_MONOTONIC); ++#elif defined(__FreeBSD__) ++ return GetTimeInternalNs(CLOCK_MONOTONIC_FAST); ++#else + return GetTimeInternalNs(CLOCK_MONOTONIC_RAW); ++#endif + } + + inline TimeNanos GetThreadCPUTimeNs() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_event__fd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_event__fd.h index 1e21eb529400..8f678f4279d6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_event__fd.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_event__fd.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/event_fd.h @@ -55,6 +55,8 @@ class EventFd { // On Mac and other non-Linux UNIX platforms a pipe-based fallback is used. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h index 885061c48f5f..eddde87c9b04 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_thread__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h -@@ -40,9 +40,10 @@ namespace base { +@@ -40,9 +40,10 @@ namespace perfetto { namespace base { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_track__event__legacy.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_track__event__legacy.h new file mode 100644 index 000000000000..26507d13fb91 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_track__event__legacy.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/track_event_legacy.h.orig 2023-04-05 11:59:13 UTC ++++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/track_event_legacy.h +@@ -267,7 +267,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTraceId { + // are different. E.g. on Mac size_t is considered a different type from + // uint64_t even though it has the same size and signedness. + // Below we add overloads for those types that are known to cause ambiguity. +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || defined(__OpenBSD__) + explicit LegacyTraceId(size_t raw_id) : raw_id_(raw_id) {} + explicit LegacyTraceId(intptr_t raw_id) + : raw_id_(static_cast<uint64_t>(raw_id)) {} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto index a61b25508784..0604693c523e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto @@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent { optional uint32 field = 2; @@ -18,7 +18,7 @@ optional uint32 sequence = 6; optional uint32 timecode_flags = 7; optional uint32 timecode_frames = 8; -@@ -48,7 +48,7 @@ message Vb2V4l2BufQueueFtraceEvent { +@@ -48,7 +48,7 @@ message V4l2DqbufFtraceEvent { message Vb2V4l2BufQueueFtraceEvent { optional uint32 field = 1; optional uint32 flags = 2; @@ -27,7 +27,7 @@ optional uint32 sequence = 4; optional uint32 timecode_flags = 5; optional uint32 timecode_frames = 6; -@@ -65,7 +65,7 @@ message Vb2V4l2BufDoneFtraceEvent { +@@ -65,7 +65,7 @@ message Vb2V4l2BufQueueFtraceEvent { message Vb2V4l2BufDoneFtraceEvent { optional uint32 field = 1; optional uint32 flags = 2; @@ -36,7 +36,7 @@ optional uint32 sequence = 4; optional uint32 timecode_flags = 5; optional uint32 timecode_frames = 6; -@@ -82,7 +82,7 @@ message Vb2V4l2QbufFtraceEvent { +@@ -82,7 +82,7 @@ message Vb2V4l2BufDoneFtraceEvent { message Vb2V4l2QbufFtraceEvent { optional uint32 field = 1; optional uint32 flags = 2; @@ -45,7 +45,7 @@ optional uint32 sequence = 4; optional uint32 timecode_flags = 5; optional uint32 timecode_frames = 6; -@@ -99,7 +99,7 @@ message Vb2V4l2DqbufFtraceEvent { +@@ -99,7 +99,7 @@ message Vb2V4l2QbufFtraceEvent { message Vb2V4l2DqbufFtraceEvent { optional uint32 field = 1; optional uint32 flags = 2; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_event__fd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_event__fd.cc index 275f0f3a64d3..817dfff36d2e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_event__fd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_event__fd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/event_fd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/event_fd.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/event_fd.cc @@ -22,7 +22,8 @@ #if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_periodic__task.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_periodic__task.cc index 1fcba7e53c81..bbcadd56dbf8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_periodic__task.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_periodic__task.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/periodic_task.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/periodic_task.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/periodic_task.cc @@ -24,7 +24,7 @@ #include "perfetto/base/time.h" @@ -9,12 +9,12 @@ (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19) #include <sys/timerfd.h> #endif -@@ -34,7 +34,7 @@ base::ScopedPlatformHandle CreateTimerFd(uint32_t peri +@@ -44,7 +44,7 @@ uint32_t GetNextDelayMs(const TimeMillis& now_ms, + } - namespace { - base::ScopedPlatformHandle CreateTimerFd(uint32_t period_ms) { + ScopedPlatformHandle CreateTimerFd(const PeriodicTask::Args& args) { -#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19) - base::ScopedPlatformHandle tfd( + ScopedPlatformHandle tfd( timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc index d51060be3e92..eb6b37260fff 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_string__utils.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/string_utils.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/string_utils.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/string_utils.cc -@@ -36,9 +36,10 @@ double StrToD(const char* nptr, char** endptr) { +@@ -36,9 +36,10 @@ namespace base { // Locale-independant as possible version of strtod. double StrToD(const char* nptr, char** endptr) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_subprocess__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_subprocess__posix.cc index 10534d2e8ec8..60382954a88f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_subprocess__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_subprocess__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/subprocess_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/subprocess_posix.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/subprocess_posix.cc @@ -35,7 +35,8 @@ #include <thread> @@ -10,7 +10,7 @@ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) #include <sys/prctl.h> #endif -@@ -64,7 +65,8 @@ void __attribute__((noreturn)) ChildProcess(ChildProce +@@ -64,7 +65,8 @@ struct ChildProcessArgs { // Don't add any dynamic allocation in this function. This will be invoked // under a fork(), potentially in a state where the allocator lock is held. void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_thread__task__runner.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_thread__task__runner.cc index fa44715f9756..42151faf0c6d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_thread__task__runner.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_thread__task__runner.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/thread_task_runner.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/thread_task_runner.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/thread_task_runner.cc @@ -27,8 +27,9 @@ #include "perfetto/ext/base/thread_utils.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc index 0a46253fce8d..94ef36aa2b95 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc @@ -42,7 +42,7 @@ #include <unistd.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc index d31670b1636b..a9d978192472 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3037,7 +3037,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3122,7 +3122,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc index 7469465e2cfc..8d8a90818732 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/arenastring.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/arenastring.cc.orig 2022-09-01 14:18:43 UTC +++ src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/arenastring.cc -@@ -64,7 +64,9 @@ constexpr size_t kStringAlign = alignof(std::string); +@@ -64,7 +64,9 @@ constexpr size_t kNewAlign = alignof(std::max_align_t) #endif constexpr size_t kStringAlign = alignof(std::string); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index 828e4f129821..fb6a391f18f1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h @@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_base_SkContainers.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_base_SkContainers.cpp new file mode 100644 index 000000000000..ab6b16f68ba7 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_base_SkContainers.cpp @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/third_party/skia/src/base/SkContainers.cpp.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/third_party/skia/src/base/SkContainers.cpp +@@ -14,7 +14,7 @@ + + #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) + #include <malloc/malloc.h> +-#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX) ++#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) + #include <malloc.h> + #elif defined(SK_BUILD_FOR_WIN) + #include <malloc.h> +@@ -38,7 +38,7 @@ SkSpan<std::byte> complete_size(void* ptr, size_t size + #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17 + completeSize = malloc_usable_size(ptr); + SkASSERT(completeSize >= size); +- #elif defined(SK_BUILD_FOR_UNIX) ++ #elif defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) + completeSize = malloc_usable_size(ptr); + SkASSERT(completeSize >= size); + #elif defined(SK_BUILD_FOR_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp index d7a0a931b2aa..d36141b5240f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp.orig 2022-06-10 05:40:07 UTC +--- src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp @@ -73,6 +73,42 @@ return features; @@ -43,26 +43,3 @@ #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>) #include <sys/auxv.h> -@@ -115,6 +151,22 @@ - return features; - } - -+#elif defined(SK_CPU_ARM32) && defined(__FreeBSD__) -+ #include <sys/auxv.h> -+ -+ static uint32_t read_cpu_features() { -+ unsigned long hwcaps = 0; -+ uint32_t features = 0; -+ -+ elf_aux_info(AT_HWCAP, (void *)&hwcaps, sizeof hwcaps); -+ if (hwcaps & HWCAP_NEON) { -+ features |= SkCpu::NEON; -+ if (hwcaps & HWCAP_VFPv4) { -+ features |= SkCpu::NEON_FMA|SkCpu::VFP_FP16; -+ } -+ } -+ return features; -+ } - #elif defined(SK_CPU_ARM32) && __has_include(<sys/auxv.h>) && \ - (!defined(__ANDROID_API__) || __ANDROID_API__ >= 18) - // sys/auxv.h will always be present in the Android NDK due to unified diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkOSFile__posix.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkOSFile__posix.cpp index 6b82921a57f2..ed1b7cbdb3a3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkOSFile__posix.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkOSFile__posix.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/skia/src/ports/SkOSFile_posix.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/skia/src/ports/SkOSFile_posix.cpp.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/third_party/skia/src/ports/SkOSFile_posix.cpp -@@ -25,7 +25,7 @@ void sk_fsync(FILE* f) { +@@ -25,7 +25,7 @@ #endif void sk_fsync(FILE* f) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_BUILD.gn new file mode 100644 index 000000000000..648b7115e8a6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/sqlite/BUILD.gn.orig 2021-12-31 00:58:29 UTC ++++ src/3rdparty/chromium/third_party/sqlite/BUILD.gn +@@ -142,7 +142,7 @@ config("sqlite_warnings") { + ] + } + } +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + cflags += [ + # SQLite doesn't believe in compiler warnings, preferring testing. + # http://www.sqlite.org/faq.html#q17 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c new file mode 100644 index 000000000000..a01061bd59ab --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c @@ -0,0 +1,23 @@ +--- src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-04-20 13:16:39 UTC ++++ src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c +@@ -43595,7 +43595,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB + memset(zBuf, 0, nBuf); + randomnessPid = osGetpid(0); + #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) ++#if defined(__OpenBSD__) + { ++ arc4random_buf(zBuf, nBuf); ++ } ++#else ++ { + int fd, got; + fd = robust_open("/dev/urandom", O_RDONLY, 0); + if( fd<0 ){ +@@ -43610,6 +43615,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB + robust_close(0, fd, __LINE__); + } + } ++#endif + #endif + return nBuf; + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni index 0d86574c08a6..f47ca892d84a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/tflite/features.gni.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/tflite/features.gni.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/third_party/tflite/features.gni -@@ -7,7 +7,7 @@ declare_args() { +@@ -7,7 +7,7 @@ import("//build/config/chrome_build.gni") declare_args() { # This enables building TFLite with XNNPACK. Currently only available for # Linux or Windows on x64. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn new file mode 100644 index 000000000000..a10cd1178266 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn +@@ -59,7 +59,7 @@ config("vulkan_internal_config") { + defines += [ + "SYSCONFDIR=\"/etc\"", + "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", +- "FALLBACK_DATA_DIRS=\"/usr/local/share:/usr/share\"", ++ "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"", + ] + } + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h new file mode 100644 index 000000000000..615a939c5599 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h +@@ -294,7 +294,15 @@ static inline char *loader_platform_executable_path(ch + + return buffer; + } +-#elif defined(__Fuchsia__) || defined(__OpenBSD__) ++#elif defined(__OpenBSD__) ++static inline char *loader_platform_executable_path(char *buffer, size_t size) { ++ if ((buffer = getenv("CHROME_EXE_PATH")) != NULL) ++ return buffer; ++ else ++ buffer = "/usr/local/chrome/chrome"; ++ return buffer; ++} ++#elif defined(__Fuchsia__) + static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; } + #elif defined(__QNXNTO__) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h new file mode 100644 index 000000000000..d759643467ec --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h +@@ -2703,7 +2703,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ + + return memalign(alignment, size); + } +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) + #define ALIGNED_ALLOC_WITH_POSIX_MEMALIGN + #elif defined(__GNU_LIBRARY__) + # if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 16) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h new file mode 100644 index 000000000000..51abae4160d2 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +@@ -2507,7 +2507,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) + + return memalign(alignment, size); + } +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) + #include <cstdlib> + + #if defined(__APPLE__) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_features.gni deleted file mode 100644 index 21fdfaface62..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_features.gni +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/third_party/wayland/features.gni.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/third_party/wayland/features.gni -@@ -21,12 +21,15 @@ declare_args() { - - declare_args() { - # Path to the wayland-scanner in the sysroot. -- assert(host_os == "linux") - if (use_system_wayland_scanner) { - if (use_sysroot) { - system_wayland_scanner_path = "$sysroot/usr/bin/wayland-scanner" - } else { -- system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ if (is_bsd) { -+ system_wayland_scanner_path = "%%LOCALBASE%%/bin/wayland-scanner" -+ } else { -+ system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ } - } - } - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn index 0ac7ded83309..8b8bdc8af8aa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/webrtc/BUILD.gn -@@ -205,6 +205,9 @@ config("common_inherited_config") { +@@ -211,6 +211,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn index 94b9abcbb690..9b9fabb12f88 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn -@@ -299,7 +299,7 @@ rtc_library("audio_device_impl") { +@@ -300,7 +300,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc index 6ce8ccddcf18..c3a3263e64d8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc -@@ -212,6 +212,12 @@ void XServerPixelBuffer::InitShm(const XWindowAttribut +@@ -212,6 +212,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) { Visual* default_visual = attributes.visual; int default_depth = attributes.depth; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn deleted file mode 100644 index e1d689e05f76..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/BUILD.gn.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/third_party/webrtc/rtc_base/BUILD.gn -@@ -1244,7 +1244,7 @@ rtc_library("rtc_base") { - sources += [ "mac_ifaddrs_converter.cc" ] - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - libs += [ - "dl", - "rt", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_byte__order.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_byte__order.h index 39354ef6a580..a225e7a2921c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_byte__order.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_byte__order.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/byte_order.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/byte_order.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/byte_order.h -@@ -88,6 +88,8 @@ +@@ -90,6 +90,8 @@ #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc index 24b926adef01..103962e0ee55 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_ip__address.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/ip_address.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/ip_address.cc.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/ip_address.cc @@ -13,7 +13,8 @@ #include <sys/socket.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc index 0f8b2704207d..27858ffdac55 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc -@@ -286,7 +286,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -288,7 +288,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc index 3818d17d430b..240bdcbb2e31 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -53,7 +53,7 @@ - #include "rtc_base/synchronization/mutex.h" +@@ -54,7 +54,7 @@ #include "rtc_base/time_utils.h" + #include "system_wrappers/include/field_trial.h" -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) #include <linux/sockios.h> #endif -@@ -72,7 +72,7 @@ typedef void* SockOptArg; +@@ -73,7 +73,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -300,7 +300,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -308,7 +308,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -318,7 +318,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -326,7 +326,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -346,7 +346,7 @@ int PhysicalSocket::Send(const void* pv, size_t cb) { +@@ -354,7 +354,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -375,7 +375,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -383,7 +383,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -566,7 +566,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h index 97c6d48addf2..d24fa878f15f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h @@ -12,7 +12,7 @@ #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_platform__thread__types.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_platform__thread__types.cc index 6ae6c28de749..958e0a3e1ff1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/platform_thread_types.cc @@ -11,7 +11,9 @@ #include "rtc_base/platform_thread_types.h" @@ -10,19 +10,16 @@ #include <sys/syscall.h> #endif -@@ -37,8 +39,10 @@ PlatformThreadId CurrentThreadId() { +@@ -44,6 +46,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - return syscall(__NR_gettid); +#elif defined(WEBRTC_BSD) + return reinterpret_cast<uint64_t>(pthread_self()); + #elif defined(WEBRTC_LINUX) + return syscall(__NR_gettid); #elif defined(__EMSCRIPTEN__) - return static_cast<PlatformThreadId>(pthread_self()); - #else -@@ -67,6 +71,7 @@ void SetCurrentThreadName(const char* name) { +@@ -74,6 +78,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { @@ -30,10 +27,10 @@ #if defined(WEBRTC_WIN) // The SetThreadDescription API works even if no debugger is attached. // The names set with this API also show up in ETW traces. Very handy. -@@ -109,6 +114,7 @@ void SetCurrentThreadName(const char* name) { - prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT - #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - pthread_setname_np(name); +@@ -120,6 +125,7 @@ void SetCurrentThreadName(const char* name) { + zx_status_t status = zx_object_set_property(zx_thread_self(), ZX_PROP_NAME, + name, strlen(name)); + RTC_DCHECK_EQ(status, ZX_OK); +#endif #endif } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h index 778b132e5db6..0ff10825d865 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h @@ -178,6 +178,10 @@ class multi_threaded_local { #endif // _SIGSLOT_HAS_WIN32_THREADS diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn index 1c966b658fa9..a3da8095119b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/webrtc/system_wrappers/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/system_wrappers/BUILD.gn.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/third_party/webrtc/system_wrappers/BUILD.gn @@ -64,8 +64,6 @@ rtc_library("system_wrappers") { if (!build_with_chromium) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn new file mode 100644 index 000000000000..b99d7342d389 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/third_party/zlib/BUILD.gn +@@ -455,7 +455,7 @@ static_library("bundled_minizip") { + ] + } + +- if (is_apple || is_android || is_nacl) { ++ if (is_apple || is_android || is_nacl || is_bsd) { + # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We + # use fopen, ftell, and fseek instead on these systems. + defines = [ "USE_FILE32API" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_generate__stubs_rules.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_generate__stubs_rules.gni index 67d01d9556cb..0d44e347c838 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_generate__stubs_rules.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_generate__stubs_rules.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/tools/generate_stubs/rules.gni.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/tools/generate_stubs/rules.gni.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/tools/generate_stubs/rules.gni @@ -110,7 +110,6 @@ template("generate_stubs") { "${target_gen_dir}/${invoker.output_name}.cc", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py index 5b56c013e103..b418fee087af 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py -@@ -153,7 +153,7 @@ class CppBundleGenerator(object): +@@ -149,7 +149,7 @@ class CppBundleGenerator(object): # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') elif platform == Platforms.LINUX: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py index 64b4f521d4b1..abbee2641c5b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py -@@ -268,6 +268,8 @@ FEATURE_GRAMMAR = ({ +@@ -271,6 +271,8 @@ FEATURE_GRAMMAR = ({ + 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', - 'fuchsia': 'Feature::FUCHSIA_PLATFORM', + 'openbsd': 'Feature::LINUX_PLATFORM', + 'freebsd': 'Feature::LINUX_PLATFORM', } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py index 295c6afda801..0dfa9b3a4808 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/licenses.py.orig 2023-07-22 20:07:18 UTC -+++ src/3rdparty/chromium/tools/licenses.py -@@ -582,6 +582,8 @@ def _GnBinary(): +--- src/3rdparty/chromium/tools/licenses/licenses.py.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/tools/licenses/licenses.py +@@ -618,6 +618,8 @@ def _GnBinary(): exe = 'gn' if sys.platform.startswith('linux'): subdir = 'linux64' diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h index e25abd6c3c26..30d5beb2271a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h @@ -60,7 +60,7 @@ class RemoteProcessMemoryReader { const pid_t pid_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn index 5dc27a39e593..c6354c6a16d6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn @@ -45,7 +45,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py index b907356a2219..24c78f4641d1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py -@@ -182,15 +182,19 @@ def main(argv): +@@ -175,15 +175,19 @@ def main(argv): if not options.exclude_imports: protoc_cmd += ["--include_imports"] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py index bc1e3ab30806..1f57970bf5d1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/tools/variations/fieldtrial_to_struct.py.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/tools/variations/fieldtrial_to_struct.py.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/tools/variations/fieldtrial_to_struct.py @@ -41,6 +41,8 @@ _platforms = [ 'linux', diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_client_drag__drop__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_client_drag__drop__client.h new file mode 100644 index 000000000000..4723f63356e8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_client_drag__drop__client.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/aura/client/drag_drop_client.h.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/ui/aura/client/drag_drop_client.h +@@ -44,7 +44,7 @@ class AURA_EXPORT DragDropClient { + int allowed_operations, + ui::mojom::DragEventSource source) = 0; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Updates the drag image. An empty |image| may be used to hide a previously + // set non-empty drag image, and a non-empty |image| shows the drag image + // again if it was previously hidden. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc index d513425044e2..46d788a1632c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/aura/screen_ozone.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.cc -@@ -109,7 +109,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -110,7 +110,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h index ee8ff2565e0b..192c365305a8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/aura/screen_ozone.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.h @@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( @@ -9,7 +9,7 @@ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -73,7 +73,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc index a7e3a5d493d8..4b933345240f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.cc -@@ -24,7 +24,7 @@ const char kMimeTypeWindowDrag[] = "chromium/x-window- +@@ -24,7 +24,7 @@ const char kMimeTypeOctetStream[] = "application/octet // Used for window dragging on some platforms. const char kMimeTypeWindowDrag[] = "chromium/x-window-drag"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h index b839f5227ff5..7924af9905e5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h -@@ -46,7 +46,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -47,7 +47,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; + + // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES ----- - // Linux-specific MIME type constants (also used in Fuchsia). -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc index dcbaea679ef9..79de80575550 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc -@@ -83,7 +83,7 @@ void CursorFactory::SetDeviceScaleFactor(float scale) +@@ -89,7 +89,7 @@ void CursorFactory::ObserveThemeChanges() { void CursorFactory::SetDeviceScaleFactor(float scale) {} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h index 2dedee97e6da..e07f7a7e8cea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/cursor/cursor_factory.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/cursor/cursor_factory.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/base/cursor/cursor_factory.h -@@ -81,7 +81,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { +@@ -88,7 +88,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { base::ObserverList<CursorFactoryObserver>::Unchecked observers_; }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc index 79db63e196e1..6b838ecccde6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -7,7 +7,7 @@ #include "base/notreached.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index 142f6eac58b5..f28d7e0eccb1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -94,7 +94,7 @@ bool OSExchangeDataProviderNonBacked::GetString(std::u +@@ -94,7 +94,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( } bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc index ceabb6d7aa85..402bea47cc09 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc @@ -159,7 +159,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h index e6ad5a23b39d..44b628327b86 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h @@ -65,7 +65,7 @@ class DummyTextInputClient : public TextInputClient { ukm::SourceId GetClientSourceForMetrics() const override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc index 33dd7cf61f45..138eaeb23614 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc -@@ -163,7 +163,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -167,7 +167,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h index c3ffc1507878..7a662ed6b560 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h -@@ -71,7 +71,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -73,7 +73,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_linux_linux__input__method__context__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_linux_linux__input__method__context__factory.cc index 71d6c9034455..b21c6c5b7e35 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_linux_linux__input__method__context__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_linux_linux__input__method__context__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context_factory.cc.orig 2022-09-27 14:30:33 UTC +++ src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context_factory.cc @@ -9,7 +9,7 @@ #include "build/build_config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h index 5ffceff19630..e9fc52934e5a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/ui/base/ime/text_input_client.h @@ -242,7 +242,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient // fields that are considered 'private' (e.g. in incognito tabs). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc index 2add172727fe..720099c22c09 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ui/base/resource/resource_bundle.cc -@@ -884,7 +884,7 @@ ResourceScaleFactor ResourceBundle::GetMaxResourceScal +@@ -885,7 +885,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc index 0e1fdc228118..5b1a5e7a453c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/base/ui_base_features.cc -@@ -205,7 +205,7 @@ CONSTINIT const base::Feature kExperimentalFlingAnimat +@@ -210,7 +210,7 @@ CONSTINIT const base::Feature kExperimentalFlingAnimat "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -310,7 +310,7 @@ CONSTINIT const base::Feature kEyeDropper( +@@ -315,7 +315,7 @@ CONSTINIT const base::Feature kEyeDropper( // milestones. CONSTINIT const base::Feature kEyeDropper( "EyeDropper", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h index d15d201fa18a..dc5e797a884a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/ui_base_types.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/ui_base_types.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/ui/base/ui_base_types.h @@ -32,7 +32,7 @@ enum WindowShowState { SHOW_STATE_END = 6 // The end of show state enum. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc index 303d88287a79..12b5a81f1fd8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/base/webui/web_ui_util.cc -@@ -220,7 +220,7 @@ std::string GetFontFamily() { +@@ -214,7 +214,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc index a2090fc82615..05cf581b5e9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc -@@ -56,7 +56,7 @@ void X11CursorFactory::ObserveThemeChanges() { +@@ -13,7 +13,7 @@ + #include "ui/gfx/geometry/point.h" + #include "ui/gfx/x/connection.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -60,7 +60,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create } void X11CursorFactory::ObserveThemeChanges() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h index a290982e4ead..f9b74e96aca2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h @@ -1,12 +1,12 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h -@@ -16,7 +16,7 @@ - #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h" - #include "ui/linux/cursor_theme_manager_observer.h" +@@ -20,7 +20,7 @@ namespace ui { + class X11Cursor; + class XCursorLoader; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/linux_ui.h" + class LinuxUi; #endif @@ -59,7 +59,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory @@ -15,6 +15,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::ScopedObservation<LinuxUi, - CursorThemeManagerObserver, - &LinuxUi::AddCursorThemeObserver, + base::ScopedObservation<LinuxUi, CursorThemeManagerObserver> + cursor_theme_observation_{this}; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc index f8748776a8f9..e016355a3077 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc @@ -32,7 +32,7 @@ #include "ui/gfx/x/xproto.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc index 1237ff589561..5a9731a9dc50 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/ui/base/x/x11_shm_image_pool.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/x/x11_shm_image_pool.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ - #include "base/environment.h" + #include "base/functional/callback.h" #include "base/location.h" #include "base/strings/string_util.h" +#include "base/system/sys_info.h" - #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" -@@ -46,10 +47,14 @@ std::size_t MaxShmSegmentSizeImpl() { + #include "net/base/url_util.h" +@@ -45,10 +46,14 @@ constexpr float kShmResizeShrinkThreshold = 1.0f / (kShmResizeThreshold * kShmResizeThreshold); std::size_t MaxShmSegmentSizeImpl() { @@ -23,7 +23,7 @@ } std::size_t MaxShmSegmentSize() { -@@ -66,6 +71,9 @@ bool ShouldUseMitShm(x11::Connection* connection) { +@@ -65,6 +70,9 @@ bool IsRemoteHost(const std::string& name) { } bool ShouldUseMitShm(x11::Connection* connection) { @@ -33,7 +33,7 @@ // MIT-SHM may be available on remote connetions, but it will be unusable. Do // a best-effort check to see if the host is remote to disable the SHM // codepath. It may be possible in contrived cases for there to be a -@@ -184,7 +192,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -183,7 +191,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size shmctl(state.shmid, IPC_RMID, nullptr); return false; } @@ -42,7 +42,7 @@ // On Linux, a shmid can still be attached after IPC_RMID if otherwise // kept alive. Detach before XShmAttach to prevent a memory leak in case // the process dies. -@@ -203,7 +211,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -202,7 +210,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size return false; state.shmseg = shmseg; state.shmem_attached_to_server = true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h index c9ad00ed0c6b..647b25e49a43 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/color/color_id.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/color/color_id.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/color/color_id.h -@@ -351,7 +351,7 @@ +@@ -435,7 +435,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc index b0536e5b1000..bead88027297 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/color/color_provider_utils.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/color/color_provider_utils.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/color/color_provider_utils.cc -@@ -88,7 +88,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -103,7 +103,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_system__theme.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_system__theme.h index e40b4047befc..aeb1264a4f56 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_system__theme.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_system__theme.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/color/system_theme.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/color/system_theme.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/ui/color/system_theme.h -@@ -15,7 +15,7 @@ enum class SystemTheme { +@@ -15,7 +15,7 @@ namespace ui { enum class SystemTheme { // Classic theme, used in the default or users' chosen theme. kDefault = 0, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc index 5d9ec98b3105..6f1bdae0e629 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.cc -@@ -868,7 +868,7 @@ void Compositor::OnResume() { +@@ -886,7 +886,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h index 0fb6327a4fc8..268a48a59e0d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.h -@@ -420,7 +420,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -453,7 +453,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h index 6f3bc872899e..1afcddf462c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/compositor/compositor_observer.h @@ -48,7 +48,7 @@ class COMPOSITOR_EXPORT CompositorObserver { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc index ac0f3b9e0d06..fe5c5793c05f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/display/screen.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/display/screen.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/ui/display/screen.cc @@ -85,7 +85,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h index f8881813e3c7..8a779268bd08 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/display/screen.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/display/screen.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ui/display/screen.h -@@ -130,7 +130,7 @@ class DISPLAY_EXPORT Screen { +@@ -131,7 +131,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -220,7 +220,7 @@ class DISPLAY_EXPORT Screen { +@@ -232,7 +232,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc index 194c8baebdac..6d82a0c801b0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc -@@ -874,6 +874,7 @@ void DeviceDataManagerX11::DisableDevice(x11::Input::D +@@ -875,6 +875,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc index 696be4597c3f..eb84a2adffd6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/event.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/events/event.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/events/event.cc -@@ -419,7 +419,7 @@ MouseEvent::MouseEvent(const PlatformEvent& native_eve +@@ -419,7 +419,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,16 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -918,7 +918,7 @@ void KeyEvent::InitializeNative() { +@@ -674,7 +674,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const + return std::make_unique<MouseWheelEvent>(*this); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on + // Linux. + // static +@@ -923,7 +923,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc index 988a3ef1b480..dc5845a86621 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/ui/events/event_switches.cc -@@ -21,7 +21,7 @@ const char kTouchSlopDistance[] = "touch-slop-distance +@@ -21,7 +21,7 @@ const char kCompensateForUnstablePinchZoom[] = // value is a floating point number that is interpreted as a distance in pixels. const char kTouchSlopDistance[] = "touch-slop-distance"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h index 95b6bfff3814..3c73a369ad21 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/event_switches.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/events/event_switches.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/ui/events/event_switches.h -@@ -13,7 +13,7 @@ EVENTS_BASE_EXPORT extern const char kTouchSlopDistanc +@@ -13,7 +13,7 @@ namespace switches { EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; EVENTS_BASE_EXPORT extern const char kTouchSlopDistance[]; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc index fa8b7e325f6e..aa6e784f908f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc @@ -11,7 +11,7 @@ #include "ui/events/keycodes/dom/dom_code.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h index bf95d2b09f7e..fcebcd07565e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.h.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.h @@ -64,7 +64,7 @@ class KeycodeConverter { // Convert a DomCode into a native keycode. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc index 97d3d0c562d1..8bea55754926 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc.orig 2022-12-12 18:53:13 UTC +--- src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc.orig 2023-10-03 19:49:54 UTC +++ src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc -@@ -638,7 +638,7 @@ void LoadKeymap(const std::string& layout_name, +@@ -637,7 +637,7 @@ void LoadKeymap(const std::string& layout_name, .options = ""}; std::unique_ptr<xkb_context, XkbContextDeleter> context; context.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES)); @@ -9,7 +9,7 @@ std::unique_ptr<xkb_keymap, XkbKeymapDeleter> keymap; keymap.reset(xkb_keymap_new_from_names(context.get(), &names, XKB_KEYMAP_COMPILE_NO_FLAGS)); -@@ -672,7 +672,7 @@ XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine( +@@ -671,7 +671,7 @@ XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine( // TODO: add XKB_CONTEXT_NO_ENVIRONMENT_NAMES xkb_context_.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES)); xkb_context_include_path_append(xkb_context_.get(), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn index 18ff151aa813..e508661c0172 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/gfx/BUILD.gn -@@ -594,7 +594,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -611,7 +611,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc index 8c53aea2a303..58dab0f666d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gfx/canvas_skia.cc @@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str Range range = StripAcceleratorChars(flags, &adjusted_text); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc index a2983001a856..49c8a36f170a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/codec/png_codec.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/codec/png_codec.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/ui/gfx/codec/png_codec.cc @@ -10,7 +10,7 @@ #include "base/memory/raw_ptr.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc index 7938afc956db..c74dc4f2b93f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc @@ -26,6 +26,8 @@ #include "ui/gfx/linux/fontconfig_util.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__list.cc index 9d9e0de46a1c..ed0c71d87717 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__list.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__list.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/font_list.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/font_list.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gfx/font_list.cc -@@ -27,7 +27,7 @@ bool IsFontFamilyAvailable(const std::string& family, +@@ -27,7 +27,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>:: bool g_default_impl_initialized = false; bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h index 473ba3263394..9ba81f5ebb84 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/font_render_params.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/font_render_params.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gfx/font_render_params.h @@ -109,7 +109,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, @@ -9,7 +9,7 @@ // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); -@@ -119,7 +119,7 @@ GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor( +@@ -119,7 +119,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc index 138030cd7192..2bb10f76460d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc @@ -25,7 +25,7 @@ #include "ui/gfx/linux/fontconfig_util.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc index a21839f63922..9ac5eac23a66 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/font_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/font_util.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gfx/font_util.cc @@ -6,7 +6,7 @@ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc index 3d41ef2a000e..9a1e11fad117 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc @@ -54,7 +54,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.region = region.Duplicate(); @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle); - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) handle.io_surface = io_surface; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h index 81b2186e4e83..4302742fbe03 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h @@ -1,13 +1,13 @@ ---- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gfx_export.h" --#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) #include "ui/gfx/mac/io_surface.h" @@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; @@ -16,5 +16,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) NativePixmapHandle native_pixmap_handle; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) ScopedIOSurface io_surface; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_client__native__pixmap__dmabuf.cc index 30f8967cad8b..d398efd7f79c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc index c84ab7ebb494..06159565c6b7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else @@ -13,8 +13,8 @@ out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: kNativePixmapHandle: out->type = gfx::NATIVE_PIXMAP; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc index 21c64952bd95..1364053a0de1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.cc -@@ -8,11 +8,11 @@ namespace mojo { +@@ -8,11 +8,11 @@ namespace mojo { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) mojo::PlatformHandle StructTraits< gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) { @@ -23,7 +23,7 @@ if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); -@@ -45,7 +45,7 @@ bool StructTraits< +@@ -54,7 +54,7 @@ bool StructTraits< gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h index cefe97738be1..a188d98c6226 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -15,7 +15,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #endif -@@ -25,7 +25,7 @@ namespace mojo { +@@ -25,7 +25,7 @@ namespace mojo { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc index 6fba7ffdfa7e..650932b68276 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc @@ -11,7 +11,7 @@ #include "ui/gfx/buffer_format_util.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h index 50f8846ee9d3..7849a6b13b1f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h -@@ -16,7 +16,7 @@ +@@ -14,7 +14,7 @@ #include "ui/gfx/buffer_types.h" #include "ui/gfx/gfx_export.h" @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif -@@ -35,7 +35,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -34,7 +34,7 @@ struct GFX_EXPORT NativePixmapPlane { NativePixmapPlane(int stride, int offset, uint64_t size @@ -18,7 +18,7 @@ , base::ScopedFD fd #elif BUILDFLAG(IS_FUCHSIA) -@@ -56,7 +56,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -55,7 +55,7 @@ struct GFX_EXPORT NativePixmapPlane { // This is necessary to map the buffers. uint64_t size; @@ -27,7 +27,7 @@ // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; #elif BUILDFLAG(IS_FUCHSIA) -@@ -85,7 +85,7 @@ struct GFX_EXPORT NativePixmapHandle { +@@ -78,7 +78,7 @@ struct GFX_EXPORT NativePixmapHandle { std::vector<NativePixmapPlane> planes; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h index e69a269e767f..401c8ea1d46b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/native_widget_types.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/native_widget_types.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gfx/native_widget_types.h @@ -106,7 +106,7 @@ class SkBitmap; @@ -9,7 +9,7 @@ extern "C" { struct _AtkObject; typedef struct _AtkObject AtkObject; -@@ -209,7 +209,7 @@ typedef id NativeViewAccessible; +@@ -209,7 +209,7 @@ typedef NSFont* NativeFont; typedef id NativeViewAccessible; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc index ce684743743c..dedacaee87cd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/platform_font_skia.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/platform_font_skia.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/ui/gfx/platform_font_skia.cc @@ -28,7 +28,7 @@ #include "ui/gfx/system_fonts_win.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc index 3bfe85857e9f..55479ac1b8d8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/render_text_api_fuzzer.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/render_text_api_fuzzer.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/ui/gfx/render_text_api_fuzzer.cc @@ -20,7 +20,7 @@ #include "ui/gfx/font_util.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__fuzzer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__fuzzer.cc index ddce6efb07c8..8cd330e09883 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__fuzzer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__fuzzer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/render_text_fuzzer.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gfx/render_text_fuzzer.cc.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/ui/gfx/render_text_fuzzer.cc @@ -14,7 +14,7 @@ #include "ui/gfx/font_util.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc index 4b51377c0d8f..7b19c6ccc833 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/switches.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/switches.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/gfx/switches.cc -@@ -26,7 +26,7 @@ const char kHeadless[] = "headless"; +@@ -33,7 +33,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h index ea51f3b7eac6..cb08def77887 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/switches.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/switches.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/gfx/switches.h -@@ -17,7 +17,7 @@ GFX_SWITCHES_EXPORT extern const char kHeadless[]; +@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_BUILD.gn new file mode 100644 index 000000000000..7cb69d0efed3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/gfx/x/BUILD.gn.orig 2023-08-16 19:50:41 UTC ++++ src/3rdparty/chromium/ui/gfx/x/BUILD.gn +@@ -7,7 +7,7 @@ import("//tools/generate_library_loader/generate_libra + import("//build/config/ui.gni") + import("//tools/generate_library_loader/generate_library_loader.gni") + +-assert(ozone_platform_x11) ++# assert(ozone_platform_x11) + + declare_args() { + regenerate_x11_protos = false diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc index fd194c053dc6..94c8e4bbf7eb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_dri3.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/x/generated_protos/dri3.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/x/generated_protos/dri3.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gfx/x/generated_protos/dri3.cc @@ -44,6 +44,8 @@ #include <xcb/xcb.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc index 134d2abf6bd3..03a91ea800cb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_generated__protos_shm.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/x/generated_protos/shm.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/x/generated_protos/shm.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gfx/x/generated_protos/shm.cc @@ -44,6 +44,8 @@ #include <xcb/xcb.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc index 2a760331922a..934f12ccb635 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/x/xlib_support.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/x/xlib_support.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/gfx/x/xlib_support.cc @@ -42,10 +42,18 @@ void InitXlib() { if (xlib_loader->loaded()) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn index 631d85b5197f..b75fb8ce4836 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/gl/BUILD.gn -@@ -167,8 +167,6 @@ jumbo_component("gl") { +@@ -172,8 +172,6 @@ jumbo_component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -185,7 +183,6 @@ jumbo_component("gl") { +@@ -190,7 +188,6 @@ jumbo_component("gl") { ] public_deps = [ "//base", @@ -17,19 +17,19 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -441,7 +438,6 @@ jumbo_component("gl") { +@@ -455,7 +452,6 @@ jumbo_component("gl") { + data_deps += [ + "//third_party/angle:libEGL", + "//third_party/angle:libGLESv2", +- "//third_party/mesa_headers", + ] + if (enable_swiftshader) { data_deps += [ - "//third_party/angle:libEGL", - "//third_party/angle:libGLESv2", -- "//third_party/mesa_headers", - ] - if (enable_swiftshader) { - data_deps += [ -@@ -685,7 +681,6 @@ test("gl_unittests") { +@@ -709,7 +705,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", - "//third_party/mesa_headers", ] - # TODO(https://crbug.com/789065): this must be moved to Ozone. + if (is_win) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_generate__bindings.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_generate__bindings.py deleted file mode 100644 index 966e4cf36b6e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_generate__bindings.py +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/ui/gl/generate_bindings.py.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/ui/gl/generate_bindings.py -@@ -3000,6 +3000,9 @@ GLX_FUNCTIONS = [ - 'arguments': - 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' - 'int32_t* denominator' }, -+{ 'return_type': '__GLXextFuncPtr', -+ 'names': ['glXGetProcAddressARB'], -+ 'arguments': 'const GLubyte* procName', }, - { 'return_type': 'void', - 'names': ['glXGetSelectedEvent'], - 'arguments': 'Display* dpy, GLXDrawable drawable, unsigned long* mask', }, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__api__autogen__glx.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__api__autogen__glx.h deleted file mode 100644 index bc8dfa207b54..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__api__autogen__glx.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/3rdparty/chromium/ui/gl/gl_bindings_api_autogen_glx.h.orig 2022-06-08 06:40:31 UTC -+++ src/3rdparty/chromium/ui/gl/gl_bindings_api_autogen_glx.h -@@ -88,6 +88,7 @@ bool glXGetMscRateOMLFn(Display* dpy, - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator) override; -+__GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) override; - void glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc deleted file mode 100644 index 274df81c1015..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- src/3rdparty/chromium/ui/gl/gl_bindings_autogen_glx.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/gl/gl_bindings_autogen_glx.cc -@@ -119,6 +119,8 @@ void DriverGLX::InitializeExtensionBindings() { - - ext.b_GLX_ARB_create_context = - gfx::HasExtension(extensions, "GLX_ARB_create_context"); -+ ext.b_GLX_ARB_get_proc_address = -+ gfx::HasExtension(extensions, "GLX_ARB_get_proc_address"); - ext.b_GLX_EXT_swap_control = - gfx::HasExtension(extensions, "GLX_EXT_swap_control"); - ext.b_GLX_EXT_texture_from_pixmap = -@@ -160,6 +162,11 @@ void DriverGLX::InitializeExtensionBindings() { - GetGLProcAddress("glXGetMscRateOML")); - } - -+ if (ext.b_GLX_ARB_get_proc_address) { -+ fn.glXGetProcAddressARBFn = reinterpret_cast<glXGetProcAddressARBProc>( -+ GetGLProcAddress("glXGetProcAddressARB")); -+ } -+ - if (ext.b_GLX_OML_sync_control) { - fn.glXGetSyncValuesOMLFn = reinterpret_cast<glXGetSyncValuesOMLProc>( - GetGLProcAddress("glXGetSyncValuesOML")); -@@ -350,6 +357,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy, - return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); - } - -+__GLXextFuncPtr GLXApiBase::glXGetProcAddressARBFn(const GLubyte* procName) { -+ return driver_->fn.glXGetProcAddressARBFn(procName); -+} -+ - void GLXApiBase::glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) { -@@ -652,6 +663,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy, - return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); - } - -+__GLXextFuncPtr TraceGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { -+ TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLXAPI::glXGetProcAddressARB") -+ return glx_api_->glXGetProcAddressARBFn(procName); -+} -+ - void TraceGLXApi::glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) { -@@ -1073,6 +1089,14 @@ bool LogGLXApi::glXGetMscRateOMLFn(Display* dpy, - << static_cast<const void*>(denominator) << ")"); - bool result = - glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); -+ GL_SERVICE_LOG("GL_RESULT: " << result); -+ return result; -+} -+ -+__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { -+ GL_SERVICE_LOG("glXGetProcAddressARB" -+ << "(" << static_cast<const void*>(procName) << ")"); -+ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName); - GL_SERVICE_LOG("GL_RESULT: " << result); - return result; - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.h deleted file mode 100644 index bc9ceaa73e79..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.h +++ /dev/null @@ -1,43 +0,0 @@ ---- src/3rdparty/chromium/ui/gl/gl_bindings_autogen_glx.h.orig 2022-06-08 06:40:31 UTC -+++ src/3rdparty/chromium/ui/gl/gl_bindings_autogen_glx.h -@@ -104,6 +104,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator); -+typedef __GLXextFuncPtr(GL_BINDING_CALL* glXGetProcAddressARBProc)( -+ const GLubyte* procName); - typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy, - GLXDrawable drawable, - unsigned long* mask); -@@ -166,6 +168,7 @@ struct ExtensionsGLX { - - struct ExtensionsGLX { - bool b_GLX_ARB_create_context; -+ bool b_GLX_ARB_get_proc_address; - bool b_GLX_EXT_swap_control; - bool b_GLX_EXT_texture_from_pixmap; - bool b_GLX_MESA_copy_sub_buffer; -@@ -203,6 +206,7 @@ struct ProcsGLX { - glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn; - glXGetFBConfigsProc glXGetFBConfigsFn; - glXGetMscRateOMLProc glXGetMscRateOMLFn; -+ glXGetProcAddressARBProc glXGetProcAddressARBFn; - glXGetSelectedEventProc glXGetSelectedEventFn; - glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn; - glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn; -@@ -310,6 +314,7 @@ class GL_EXPORT GLXApi { - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator) = 0; -+ virtual __GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) = 0; - virtual void glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) = 0; -@@ -394,6 +399,7 @@ class GL_EXPORT GLXApi { - ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn - #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn - #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn -+#define glXGetProcAddressARB ::gl::g_current_glx_context->glXGetProcAddressARBFn - #define glXGetSelectedEvent ::gl::g_current_glx_context->glXGetSelectedEventFn - #define glXGetSyncValuesOML ::gl::g_current_glx_context->glXGetSyncValuesOMLFn - #define glXGetVisualFromFBConfig \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc index 934b12d2d9c1..41a4c19bebb3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/gl_context.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gl/gl_context.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/gl/gl_context.cc -@@ -414,7 +414,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -416,7 +416,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__features.cc deleted file mode 100644 index 4dc53e44d3a5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/gl/gl_features.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/ui/gl/gl_features.cc -@@ -86,7 +86,7 @@ CONSTINIT const base::Feature kDefaultPassthroughComma - "DefaultPassthroughCommandDecoder", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__image__glx__native__pixmap.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__image__glx__native__pixmap.cc deleted file mode 100644 index cd774139ff79..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__image__glx__native__pixmap.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/gl/gl_image_glx_native_pixmap.cc.orig 2023-03-28 19:45:02 UTC -+++ src/3rdparty/chromium/ui/gl/gl_image_glx_native_pixmap.cc -@@ -12,6 +12,8 @@ - #include "ui/gl/buffer_format_utils.h" - #include "ui/gl/glx_util.h" - -+#include <unistd.h> -+ - namespace gl { - - GLImageGLXNativePixmap::GLImageGLXNativePixmap(const gfx::Size& size, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc index 1a847bc58c6f..4a3afa687cde 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/gl/gl_implementation.cc -@@ -293,7 +293,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -288,7 +288,7 @@ GetRequestedGLImplementationFromCommandLine( *fallback_to_software_gl = false; bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc index 19d077eb3035..c918d5c71f4a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/ui/gl/gl_switches.cc @@ -12,7 +12,7 @@ #include "base/android/build_info.h" @@ -9,12 +9,12 @@ #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -287,7 +287,7 @@ bool IsDefaultANGLEVulkan() { +@@ -298,7 +298,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_VULKAN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_VULKAN) angle::SystemInfo system_info; if (!angle::GetSystemInfoVulkan(&system_info)) return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc index 94e8d63afef8..059a48e2cf77 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" @@ -9,7 +9,7 @@ // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -26,7 +26,7 @@ SyncControlVSyncProvider::SyncControlVSyncProvider() : +@@ -26,7 +26,7 @@ const double kRelativeIntervalDifferenceThreshold = 0. namespace gl { SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { @@ -27,7 +27,7 @@ // The actual clock used for the system time returned by glXGetSyncValuesOML // is unspecified. In practice, the clock used is likely to be either // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the -@@ -159,7 +159,7 @@ bool SyncControlVSyncProvider::SupportGetVSyncParamete +@@ -159,7 +159,7 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva } bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.h index 739efdc1ef59..b01e52ec927a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.h.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/ui/gl/sync_control_vsync_provider.h @@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv bool SupportGetVSyncParametersIfAvailable() const override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc index 2b77580ffa10..5e60d9bccb3f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gtk/gtk_compat.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gtk/gtk_compat.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/ui/gtk/gtk_compat.cc -@@ -62,27 +62,47 @@ void* GetLibGio() { +@@ -62,27 +62,47 @@ auto DlCast(void* symbol) { } void* GetLibGio() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc index 5586e275d2d2..b6194b735755 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc -@@ -400,7 +400,7 @@ void PrintDialogGtk::ShowDialog( +@@ -403,7 +403,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc index 960fdf283f6f..0a3f4489658f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc @@ -118,7 +118,7 @@ void MessagePopupView::Show() { params.z_order = ui::ZOrderLevel::kFloatingWindow; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h index 45452b56d68d..dac2cd783482 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/native_theme/native_theme.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/native_theme/native_theme.h.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/ui/native_theme/native_theme.h @@ -59,7 +59,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc index e261d5a4fabd..9f5cbc157524 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/native_theme/native_theme_base.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/native_theme/native_theme_base.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ui/native_theme/native_theme_base.cc -@@ -269,7 +269,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -273,7 +273,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc index 5e1937a31e6f..837f0774b9d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/common/egl_util.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/ozone/common/egl_util.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/ui/ozone/common/egl_util.cc -@@ -26,9 +26,9 @@ const base::FilePath::CharType kDefaultEglSoname[] = +@@ -26,9 +26,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = FILE_PATH_LITERAL("libGLESv2.so"); #else // BUILDFLAG(IS_FUCHSIA) const base::FilePath::CharType kDefaultEglSoname[] = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc index 356fe45539e0..8e2195dfa204 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc @@ -34,7 +34,7 @@ #include "ui/ozone/platform/headless/headless_window_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" #endif -@@ -282,7 +282,7 @@ HeadlessSurfaceFactory::CreateVulkanImplementation( +@@ -281,7 +281,7 @@ std::unique_ptr<gpu::VulkanImplementation> HeadlessSurfaceFactory::CreateVulkanImplementation( bool use_swiftshader, bool allow_protected_memory) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc index e036732d217b..5bd7e902a72e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc @@ -102,7 +102,7 @@ class OzonePlatformHeadless : public OzonePlatform { } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc index 431bb3df0963..33e247782197 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc @@ -155,7 +155,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc index e3acb903a115..f4a8fa73c518 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc @@ -38,7 +38,11 @@ bool VulkanImplementationWayland::InitializeVulkanInst diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc new file mode 100644 index 000000000000..8ee267a44110 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc +@@ -448,7 +448,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur + const bool did_active_change = is_active_ != window_states.is_activated; + is_active_ = window_states.is_activated; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // The tiled state affects the window geometry, so apply it here. + if (window_states.tiled_edges != tiled_state_) { + // This configure changes the decoration insets. We should adjust the diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h new file mode 100644 index 000000000000..8ae031564f3a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h +@@ -250,7 +250,7 @@ class WaylandToplevelWindow : public WaylandWindow, + // Contains the previous state of the window. + PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Contains the current state of the tiled edges. + WindowTiledEdges tiled_state_; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h new file mode 100644 index 000000000000..4dd51dee4908 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-03-09 06:31:50 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h +@@ -231,7 +231,7 @@ class WaylandWindow : public PlatformWindow, + bool is_snapped_primary = false; + bool is_snapped_secondary = false; + bool is_floated = false; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + WindowTiledEdges tiled_edges; + #endif + }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc new file mode 100644 index 000000000000..d46e1bcac45c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc +@@ -272,7 +272,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel( + CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), + }; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + if (xdg_toplevel_get_version(xdg_toplevel) >= + XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) { + // All four tiled states have the same since version, so it is enough to diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc new file mode 100644 index 000000000000..223bac5db10c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc +@@ -71,7 +71,7 @@ + #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" + #endif + +@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform, + + supported_buffer_formats_ = + connection_->buffer_manager_host()->GetSupportedBufferFormats(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + linux_ui_delegate_ = + std::make_unique<LinuxUiDelegateWayland>(connection_.get()); + #endif +@@ -470,7 +470,7 @@ class OzonePlatformWayland : public OzonePlatform, + DrmRenderNodePathFinder path_finder_; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<LinuxUiDelegateWayland> linux_ui_delegate_; + #endif + }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc index 1be1d1afecbb..77f27f258b14 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -195,7 +195,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc index 1169cae29714..4e62f56938ea 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_vulkan__implementation__x11.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2022-03-25 21:59:56 UTC +++ src/3rdparty/chromium/ui/ozone/platform/x11/vulkan_implementation_x11.cc @@ -58,7 +58,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h index 59a8aea742e5..69ac9d2ee115 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/public/ozone_platform.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/ozone/public/ozone_platform.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/ui/ozone/public/ozone_platform.h @@ -144,7 +144,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h index 7bf49c085e69..eb6a843cf90f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h @@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind MOCK_METHOD2(OnWindowStateChanged, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc index a64cd5090dd4..3e295b22fc60 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc -@@ -16,7 +16,7 @@ PlatformWindowDelegate::~PlatformWindowDelegate() = de +@@ -29,7 +29,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def PlatformWindowDelegate::~PlatformWindowDelegate() = default; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h index 8ae97161299e..6c4c24b12e2f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h -@@ -96,7 +96,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -130,7 +130,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h index 9b3cbe6590e3..3e5bc7e07f31 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h -@@ -56,7 +56,7 @@ class ScenicWindowDelegate; +@@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd index 13f32446fcba..0a0f3587a067 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/app_locale_settings.grd.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/app_locale_settings.grd.orig 2022-07-22 17:30:31 UTC +++ src/3rdparty/chromium/ui/strings/app_locale_settings.grd @@ -218,7 +218,7 @@ 75% diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb index 7bb3c9deb094..71e8022b2a30 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_bn.xtb.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_bn.xtb.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_bn.xtb @@ -10,7 +10,7 @@ <translation id="IDS_WEB_FONT_FAMILY">Vrinda</translation> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb index 3b4495b5c200..342fe1653a3c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ja.xtb.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ja.xtb.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ja.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb index b53a3bc08fc1..07d66a247845 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ko.xtb.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ko.xtb.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ko.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb index 960304e2bc21..9fbf0f264e95 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ml.xtb.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ml.xtb.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ml.xtb @@ -9,7 +9,7 @@ <translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,AnjaliOldLipi,Rachana,Kartika</translation> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb index 7e537f24a84c..4ce623f14532 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_th.xtb.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_th.xtb.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_th.xtb @@ -6,7 +6,7 @@ <translation id="IDS_WEB_FONT_FAMILY">Tahoma,sans-serif</translation> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb index 8b4edd0def82..02173dbb3aa4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-CN.xtb.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-CN.xtb.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-CN.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb index 9dd766cc0d52..de3480d2f9ab 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-TW.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> @@ -6,6 +6,6 @@ </if> -<if expr="is_linux"> +<if expr="is_posix"> - <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> + <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK TC, WenQuanYi Zen Hei, sans-serif</translation> </if> <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc index b22ca0cbb2a1..9f7c18790a9d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/controls/prefix_selector.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/controls/prefix_selector.cc.orig 2022-09-24 10:57:32 UTC +++ src/3rdparty/chromium/ui/views/controls/prefix_selector.cc @@ -174,7 +174,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h index 2bbd090fcecf..d515d51dbdc9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/controls/prefix_selector.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/controls/prefix_selector.h.orig 2022-08-31 12:19:35 UTC +++ src/3rdparty/chromium/ui/views/controls/prefix_selector.h @@ -83,7 +83,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp ukm::SourceId GetClientSourceForMetrics() const override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc index 5377705b5035..aab08dfe6cb7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc -@@ -71,7 +71,7 @@ +@@ -74,7 +74,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" #endif -@@ -164,7 +164,7 @@ bool IsControlKeyModifier(int flags) { +@@ -168,7 +168,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -707,7 +707,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -851,7 +851,7 @@ bool Textfield::SkipDefaultKeyEventProcessing(const ui +@@ -878,7 +878,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1721,7 +1721,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1831,7 +1831,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2220,14 +2220,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2344,14 +2344,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h index 9bb8855fcd43..a18da2326123 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.h @@ -42,7 +42,7 @@ #include "ui/views/view.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -448,7 +448,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -450,7 +450,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc index 5ffde5157e09..658dfa312d5e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc -@@ -53,7 +53,7 @@ bool CanUseTranslucentTooltipWidget() { +@@ -51,7 +51,7 @@ constexpr int kVerticalPaddingBottom = 5; bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc index 6c93c10fba91..767a55e6f2b7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/views/examples/widget_example.cc -@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -49,7 +49,7 @@ void WidgetExample::CreateExampleView(View* container) modal_button->SetCallback( base::BindRepeating(&WidgetExample::CreateDialogWidget, base::Unretained(this), modal_button, true)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc index ff6d14e25ae6..01f65e8da5fa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/views/focus/focus_manager.cc -@@ -622,7 +622,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -625,7 +625,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -639,7 +639,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -642,7 +642,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc index bc6fdb1ddd2f..ea2b48192249 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/ui/views/style/platform_style.cc @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" @@ -9,16 +9,16 @@ #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" #endif -@@ -52,7 +52,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = +@@ -50,7 +50,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus + // Linux clips bubble windows that extend outside their parent window + // bounds. const bool PlatformStyle::kAdjustBubbleIfOffscreen = - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) false; #else true; -@@ -60,7 +60,7 @@ std::unique_ptr<ScrollBar> PlatformStyle::CreateScroll +@@ -58,7 +58,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = // static std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc index bf01913cac73..90dc74c82797 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.cc @@ -95,7 +95,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h index 61c0241ad7de..ee58ed921e7d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.h @@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc new file mode 100644 index 000000000000..c60c14fcaaa5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-01-11 09:17:16 UTC ++++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc +@@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd + return drag_operation_; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void DesktopDragDropClientOzone::UpdateDragImage(const gfx::ImageSkia& image, + const gfx::Vector2d& offset) { + DCHECK(drag_handler_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h index 8809f6450c71..b37181bdfb26 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h -@@ -68,7 +68,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone // The offset of |drag_widget_| relative to the mouse position. gfx::Vector2d offset; @@ -9,3 +9,12 @@ // The last received drag location. The drag widget is moved asynchronously // so its position is updated when the UI thread has time for that. When // the first change to the location happens, a call to UpdateDragWidget() +@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone + const gfx::Point& root_location, + int allowed_operations, + ui::mojom::DragEventSource source) override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void UpdateDragImage(const gfx::ImageSkia& image, + const gfx::Vector2d& offset) override; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc index 73d6973ad26e..7abf08fef0eb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc @@ -25,7 +25,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF widget); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 9fab196c8f52..27dde6a0455b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -329,7 +329,7 @@ DesktopWindowTreeHostPlatform::CreateDragDropClient() +@@ -329,7 +329,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1017,7 +1017,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1039,7 +1039,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc index 5ebcdea09038..73ca48fa28fb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc -@@ -22,7 +22,7 @@ +@@ -21,7 +21,7 @@ #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/native_frame_view.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc index 7cc03a0114db..90f4d3025dd4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/ui/views/widget/widget.cc -@@ -50,7 +50,7 @@ +@@ -52,7 +52,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -1871,7 +1871,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1989,7 +1989,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h index 62760152fc54..84a4e98c1e40 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/widget/widget.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/widget/widget.h.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/ui/views/widget/widget.h -@@ -402,7 +402,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -408,7 +408,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid // If set, the widget was created in headless mode. bool headless_mode = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc index 8fb5918bb9a1..351cc1de60db 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2022-10-24 13:33:33 UTC +++ src/3rdparty/chromium/ui/views/window/custom_frame_view.cc @@ -266,7 +266,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc index 841eb3a55e2b..5afcd6af4470 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/ui/views/window/dialog_delegate.cc -@@ -79,7 +79,7 @@ bool DialogDelegate::CanSupportCustomFrame(gfx::Native +@@ -73,7 +73,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc index d16c5dec534e..4f644ce8b9bc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig 2022-02-28 16:54:41 UTC +++ src/3rdparty/chromium/ui/views/window/frame_background.cc @@ -110,7 +110,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv int width) const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn index a5b89f017cc8..14c7a8d8a55c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/v8/BUILD.gn.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/BUILD.gn.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/v8/BUILD.gn -@@ -1243,6 +1243,14 @@ config("toolchain") { - } else if (target_os == "win") { +@@ -1305,6 +1305,14 @@ config("toolchain") { + } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] - defines += [ "V8_TARGET_OS_WIN" ] + defines += [ "V8_TARGET_OS_CHROMEOS" ] + } else if (target_os == "openbsd") { + defines += [ "V8_HAVE_TARGET_OS" ] + defines += [ "V8_TARGET_OS_OPENBSD" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5518,7 +5526,7 @@ v8_component("v8_libbase") { +@@ -5777,7 +5785,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5529,6 +5537,18 @@ v8_component("v8_libbase") { +@@ -5788,6 +5796,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h index 0d7dccdc516d..3e0eecb4313f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/include/v8-internal.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/include/v8-internal.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/v8/include/v8-internal.h -@@ -174,7 +174,7 @@ using SandboxedPointer_t = Address; +@@ -176,7 +176,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h index edcd8ac5693f..c7ec1607455b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h @@ -1,24 +1,24 @@ ---- src/3rdparty/chromium/v8/include/v8config.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/include/v8config.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/v8/include/v8config.h -@@ -183,6 +183,8 @@ path. Add it with -I<path> to the command line +@@ -184,6 +184,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ + && !defined(V8_TARGET_OS_OPENBSD) \ + && !defined(V8_TARGET_OS_FREEBSD) \ && !defined(V8_TARGET_OS_MACOS) \ - && !defined(V8_TARGET_OS_WIN) - # error No known target OS defined. -@@ -194,6 +196,8 @@ path. Add it with -I<path> to the command line + && !defined(V8_TARGET_OS_WIN) \ + && !defined(V8_TARGET_OS_CHROMEOS) +@@ -196,6 +198,8 @@ path. Add it with -I<path> to the command line || defined(V8_TARGET_OS_FUCHSIA) \ || defined(V8_TARGET_OS_IOS) \ || defined(V8_TARGET_OS_LINUX) \ + || defined(V8_TARGET_OS_OPENBSD) \ + || defined(V8_TARGET_OS_FREEBSD) \ || defined(V8_TARGET_OS_MACOS) \ - || defined(V8_TARGET_OS_WIN) - # error A target OS is defined but V8_HAVE_TARGET_OS is unset. -@@ -214,6 +218,16 @@ path. Add it with -I<path> to the command line + || defined(V8_TARGET_OS_WIN) \ + || defined(V8_TARGET_OS_CHROMEOS) +@@ -217,6 +221,16 @@ path. Add it with -I<path> to the command line #ifdef V8_OS_LINUX # define V8_TARGET_OS_LINUX diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc index 8e8b5be0d2fb..3254a55f7306 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/api/api.cc.orig 2023-07-07 17:40:32 UTC +--- src/3rdparty/chromium/v8/src/api/api.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/chromium/v8/src/api/api.cc -@@ -140,7 +140,7 @@ +@@ -142,7 +142,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #if V8_ENABLE_WEBASSEMBLY -@@ -6217,7 +6217,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6354,7 +6354,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h index 7f180c40d2a3..446117838b0a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/base/atomicops.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/base/atomicops.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/v8/src/base/atomicops.h -@@ -57,10 +57,10 @@ using Atomic32 = int32_t; +@@ -57,10 +57,10 @@ using Atomic64 = SbAtomic64; using Atomic8 = char; using Atomic16 = int16_t; using Atomic32 = int32_t; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h index 50e64192b7c8..ec0ea5f43489 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/v8/src/base/platform/memory.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/base/platform/memory.h.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/v8/src/base/platform/memory.h @@ -19,11 +19,11 @@ #if V8_OS_DARWIN #include <malloc/malloc.h> -#else // !V8_OS_DARWIN -+#elif !V8_OS_BSD // !V8_OS_DARWIN ++#elif !V8_OS_BSD #include <malloc.h> #endif // !V8_OS_DARWIN --#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN -+#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_BSD) || V8_OS_WIN +-#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_BSD) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 - #endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN + #endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc index eb34b5eb35c5..3c3165a63310 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc @@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache() { return new PosixDefaultTimezoneCache(); @@ -20,7 +20,7 @@ lib_name = std::string(path); } result.push_back(SharedLibraryAddress( -+#if defined(__i386__) || defined(__arm__) || defined(OS_FREEBSD) ++#if defined(__i386__) || defined(OS_FREEBSD) + lib_name, static_cast<uintptr_t>(map->kve_start), + static_cast<uintptr_t>(map->kve_end))); +#else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc index f4772c292363..3e8509780585 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc @@ -6,6 +6,7 @@ // POSIX-compatible parts, the implementation is in platform-posix.cc. @@ -8,7 +8,7 @@ #include <semaphore.h> #include <signal.h> #include <stdlib.h> -@@ -121,6 +122,17 @@ void OS::AdjustSchedulingParams() {} +@@ -121,6 +122,17 @@ void OS::SignalCodeMovingGC() { } void OS::AdjustSchedulingParams() {} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc index 4a37a3b17f47..a6ab51a09133 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig 2023-03-09 06:31:50 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc @@ -53,7 +53,7 @@ #if V8_OS_DARWIN @@ -42,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -650,7 +658,7 @@ bool OS::HasLazyCommits() { +@@ -661,7 +669,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1227,7 +1235,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1238,7 +1246,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_small-vector.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_small-vector.h index 3db3b819247e..1432a9e91c60 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_small-vector.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_small-vector.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/base/small-vector.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/base/small-vector.h.orig 2022-10-25 08:25:05 UTC +++ src/3rdparty/chromium/v8/src/base/small-vector.h -@@ -22,7 +22,7 @@ class SmallVector { +@@ -22,7 +22,7 @@ template <typename T, size_t kSize, typename Allocator class SmallVector { // Currently only support trivially copyable and trivially destructible data // types, as it uses memcpy to copy elements and never calls destructors. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc index 55ca989421cd..41b13e8453b8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_sys-info.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/base/sys-info.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/base/sys-info.cc.orig 2022-02-07 13:39:41 UTC +++ src/3rdparty/chromium/v8/src/base/sys-info.cc -@@ -38,7 +38,7 @@ int SysInfo::NumberOfProcessors() { +@@ -38,7 +38,7 @@ namespace base { // static int SysInfo::NumberOfProcessors() { #if V8_OS_OPENBSD diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc index 2dbe37762323..080323f60714 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-11-30 08:12:58 UTC +++ src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc @@ -3034,6 +3034,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); @@ -8,7 +8,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) { InstructionCode op = kIA32I8x16Swizzle; -@@ -3087,6 +3088,9 @@ void InstructionSelector::VisitF32x4Pmin(Node* node) { +@@ -3087,6 +3088,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node void InstructionSelector::VisitF32x4Pmin(Node* node) { VisitMinOrMax(this, node, kIA32Minps, true); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc index 6cb7fc3b3fef..6b2abb31d0dd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc @@ -30,7 +30,7 @@ #include "src/common/assert-scope.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h index 3d2559f11cc2..7a8cbe25963e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.h.orig 2022-06-17 14:20:10 UTC +++ src/3rdparty/chromium/v8/src/diagnostics/perf-jit.h @@ -31,7 +31,7 @@ #include "include/v8config.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc new file mode 100644 index 000000000000..25ea084c2370 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc @@ -0,0 +1,25 @@ +--- src/3rdparty/chromium/v8/src/execution/isolate.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/v8/src/execution/isolate.cc +@@ -146,6 +146,10 @@ + #include "src/execution/simulator-base.h" + #endif + ++#if defined(V8_OS_OPENBSD) ++#include <sys/mman.h> ++#endif ++ + extern "C" const uint8_t v8_Default_embedded_blob_code_[]; + extern "C" uint32_t v8_Default_embedded_blob_code_size_; + extern "C" const uint8_t v8_Default_embedded_blob_data_[]; +@@ -3849,6 +3853,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { + uint32_t code_size = DefaultEmbeddedBlobCodeSize(); + const uint8_t* data = DefaultEmbeddedBlobData(); + uint32_t data_size = DefaultEmbeddedBlobDataSize(); ++ ++#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) ++ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), ++ code_size, PROT_READ | PROT_EXEC); ++#endif + + if (StickyEmbeddedBlobCode() != nullptr) { + base::MutexGuard guard(current_embedded_blob_refcount_mutex_.Pointer()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc index c2413fe23a32..3825d4bd6f8f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/sandbox/sandbox.cc.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/sandbox/sandbox.cc.orig 2023-02-08 09:03:45 UTC +++ src/3rdparty/chromium/v8/src/sandbox/sandbox.cc -@@ -49,7 +49,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -46,7 +46,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc new file mode 100644 index 000000000000..bb21569c146b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc +@@ -142,6 +142,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { + return EmbeddedTargetOs::kWin; + } else if (string == "starboard") { + return EmbeddedTargetOs::kStarboard; ++ } else if (string == "openbsd") { ++ return EmbeddedTargetOs::kOpenBSD; + } else { + return EmbeddedTargetOs::kGeneric; + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.h new file mode 100644 index 000000000000..424977f754e8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-base.h @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2023-02-08 09:03:45 UTC ++++ src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h +@@ -31,6 +31,7 @@ enum class EmbeddedTargetOs { + kMac, + kWin, + kStarboard, ++ kOpenBSD, + kGeneric, // Everything not covered above falls in here. + }; + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc new file mode 100644 index 000000000000..956817daf095 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc @@ -0,0 +1,42 @@ +--- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-04-05 11:05:06 UTC ++++ src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc +@@ -9,6 +9,10 @@ + + #include "src/objects/code.h" + ++#if V8_OS_OPENBSD ++#include <sys/param.h> ++#endif ++ + namespace v8 { + namespace internal { + +@@ -35,6 +39,10 @@ const char* DirectiveAsString(DataDirective directive) + void PlatformEmbeddedFileWriterGeneric::SectionText() { + if (target_os_ == EmbeddedTargetOs::kChromeOS) { + fprintf(fp_, ".section .text.hot.embedded\n"); ++#if !defined(V8_TARGET_ARCH_IA32) ++ } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) { ++ fprintf(fp_, ".section .openbsd.mutable,\"a\"\n"); ++#endif + } else { + fprintf(fp_, ".section .text\n"); + } +@@ -66,6 +74,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli + // On these architectures and platforms, we remap the builtins, so need these + // to be aligned on a page boundary. + fprintf(fp_, ".balign 4096\n"); ++#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) ++ fprintf(fp_, ".balign %d\n", PAGE_SIZE); + #elif V8_TARGET_ARCH_X64 + // On x64 use 64-bytes code alignment to allow 64-bytes loop header alignment. + static_assert(64 >= kCodeAlignment); +@@ -86,6 +96,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz + (V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64) + // Since the builtins are remapped, need to pad until the next page boundary. + fprintf(fp_, ".balign 4096\n"); ++#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) ++ fprintf(fp_, ".balign %d\n", PAGE_SIZE); + #endif + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc index 8c88b50ed733..dc0542162ea5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig 2023-01-11 09:17:16 UTC +++ src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc -@@ -53,6 +53,8 @@ namespace trap_handler { +@@ -55,6 +55,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg #elif V8_OS_FREEBSD #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -62,8 +64,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { +@@ -64,8 +66,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { // si_code at its default of 0 for signals that don’t originate in hardware. // The other conditions are only relevant for Linux. return info->si_code > 0 && info->si_code != SI_USER && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h index cd178e4f2324..07e418789dbc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h -@@ -13,7 +13,7 @@ namespace trap_handler { +@@ -13,7 +13,7 @@ namespace v8 { namespace internal { namespace trap_handler { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h index 41d8c7a2d106..d9d610892469 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h.orig 2022-04-21 18:48:31 UTC +++ src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h @@ -20,7 +20,7 @@ namespace trap_handler { // X64 on Linux, Windows, MacOS, FreeBSD. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index 1bc30bfee877..174870543e59 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-03-28 19:45:02 UTC +--- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-04-05 11:05:06 UTC +++ src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -432,7 +432,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -424,7 +424,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, LoadType type, uint32_t* protected_load_pc, - bool /* is_load_mem */, bool i64_offset, + bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -512,7 +512,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -504,7 +504,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,84 +18,111 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -581,7 +581,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -573,7 +573,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, - LoadType type, LiftoffRegList /* pinned */) { + LoadType type, LiftoffRegList /* pinned */, + bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { - Load(dst, src_addr, offset_reg, offset_imm, type, nullptr, true); -@@ -600,7 +600,7 @@ void LiftoffAssembler::AtomicStore(Register dst_addr, +@@ -593,7 +593,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister src, + uintptr_t offset_imm, LiftoffRegister src, - StoreType type, LiftoffRegList pinned) { + StoreType type, LiftoffRegList pinned, + bool /* i64_offset */) { DCHECK_NE(offset_reg, no_reg); - DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -940,7 +940,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -663,7 +663,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; + + inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, + Register dst_addr, Register offset_reg, +- uint32_t offset_imm, ++ uintptr_t offset_imm, + LiftoffRegister value, + LiftoffRegister result, StoreType type) { + DCHECK_EQ(value, result); +@@ -730,7 +730,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble + } + + inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, +- Register offset_reg, uint32_t offset_imm, ++ Register offset_reg, uintptr_t offset_imm, + LiftoffRegister value, LiftoffRegister result, + StoreType type) { + DCHECK_EQ(value, result); +@@ -842,7 +842,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino + } + + inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, +- Register offset_reg, uint32_t offset_imm, ++ Register offset_reg, uintptr_t offset_imm, + LiftoffRegister value, LiftoffRegister result) { + // We need {ebx} here, which is the root register. As the root register it + // needs special treatment. As we use {ebx} directly in the code below, we +@@ -934,7 +934,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister value, + uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type) { + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { - liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg, -@@ -953,7 +953,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -948,7 +948,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister value, + uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type) { + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { - liftoff::AtomicBinop64(this, liftoff::kSub, dst_addr, offset_reg, -@@ -965,7 +965,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -961,7 +961,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister value, + uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type) { + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { - liftoff::AtomicBinop64(this, liftoff::kAnd, dst_addr, offset_reg, -@@ -978,7 +978,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -975,7 +975,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister value, + uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type) { + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { - liftoff::AtomicBinop64(this, liftoff::kOr, dst_addr, offset_reg, offset_imm, -@@ -991,7 +991,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -989,7 +989,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister value, + uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type) { + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { - liftoff::AtomicBinop64(this, liftoff::kXor, dst_addr, offset_reg, -@@ -1004,7 +1004,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1003,7 +1003,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, - uint32_t offset_imm, + uintptr_t offset_imm, LiftoffRegister value, - LiftoffRegister result, StoreType type) { - if (type.value() == StoreType::kI64Store) { -@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicCompareExchange( + LiftoffRegister result, StoreType type, + bool /* i64_offset */) { +@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( - Register dst_addr, Register offset_reg, uint32_t offset_imm, + Register dst_addr, Register offset_reg, uintptr_t offset_imm, LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result, - StoreType type) { + StoreType type, bool /* i64_offset */) { // We expect that the offset has already been added to {dst_addr}, and no diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py index 29e79e0b58d9..48b5966ed3c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_tools_run.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/tools/run.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/tools/run.py.orig 2022-05-19 14:06:27 UTC +++ src/3rdparty/chromium/v8/tools/run.py -@@ -9,7 +9,7 @@ import sys +@@ -9,7 +9,7 @@ scripts.""" import subprocess import sys diff --git a/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py b/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py index f943dc7dfa8c..bbed1c867e6f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_gn_build_gen.py @@ -1,4 +1,4 @@ ---- src/3rdparty/gn/build/gen.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/gn/build/gen.py.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/gn/build/gen.py @@ -92,6 +92,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] -@@ -291,7 +297,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -294,7 +300,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -514,6 +520,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -531,6 +537,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc index bc26ec986543..5cd8826324eb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/gn/src/base/files/file_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/gn/src/base/files/file_posix.cc.orig 2023-08-16 19:50:41 UTC +++ src/3rdparty/gn/src/base/files/file_posix.cc -@@ -369,7 +369,7 @@ bool File::Flush() { +@@ -371,7 +371,7 @@ bool File::Flush() { bool File::Flush() { DCHECK(IsValid()); diff --git a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt index 8f1ef6878762..2c1eeafc4734 100644 --- a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt @@ -1,4 +1,4 @@ ---- src/core/CMakeLists.txt.orig 2023-07-07 17:40:32 UTC +--- src/core/CMakeLists.txt.orig 2023-08-16 19:50:41 UTC +++ src/core/CMakeLists.txt @@ -20,7 +20,7 @@ add_subdirectory(tools) # TOOLCHAIN SETUP @@ -9,7 +9,7 @@ setup_toolchains() endif() -@@ -399,7 +399,7 @@ foreach(arch ${archs}) +@@ -405,7 +405,7 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_embedded_build ) @@ -18,16 +18,16 @@ list(APPEND gnArgArg use_gtk=false # GTK toolkit bindings use_qt=false # Qt5 toolkit bindings -@@ -410,7 +410,7 @@ foreach(arch ${archs}) +@@ -415,7 +415,7 @@ foreach(arch ${archs}) + use_bundled_fontconfig=false use_glib=false use_bluez=false - use_vaapi=false - use_udev=true + use_udev=false is_cfi=false use_ozone=true ozone_auto_platforms=false -@@ -465,6 +465,10 @@ foreach(arch ${archs}) +@@ -474,6 +474,10 @@ foreach(arch ${archs}) extend_gn_list(gnArgArg ARGS use_pulseaudio CONDITION QT_FEATURE_webengine_system_pulseaudio @@ -37,4 +37,4 @@ + CONDITION QT_FEATURE_webengine_system_sndio ) extend_gn_list(gnArgArg - ARGS ozone_platform_x11 use_xkbcommon + ARGS use_vaapi diff --git a/www/qt6-webengine/files/patch-src_core_api_configure.cmake b/www/qt6-webengine/files/patch-src_core_api_configure.cmake index 654b8ebcb7fc..a80e138141a7 100644 --- a/www/qt6-webengine/files/patch-src_core_api_configure.cmake +++ b/www/qt6-webengine/files/patch-src_core_api_configure.cmake @@ -1,4 +1,4 @@ ---- src/core/api/configure.cmake.orig 2023-07-07 17:40:32 UTC +--- src/core/api/configure.cmake.orig 2023-09-21 14:52:09 UTC +++ src/core/api/configure.cmake @@ -10,6 +10,7 @@ if(NOT QT_CONFIGURE_RUNNING) if(PkgConfig_FOUND) @@ -7,8 +7,8 @@ + pkg_check_modules(SNDIO libsndio) pkg_check_modules(XDAMAGE xdamage) pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET) - if(NOT GIO_FOUND) -@@ -78,6 +79,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE + pkg_check_modules(GBM gbm) +@@ -84,6 +85,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND (CUPS_FOUND OR WIN32) ) @@ -20,14 +20,35 @@ qt_feature("webengine-pepper-plugins" PRIVATE LABEL "Pepper Plugins" PURPOSE "Enables use of Pepper plugins." -@@ -189,6 +195,10 @@ qt_configure_add_summary_entry( +@@ -163,7 +169,7 @@ qt_feature("webengine-vaapi" PRIVATE + LABEL "VA-API support" + PURPOSE "Enables support for VA-API hardware acceleration" + AUTODETECT GBM_FOUND AND LIBVA_FOUND AND QT_FEATURE_vulkan +- CONDITION LINUX ++ CONDITION UNIX + ) + # internal testing feature + qt_feature("webengine-system-poppler" PRIVATE +@@ -198,15 +204,19 @@ qt_configure_add_summary_entry( + ) + qt_configure_add_summary_entry( + ARGS "webengine-vaapi" +- CONDITION LINUX ++ CONDITION UNIX + ) + qt_configure_add_summary_entry( + ARGS "webengine-system-alsa" +- CONDITION LINUX ++ CONDITION UNIX ) qt_configure_add_summary_entry( ARGS "webengine-system-pulseaudio" +- CONDITION LINUX + CONDITION UNIX +) +qt_configure_add_summary_entry( + ARGS "webengine-system-sndio" - CONDITION UNIX ++ CONDITION UNIX ) + qt_configure_add_summary_entry(ARGS "webengine-v8-context-snapshot") qt_configure_end_summary_section() # end of "Qt WebEngineCore" section diff --git a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt index d8bf271bb7e4..02f80b1dfddd 100644 --- a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt @@ -1,15 +1,15 @@ ---- src/pdf/CMakeLists.txt.orig 2023-07-07 17:40:32 UTC +--- src/pdf/CMakeLists.txt.orig 2023-10-03 19:49:54 UTC +++ src/pdf/CMakeLists.txt -@@ -70,7 +70,7 @@ add_dependencies(docs generate_pdf_attributions) +@@ -71,7 +71,7 @@ add_dependencies(docs generate_pdf_attributions) # TOOLCHAIN SETUP ## --if(LINUX) -+if(LINUX OR FREEBSD) +-if(LINUX OR MINGW) ++if(LINUX OR MINGW OR FREEBSD) setup_toolchains() endif() -@@ -128,7 +128,7 @@ foreach(arch ${archs}) +@@ -134,7 +134,7 @@ foreach(arch ${archs}) strip_absolute_paths_from_debug_symbols=false ) diff --git a/www/qt6-webengine/pkg-plist b/www/qt6-webengine/pkg-plist index 71da1b69c673..9dfd1b4145ab 100644 --- a/www/qt6-webengine/pkg-plist +++ b/www/qt6-webengine/pkg-plist @@ -2,14 +2,15 @@ %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdffile_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflink_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchmodel_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfselection_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdf-config_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdfexports_p.h %%QT_INCDIR%%/QtPdf/QPdfBookmarkModel %%QT_INCDIR%%/QtPdf/QPdfDocument %%QT_INCDIR%%/QtPdf/QPdfDocumentRenderOptions %%QT_INCDIR%%/QtPdf/QPdfLink +%%QT_INCDIR%%/QtPdf/QPdfLinkModel %%QT_INCDIR%%/QtPdf/QPdfPageNavigator %%QT_INCDIR%%/QtPdf/QPdfPageRenderer %%QT_INCDIR%%/QtPdf/QPdfSearchModel @@ -21,11 +22,13 @@ %%QT_INCDIR%%/QtPdf/qpdfdocument.h %%QT_INCDIR%%/QtPdf/qpdfdocumentrenderoptions.h %%QT_INCDIR%%/QtPdf/qpdflink.h +%%QT_INCDIR%%/QtPdf/qpdflinkmodel.h %%QT_INCDIR%%/QtPdf/qpdfpagenavigator.h %%QT_INCDIR%%/QtPdf/qpdfpagerenderer.h %%QT_INCDIR%%/QtPdf/qpdfsearchmodel.h %%QT_INCDIR%%/QtPdf/qpdfselection.h %%QT_INCDIR%%/QtPdf/qtpdf-config.h +%%QT_INCDIR%%/QtPdf/qtpdfexports.h %%QT_INCDIR%%/QtPdf/qtpdfglobal.h %%QT_INCDIR%%/QtPdf/qtpdfversion.h %%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfbookmarkmodel_p.h @@ -40,11 +43,14 @@ %%QT_INCDIR%%/QtPdfQuick/QtPdfQuickDepends %%QT_INCDIR%%/QtPdfQuick/QtPdfQuickVersion %%QT_INCDIR%%/QtPdfQuick/qtpdfquickversion.h +%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfpageselector_p.h %%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfview_p.h +%%QT_INCDIR%%/QtPdfWidgets/QPdfPageSelector %%QT_INCDIR%%/QtPdfWidgets/QPdfView %%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgets %%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsDepends %%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsVersion +%%QT_INCDIR%%/QtPdfWidgets/qpdfpageselector.h %%QT_INCDIR%%/QtPdfWidgets/qpdfview.h %%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsglobal.h %%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsversion.h @@ -53,6 +59,7 @@ %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecontextmenurequest_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecookiestore_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginedownloadrequest_p.h +%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineglobalsettings_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginehistory_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginenewwindowrequest_p.h @@ -69,6 +76,7 @@ %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFileSystemAccessRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFindTextResult %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFullScreenRequest +%%QT_INCDIR%%/QtWebEngineCore/QWebEngineGlobalSettings %%QT_INCDIR%%/QtWebEngineCore/QWebEngineHistory %%QT_INCDIR%%/QtWebEngineCore/QWebEngineHistoryItem %%QT_INCDIR%%/QtWebEngineCore/QWebEngineHistoryModel @@ -79,10 +87,6 @@ %%QT_INCDIR%%/QtWebEngineCore/QWebEngineNotification %%QT_INCDIR%%/QtWebEngineCore/QWebEnginePage %%QT_INCDIR%%/QtWebEngineCore/QWebEngineProfile -%%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineViewAccessible -%%QT_INCDIR%%/QtWebEngineQuick/qquickwebengine_accessible.h -%%QT_INCDIR%%/QtWebEngineQuick/render_widget_host_view_qt_delegate_quickwindow.h -%%QT_INCDIR%%/QtWebEngineQuick/ui_delegates_manager.h %%QT_INCDIR%%/QtWebEngineCore/QWebEngineQuotaRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineScript @@ -108,6 +112,7 @@ %%QT_INCDIR%%/QtWebEngineCore/qwebenginefilesystemaccessrequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginefindtextresult.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginefullscreenrequest.h +%%QT_INCDIR%%/QtWebEngineCore/qwebengineglobalsettings.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginehistory.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginehttprequest.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineloadinginfo.h @@ -148,26 +153,30 @@ %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qtwebenginequick-config_p.h %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qtwebenginequickglobal_p.h %%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineProfile +%%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineViewAccessible %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuick %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuickDepends %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuickVersion +%%QT_INCDIR%%/QtWebEngineQuick/qquickwebengine_accessible.h %%QT_INCDIR%%/QtWebEngineQuick/qquickwebengineprofile.h %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequick-config.h %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequickglobal.h %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequickversion.h +%%QT_INCDIR%%/QtWebEngineQuick/render_widget_host_view_qt_delegate_quickwindow.h +%%QT_INCDIR%%/QtWebEngineQuick/ui_delegates_manager.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/autofillpopupwidget_p.h -%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchhandlewidget_p.h -%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengineview_p.h +%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchhandlewidget_p.h +%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineView %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineViewAccessible %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgets %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsDepends %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsVersion -%%QT_INCDIR%%/QtWebEngineWidgets/qwebengine_accessible.h %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsglobal.h %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsversion.h +%%QT_INCDIR%%/QtWebEngineWidgets/qwebengine_accessible.h %%QT_INCDIR%%/QtWebEngineWidgets/qwebengineview.h lib/cmake/Qt6/FindGPerf.cmake lib/cmake/Qt6/FindGn.cmake @@ -372,6 +381,7 @@ libdata/pkgconfig/Qt6WebEngineWidgets.pc %%QT_DATADIR%%/resources/qtwebengine_resources.pak %%QT_DATADIR%%/resources/qtwebengine_resources_100p.pak %%QT_DATADIR%%/resources/qtwebengine_resources_200p.pak +%%QT_DATADIR%%/resources/v8_context_snapshot.bin %%QT_L10NDIR%%/qtwebengine_locales/am.pak %%QT_L10NDIR%%/qtwebengine_locales/ar.pak %%QT_L10NDIR%%/qtwebengine_locales/bg.pak diff --git a/www/qt6-websockets/Makefile b/www/qt6-websockets/Makefile index 84bd873d9cc6..29fe6e87ca91 100644 --- a/www/qt6-websockets/Makefile +++ b/www/qt6-websockets/Makefile @@ -1,5 +1,5 @@ PORTNAME= websockets -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 +USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 USE_QT= base declarative .include <bsd.port.mk> diff --git a/www/qt6-websockets/distinfo b/www/qt6-websockets/distinfo index 1ed009f2b3c4..12a65f3cb827 100644 --- a/www/qt6-websockets/distinfo +++ b/www/qt6-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931953 -SHA256 (KDE/Qt/6.5.3/qtwebsockets-everywhere-src-6.5.3.tar.xz) = 04e2ae17594d56cf2930c99dbd2a97eb88ff514b445c17ff7b86e8978fc7a7c3 -SIZE (KDE/Qt/6.5.3/qtwebsockets-everywhere-src-6.5.3.tar.xz) = 459696 +TIMESTAMP = 1697050317 +SHA256 (KDE/Qt/6.6.0/qtwebsockets-everywhere-src-6.6.0.tar.xz) = 2e05b15c0c6e82c484cf3a4a39a3e3e484a6c8f72bc31ee5cf615d52d07df30e +SIZE (KDE/Qt/6.6.0/qtwebsockets-everywhere-src-6.6.0.tar.xz) = 463624 diff --git a/www/qt6-webview/Makefile b/www/qt6-webview/Makefile index d0a7ecb4d350..45de0575c5d4 100644 --- a/www/qt6-webview/Makefile +++ b/www/qt6-webview/Makefile @@ -1,5 +1,5 @@ PORTNAME= webview -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -8,7 +8,7 @@ COMMENT= Qt component for displaying web content LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -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 positioning webchannel webengine diff --git a/www/qt6-webview/distinfo b/www/qt6-webview/distinfo index fa2718fa98a1..608c80fc79df 100644 --- a/www/qt6-webview/distinfo +++ b/www/qt6-webview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931955 -SHA256 (KDE/Qt/6.5.3/qtwebview-everywhere-src-6.5.3.tar.xz) = cf1cf14c9409aab9a904eb56e76a34cd98a447e6448dea47269f922b21e77149 -SIZE (KDE/Qt/6.5.3/qtwebview-everywhere-src-6.5.3.tar.xz) = 145556 +TIMESTAMP = 1697050319 +SHA256 (KDE/Qt/6.6.0/qtwebview-everywhere-src-6.6.0.tar.xz) = a5a48d9b5dfac60b66a737f844dc57de311de9d154fe10ccd8ec498506753392 +SIZE (KDE/Qt/6.6.0/qtwebview-everywhere-src-6.6.0.tar.xz) = 147528 diff --git a/www/qt6-webview/pkg-plist b/www/qt6-webview/pkg-plist index 898b6c0b809a..08c1fdc94cc7 100644 --- a/www/qt6-webview/pkg-plist +++ b/www/qt6-webview/pkg-plist @@ -50,7 +50,6 @@ lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickDependencies.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickTargets.cmake lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickVersionlessTargets.cmake -%%DEBUG%%%%QT_LIBDIR%%/libQt5WebView.so.%%FULLVER%%.debug %%QT_LIBDIR%%/libQt6WebView.prl %%QT_LIBDIR%%/libQt6WebView.so %%QT_LIBDIR%%/libQt6WebView.so.6 @@ -66,8 +65,6 @@ lib/cmake/Qt6WebViewQuick/Qt6WebViewQuickVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_webviewquick.pri %%QT_MKSPECDIR%%/modules/qt_lib_webviewquick_private.pri %%QT_PLUGINDIR%%/webview/libqtwebview_webengine.so -%%DEBUG%%%%QT_PLUGINDIR%%/webview/libqtwebview_webengine.so.debug -%%DEBUG%%%%QT_QMLDIR%%/QtWebView/libdeclarative_webview.so.debug %%QT_QMLDIR%%/QtWebView/libqtwebviewquickplugin.so %%QT_QMLDIR%%/QtWebView/plugins.qmltypes %%QT_QMLDIR%%/QtWebView/qmldir diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index c65f8d845c81..d38d2ed2ae12 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -182,6 +182,7 @@ SUBDIR += qt6-charts SUBDIR += qt6-datavis3d SUBDIR += qt6-declarative + SUBDIR += qt6-graphs SUBDIR += qt6-quick3d SUBDIR += qt6-quicktimeline SUBDIR += qt6-shadertools diff --git a/x11-toolkits/py-qt6-chart/distinfo b/x11-toolkits/py-qt6-chart/distinfo index 9611dae5966d..2a7e119613f9 100644 --- a/x11-toolkits/py-qt6-chart/distinfo +++ b/x11-toolkits/py-qt6-chart/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690218294 -SHA256 (PyQt6_Charts-6.5.0.tar.gz) = 6ff00f65b2517f99bf106ddd28c76f3ca344f91ecf5ba68191e20a2d90024962 -SIZE (PyQt6_Charts-6.5.0.tar.gz) = 41148 +TIMESTAMP = 1698899792 +SHA256 (PyQt6_Charts-6.6.0.tar.gz) = 14cc6e5d19cae80129524a42fa6332d0d5dada4282a9423425e6b9ae1b6bc56d +SIZE (PyQt6_Charts-6.6.0.tar.gz) = 41221 diff --git a/x11-toolkits/py-qt6-datavis3d/distinfo b/x11-toolkits/py-qt6-datavis3d/distinfo index 336c6ca6b0c8..798540481cbe 100644 --- a/x11-toolkits/py-qt6-datavis3d/distinfo +++ b/x11-toolkits/py-qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690490879 -SHA256 (PyQt6_DataVisualization-6.5.0.tar.gz) = 19b949abcc315b1fa9293ba5b8b66bbf694d2d3f84585edc78167473328df212 -SIZE (PyQt6_DataVisualization-6.5.0.tar.gz) = 209805 +TIMESTAMP = 1698900083 +SHA256 (PyQt6_DataVisualization-6.6.0.tar.gz) = 5ad62a0f9815eca3acdff1078cfc2c10f6542c1d5cfe53626c0015e854441479 +SIZE (PyQt6_DataVisualization-6.6.0.tar.gz) = 209892 diff --git a/x11-toolkits/qt6-charts/Makefile b/x11-toolkits/qt6-charts/Makefile index aba1cf54b7f2..a11d9cc188b5 100644 --- a/x11-toolkits/qt6-charts/Makefile +++ b/x11-toolkits/qt6-charts/Makefile @@ -1,5 +1,5 @@ PORTNAME= charts -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= x11-toolkits 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/x11-toolkits/qt6-charts/distinfo b/x11-toolkits/qt6-charts/distinfo index 755ad7e93772..d987a84c2be3 100644 --- a/x11-toolkits/qt6-charts/distinfo +++ b/x11-toolkits/qt6-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931959 -SHA256 (KDE/Qt/6.5.3/qtcharts-everywhere-src-6.5.3.tar.xz) = 4a9b800e0af5bfded97592aa5836cfd761bf4de1ada414a603951f021d752ed9 -SIZE (KDE/Qt/6.5.3/qtcharts-everywhere-src-6.5.3.tar.xz) = 4668456 +TIMESTAMP = 1697050324 +SHA256 (KDE/Qt/6.6.0/qtcharts-everywhere-src-6.6.0.tar.xz) = e6beabcdc70c7719818459d2b2db63d7b0b5adc5572b8802368b698f64292cf5 +SIZE (KDE/Qt/6.6.0/qtcharts-everywhere-src-6.6.0.tar.xz) = 4668892 diff --git a/x11-toolkits/qt6-datavis3d/Makefile b/x11-toolkits/qt6-datavis3d/Makefile index a03ab5aac17b..89dc21b0e7a9 100644 --- a/x11-toolkits/qt6-datavis3d/Makefile +++ b/x11-toolkits/qt6-datavis3d/Makefile @@ -1,5 +1,5 @@ PORTNAME= datavis3d -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= x11-toolkits 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/x11-toolkits/qt6-datavis3d/distinfo b/x11-toolkits/qt6-datavis3d/distinfo index 967ec7a48c54..4f28d7f7aef6 100644 --- a/x11-toolkits/qt6-datavis3d/distinfo +++ b/x11-toolkits/qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695931963 -SHA256 (KDE/Qt/6.5.3/qtdatavis3d-everywhere-src-6.5.3.tar.xz) = 11b6c0b06e18dcdfbc652ff185d3be16c034052d240c3befa917d3bb463dc061 -SIZE (KDE/Qt/6.5.3/qtdatavis3d-everywhere-src-6.5.3.tar.xz) = 3955304 +TIMESTAMP = 1697050328 +SHA256 (KDE/Qt/6.6.0/qtdatavis3d-everywhere-src-6.6.0.tar.xz) = c0489f6d9f0be9b45917d8e8c49f3a4a7521bf836abe85e4733b9003abd1599e +SIZE (KDE/Qt/6.6.0/qtdatavis3d-everywhere-src-6.6.0.tar.xz) = 3955580 diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile index c35c3ee67068..aabeae3edf6e 100644 --- a/x11-toolkits/qt6-declarative/Makefile +++ b/x11-toolkits/qt6-declarative/Makefile @@ -1,6 +1,5 @@ PORTNAME= declarative DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo index 940877b43bc1..e521515d3f9a 100644 --- a/x11-toolkits/qt6-declarative/distinfo +++ b/x11-toolkits/qt6-declarative/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1699221846 -SHA256 (KDE/Qt/6.5.3/qtdeclarative-everywhere-src-6.5.3.tar.xz) = 404dd6d2d206bb882ecd6622f0c708c9d6bd724a4d83776e13c49761c159d215 -SIZE (KDE/Qt/6.5.3/qtdeclarative-everywhere-src-6.5.3.tar.xz) = 34140352 -SHA256 (KDE/Qt/6.5.3/54059d0dffd1966c8a442b3675eb979c32c16cbe.patch) = 804de6136d8728bb725a37fad542de0c3b016f31cac29b86b1379205c9e6b744 -SIZE (KDE/Qt/6.5.3/54059d0dffd1966c8a442b3675eb979c32c16cbe.patch) = 1282 +TIMESTAMP = 1697050345 +SHA256 (KDE/Qt/6.6.0/qtdeclarative-everywhere-src-6.6.0.tar.xz) = 1b539bb0a918c8f0307fd07bd4ef0334bf7f8934bbc2eabfc04c433a7d7fa331 +SIZE (KDE/Qt/6.6.0/qtdeclarative-everywhere-src-6.6.0.tar.xz) = 34331124 +SHA256 (KDE/Qt/6.6.0/54059d0dffd1966c8a442b3675eb979c32c16cbe.patch) = 804de6136d8728bb725a37fad542de0c3b016f31cac29b86b1379205c9e6b744 +SIZE (KDE/Qt/6.6.0/54059d0dffd1966c8a442b3675eb979c32c16cbe.patch) = 1282 diff --git a/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h index 78aedc0e0026..c6bda86fecbf 100644 --- a/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h +++ b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h @@ -1,6 +1,6 @@ ---- src/3rdparty/masm/assembler/ARM64Assembler.h.orig 2018-06-15 11:30:15 UTC +--- src/3rdparty/masm/assembler/ARM64Assembler.h.orig 2023-09-07 12:16:06 UTC +++ src/3rdparty/masm/assembler/ARM64Assembler.h -@@ -3036,6 +3036,8 @@ class ARM64Assembler { (public) +@@ -3045,6 +3045,8 @@ class ARM64Assembler { (public) linuxPageFlush(current, current + page); linuxPageFlush(current, end); diff --git a/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h index 29c5396f24f0..cc8ac71a7264 100644 --- a/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h +++ b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h @@ -1,6 +1,6 @@ ---- src/3rdparty/masm/assembler/ARMv7Assembler.h.orig 2018-06-15 11:30:15 UTC +--- src/3rdparty/masm/assembler/ARMv7Assembler.h.orig 2023-09-07 12:16:06 UTC +++ src/3rdparty/masm/assembler/ARMv7Assembler.h -@@ -2372,6 +2372,8 @@ class ARMv7Assembler { (public) +@@ -2374,6 +2374,8 @@ class ARMv7Assembler { (public) UNUSED_PARAM(code); UNUSED_PARAM(size); #endif diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist index 66ae4959342a..dcc17ca8699c 100644 --- a/x11-toolkits/qt6-declarative/pkg-plist +++ b/x11-toolkits/qt6-declarative/pkg-plist @@ -1,4 +1,3 @@ -@dir lib/cmake/Qt6 bin/qml6 bin/qmleasing6 bin/qmlls6 @@ -315,6 +314,8 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vtable_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4writebarrier_p.h %%QT_INCDIR%%/QtQml/QJSEngine +%%QT_INCDIR%%/QtQml/QJSList +%%QT_INCDIR%%/QtQml/QJSListIndexClamp %%QT_INCDIR%%/QtQml/QJSManagedValue %%QT_INCDIR%%/QtQml/QJSNumberCoercion %%QT_INCDIR%%/QtQml/QJSPrimitiveValue @@ -357,6 +358,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQml/QtQmlDepends %%QT_INCDIR%%/QtQml/QtQmlVersion %%QT_INCDIR%%/QtQml/qjsengine.h +%%QT_INCDIR%%/QtQml/qjslist.h %%QT_INCDIR%%/QtQml/qjsmanagedvalue.h %%QT_INCDIR%%/QtQml/qjsnumbercoercion.h %%QT_INCDIR%%/QtQml/qjsprimitivevalue.h @@ -407,6 +409,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsliteralbindingcheck_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsloadergenerator_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljslogger_p.h +%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsloggingutils_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsmetatypes_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsregistercontent_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsresourcefilemapper_p.h @@ -420,14 +423,20 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljstyperesolver_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsutils_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmlsa_p.h +%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmlsasourcelocation_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qresourcerelocater_p.h %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qtqmlcompilerexports_p.h %%QT_INCDIR%%/QtQmlCompiler/QtQmlCompiler %%QT_INCDIR%%/QtQmlCompiler/QtQmlCompilerDepends %%QT_INCDIR%%/QtQmlCompiler/QtQmlCompilerVersion +%%QT_INCDIR%%/QtQmlCompiler/qqmljsloggingutils.h +%%QT_INCDIR%%/QtQmlCompiler/qqmlsa.h +%%QT_INCDIR%%/QtQmlCompiler/qqmlsaconstants.h +%%QT_INCDIR%%/QtQmlCompiler/qqmlsasourcelocation.h %%QT_INCDIR%%/QtQmlCompiler/qtqmlcompilerexports.h %%QT_INCDIR%%/QtQmlCompiler/qtqmlcompilerversion.h %%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlcoreglobal_p.h +%%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlpermissions_p.h %%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlsettings_p.h %%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlstandardpaths_p.h %%QT_INCDIR%%/QtQmlCore/%%FULLVER%%/QtQmlCore/private/qqmlsysteminformation_p.h @@ -465,6 +474,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlDebug/QtQmlDebugVersion %%QT_INCDIR%%/QtQmlDebug/qtqmldebugversion.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldom_fwd_p.h +%%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldom_utils_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomastcreator_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomastdumper_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomattachedinfo_p.h @@ -487,6 +497,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldompath_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomreformatter_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomscanner_p.h +%%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomscriptelements_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomstringdumper_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomtop_p.h %%QT_INCDIR%%/QtQmlDom/%%FULLVER%%/QtQmlDom/private/qqmldomtypesreader_p.h @@ -500,6 +511,27 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlIntegration/QtQmlIntegrationVersion %%QT_INCDIR%%/QtQmlIntegration/qqmlintegration.h %%QT_INCDIR%%/QtQmlIntegration/qtqmlintegrationversion.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qlanguageserver_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qlspcustomtypes_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlbasemodule_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcodemodel_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcompletionsupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlfindusagessupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlformatting_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlgotodefinitionsupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlgototypedefinitionsupport_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllanguageserver_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllintsuggestions_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllsutils_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextblock_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextcursor_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextdocument_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextsynchronization_p.h +%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qworkspace_p.h +%%QT_INCDIR%%/QtQmlLS/QtQmlLS +%%QT_INCDIR%%/QtQmlLS/QtQmlLSDepends +%%QT_INCDIR%%/QtQmlLS/QtQmlLSVersion +%%QT_INCDIR%%/QtQmlLS/qtqmllsversion.h %%QT_INCDIR%%/QtQmlLocalStorage/%%FULLVER%%/QtQmlLocalStorage/private/qqmllocalstorage_p.h %%QT_INCDIR%%/QtQmlLocalStorage/%%FULLVER%%/QtQmlLocalStorage/private/qqmllocalstorageglobal_p.h %%QT_INCDIR%%/QtQmlLocalStorage/%%FULLVER%%/QtQmlLocalStorage/private/qtqmllocalstorageexports_p.h @@ -510,9 +542,13 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlLocalStorage/qtqmllocalstorageversion.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlabstractdelegatecomponent_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodel_p.h +%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmladaptormodelenginedata_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlchangeset_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldelegatemodel_p_p.h +%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldmabstractitemmodeldata_p.h +%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldmlistaccessordata_p.h +%%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmldmobjectdata_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlinstantiator_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmlinstantiator_p_p.h %%QT_INCDIR%%/QtQmlModels/%%FULLVER%%/QtQmlModels/private/qqmllistaccessor_p.h @@ -536,6 +572,11 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQmlModels/qtqmlmodelsexports.h %%QT_INCDIR%%/QtQmlModels/qtqmlmodelsglobal.h %%QT_INCDIR%%/QtQmlModels/qtqmlmodelsversion.h +%%QT_INCDIR%%/QtQmlToolingSettings/%%FULLVER%%/QtQmlToolingSettings/private/qqmltoolingsettings_p.h +%%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettings +%%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettingsDepends +%%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettingsVersion +%%QT_INCDIR%%/QtQmlToolingSettings/qtqmltoolingsettingsversion.h %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qmetatypesjsonprocessor_p.h %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmljsstreamwriter_p.h %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmltyperegistrar_p.h @@ -995,6 +1036,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquickgridlayoutengine_p.h %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquicklayout_p.h %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquicklayoutglobal_p.h +%%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquicklayoutitemproxy_p.h %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquicklayoutstyleinfo_p.h %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquicklinearlayout_p.h %%QT_INCDIR%%/QtQuickLayouts/%%FULLVER%%/QtQuickLayouts/private/qquickstacklayout_p.h @@ -1039,11 +1081,18 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickParticles/QtQuickParticlesVersion %%QT_INCDIR%%/QtQuickParticles/qtquickparticlesexports.h %%QT_INCDIR%%/QtQuickParticles/qtquickparticlesversion.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquadpath_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshape_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshape_p_p.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurvenode_p.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurvenode_p_p.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurverenderer_p.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurverenderer_p_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapegenericrenderer_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapesglobal_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapesoftwarerenderer_p.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapestrokenode_p.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapestrokenode_p_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qtquickshapesexports_p.h %%QT_INCDIR%%/QtQuickShapes/QtQuickShapes %%QT_INCDIR%%/QtQuickShapes/QtQuickShapesDepends @@ -1580,21 +1629,21 @@ lib/cmake/Qt6Qml/Qt6QmlTargets.cmake lib/cmake/Qt6Qml/Qt6QmlVersionlessTargets.cmake lib/cmake/Qt6Qml/Qt6QmltcFileMappingTemplate.qrc.in lib/cmake/Qt6Qml/Qt6qmldirTemplate.cmake.in -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateAdditionalTargetInfo.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfig.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersion.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateConfigVersionImpl.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateDependencies.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivatePlugins.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateTargets.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlCompilerPrivateVersionlessTargets.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginAdditionalTargetInfo.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfig.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfigVersion.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginConfigVersionImpl.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6QmlCompilerPrivate/Qt6QmlLintQuickPluginTargets.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfig.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfigVersion.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfigVersionImpl.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerDependencies.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerPlugins.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerTargets.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerVersionlessTargets.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfig.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfigVersion.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginConfigVersionImpl.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QmlCompiler/Qt6QmlLintQuickPluginTargets.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreAdditionalTargetInfo.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreConfig.cmake lib/cmake/Qt6QmlCore/Qt6QmlCoreConfigVersion.cmake @@ -1629,6 +1678,14 @@ lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersion.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationConfigVersionImpl.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationTargets.cmake lib/cmake/Qt6QmlIntegration/Qt6QmlIntegrationVersionlessTargets.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfig.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfigVersion.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateDependencies.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateTargets.cmake +lib/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageAdditionalTargetInfo.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfig.cmake lib/cmake/Qt6QmlLocalStorage/Qt6QmlLocalStorageConfigVersion.cmake @@ -1645,6 +1702,14 @@ lib/cmake/Qt6QmlModels/Qt6QmlModelsDependencies.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets.cmake lib/cmake/Qt6QmlModels/Qt6QmlModelsVersionlessTargets.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfig.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfigVersion.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateDependencies.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateTargets.cmake +lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateVersionlessTargets.cmake lib/cmake/Qt6QmlTools/Qt6QmlToolsAdditionalTargetInfo.cmake lib/cmake/Qt6QmlTools/Qt6QmlToolsConfig.cmake lib/cmake/Qt6QmlTools/Qt6QmlToolsConfigVersion.cmake @@ -1852,6 +1917,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QmlDebug.prl %%QT_LIBDIR%%/libQt6QmlDom.a %%QT_LIBDIR%%/libQt6QmlDom.prl +%%QT_LIBDIR%%/libQt6QmlLS.a +%%QT_LIBDIR%%/libQt6QmlLS.prl %%QT_LIBDIR%%/libQt6QmlLocalStorage.prl %%QT_LIBDIR%%/libQt6QmlLocalStorage.so %%QT_LIBDIR%%/libQt6QmlLocalStorage.so.6 @@ -1860,6 +1927,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6QmlModels.so %%QT_LIBDIR%%/libQt6QmlModels.so.6 %%QT_LIBDIR%%/libQt6QmlModels.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6QmlToolingSettings.a +%%QT_LIBDIR%%/libQt6QmlToolingSettings.prl %%QT_LIBDIR%%/libQt6QmlTypeRegistrar.a %%QT_LIBDIR%%/libQt6QmlTypeRegistrar.prl %%QT_LIBDIR%%/libQt6QmlWorkerScript.prl @@ -1934,12 +2003,14 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6labswavefrontmesh_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6packetprotocolprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qml_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%QT_LIBDIR%%/metatypes/qt6qmlcompilerprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6qmlcompiler_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlcore_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmldebugprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmldomprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmllocalstorage_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6qmllsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlmodels_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6qmltoolingsettingsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmltyperegistrarprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlworkerscript_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6qmlxmllistmodel_%%CMAKE_BUILD_TYPE%%_metatypes.json @@ -1976,6 +2047,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qml.pri %%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmlcompiler.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlcompiler_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlcore.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlcore_private.pri @@ -1985,10 +2057,12 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_qmlintegration_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmllocalstorage.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmllocalstorage_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmlls_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmltest.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmltest_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_qmltoolingsettings_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmltyperegistrar_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlworkerscript.pri %%QT_MKSPECDIR%%/modules/qt_lib_qmlworkerscript_private.pri @@ -2054,7 +2128,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/Qt/labs/wavefrontmesh/qmldir %%QT_QMLDIR%%/Qt/test/controls/QuickControlsTestUtilsPrivate.qmltypes %%QT_QMLDIR%%/Qt/test/controls/libquickcontrolstestutilsprivateplugin.so -%%QT_QMLDIR%%/Qt/test/controls/objects-Release/QuickControlsTestUtilsPrivate_resources_1/.rcc/qrc_qmake_Qt_test_controls.cpp.o +%%DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Debug/QuickControlsTestUtilsPrivate_resources_1/.rcc/qrc_qmake_Qt_test_controls.cpp.o +%%NO_DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Release/QuickControlsTestUtilsPrivate_resources_1/.rcc/qrc_qmake_Qt_test_controls.cpp.o %%QT_QMLDIR%%/Qt/test/controls/qmldir %%QT_QMLDIR%%/QtCore/libqtqmlcoreplugin.so %%QT_QMLDIR%%/QtCore/plugins.qmltypes @@ -2654,6 +2729,7 @@ libdata/pkgconfig/Qt6LabsSettings.pc libdata/pkgconfig/Qt6LabsSharedImage.pc libdata/pkgconfig/Qt6LabsWavefrontMesh.pc libdata/pkgconfig/Qt6Qml.pc +libdata/pkgconfig/Qt6QmlCompiler.pc libdata/pkgconfig/Qt6QmlCore.pc libdata/pkgconfig/Qt6QmlIntegration.pc libdata/pkgconfig/Qt6QmlLocalStorage.pc @@ -2681,13 +2757,15 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/LabsWavefrontMesh.json %%QT_DATADIR%%/modules/PacketProtocolPrivate.json %%QT_DATADIR%%/modules/Qml.json -%%QT_DATADIR%%/modules/QmlCompilerPrivate.json +%%QT_DATADIR%%/modules/QmlCompiler.json %%QT_DATADIR%%/modules/QmlCore.json %%QT_DATADIR%%/modules/QmlDebugPrivate.json %%QT_DATADIR%%/modules/QmlDomPrivate.json %%QT_DATADIR%%/modules/QmlIntegration.json +%%QT_DATADIR%%/modules/QmlLSPrivate.json %%QT_DATADIR%%/modules/QmlLocalStorage.json %%QT_DATADIR%%/modules/QmlModels.json +%%QT_DATADIR%%/modules/QmlToolingSettingsPrivate.json %%QT_DATADIR%%/modules/QmlTypeRegistrarPrivate.json %%QT_DATADIR%%/modules/QmlWorkerScript.json %%QT_DATADIR%%/modules/QmlXmlListModel.json @@ -2706,3 +2784,4 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/QuickTest.json %%QT_DATADIR%%/modules/QuickTestUtilsPrivate.json %%QT_DATADIR%%/modules/QuickWidgets.json +@dir lib/cmake/Qt6 diff --git a/x11-toolkits/qt6-graphs/Makefile b/x11-toolkits/qt6-graphs/Makefile new file mode 100644 index 000000000000..93c1666d1fa1 --- /dev/null +++ b/x11-toolkits/qt6-graphs/Makefile @@ -0,0 +1,17 @@ +PORTNAME= graphs +DISTVERSION= ${QT6_VERSION} +CATEGORIES= x11-toolkits +PKGNAMEPREFIX= qt6- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt 6 graphs module +WWW= https://qt.io + +BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers +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 quick3d shadertools + +.include <bsd.port.mk> diff --git a/x11-toolkits/qt6-graphs/distinfo b/x11-toolkits/qt6-graphs/distinfo new file mode 100644 index 000000000000..4d07f3aa58f7 --- /dev/null +++ b/x11-toolkits/qt6-graphs/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1697050348 +SHA256 (KDE/Qt/6.6.0/qtgraphs-everywhere-src-6.6.0.tar.xz) = 56e147fc89031b77002a87da2970c1d6ebf3f595268d0cae52f5f71278e15e7f +SIZE (KDE/Qt/6.6.0/qtgraphs-everywhere-src-6.6.0.tar.xz) = 3827408 diff --git a/x11-toolkits/qt6-graphs/pkg-descr b/x11-toolkits/qt6-graphs/pkg-descr new file mode 100644 index 000000000000..c21ab9315db9 --- /dev/null +++ b/x11-toolkits/qt6-graphs/pkg-descr @@ -0,0 +1,8 @@ +The Qt Graphs module enables you to visualize data in 3D as bar, scatter, +and surface graphs. It's especially useful for visualizing depth maps +and large quantities of rapidly changing data, such as data received from +multiple sensors. The look and feel of graphs can be customized by using +themes or by adding custom items and labels. + +Qt Graphs is built on Qt 6 and Qt Quick 3D to take advantage of hardware +acceleration and Qt Quick 2. diff --git a/x11-toolkits/qt6-graphs/pkg-plist b/x11-toolkits/qt6-graphs/pkg-plist new file mode 100644 index 000000000000..0f41ce475fa2 --- /dev/null +++ b/x11-toolkits/qt6-graphs/pkg-plist @@ -0,0 +1,169 @@ +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/abstract3dcontroller_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/abstractitemmodelhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axishelper_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/barinstancing_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/baritemmodelhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/bars3dcontroller_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/colorgradient_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativecolor_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativescene_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativeseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativetheme_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypes_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/graphsglobal_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dcamera_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dinputhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dlight_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dobject_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dscene_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dtheme_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3daxis_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3dinputhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3dseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractdataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbar3dseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbardataitem_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbardataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcategory3daxis_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3ditem_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3dlabel_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3dvolume_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qheightmapsurfacedataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelbardataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelscatterdataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelsurfacedataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qlogvalue3daxisformatter_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsbars_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsitem_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsscatter_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphssurface_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatter3dseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatterdataitem_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatterdataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurface3dseries_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurfacedataitem_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurfacedataproxy_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qtgraphs-config_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qtouch3dinputhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/quickgraphstexturedata_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalue3daxis_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalue3daxisformatter_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatter3dcontroller_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatterinstancing_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatteritemmodelhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surface3dcontroller_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surfaceitemmodelhandler_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surfaceselectioninstancing_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/thememanager_p.h +%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/utils_p.h +%%QT_INCDIR%%/QtGraphs/Q3DBars +%%QT_INCDIR%%/QtGraphs/Q3DCamera +%%QT_INCDIR%%/QtGraphs/Q3DInputHandler +%%QT_INCDIR%%/QtGraphs/Q3DLight +%%QT_INCDIR%%/QtGraphs/Q3DObject +%%QT_INCDIR%%/QtGraphs/Q3DScatter +%%QT_INCDIR%%/QtGraphs/Q3DScene +%%QT_INCDIR%%/QtGraphs/Q3DSurface +%%QT_INCDIR%%/QtGraphs/Q3DTheme +%%QT_INCDIR%%/QtGraphs/QAbstract3DAxis +%%QT_INCDIR%%/QtGraphs/QAbstract3DGraph +%%QT_INCDIR%%/QtGraphs/QAbstract3DInputHandler +%%QT_INCDIR%%/QtGraphs/QAbstract3DSeries +%%QT_INCDIR%%/QtGraphs/QAbstractDataProxy +%%QT_INCDIR%%/QtGraphs/QBar3DSeries +%%QT_INCDIR%%/QtGraphs/QBarDataItem +%%QT_INCDIR%%/QtGraphs/QBarDataProxy +%%QT_INCDIR%%/QtGraphs/QCategory3DAxis +%%QT_INCDIR%%/QtGraphs/QCustom3DItem +%%QT_INCDIR%%/QtGraphs/QCustom3DLabel +%%QT_INCDIR%%/QtGraphs/QCustom3DVolume +%%QT_INCDIR%%/QtGraphs/QHeightMapSurfaceDataProxy +%%QT_INCDIR%%/QtGraphs/QItemModelBarDataProxy +%%QT_INCDIR%%/QtGraphs/QItemModelScatterDataProxy +%%QT_INCDIR%%/QtGraphs/QItemModelSurfaceDataProxy +%%QT_INCDIR%%/QtGraphs/QLogValue3DAxisFormatter +%%QT_INCDIR%%/QtGraphs/QScatter3DSeries +%%QT_INCDIR%%/QtGraphs/QScatterDataItem +%%QT_INCDIR%%/QtGraphs/QScatterDataProxy +%%QT_INCDIR%%/QtGraphs/QSurface3DSeries +%%QT_INCDIR%%/QtGraphs/QSurfaceDataItem +%%QT_INCDIR%%/QtGraphs/QSurfaceDataProxy +%%QT_INCDIR%%/QtGraphs/QTouch3DInputHandler +%%QT_INCDIR%%/QtGraphs/QValue3DAxis +%%QT_INCDIR%%/QtGraphs/QValue3DAxisFormatter +%%QT_INCDIR%%/QtGraphs/QtGraphs +%%QT_INCDIR%%/QtGraphs/QtGraphsDepends +%%QT_INCDIR%%/QtGraphs/QtGraphsVersion +%%QT_INCDIR%%/QtGraphs/q3dbars.h +%%QT_INCDIR%%/QtGraphs/q3dcamera.h +%%QT_INCDIR%%/QtGraphs/q3dinputhandler.h +%%QT_INCDIR%%/QtGraphs/q3dlight.h +%%QT_INCDIR%%/QtGraphs/q3dobject.h +%%QT_INCDIR%%/QtGraphs/q3dscatter.h +%%QT_INCDIR%%/QtGraphs/q3dscene.h +%%QT_INCDIR%%/QtGraphs/q3dsurface.h +%%QT_INCDIR%%/QtGraphs/q3dtheme.h +%%QT_INCDIR%%/QtGraphs/qabstract3daxis.h +%%QT_INCDIR%%/QtGraphs/qabstract3dgraph.h +%%QT_INCDIR%%/QtGraphs/qabstract3dinputhandler.h +%%QT_INCDIR%%/QtGraphs/qabstract3dseries.h +%%QT_INCDIR%%/QtGraphs/qabstractdataproxy.h +%%QT_INCDIR%%/QtGraphs/qbar3dseries.h +%%QT_INCDIR%%/QtGraphs/qbardataitem.h +%%QT_INCDIR%%/QtGraphs/qbardataproxy.h +%%QT_INCDIR%%/QtGraphs/qcategory3daxis.h +%%QT_INCDIR%%/QtGraphs/qcustom3ditem.h +%%QT_INCDIR%%/QtGraphs/qcustom3dlabel.h +%%QT_INCDIR%%/QtGraphs/qcustom3dvolume.h +%%QT_INCDIR%%/QtGraphs/qgraphsglobal.h +%%QT_INCDIR%%/QtGraphs/qheightmapsurfacedataproxy.h +%%QT_INCDIR%%/QtGraphs/qitemmodelbardataproxy.h +%%QT_INCDIR%%/QtGraphs/qitemmodelscatterdataproxy.h +%%QT_INCDIR%%/QtGraphs/qitemmodelsurfacedataproxy.h +%%QT_INCDIR%%/QtGraphs/qlogvalue3daxisformatter.h +%%QT_INCDIR%%/QtGraphs/qscatter3dseries.h +%%QT_INCDIR%%/QtGraphs/qscatterdataitem.h +%%QT_INCDIR%%/QtGraphs/qscatterdataproxy.h +%%QT_INCDIR%%/QtGraphs/qsurface3dseries.h +%%QT_INCDIR%%/QtGraphs/qsurfacedataitem.h +%%QT_INCDIR%%/QtGraphs/qsurfacedataproxy.h +%%QT_INCDIR%%/QtGraphs/qtgraphs-config.h +%%QT_INCDIR%%/QtGraphs/qtgraphsexports.h +%%QT_INCDIR%%/QtGraphs/qtgraphsversion.h +%%QT_INCDIR%%/QtGraphs/qtouch3dinputhandler.h +%%QT_INCDIR%%/QtGraphs/qutils.h +%%QT_INCDIR%%/QtGraphs/qvalue3daxis.h +%%QT_INCDIR%%/QtGraphs/qvalue3daxisformatter.h +lib/cmake/Qt6BuildInternals/StandaloneTests/QtGraphsTestsConfig.cmake +lib/cmake/Qt6Graphs/Qt6GraphsAdditionalTargetInfo.cmake +lib/cmake/Qt6Graphs/Qt6GraphsConfig.cmake +lib/cmake/Qt6Graphs/Qt6GraphsConfigVersion.cmake +lib/cmake/Qt6Graphs/Qt6GraphsConfigVersionImpl.cmake +lib/cmake/Qt6Graphs/Qt6GraphsDependencies.cmake +lib/cmake/Qt6Graphs/Qt6GraphsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Graphs/Qt6GraphsTargets.cmake +lib/cmake/Qt6Graphs/Qt6GraphsVersionlessTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginTargets.cmake +%%QT_LIBDIR%%/libQt6Graphs.prl +%%QT_LIBDIR%%/libQt6Graphs.so +%%QT_LIBDIR%%/libQt6Graphs.so.6 +%%QT_LIBDIR%%/libQt6Graphs.so.%%FULLVER%% +%%QT_LIBDIR%%/metatypes/qt6graphs_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_MKSPECDIR%%/modules/qt_lib_graphs.pri +%%QT_MKSPECDIR%%/modules/qt_lib_graphs_private.pri +%%QT_QMLDIR%%/QtGraphs/libgraphsplugin.so +%%QT_QMLDIR%%/QtGraphs/plugins.qmltypes +%%QT_QMLDIR%%/QtGraphs/qml/designer/Bars3DSpecifics.qml +%%QT_QMLDIR%%/QtGraphs/qml/designer/Scatter3DSpecifics.qml +%%QT_QMLDIR%%/QtGraphs/qml/designer/Surface3DSpecifics.qml +%%QT_QMLDIR%%/QtGraphs/qml/designer/default/Bars3D.qml +%%QT_QMLDIR%%/QtGraphs/qml/designer/default/Scatter3D.qml +%%QT_QMLDIR%%/QtGraphs/qml/designer/default/Surface3D.qml +%%QT_QMLDIR%%/QtGraphs/qmldir +libdata/pkgconfig/Qt6Graphs.pc +%%QT_DATADIR%%/modules/Graphs.json diff --git a/x11-toolkits/qt6-quick3d/Makefile b/x11-toolkits/qt6-quick3d/Makefile index 8e44273ee332..1aca4f3f3a65 100644 --- a/x11-toolkits/qt6-quick3d/Makefile +++ b/x11-toolkits/qt6-quick3d/Makefile @@ -1,6 +1,5 @@ PORTNAME= quick3d DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- @@ -9,7 +8,8 @@ COMMENT= Provides a high-level API for creating 3D content or UIs based on Qt Qu WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ +LIB_DEPENDS= libassimp.so:multimedia/assimp \ + libdouble-conversion.so:devel/double-conversion \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ @@ -30,6 +30,4 @@ USE_QT= base declarative quicktimeline shadertools USE_XORG= x11 xau xcb xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -INSTALL_TARGET= install - .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-quick3d/distinfo b/x11-toolkits/qt6-quick3d/distinfo index f777d67d59be..a8aa6110b142 100644 --- a/x11-toolkits/qt6-quick3d/distinfo +++ b/x11-toolkits/qt6-quick3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695932004 -SHA256 (KDE/Qt/6.5.3/qtquick3d-everywhere-src-6.5.3.tar.xz) = 6682aa603f308de409b26f3d2665f3467d722e6f2e8d8d022fcd44c57888ce5d -SIZE (KDE/Qt/6.5.3/qtquick3d-everywhere-src-6.5.3.tar.xz) = 59323996 +TIMESTAMP = 1697050374 +SHA256 (KDE/Qt/6.6.0/qtquick3d-everywhere-src-6.6.0.tar.xz) = 37ab3eb394e49d6c2b03c4da0c7f782c255dff294e73946369dd2e059a837aba +SIZE (KDE/Qt/6.6.0/qtquick3d-everywhere-src-6.6.0.tar.xz) = 59166200 diff --git a/x11-toolkits/qt6-quick3d/pkg-plist b/x11-toolkits/qt6-quick3d/pkg-plist index 51df01e4625f..abe94e38ae42 100644 --- a/x11-toolkits/qt6-quick3d/pkg-plist +++ b/x11-toolkits/qt6-quick3d/pkg-plist @@ -8,6 +8,7 @@ %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3ddefaultmaterial_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3ddirectionallight_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3deffect_p.h +%%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dextensionhelpers_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dfog_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dfrustumcamera_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dgeometry_p.h @@ -32,6 +33,7 @@ %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dquaternionanimation_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dquaternionutils_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dreflectionprobe_p.h +%%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3drenderextensions_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3drenderstats_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3drepeater_p.h %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dresourceloader_p.h @@ -114,7 +116,9 @@ %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/infinitegrid_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/instancerepeater_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/lookatnode_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/proceduralmesh_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/proceduralskytexturedata_p.h +%%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/qquick3dtexturedatafrontend_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/qtquick3dhelpersexports_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/qtquick3dhelpersglobal_p.h %%QT_INCDIR%%/QtQuick3DHelpers/%%FULLVER%%/QtQuick3DHelpers/private/randominstancing_p.h @@ -195,8 +199,10 @@ %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendereffect_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderer_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendererutil_p.h +%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderextensions_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendergeometry_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendergraphobject_p.h +%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderhelpers_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderimage_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderimagetexture_p.h %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderinstancetable_p.h diff --git a/x11-toolkits/qt6-quicktimeline/Makefile b/x11-toolkits/qt6-quicktimeline/Makefile index 5b53cd99d4de..30a5fbd563e4 100644 --- a/x11-toolkits/qt6-quicktimeline/Makefile +++ b/x11-toolkits/qt6-quicktimeline/Makefile @@ -1,6 +1,5 @@ PORTNAME= quicktimeline DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- diff --git a/x11-toolkits/qt6-quicktimeline/distinfo b/x11-toolkits/qt6-quicktimeline/distinfo index 924d7146283a..a9750426dafc 100644 --- a/x11-toolkits/qt6-quicktimeline/distinfo +++ b/x11-toolkits/qt6-quicktimeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695932007 -SHA256 (KDE/Qt/6.5.3/qtquicktimeline-everywhere-src-6.5.3.tar.xz) = fb3e4cec57d88f8130f31288b3f405dacfcae2e60d67c8030bea0ddfca2e7b5b -SIZE (KDE/Qt/6.5.3/qtquicktimeline-everywhere-src-6.5.3.tar.xz) = 113176 +TIMESTAMP = 1697050376 +SHA256 (KDE/Qt/6.6.0/qtquicktimeline-everywhere-src-6.6.0.tar.xz) = 079e51d4572aed992731628b269f9c3f9c61a6c379bae6c354c949a6d89bb590 +SIZE (KDE/Qt/6.6.0/qtquicktimeline-everywhere-src-6.6.0.tar.xz) = 113676 diff --git a/x11-toolkits/qt6-shadertools/Makefile b/x11-toolkits/qt6-shadertools/Makefile index 89fb15260d79..2667f440cd20 100644 --- a/x11-toolkits/qt6-shadertools/Makefile +++ b/x11-toolkits/qt6-shadertools/Makefile @@ -1,6 +1,5 @@ PORTNAME= shadertools DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- diff --git a/x11-toolkits/qt6-shadertools/distinfo b/x11-toolkits/qt6-shadertools/distinfo index 06ba609d1986..8c6eb06dbc26 100644 --- a/x11-toolkits/qt6-shadertools/distinfo +++ b/x11-toolkits/qt6-shadertools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695932009 -SHA256 (KDE/Qt/6.5.3/qtshadertools-everywhere-src-6.5.3.tar.xz) = 201b7b3a409f048e78c5defb90a70af423166313ad4386f8e6b83990ae0f3573 -SIZE (KDE/Qt/6.5.3/qtshadertools-everywhere-src-6.5.3.tar.xz) = 1062252 +TIMESTAMP = 1697050379 +SHA256 (KDE/Qt/6.6.0/qtshadertools-everywhere-src-6.6.0.tar.xz) = 3690327dc550144b8102be2bb7f6dc995ccbe3584041094ad021a83737ef9875 +SIZE (KDE/Qt/6.6.0/qtshadertools-everywhere-src-6.6.0.tar.xz) = 1063372 diff --git a/x11-toolkits/qt6-shadertools/pkg-plist b/x11-toolkits/qt6-shadertools/pkg-plist index b72e07689c77..d4511b6bbf2e 100644 --- a/x11-toolkits/qt6-shadertools/pkg-plist +++ b/x11-toolkits/qt6-shadertools/pkg-plist @@ -1,10 +1,10 @@ -%%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qshaderbaker_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qshaderrewriter_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qspirvcompiler_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qspirvshader_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qspirvshaderremap_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qtshadertoolsexports_p.h %%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/private/qtshadertoolsglobal_p.h +%%QT_INCDIR%%/QtShaderTools/%%FULLVER%%/QtShaderTools/rhi/qshaderbaker.h %%QT_INCDIR%%/QtShaderTools/QtShaderTools %%QT_INCDIR%%/QtShaderTools/QtShaderToolsDepends %%QT_INCDIR%%/QtShaderTools/QtShaderToolsVersion diff --git a/x11-toolkits/qt6-virtualkeyboard/Makefile b/x11-toolkits/qt6-virtualkeyboard/Makefile index c95cc4a9ab8c..f3d661feff32 100644 --- a/x11-toolkits/qt6-virtualkeyboard/Makefile +++ b/x11-toolkits/qt6-virtualkeyboard/Makefile @@ -1,5 +1,5 @@ PORTNAME= virtualkeyboard -PORTVERSION= ${QT6_VERSION} +DISTVERSION= ${QT6_VERSION} CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- @@ -11,7 +11,7 @@ BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \ libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++11-lang gl pkgconfig qt-dist:6 xorg +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 xorg USE_GL= gl opengl USE_QT= base declarative svg USE_XORG= xcb diff --git a/x11-toolkits/qt6-virtualkeyboard/distinfo b/x11-toolkits/qt6-virtualkeyboard/distinfo index 8ece83221406..36de391d57cd 100644 --- a/x11-toolkits/qt6-virtualkeyboard/distinfo +++ b/x11-toolkits/qt6-virtualkeyboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695932013 -SHA256 (KDE/Qt/6.5.3/qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz) = 31808f15126940d737db3c3e5c2183e502c8668b6b2943da5885d71c1b3ae62d -SIZE (KDE/Qt/6.5.3/qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz) = 3729672 +TIMESTAMP = 1697050382 +SHA256 (KDE/Qt/6.6.0/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz) = 2784db43f514bfd3a2ce0e79e0096deea95a3866254d376a9134bc512bfa777b +SIZE (KDE/Qt/6.6.0/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz) = 3735008 diff --git a/x11-toolkits/qt6-virtualkeyboard/pkg-plist b/x11-toolkits/qt6-virtualkeyboard/pkg-plist index 8920060069e3..a61c77d69a48 100644 --- a/x11-toolkits/qt6-virtualkeyboard/pkg-plist +++ b/x11-toolkits/qt6-virtualkeyboard/pkg-plist @@ -30,6 +30,7 @@ %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qvirtualkeyboardabstractinputmethod_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qvirtualkeyboardfeatures_namespace_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qvirtualkeyboardinputcontext_p.h +%%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/qvirtualkeyboardnamespace_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/settings_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/shadowinputcontext_p.h %%QT_INCDIR%%/QtVirtualKeyboard/%%FULLVER%%/QtVirtualKeyboard/private/shifthandler_p.h @@ -57,7 +58,6 @@ %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboarddictionarymanager.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardinputcontext.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardinputengine.h -%%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardnamespace.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardobserver.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardselectionlistmodel.h %%QT_INCDIR%%/QtVirtualKeyboard/qvirtualkeyboardtrace.h |