Mailing List Archive | ports@openbsd.org

I'd like to commit this update as soon as possible. Are there any objections? https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.11.2/release-note.md It's a "simple" bug fix update which includes some CVEs. diff --git a/x11/qt6/Makefile.version b/x11/qt6/Makefile.version index 28f695ec23b..e0c80de62ce 100644 --- a/x11/qt6/Makefile.version +++ b/x11/qt6/Makefile.version @@ -1,6 +1,6 @@ # Common source for Qt6 version -QT6_VERSION = 6.11.1 -PYSIDE_VERSION = 6.11.1 +QT6_VERSION = 6.11.2 +PYSIDE_VERSION = 6.11.2 # This one is used for building dependencies for examples and documentation, # which obviously should be in sync with core packages. diff --git a/x11/qt6/pyside6/pyside/Makefile b/x11/qt6/pyside6/pyside/Makefile index 1c9f73994dc..edfcb4a6b2d 100644 --- a/x11/qt6/pyside6/pyside/Makefile +++ b/x11/qt6/pyside6/pyside/Makefile @@ -2,9 +2,8 @@ DPB_PROPERTIES = parallel COMMENT = Python Qt bindings for Qt 6 PKGNAME = pyside6-${VERSION} -REVISION = 0 -SHARED_LIBS += pyside6.abi3 2.0 # 0.0 +SHARED_LIBS += pyside6.abi3 3.0 # 0.0 SHARED_LIBS += pyside6qml.abi3 1.0 # 0.0 WANTLIB += ${COMPILER_LIBCXX} GL Qt63DAnimation Qt63DCore Qt63DExtras diff --git a/x11/qt6/pyside6/pyside/distinfo b/x11/qt6/pyside6/pyside/distinfo index a61e2edb9e9..8b7ccfbbf07 100644 --- a/x11/qt6/pyside6/pyside/distinfo +++ b/x11/qt6/pyside6/pyside/distinfo @@ -1,6 +1,6 @@ SHA256 (qt/0001-Always-link-to-python-libraries.patch) = bcT6jp4WZDdmDXS0KhRv3QR6aofik8NO1uzgueZqa3w= SHA256 (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = O8h0Ceo9xBhH8dXXYS/ZeTG2fxtAUQtGVUOo71yXZP8= -SHA256 (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = b/2YNbsN0sVvBh1i8WFrsXB8/AICuA4xZda+CH85ZeI= +SHA256 (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = y6R++6rRvt1SlyXLwU4h8VbHoZNm8Hs+37sHb/16/fg= SIZE (qt/0001-Always-link-to-python-libraries.patch) = 1320 SIZE (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = 11793 -SIZE (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = 17963432 +SIZE (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = 18053248 diff --git a/x11/qt6/pyside6/pyside/pkg/PLIST b/x11/qt6/pyside6/pyside/pkg/PLIST index cb96b1d2ac6..a505234a742 100644 --- a/x11/qt6/pyside6/pyside/pkg/PLIST +++ b/x11/qt6/pyside6/pyside/pkg/PLIST @@ -342,6 +342,7 @@ lib/python${MODPY_VERSION}/site-packages/PySide6/support/generate_pyi.py share/PySide6/ share/PySide6/doc/ share/PySide6/doc/qtcore.rst +share/PySide6/doc/qtgui.rst share/PySide6/doc/qtqml.rst share/PySide6/doc/qtquicktest.rst share/PySide6/doc/qtuitools.rst diff --git a/x11/qt6/pyside6/shiboken/Makefile b/x11/qt6/pyside6/shiboken/Makefile index c6b0d3810b0..7b1d76c6506 100644 --- a/x11/qt6/pyside6/shiboken/Makefile +++ b/x11/qt6/pyside6/shiboken/Makefile @@ -1,6 +1,5 @@ COMMENT = Python binding generator for C++ libraries PKGNAME = shiboken6-${VERSION} -REVISION = 0 SHARED_LIBS += shiboken6.abi3 2.0 # 0.0 diff --git a/x11/qt6/pyside6/shiboken/distinfo b/x11/qt6/pyside6/shiboken/distinfo index a61e2edb9e9..8b7ccfbbf07 100644 --- a/x11/qt6/pyside6/shiboken/distinfo +++ b/x11/qt6/pyside6/shiboken/distinfo @@ -1,6 +1,6 @@ SHA256 (qt/0001-Always-link-to-python-libraries.patch) = bcT6jp4WZDdmDXS0KhRv3QR6aofik8NO1uzgueZqa3w= SHA256 (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = O8h0Ceo9xBhH8dXXYS/ZeTG2fxtAUQtGVUOo71yXZP8= -SHA256 (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = b/2YNbsN0sVvBh1i8WFrsXB8/AICuA4xZda+CH85ZeI= +SHA256 (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = y6R++6rRvt1SlyXLwU4h8VbHoZNm8Hs+37sHb/16/fg= SIZE (qt/0001-Always-link-to-python-libraries.patch) = 1320 SIZE (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = 11793 -SIZE (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = 17963432 +SIZE (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = 18053248 diff --git a/x11/qt6/pyside6/shiboken/patches/patch-sources_shiboken6_libshiboken_helper_h b/x11/qt6/pyside6/shiboken/patches/patch-sources_shiboken6_libshiboken_helper_h index a8967710a18..891def255ca 100644 --- a/x11/qt6/pyside6/shiboken/patches/patch-sources_shiboken6_libshiboken_helper_h +++ b/x11/qt6/pyside6/shiboken/patches/patch-sources_shiboken6_libshiboken_helper_h @@ -1,7 +1,7 @@ Index: sources/shiboken6/libshiboken/helper.h --- sources/shiboken6/libshiboken/helper.h.orig +++ sources/shiboken6/libshiboken/helper.h -@@ -7,6 +7,9 @@ +@@ -8,6 +8,9 @@ #include "sbkpython.h" #include "shibokenmacros.h" @@ -11,7 +11,7 @@ Index: sources/shiboken6/libshiboken/helper.h #include <iosfwd> #define SBK_UNUSED(x) (void)(x); -@@ -73,7 +76,7 @@ class ArrayPointer +@@ -74,7 +77,7 @@ class ArrayPointer template <class T> using AutoArrayPointer = ArrayPointer<T>; // deprecated diff --git a/x11/qt6/pyside6/shiboken_generator/Makefile b/x11/qt6/pyside6/shiboken_generator/Makefile index 54c7075c930..15d734b2c4b 100644 --- a/x11/qt6/pyside6/shiboken_generator/Makefile +++ b/x11/qt6/pyside6/shiboken_generator/Makefile @@ -1,6 +1,5 @@ COMMENT = Python binding generator for C++ libraries PKGNAME = shiboken6-generator-${VERSION} -REVISION = 0 WANTLIB += ${COMPILER_LIBCXX} Qt6Core c m xml2 xslt WANTLIB += llvm${MODCLANG_VERSION}/lib/clang diff --git a/x11/qt6/pyside6/shiboken_generator/distinfo b/x11/qt6/pyside6/shiboken_generator/distinfo index a61e2edb9e9..8b7ccfbbf07 100644 --- a/x11/qt6/pyside6/shiboken_generator/distinfo +++ b/x11/qt6/pyside6/shiboken_generator/distinfo @@ -1,6 +1,6 @@ SHA256 (qt/0001-Always-link-to-python-libraries.patch) = bcT6jp4WZDdmDXS0KhRv3QR6aofik8NO1uzgueZqa3w= SHA256 (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = O8h0Ceo9xBhH8dXXYS/ZeTG2fxtAUQtGVUOo71yXZP8= -SHA256 (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = b/2YNbsN0sVvBh1i8WFrsXB8/AICuA4xZda+CH85ZeI= +SHA256 (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = y6R++6rRvt1SlyXLwU4h8VbHoZNm8Hs+37sHb/16/fg= SIZE (qt/0001-Always-link-to-python-libraries.patch) = 1320 SIZE (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = 11793 -SIZE (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = 17963432 +SIZE (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = 18053248 diff --git a/x11/qt6/pyside6/tools/distinfo b/x11/qt6/pyside6/tools/distinfo index a61e2edb9e9..8b7ccfbbf07 100644 --- a/x11/qt6/pyside6/tools/distinfo +++ b/x11/qt6/pyside6/tools/distinfo @@ -1,6 +1,6 @@ SHA256 (qt/0001-Always-link-to-python-libraries.patch) = bcT6jp4WZDdmDXS0KhRv3QR6aofik8NO1uzgueZqa3w= SHA256 (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = O8h0Ceo9xBhH8dXXYS/ZeTG2fxtAUQtGVUOo71yXZP8= -SHA256 (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = b/2YNbsN0sVvBh1i8WFrsXB8/AICuA4xZda+CH85ZeI= +SHA256 (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = y6R++6rRvt1SlyXLwU4h8VbHoZNm8Hs+37sHb/16/fg= SIZE (qt/0001-Always-link-to-python-libraries.patch) = 1320 SIZE (qt/0001-Revert-Modify-headers-installation-for-CMake-builds.patch) = 11793 -SIZE (qt/pyside-setup-everywhere-src-6.11.1.tar.xz) = 17963432 +SIZE (qt/pyside-setup-everywhere-src-6.11.2.tar.xz) = 18053248 diff --git a/x11/qt6/qt3d/Makefile b/x11/qt6/qt3d/Makefile index 453415c165b..00ed450cc04 100644 --- a/x11/qt6/qt3d/Makefile +++ b/x11/qt6/qt3d/Makefile @@ -3,7 +3,7 @@ COMMENT = Qt6 components for 3D graphics PKGSPEC = qt6-qt3d-${QT6_PKGSPEC} SHARED_LIBS += Qt63DAnimation 1.0 # 6.6 -SHARED_LIBS += Qt63DCore 1.2 # 6.6 +SHARED_LIBS += Qt63DCore 2.0 # 6.6 SHARED_LIBS += Qt63DExtras 1.1 # 6.6 SHARED_LIBS += Qt63DInput 1.1 # 6.6 SHARED_LIBS += Qt63DLogic 1.0 # 6.6 @@ -14,7 +14,7 @@ SHARED_LIBS += Qt63DQuickInput 1.0 # 6.6 SHARED_LIBS += Qt63DQuickRender 2.1 # 6.6 SHARED_LIBS += Qt63DQuickScene2D 1.1 # 6.6 SHARED_LIBS += Qt63DQuickScene3D 0.0 # 0.0 -SHARED_LIBS += Qt63DRender 2.0 # 6.6 +SHARED_LIBS += Qt63DRender 3.0 # 6.6 SHARED_LIBS += Qt63DQuickLogic 0.0 # 0.0 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui diff --git a/x11/qt6/qt3d/distinfo b/x11/qt6/qt3d/distinfo index 1245f7fdf2e..74a232f90ae 100644 --- a/x11/qt6/qt3d/distinfo +++ b/x11/qt6/qt3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt3d-everywhere-src-6.11.1.tar.xz) = pm2MjgSdHuenaHs0lA81VdDXCEhYttx40eHLffQKAQc= -SIZE (qt/qt3d-everywhere-src-6.11.1.tar.xz) = 141869788 +SHA256 (qt/qt3d-everywhere-src-6.11.2.tar.xz) = QRGFpHlacRRyyPcv99axOgqQgqXyw8PRypVWcn77rCk= +SIZE (qt/qt3d-everywhere-src-6.11.2.tar.xz) = 141876916 diff --git a/x11/qt6/qt5compat/distinfo b/x11/qt6/qt5compat/distinfo index 1400bef2b4f..23fd00d2a1b 100644 --- a/x11/qt6/qt5compat/distinfo +++ b/x11/qt6/qt5compat/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt5compat-everywhere-src-6.11.1.tar.xz) = z8uf2qBRqtVLDmGySsVpO0iHqG4HYJ9mX+pnMopvFhs= -SIZE (qt/qt5compat-everywhere-src-6.11.1.tar.xz) = 14621480 +SHA256 (qt/qt5compat-everywhere-src-6.11.2.tar.xz) = aMMg/jORCWqfLYcBcO3xtn2sivHQ5RwMnlNDgH8RQoc= +SIZE (qt/qt5compat-everywhere-src-6.11.2.tar.xz) = 14620928 diff --git a/x11/qt6/qtbase/Makefile b/x11/qt6/qtbase/Makefile index be96953c2fa..9bf9420cb0a 100644 --- a/x11/qt6/qtbase/Makefile +++ b/x11/qt6/qtbase/Makefile @@ -16,23 +16,23 @@ PKG_ARCH-global = * DPB_PROPERTIES = parallel SHARED_LIBS += Qt6Concurrent 0.1 # 6.7 -SHARED_LIBS += Qt6Core 8.0 # 6.7 +SHARED_LIBS += Qt6Core 9.0 # 6.7 SHARED_LIBS += Qt6DBus 3.1 # 6.7 -SHARED_LIBS += Qt6Gui 10.0 # 6.7 -SHARED_LIBS += Qt6Network 6.0 # 6.7 +SHARED_LIBS += Qt6Gui 11.0 # 6.7 +SHARED_LIBS += Qt6Network 7.0 # 6.7 SHARED_LIBS += Qt6OpenGL 3.0 # 6.7 SHARED_LIBS += Qt6PrintSupport 1.1 # 6.7 SHARED_LIBS += Qt6Sql 3.1 # 6.7 -SHARED_LIBS += Qt6Test 5.1 # 6.7 -SHARED_LIBS += Qt6Widgets 6.0 # 6.7 +SHARED_LIBS += Qt6Test 5.2 # 6.7 +SHARED_LIBS += Qt6Widgets 7.0 # 6.7 SHARED_LIBS += Qt6Xml 1.0 # 6.7 SHARED_LIBS += Qt6EglFSDeviceIntegration 2.0 # 6.7 SHARED_LIBS += Qt6EglFsKmsSupport 1.1 # 6.7 SHARED_LIBS += Qt6XcbQpa 5.0 # 6.7 SHARED_LIBS += Qt6EglFsKmsGbmSupport 1.0 # 6.7 SHARED_LIBS += Qt6OpenGLWidgets 1.0 # 6.7 -SHARED_LIBS += Qt6WaylandClient 10.0 # 6.7 -SHARED_LIBS += Qt6WlShellIntegration 4.1 # 6.7 +SHARED_LIBS += Qt6WaylandClient 10.1 # 6.7 +SHARED_LIBS += Qt6WlShellIntegration 4.2 # 6.7 WANTLIB-main += ${COMPILER_LIBCXX} EGL GL ICE SM X11 X11-xcb atk-1.0 WANTLIB-main += b2 brotlidec c cairo cairo-gobject crypto cups dbus-1 diff --git a/x11/qt6/qtbase/distinfo b/x11/qt6/qtbase/distinfo index 51ba8cbacea..e5143052eea 100644 --- a/x11/qt6/qtbase/distinfo +++ b/x11/qt6/qtbase/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtbase-everywhere-src-6.11.1.tar.xz) = 2VlKMSKKojrWtTFxmim0Xw85if5sE21Fdn6hefIzwaw= -SIZE (qt/qtbase-everywhere-src-6.11.1.tar.xz) = 50648500 +SHA256 (qt/qtbase-everywhere-src-6.11.2.tar.xz) = Wy4A7Mr1pNjBQTT/oOqN/Qo1rh/8f42H+kMFoe0jzyI= +SIZE (qt/qtbase-everywhere-src-6.11.2.tar.xz) = 50582668 diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake index ea024601a63..847cf50cd69 100644 --- a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake +++ b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake @@ -1,7 +1,7 @@ Index: cmake/QtFeature.cmake --- cmake/QtFeature.cmake.orig +++ cmake/QtFeature.cmake -@@ -1802,7 +1802,23 @@ function(qt_get_platform_try_compile_vars out_var) +@@ -1837,7 +1837,23 @@ function(qt_get_platform_try_compile_vars out_var) set("${out_var}" "${flags_cmd_line}" PARENT_SCOPE) endfunction() diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtFlagHandlingHelpers_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtFlagHandlingHelpers_cmake index 50c9583c0b8..39a524942a7 100644 --- a/x11/qt6/qtbase/patches/patch-cmake_QtFlagHandlingHelpers_cmake +++ b/x11/qt6/qtbase/patches/patch-cmake_QtFlagHandlingHelpers_cmake @@ -1,7 +1,7 @@ Index: cmake/QtFlagHandlingHelpers.cmake --- cmake/QtFlagHandlingHelpers.cmake.orig +++ cmake/QtFlagHandlingHelpers.cmake -@@ -179,6 +179,10 @@ function(qt_internal_add_link_flags_no_undefined targe +@@ -181,6 +181,10 @@ function(qt_internal_add_link_flags_no_undefined targe set(no_undefined_flag "-Wl,--no-undefined") endif() diff --git a/x11/qt6/qtbase/patches/patch-src_corelib_global_qlogging_cpp b/x11/qt6/qtbase/patches/patch-src_corelib_global_qlogging_cpp index e6331b7565f..91731988d10 100644 --- a/x11/qt6/qtbase/patches/patch-src_corelib_global_qlogging_cpp +++ b/x11/qt6/qtbase/patches/patch-src_corelib_global_qlogging_cpp @@ -1,7 +1,7 @@ Index: src/corelib/global/qlogging.cpp --- src/corelib/global/qlogging.cpp.orig +++ src/corelib/global/qlogging.cpp -@@ -1539,7 +1539,7 @@ backtraceFramesForLogMessage(int frameCount, +@@ -1556,7 +1556,7 @@ backtraceFramesForLogMessage(int frameCount, // This code is protected by QMessagePattern::mutex so it is thread safe on all compilers static const QRegularExpression rx(QStringLiteral("^(?:[^(]*/)?([^(/]+)\$([^+]*)(?:[\\+[a-f0-9x]*)?\$ \\[[a-f0-9x]*\\]$")); diff --git a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qopenssl_p_h b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qopenssl_p_h index 22627f29d2b..bcda7efba8c 100644 --- a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qopenssl_p_h +++ b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qopenssl_p_h @@ -1,7 +1,7 @@ Index: src/plugins/tls/openssl/qopenssl_p.h --- src/plugins/tls/openssl/qopenssl_p.h.orig +++ src/plugins/tls/openssl/qopenssl_p.h -@@ -71,6 +71,13 @@ +@@ -77,6 +77,13 @@ QT_BEGIN_NAMESPACE diff --git a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp index 50d9b885e39..7ee382d8c21 100644 --- a/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp +++ b/x11/qt6/qtbase/patches/patch-src_plugins_tls_openssl_qx509_openssl_cpp @@ -1,7 +1,7 @@ Index: src/plugins/tls/openssl/qx509_openssl.cpp --- src/plugins/tls/openssl/qx509_openssl.cpp.orig +++ src/plugins/tls/openssl/qx509_openssl.cpp -@@ -191,7 +191,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e +@@ -191,7 +191,11 @@ QVariant x509UnknownExtensionToValue(QT_OPENSSL4_CONST QVariantList list; bool isMap = false; @@ -13,10 +13,11 @@ Index: src/plugins/tls/openssl/qx509_openssl.cpp CONF_VALUE *nval = q_SKM_sk_value(CONF_VALUE, val, j); if (nval->name && nval->value) { isMap = true; -@@ -287,7 +291,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) +@@ -287,7 +291,12 @@ QVariant x509ExtensionToValue(QT_OPENSSL4_CONST X509_E if (!info) return {}; QVariantMap result; ++ +#if defined(LIBRESSL_VERSION_NUMBER) + for (int i=0; i < q_SKM_sk_num(ACCESS_DESCRIPTION, info); i++) { +#else @@ -25,37 +26,23 @@ Index: src/plugins/tls/openssl/qx509_openssl.cpp ACCESS_DESCRIPTION *ad = q_SKM_sk_value(ACCESS_DESCRIPTION, info, i); GENERAL_NAME *name = ad->location; -@@ -330,8 +338,8 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) - - // keyid - if (auth_key->keyid) { -- QByteArray keyid(reinterpret_cast<const char *>(auth_key->keyid->data), -- auth_key->keyid->length); -+ QByteArray keyid(reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(auth_key->keyid)), -+ q_ASN1_STRING_length(auth_key->keyid)); - result["keyid"_L1] = keyid.toHex(); - } - -@@ -465,10 +473,10 @@ X509CertificateOpenSSL::subjectAlternativeNames() cons +@@ -466,7 +475,7 @@ X509CertificateOpenSSL::subjectAlternativeNames() cons QHostAddress ipAddress; switch (len) { case 4: // IPv4 -- ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<quint32 *>(genName->d.iPAddress->data))); -+ ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<const quint32 *>(q_ASN1_STRING_get0_data(genName->d.iPAddress)))); +- ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<const quint32 *>(q_ASN1_STRING_get0_data(genName->d.iPAddress)))); ++ ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<quint32 *>(genName->d.iPAddress->data))); break; case 16: // IPv6 -- ipAddress = QHostAddress(reinterpret_cast<quint8 *>(genName->d.iPAddress->data)); -+ ipAddress = QHostAddress(reinterpret_cast<const quint8 *>(q_ASN1_STRING_get0_data(genName->d.iPAddress))); - break; - default: // Unknown IP address format - break; -@@ -562,9 +570,9 @@ QSslCertificate X509CertificateOpenSSL::certificateFro - + ipAddress = QHostAddress(reinterpret_cast<const quint8 *>(q_ASN1_STRING_get0_data(genName->d.iPAddress))); +@@ -564,10 +573,9 @@ QSslCertificate X509CertificateOpenSSL::certificateFro if (ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(x509)) { QByteArray hexString; -- hexString.reserve(serialNumber->length * 3); -- for (int a = 0; a < serialNumber->length; ++a) { -- hexString += QByteArray::number(serialNumber->data[a], 16).rightJustified(2, '0'); + const unsigned char *serialNumberData = q_ASN1_STRING_get0_data(serialNumber); +- int serialNumberLength = q_ASN1_STRING_length(serialNumber); +- hexString.reserve(qsizetype(serialNumberLength) * 3); +- for (int a = 0; a < serialNumberLength; ++a) { +- hexString += QByteArray::number(serialNumberData[a], 16).rightJustified(2, '0'); + hexString.reserve(q_ASN1_STRING_length(serialNumber) * 3); + for (int a = 0; a < q_ASN1_STRING_length(serialNumber); ++a) { + hexString += QByteArray::number(q_ASN1_STRING_get0_data(serialNumber)[a], 16).rightJustified(2, '0'); diff --git a/x11/qt6/qtbase/pkg/PLIST-global b/x11/qt6/qtbase/pkg/PLIST-global index b8e033285c9..0ffb17d971c 100644 --- a/x11/qt6/qtbase/pkg/PLIST-global +++ b/x11/qt6/qtbase/pkg/PLIST-global @@ -43,7 +43,7 @@ share/doc/qt6/config/exampleurl-qtxmlpatterns.qdocconf share/doc/qt6/global/ share/doc/qt6/global/app-examples-template/ share/doc/qt6/global/app-examples-template/README.md -share/doc/qt6/global/app-examples-template/app-examples-template.qdoc +share/doc/qt6/global/app-examples-template/app-examples.qdoc.template share/doc/qt6/global/compat.qdocconf share/doc/qt6/global/config.qdocconf share/doc/qt6/global/cpp-doc-macros.qdocconf @@ -55,6 +55,7 @@ share/doc/qt6/global/externalsites/qt-webpages.qdoc share/doc/qt6/global/externalsites/qtcreator.qdoc share/doc/qt6/global/externalsites/qtdesignstudio.qdoc share/doc/qt6/global/externalsites/rfc.qdoc +share/doc/qt6/global/externalsites/vscodeext.qdoc share/doc/qt6/global/fileextensions.qdocconf share/doc/qt6/global/grid.qdocconf share/doc/qt6/global/html-config.qdocconf diff --git a/x11/qt6/qtbase/pkg/PLIST-main b/x11/qt6/qtbase/pkg/PLIST-main index 81f8697e5ac..8cb389897e1 100644 --- a/x11/qt6/qtbase/pkg/PLIST-main +++ b/x11/qt6/qtbase/pkg/PLIST-main @@ -545,6 +545,7 @@ include/X11/qt6/QtCore/QTransposeProxyModel include/X11/qt6/QtCore/QTypeInfo include/X11/qt6/QtCore/QTypeInfoMerger include/X11/qt6/QtCore/QTypeRevision +include/X11/qt6/QtCore/QTypedArrayAllocationResult include/X11/qt6/QtCore/QTypedArrayData include/X11/qt6/QtCore/QUnhandledException include/X11/qt6/QtCore/QUntypedBindable @@ -1691,6 +1692,7 @@ include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhostaddress_p.h include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhostinfo_p.h include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhsts_p.h include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhstsstore_p.h +include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhttp2configuration_p.h include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhttp2connection_p.h include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhttp2protocolhandler_p.h include/X11/qt6/QtNetwork/${VERSION}/QtNetwork/private/qhttpheaderparser_p.h @@ -2866,6 +2868,7 @@ lib/cmake/Qt6/FindWrapSystemJpeg.cmake lib/cmake/Qt6/FindWrapSystemMd4c.cmake lib/cmake/Qt6/FindWrapSystemPCRE2.cmake lib/cmake/Qt6/FindWrapSystemPNG.cmake +lib/cmake/Qt6/FindWrapSystemSQLite3.cmake lib/cmake/Qt6/FindWrapSystemZLIB.cmake lib/cmake/Qt6/FindWrapVulkan.cmake lib/cmake/Qt6/FindWrapVulkanHeaders.cmake @@ -2962,12 +2965,14 @@ lib/cmake/Qt6/QtPublicAndroidHelpers.cmake lib/cmake/Qt6/QtPublicAppleHelpers.cmake lib/cmake/Qt6/QtPublicCMakeEarlyPolicyHelpers.cmake lib/cmake/Qt6/QtPublicCMakeHelpers.cmake +lib/cmake/Qt6/QtPublicCMakeIncludeGuardHelpers.cmake lib/cmake/Qt6/QtPublicCMakeVersionHelpers.cmake lib/cmake/Qt6/QtPublicDependencyHelpers.cmake lib/cmake/Qt6/QtPublicExternalProjectHelpers.cmake lib/cmake/Qt6/QtPublicFinalizerHelpers.cmake lib/cmake/Qt6/QtPublicFindPackageHelpers.cmake lib/cmake/Qt6/QtPublicGitHelpers.cmake +lib/cmake/Qt6/QtPublicJsonHelpers.cmake lib/cmake/Qt6/QtPublicPluginHelpers.cmake lib/cmake/Qt6/QtPublicPluginHelpers_v2.cmake lib/cmake/Qt6/QtPublicSbomAttributionHelpers.cmake diff --git a/x11/qt6/qtcharts/distinfo b/x11/qt6/qtcharts/distinfo index 74df949a13a..d210ae29353 100644 --- a/x11/qt6/qtcharts/distinfo +++ b/x11/qt6/qtcharts/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtcharts-everywhere-src-6.11.1.tar.xz) = P+PtMYwqhtFBfFwpz3SUJ16P1LU3zTdFP1WZxXNlUVw= -SIZE (qt/qtcharts-everywhere-src-6.11.1.tar.xz) = 4651704 +SHA256 (qt/qtcharts-everywhere-src-6.11.2.tar.xz) = UGnlO4HRJVCek3xjecum1mTFYtWh5e0o3Tg2kNS2+yk= +SIZE (qt/qtcharts-everywhere-src-6.11.2.tar.xz) = 4652744 diff --git a/x11/qt6/qtconnectivity/distinfo b/x11/qt6/qtconnectivity/distinfo index 7b811ffaa93..f76fd647125 100644 --- a/x11/qt6/qtconnectivity/distinfo +++ b/x11/qt6/qtconnectivity/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtconnectivity-everywhere-src-6.11.1.tar.xz) = IQUonqQUtG7V+lO6h4IjAEW55HzIFWtZQMnjHjmA5ZE= -SIZE (qt/qtconnectivity-everywhere-src-6.11.1.tar.xz) = 1059432 +SHA256 (qt/qtconnectivity-everywhere-src-6.11.2.tar.xz) = hbAaV70FlYOrUgqFeZDf30AhRHUH/1uUmPA2tyleYDc= +SIZE (qt/qtconnectivity-everywhere-src-6.11.2.tar.xz) = 1064168 diff --git a/x11/qt6/qtdatavis3d/distinfo b/x11/qt6/qtdatavis3d/distinfo index ab61bdcd92d..a9de7da6fe2 100644 --- a/x11/qt6/qtdatavis3d/distinfo +++ b/x11/qt6/qtdatavis3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtdatavis3d-everywhere-src-6.11.1.tar.xz) = Hhp7nAqUdzFlUzT115JS1Aza9YwYAQdOpenggh1mk6w= -SIZE (qt/qtdatavis3d-everywhere-src-6.11.1.tar.xz) = 3939800 +SHA256 (qt/qtdatavis3d-everywhere-src-6.11.2.tar.xz) = 0k5pGcXW+KFt0Zzjx8j0donTmnLb5KMcHBvO36YLZh0= +SIZE (qt/qtdatavis3d-everywhere-src-6.11.2.tar.xz) = 3939712 diff --git a/x11/qt6/qtdeclarative/Makefile b/x11/qt6/qtdeclarative/Makefile index 058a9d13a20..93c894656a7 100644 --- a/x11/qt6/qtdeclarative/Makefile +++ b/x11/qt6/qtdeclarative/Makefile @@ -7,13 +7,13 @@ PKGSPEC = qt6-qtdeclarative-${QT6_PKGSPEC} DPB_PROPERTIES = parallel -SHARED_LIBS = Qt6Qml 8.0 # 6.7 +SHARED_LIBS = Qt6Qml 9.0 # 6.7 SHARED_LIBS += Qt6Quick 9.0 # 6.7 -SHARED_LIBS += Qt6QuickParticles 3.0 # 6.7 +SHARED_LIBS += Qt6QuickParticles 3.1 # 6.7 SHARED_LIBS += Qt6QuickTest 3.0 # 6.7 SHARED_LIBS += Qt6QuickWidgets 5.0 # 6.7 SHARED_LIBS += Qt6QuickShapes 3.1 # 6.7 -SHARED_LIBS += Qt6QmlModels 6.0 # 6.7 +SHARED_LIBS += Qt6QmlModels 7.0 # 6.7 SHARED_LIBS += Qt6QmlWorkerScript 2.0 # 6.7 SHARED_LIBS += Qt6LabsAnimation 2.0 # 6.7 SHARED_LIBS += Qt6LabsFolderListModel 2.0 # 6.7 @@ -30,8 +30,8 @@ SHARED_LIBS += Qt6QuickDialogs2 3.0 # 6.7 SHARED_LIBS += Qt6QuickDialogs2QuickImpl 4.2 # 6.7 SHARED_LIBS += Qt6QuickDialogs2Utils 2.0 # 6.7 SHARED_LIBS += Qt6QuickLayouts 4.0 # 6.7 -SHARED_LIBS += Qt6QuickTemplates2 8.0 # 6.7 -SHARED_LIBS += Qt6QmlCompiler 6.0 # 6.7 +SHARED_LIBS += Qt6QuickTemplates2 8.1 # 6.7 +SHARED_LIBS += Qt6QmlCompiler 6.1 # 6.7 SHARED_LIBS += Qt6QuickEffects 2.1 # 6.7 SHARED_LIBS += Qt6QmlNetwork 2.1 # 6.7 @@ -55,7 +55,7 @@ SHARED_LIBS += Qt6QuickVectorImageGenerator 2.0 # 0.0 SHARED_LIBS += Qt6LabsSynchronizer 0.0 # 0.0 SHARED_LIBS += Qt6QuickShapesDesignHelpers 1.0 # 0.0 SHARED_LIBS += Qt6QuickVectorImageHelpers 0.1 # 0.0 -SHARED_LIBS += Qt6LabsStyleKit 0.0 # 0.0 +SHARED_LIBS += Qt6LabsStyleKit 0.1 # 0.0 SHARED_LIBS += Qt6LabsStyleKitImpl 0.0 # 0.0 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL diff --git a/x11/qt6/qtdeclarative/distinfo b/x11/qt6/qtdeclarative/distinfo index ccbcc0c593a..014b6280fb3 100644 --- a/x11/qt6/qtdeclarative/distinfo +++ b/x11/qt6/qtdeclarative/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtdeclarative-everywhere-src-6.11.1.tar.xz) = UuZw9nCwME9TSyT5jEfOuKQbtxBGRBTryVJ+xxzIaqQ= -SIZE (qt/qtdeclarative-everywhere-src-6.11.1.tar.xz) = 38744644 +SHA256 (qt/qtdeclarative-everywhere-src-6.11.2.tar.xz) = IVt7cFF+OAEj6rxrkiQ/PEe28BapHRJgV9vlNVHGtDA= +SIZE (qt/qtdeclarative-everywhere-src-6.11.2.tar.xz) = 38780392 diff --git a/x11/qt6/qtdeclarative/pkg/PLIST b/x11/qt6/qtdeclarative/pkg/PLIST index 505b2cb4807..557fb08cabd 100644 --- a/x11/qt6/qtdeclarative/pkg/PLIST +++ b/x11/qt6/qtdeclarative/pkg/PLIST @@ -851,6 +851,23 @@ include/X11/qt6/QtQmlXmlListModel/QtQmlXmlListModelDepends include/X11/qt6/QtQmlXmlListModel/QtQmlXmlListModelVersion include/X11/qt6/QtQmlXmlListModel/qtqmlxmllistmodelexports.h include/X11/qt6/QtQmlXmlListModel/qtqmlxmllistmodelversion.h +include/X11/qt6/QtQmltc/ +include/X11/qt6/QtQmltc/${VERSION}/ +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/ +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/ +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltccodewriter_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltccommandlineutils_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltccompiler_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltccompilerpieces_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltcoutputir_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltcoutputprimitives_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltcpropertyutils_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltctyperesolver_p.h +include/X11/qt6/QtQmltc/${VERSION}/QtQmltc/private/qqmltcvisitor_p.h +include/X11/qt6/QtQmltc/QtQmltc +include/X11/qt6/QtQmltc/QtQmltcDepends +include/X11/qt6/QtQmltc/QtQmltcVersion +include/X11/qt6/QtQmltc/qtqmltcversion.h include/X11/qt6/QtQuick/ include/X11/qt6/QtQuick/${VERSION}/ include/X11/qt6/QtQuick/${VERSION}/QtQuick/ @@ -2728,6 +2745,17 @@ lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateTargets.cmake lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateTargetsPrecheck.cmake lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6QmlXmlListModelPrivate/Qt6QmlXmlListModelPrivateVersionlessTargets.cmake +lib/cmake/Qt6QmltcPrivate/ +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateConfig.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateConfigVersion.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateConfigVersionImpl.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateDependencies.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateTargets.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateTargetsPrecheck.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6QmltcPrivate/Qt6QmltcPrivateVersionlessTargets.cmake lib/cmake/Qt6Quick/ lib/cmake/Qt6Quick/Qt6QuickAdditionalTargetInfo.cmake lib/cmake/Qt6Quick/Qt6QuickConfig.cmake @@ -3362,6 +3390,8 @@ lib/libQt6QmlWorkerScript.prl @lib lib/libQt6QmlWorkerScript.so.${LIBQt6QmlWorkerScript_VERSION} lib/libQt6QmlXmlListModel.prl @lib lib/libQt6QmlXmlListModel.so.${LIBQt6QmlXmlListModel_VERSION} +@static-lib lib/libQt6Qmltc.a +lib/libQt6Qmltc.prl lib/libQt6Quick.prl @lib lib/libQt6Quick.so.${LIBQt6Quick_VERSION} lib/libQt6QuickControls2.prl @@ -3514,6 +3544,7 @@ lib/qt6/metatypes/qt6qmllsprivate_metatypes.json lib/qt6/metatypes/qt6qmlmeta_metatypes.json lib/qt6/metatypes/qt6qmlmodels_metatypes.json lib/qt6/metatypes/qt6qmlnetwork_metatypes.json +lib/qt6/metatypes/qt6qmltcprivate_metatypes.json lib/qt6/metatypes/qt6qmltoolingsettingsprivate_metatypes.json lib/qt6/metatypes/qt6qmltyperegistrarprivate_metatypes.json lib/qt6/metatypes/qt6qmlworkerscript_metatypes.json @@ -3591,6 +3622,7 @@ lib/qt6/mkspecs/modules/qt_lib_qmlmodels.pri lib/qt6/mkspecs/modules/qt_lib_qmlmodels_private.pri lib/qt6/mkspecs/modules/qt_lib_qmlnetwork.pri lib/qt6/mkspecs/modules/qt_lib_qmlnetwork_private.pri +lib/qt6/mkspecs/modules/qt_lib_qmltc_private.pri lib/qt6/mkspecs/modules/qt_lib_qmltest.pri lib/qt6/mkspecs/modules/qt_lib_qmltest_private.pri lib/qt6/mkspecs/modules/qt_lib_qmltoolingsettings_private.pri @@ -3678,6 +3710,7 @@ lib/qt6/modules/QmlToolingSettingsPrivate.json lib/qt6/modules/QmlTypeRegistrarPrivate.json lib/qt6/modules/QmlWorkerScript.json lib/qt6/modules/QmlXmlListModel.json +lib/qt6/modules/QmltcPrivate.json lib/qt6/modules/Quick.json lib/qt6/modules/QuickControls2.json lib/qt6/modules/QuickControls2Basic.json @@ -4884,6 +4917,8 @@ lib/qt6/qml/QtQuick/Controls/Imagine/HorizontalHeaderViewDelegate.qml lib/qt6/qml/QtQuick/Controls/Imagine/ItemDelegate.qml lib/qt6/qml/QtQuick/Controls/Imagine/Label.qml lib/qt6/qml/QtQuick/Controls/Imagine/Menu.qml +lib/qt6/qml/QtQuick/Controls/Imagine/MenuBar.qml +lib/qt6/qml/QtQuick/Controls/Imagine/MenuBarItem.qml lib/qt6/qml/QtQuick/Controls/Imagine/MenuItem.qml lib/qt6/qml/QtQuick/Controls/Imagine/MenuSeparator.qml lib/qt6/qml/QtQuick/Controls/Imagine/Page.qml diff --git a/x11/qt6/qtgraphs/distinfo b/x11/qt6/qtgraphs/distinfo index 32216285b54..d55b601d680 100644 --- a/x11/qt6/qtgraphs/distinfo +++ b/x11/qt6/qtgraphs/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtgraphs-everywhere-src-6.11.1.tar.xz) = hLETiraKjilWQ5iVpLheto3aSKwWnaZz9nGRhzseBGI= -SIZE (qt/qtgraphs-everywhere-src-6.11.1.tar.xz) = 9285696 +SHA256 (qt/qtgraphs-everywhere-src-6.11.2.tar.xz) = nyEJhUr6Rd0UQRbBFGGYnEEaFwZcY9pQaEQaEgD7iyE= +SIZE (qt/qtgraphs-everywhere-src-6.11.2.tar.xz) = 9287464 diff --git a/x11/qt6/qtgrpc/distinfo b/x11/qt6/qtgrpc/distinfo index 4821c04a96a..8e3412e4c37 100644 --- a/x11/qt6/qtgrpc/distinfo +++ b/x11/qt6/qtgrpc/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtgrpc-everywhere-src-6.11.1.tar.xz) = Q3sE8MVQzNsXOcpfkRm3PfoDdlZIFei/wZmJBkPiolA= -SIZE (qt/qtgrpc-everywhere-src-6.11.1.tar.xz) = 753800 +SHA256 (qt/qtgrpc-everywhere-src-6.11.2.tar.xz) = REFGF/AFj/NJZfqFICe/zH5Pce78qM1EBslq8ixkrZM= +SIZE (qt/qtgrpc-everywhere-src-6.11.2.tar.xz) = 754012 diff --git a/x11/qt6/qthttpserver/distinfo b/x11/qt6/qthttpserver/distinfo index 86f61893c0b..450d3c3abb3 100644 --- a/x11/qt6/qthttpserver/distinfo +++ b/x11/qt6/qthttpserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qthttpserver-everywhere-src-6.11.1.tar.xz) = BL9w/PdoYfm2hwxygIXyN1prbZI8tdGhFt/y7VKk5wY= -SIZE (qt/qthttpserver-everywhere-src-6.11.1.tar.xz) = 185072 +SHA256 (qt/qthttpserver-everywhere-src-6.11.2.tar.xz) = 8PV2OyuljyD1z/377bl+YuMrXGOd9tmmN4kFAovnvY4= +SIZE (qt/qthttpserver-everywhere-src-6.11.2.tar.xz) = 186532 diff --git a/x11/qt6/qtimageformats/distinfo b/x11/qt6/qtimageformats/distinfo index 31e6ae161f4..b95671f4e3f 100644 --- a/x11/qt6/qtimageformats/distinfo +++ b/x11/qt6/qtimageformats/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtimageformats-everywhere-src-6.11.1.tar.xz) = sr9saEWsF17X+BkUVIO6Rnb2F6qmpQEsjv7mPIu6xBM= -SIZE (qt/qtimageformats-everywhere-src-6.11.1.tar.xz) = 2032792 +SHA256 (qt/qtimageformats-everywhere-src-6.11.2.tar.xz) = zs2JAPNLZVAHYwm8lPYvgoAItjOkI54KCMhniPQQAfg= +SIZE (qt/qtimageformats-everywhere-src-6.11.2.tar.xz) = 2050424 diff --git a/x11/qt6/qtlanguageserver/distinfo b/x11/qt6/qtlanguageserver/distinfo index ef2a901f48c..a310b8f18a7 100644 --- a/x11/qt6/qtlanguageserver/distinfo +++ b/x11/qt6/qtlanguageserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlanguageserver-everywhere-src-6.11.1.tar.xz) = UACFN/LKVKuzuNw/JnWYZOnK0rKtOekuQvpxjeLdiu8= -SIZE (qt/qtlanguageserver-everywhere-src-6.11.1.tar.xz) = 137276 +SHA256 (qt/qtlanguageserver-everywhere-src-6.11.2.tar.xz) = OLxCcuz0yg6xknInBT5SvmsuBXM/RtA0IjBqrOUR/F4= +SIZE (qt/qtlanguageserver-everywhere-src-6.11.2.tar.xz) = 138104 diff --git a/x11/qt6/qtlocation/distinfo b/x11/qt6/qtlocation/distinfo index 0ea8bee29c9..a51080670cf 100644 --- a/x11/qt6/qtlocation/distinfo +++ b/x11/qt6/qtlocation/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlocation-everywhere-src-6.11.1.tar.xz) = N5HOdymeb2AKWT0Pv6W9MvvPwtFhBHgrhKzEieOC5Bs= -SIZE (qt/qtlocation-everywhere-src-6.11.1.tar.xz) = 3151756 +SHA256 (qt/qtlocation-everywhere-src-6.11.2.tar.xz) = TVCn7OAfvXb27BfGUCNstW6mD5h8Uvw5Haxy8T9lwjo= +SIZE (qt/qtlocation-everywhere-src-6.11.2.tar.xz) = 3152216 diff --git a/x11/qt6/qtlottie/distinfo b/x11/qt6/qtlottie/distinfo index 5044d2205fb..246735c0dde 100644 --- a/x11/qt6/qtlottie/distinfo +++ b/x11/qt6/qtlottie/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlottie-everywhere-src-6.11.1.tar.xz) = 4ND629wz6XyCQcVic7VLansROeB2/dISgbxGYu5LJnk= -SIZE (qt/qtlottie-everywhere-src-6.11.1.tar.xz) = 663580 +SHA256 (qt/qtlottie-everywhere-src-6.11.2.tar.xz) = 9TxxJxbZ66mnzLQFuM0tMGUgl4KPz+sVL0a07EBSSFI= +SIZE (qt/qtlottie-everywhere-src-6.11.2.tar.xz) = 663696 diff --git a/x11/qt6/qtmultimedia/Makefile b/x11/qt6/qtmultimedia/Makefile index 91e4122b24f..6b4cd151910 100644 --- a/x11/qt6/qtmultimedia/Makefile +++ b/x11/qt6/qtmultimedia/Makefile @@ -1,9 +1,8 @@ QT6NAME = QtMultimedia COMMENT = Qt6 multimedia components PKGSPEC = qt6-qtmultimedia-${QT6_PKGSPEC} -REVISION = 0 -SHARED_LIBS += Qt6Multimedia 10.0 # 6.7 +SHARED_LIBS += Qt6Multimedia 11.0 # 6.7 SHARED_LIBS += Qt6MultimediaQuick 7.0 # 6.7 SHARED_LIBS += Qt6MultimediaWidgets 1.0 # 6.7 SHARED_LIBS += Qt6SpatialAudio 2.0 # 6.7 diff --git a/x11/qt6/qtmultimedia/distinfo b/x11/qt6/qtmultimedia/distinfo index 380cf45ad84..75ba4f34783 100644 --- a/x11/qt6/qtmultimedia/distinfo +++ b/x11/qt6/qtmultimedia/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtmultimedia-everywhere-src-6.11.1.tar.xz) = OQ+OUt3uOspcTefurZAMhMT6Yf9tHw6+qcdUM2XAmwo= -SIZE (qt/qtmultimedia-everywhere-src-6.11.1.tar.xz) = 10243896 +SHA256 (qt/qtmultimedia-everywhere-src-6.11.2.tar.xz) = lnteAuxreTzbNgYizW5wMTKDavmDII1nja5LUPEJzZ8= +SIZE (qt/qtmultimedia-everywhere-src-6.11.2.tar.xz) = 10255120 diff --git a/x11/qt6/qtmultimedia/pkg/PLIST b/x11/qt6/qtmultimedia/pkg/PLIST index 1502e25a608..166c4faf1ef 100644 --- a/x11/qt6/qtmultimedia/pkg/PLIST +++ b/x11/qt6/qtmultimedia/pkg/PLIST @@ -84,6 +84,7 @@ include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl/private/qgstreameraudiooutput_p.h include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl/private/qgstreamerbufferprobe_p.h include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl/private/qgstreamercamera_p.h +include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl/private/qgstreameregldisplay_p.h include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl/private/qgstreamerformatinfo_p.h include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl/private/qgstreamerimagecapture_p.h include/X11/qt6/QtGstreamerMediaPluginImpl/${VERSION}/QtGstreamerMediaPluginImpl/private/qgstreamerintegration_p.h diff --git a/x11/qt6/qtnetworkauth/distinfo b/x11/qt6/qtnetworkauth/distinfo index 05269bd0da6..452b19e2185 100644 --- a/x11/qt6/qtnetworkauth/distinfo +++ b/x11/qt6/qtnetworkauth/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtnetworkauth-everywhere-src-6.11.1.tar.xz) = nx1b8izMAz5CB2GGuWT51NQXn9AxKiwPGqGdtCUWVj0= -SIZE (qt/qtnetworkauth-everywhere-src-6.11.1.tar.xz) = 435572 +SHA256 (qt/qtnetworkauth-everywhere-src-6.11.2.tar.xz) = DIPCMHereCQ5P6FbsAFcPFrK9WeFRKp4nj/LtNQfoFs= +SIZE (qt/qtnetworkauth-everywhere-src-6.11.2.tar.xz) = 435820 diff --git a/x11/qt6/qtpositioning/Makefile b/x11/qt6/qtpositioning/Makefile index 2ad8594ad5b..8569c07c16c 100644 --- a/x11/qt6/qtpositioning/Makefile +++ b/x11/qt6/qtpositioning/Makefile @@ -2,7 +2,7 @@ QT6NAME = QtPositioning COMMENT = Qt Positioning API PKGSPEC = qt6-qtpositioning-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Positioning 2.0 # 6.7 +SHARED_LIBS += Qt6Positioning 3.0 # 6.7 SHARED_LIBS += Qt6PositioningQuick 3.0 # 6.7 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Network diff --git a/x11/qt6/qtpositioning/distinfo b/x11/qt6/qtpositioning/distinfo index 798b15e3849..175b804ab69 100644 --- a/x11/qt6/qtpositioning/distinfo +++ b/x11/qt6/qtpositioning/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtpositioning-everywhere-src-6.11.1.tar.xz) = 1ea5GAGuKG52MAFsrqO9xeGXi0KR1nQdDWTBJWUPePU= -SIZE (qt/qtpositioning-everywhere-src-6.11.1.tar.xz) = 653096 +SHA256 (qt/qtpositioning-everywhere-src-6.11.2.tar.xz) = 2M8VrUOjsVIK2sZM7FkAAoUlz3XwGkyCoAAuesGudJk= +SIZE (qt/qtpositioning-everywhere-src-6.11.2.tar.xz) = 655468 diff --git a/x11/qt6/qtquick3d/Makefile b/x11/qt6/qtquick3d/Makefile index e723d814a06..2082bf8c9c1 100644 --- a/x11/qt6/qtquick3d/Makefile +++ b/x11/qt6/qtquick3d/Makefile @@ -2,9 +2,9 @@ QT6NAME = QtQuick3d COMMENT = Quick 3D support for Qt6 PKGSPEC = qt6-qtquick3d-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Quick3D 7.0 # 6.7 +SHARED_LIBS += Qt6Quick3D 7.1 # 6.7 SHARED_LIBS += Qt6Quick3DAssetImport 2.0 # 6.7 -SHARED_LIBS += Qt6Quick3DRuntimeRender 7.0 # 6.7 +SHARED_LIBS += Qt6Quick3DRuntimeRender 8.0 # 6.7 SHARED_LIBS += Qt6Quick3DUtils 5.1 # 6.7 SHARED_LIBS += Qt6Quick3DAssetUtils 2.1 # 6.7 SHARED_LIBS += Qt6Quick3DEffects 1.0 # 6.7 @@ -12,7 +12,7 @@ SHARED_LIBS += Qt6Quick3DGlslParser 1.0 # 6.7 SHARED_LIBS += Qt6Quick3DHelpers 2.1 # 6.7 SHARED_LIBS += Qt6Quick3DIblBaker 1.0 # 6.7 SHARED_LIBS += Qt6Quick3DParticleEffects 1.0 # 6.7 -SHARED_LIBS += Qt6Quick3DParticles 2.1 # 6.7 +SHARED_LIBS += Qt6Quick3DParticles 2.2 # 6.7 SHARED_LIBS += Qt6Quick3DHelpersImpl 1.0 # 6.7 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui diff --git a/x11/qt6/qtquick3d/distinfo b/x11/qt6/qtquick3d/distinfo index 72cd049cc83..eb1529299e2 100644 --- a/x11/qt6/qtquick3d/distinfo +++ b/x11/qt6/qtquick3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquick3d-everywhere-src-6.11.1.tar.xz) = x2uF3j+KoqS+5kmHrP71YGdcGzeLkgdsfGJkYT5bRW8= -SIZE (qt/qtquick3d-everywhere-src-6.11.1.tar.xz) = 69622816 +SHA256 (qt/qtquick3d-everywhere-src-6.11.2.tar.xz) = Orjh8I7bJjc6N8+dQsI+fQksEzRWa5U/u1HLG5NnN7Q= +SIZE (qt/qtquick3d-everywhere-src-6.11.2.tar.xz) = 69948340 diff --git a/x11/qt6/qtquick3dphysics/Makefile b/x11/qt6/qtquick3dphysics/Makefile index 3dda9c7988b..1a4b5e75d77 100644 --- a/x11/qt6/qtquick3dphysics/Makefile +++ b/x11/qt6/qtquick3dphysics/Makefile @@ -6,7 +6,7 @@ QT6NAME = QtQuick3dPhysics COMMENT = Quick 3D Physics support for Qt6 PKGSPEC = qt6-qtquick3dphysics-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Quick3DPhysics 3.0 # 0.0 +SHARED_LIBS += Qt6Quick3DPhysics 4.0 # 0.0 SHARED_LIBS += Qt6Quick3DPhysicsHelpers 0.0 # 0.0 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL diff --git a/x11/qt6/qtquick3dphysics/distinfo b/x11/qt6/qtquick3dphysics/distinfo index 7b6a49c3838..9d80fdc34f3 100644 --- a/x11/qt6/qtquick3dphysics/distinfo +++ b/x11/qt6/qtquick3dphysics/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquick3dphysics-everywhere-src-6.11.1.tar.xz) = 0QhtbwFOe2mJRc8O4dw+Q1Re19zwteUBwNaDapasea8= -SIZE (qt/qtquick3dphysics-everywhere-src-6.11.1.tar.xz) = 4669964 +SHA256 (qt/qtquick3dphysics-everywhere-src-6.11.2.tar.xz) = HFokz0KF/EhIHXx65lvW6A7ZixCWTqboUwxgjEzeuG4= +SIZE (qt/qtquick3dphysics-everywhere-src-6.11.2.tar.xz) = 4669820 diff --git a/x11/qt6/qtquickeffectmaker/distinfo b/x11/qt6/qtquickeffectmaker/distinfo index 5a6a972694d..38f2f17cc1b 100644 --- a/x11/qt6/qtquickeffectmaker/distinfo +++ b/x11/qt6/qtquickeffectmaker/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquickeffectmaker-everywhere-src-6.11.1.tar.xz) = z+Y+cOiL3RJqF1di0+6zjrM25Fvs7ty9AnvFNidEE2s= -SIZE (qt/qtquickeffectmaker-everywhere-src-6.11.1.tar.xz) = 4343420 +SHA256 (qt/qtquickeffectmaker-everywhere-src-6.11.2.tar.xz) = eSPccoTpM6XjauJKQnVk8E4LJ6+N+jju6AksAcKDXLc= +SIZE (qt/qtquickeffectmaker-everywhere-src-6.11.2.tar.xz) = 4343516 diff --git a/x11/qt6/qtquicktimeline/distinfo b/x11/qt6/qtquicktimeline/distinfo index d1df8e9818a..3d02bba75ca 100644 --- a/x11/qt6/qtquicktimeline/distinfo +++ b/x11/qt6/qtquicktimeline/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquicktimeline-everywhere-src-6.11.1.tar.xz) = r1P2Q/2eQEXhubqRmZjlwEjKh3RSwIA2ycjF7gfqjCc= -SIZE (qt/qtquicktimeline-everywhere-src-6.11.1.tar.xz) = 97268 +SHA256 (qt/qtquicktimeline-everywhere-src-6.11.2.tar.xz) = JQrxBQCgxARd3nThB0SKaaRNWK+LfpqRcEqAjV+IHRc= +SIZE (qt/qtquicktimeline-everywhere-src-6.11.2.tar.xz) = 97312 diff --git a/x11/qt6/qtremoteobjects/distinfo b/x11/qt6/qtremoteobjects/distinfo index 404e3e4d353..41592ed0828 100644 --- a/x11/qt6/qtremoteobjects/distinfo +++ b/x11/qt6/qtremoteobjects/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtremoteobjects-everywhere-src-6.11.1.tar.xz) = QGKYlcaVMaaHqcAlgxbO4/BMLRiyvyrTbcg+dqWPERo= -SIZE (qt/qtremoteobjects-everywhere-src-6.11.1.tar.xz) = 529300 +SHA256 (qt/qtremoteobjects-everywhere-src-6.11.2.tar.xz) = XgyWgXmewrEXmnElBiZvsB+ySR6UvS26lCty/e95fP0= +SIZE (qt/qtremoteobjects-everywhere-src-6.11.2.tar.xz) = 530156 diff --git a/x11/qt6/qtscxml/distinfo b/x11/qt6/qtscxml/distinfo index 13aedb5c19a..906c2ae70c9 100644 --- a/x11/qt6/qtscxml/distinfo +++ b/x11/qt6/qtscxml/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtscxml-everywhere-src-6.11.1.tar.xz) = jklSReXR/nXeYSyKB+QENjVAehl5ux3ViPF1HROQID8= -SIZE (qt/qtscxml-everywhere-src-6.11.1.tar.xz) = 550144 +SHA256 (qt/qtscxml-everywhere-src-6.11.2.tar.xz) = 9ZTEu6f4v/sghXlzxyiVZp1uVN8IyNiX9Q0VJRzsNf8= +SIZE (qt/qtscxml-everywhere-src-6.11.2.tar.xz) = 550868 diff --git a/x11/qt6/qtsensors/distinfo b/x11/qt6/qtsensors/distinfo index 33c4dd61e04..10f045b519f 100644 --- a/x11/qt6/qtsensors/distinfo +++ b/x11/qt6/qtsensors/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtsensors-everywhere-src-6.11.1.tar.xz) = I2FwYtp75SbQI97H+bdiMQAaEJin5flMZG8uT4fPz48= -SIZE (qt/qtsensors-everywhere-src-6.11.1.tar.xz) = 1485472 +SHA256 (qt/qtsensors-everywhere-src-6.11.2.tar.xz) = aMjkTfsy6OIYL2P1VEwvRiCJsbsElXTx1QTuJkiQMRk= +SIZE (qt/qtsensors-everywhere-src-6.11.2.tar.xz) = 1486076 diff --git a/x11/qt6/qtserialbus/distinfo b/x11/qt6/qtserialbus/distinfo index 5636614e4f1..d18aa9782a1 100644 --- a/x11/qt6/qtserialbus/distinfo +++ b/x11/qt6/qtserialbus/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialbus-everywhere-src-6.11.1.tar.xz) = xGycDI1oFTAaZpzb1YZsELz7nlaIn119oU4R1q0k8go= -SIZE (qt/qtserialbus-everywhere-src-6.11.1.tar.xz) = 535680 +SHA256 (qt/qtserialbus-everywhere-src-6.11.2.tar.xz) = jwbJupX2sEXsQ/ARCU41pBFgRzEKokKAlmVBtyDfNsE= +SIZE (qt/qtserialbus-everywhere-src-6.11.2.tar.xz) = 535820 diff --git a/x11/qt6/qtserialport/distinfo b/x11/qt6/qtserialport/distinfo index 3660efea015..fa4c71bf969 100644 --- a/x11/qt6/qtserialport/distinfo +++ b/x11/qt6/qtserialport/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialport-everywhere-src-6.11.1.tar.xz) = mvMaiY/9mn5Pr2/thF0p54PHFohXiQVcvjGfPgctOXQ= -SIZE (qt/qtserialport-everywhere-src-6.11.1.tar.xz) = 264092 +SHA256 (qt/qtserialport-everywhere-src-6.11.2.tar.xz) = 3zpzNhZETzGy7LaJIY6hREvpHYYoqjq45GTF6xsXrY4= +SIZE (qt/qtserialport-everywhere-src-6.11.2.tar.xz) = 264044 diff --git a/x11/qt6/qtshadertools/Makefile b/x11/qt6/qtshadertools/Makefile index 26f72c80c0d..a3d5b390cbf 100644 --- a/x11/qt6/qtshadertools/Makefile +++ b/x11/qt6/qtshadertools/Makefile @@ -1,9 +1,8 @@ QT6NAME = QtShaderTools COMMENT = Qt6 shader tools module PKGSPEC = qt6-qtshadertools-${QT6_PKGSPEC} -REVISION = 0 -SHARED_LIBS = Qt6ShaderTools 3.0 # 6.7 +SHARED_LIBS = Qt6ShaderTools 4.0 # 6.7 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui c m xkbcommon diff --git a/x11/qt6/qtshadertools/distinfo b/x11/qt6/qtshadertools/distinfo index 990f1982924..c9cf6f04eb3 100644 --- a/x11/qt6/qtshadertools/distinfo +++ b/x11/qt6/qtshadertools/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtshadertools-everywhere-src-6.11.1.tar.xz) = IHUFL5sjvPneBFu9GAA3CElC+CzOhwqrFKFFSQLJgvw= -SIZE (qt/qtshadertools-everywhere-src-6.11.1.tar.xz) = 1216568 +SHA256 (qt/qtshadertools-everywhere-src-6.11.2.tar.xz) = gFBGuLd1dmVYaJCzdZQAR+h0rjqwCtttPys4/GsgCxw= +SIZE (qt/qtshadertools-everywhere-src-6.11.2.tar.xz) = 1216816 diff --git a/x11/qt6/qtspeech/distinfo b/x11/qt6/qtspeech/distinfo index bbecc408639..66b12122061 100644 --- a/x11/qt6/qtspeech/distinfo +++ b/x11/qt6/qtspeech/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtspeech-everywhere-src-6.11.1.tar.xz) = wDXDGAEgJYdaZTJFcBoj04B+jka4v3mHh3hCIZwnPxQ= -SIZE (qt/qtspeech-everywhere-src-6.11.1.tar.xz) = 249232 +SHA256 (qt/qtspeech-everywhere-src-6.11.2.tar.xz) = nB0F3J1xAEnyCmdoD8a0KTybWEqQ8E9M9sw251jFy5g= +SIZE (qt/qtspeech-everywhere-src-6.11.2.tar.xz) = 249288 diff --git a/x11/qt6/qtsvg/Makefile b/x11/qt6/qtsvg/Makefile index efe1522f97f..278327189f7 100644 --- a/x11/qt6/qtsvg/Makefile +++ b/x11/qt6/qtsvg/Makefile @@ -2,7 +2,7 @@ QT6NAME = QtSVG COMMENT = SVG support for Qt6 PKGSPEC = qt6-qtsvg-${QT6_PKGSPEC} -SHARED_LIBS += Qt6Svg 5.0 # 6.7 +SHARED_LIBS += Qt6Svg 6.0 # 6.7 SHARED_LIBS += Qt6SvgWidgets 1.1 # 6.7 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Widgets m xkbcommon diff --git a/x11/qt6/qtsvg/distinfo b/x11/qt6/qtsvg/distinfo index 1448198efbd..561c482a885 100644 --- a/x11/qt6/qtsvg/distinfo +++ b/x11/qt6/qtsvg/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtsvg-everywhere-src-6.11.1.tar.xz) = fzzwL0gkvwPCxYWeptsXO/FIKh2vJObN97x4z6JqipQ= -SIZE (qt/qtsvg-everywhere-src-6.11.1.tar.xz) = 2336944 +SHA256 (qt/qtsvg-everywhere-src-6.11.2.tar.xz) = 1ZQzf+yoTCb7Z/6HuF5qXBL9pAS2EdkF+dE4IQwxGHY= +SIZE (qt/qtsvg-everywhere-src-6.11.2.tar.xz) = 2341860 diff --git a/x11/qt6/qttools/Makefile b/x11/qt6/qttools/Makefile index fabf69eba9c..821ea7bc482 100644 --- a/x11/qt6/qttools/Makefile +++ b/x11/qt6/qttools/Makefile @@ -1,9 +1,8 @@ QT6NAME = QtTools COMMENT = Qt6 development tools PKGSPEC = qt6-qttools-${QT6_PKGSPEC} -REVISION = 0 -SHARED_LIBS += Qt6Designer 4.0 # 6.7 +SHARED_LIBS += Qt6Designer 5.0 # 6.7 SHARED_LIBS += Qt6DesignerComponents 2.0 # 6.7 SHARED_LIBS += Qt6Help 2.0 # 6.7 SHARED_LIBS += Qt6UiTools 2.0 # 6.7 diff --git a/x11/qt6/qttools/distinfo b/x11/qt6/qttools/distinfo index 40558176d19..d984cc18b87 100644 --- a/x11/qt6/qttools/distinfo +++ b/x11/qt6/qttools/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qttools-everywhere-src-6.11.1.tar.xz) = jmGDWmeck/qcYGWxQjU8IHG6aOKXiYk3wyoDd3/K9Q0= -SIZE (qt/qttools-everywhere-src-6.11.1.tar.xz) = 10225832 +SHA256 (qt/qttools-everywhere-src-6.11.2.tar.xz) = nqda81xRL34J5hyMOvOZfxO01Duwmc9D/OxHASa0BB4= +SIZE (qt/qttools-everywhere-src-6.11.2.tar.xz) = 10226452 diff --git a/x11/qt6/qttranslations/distinfo b/x11/qt6/qttranslations/distinfo index 181a8aebf0f..be29aaa20e3 100644 --- a/x11/qt6/qttranslations/distinfo +++ b/x11/qt6/qttranslations/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qttranslations-everywhere-src-6.11.1.tar.xz) = N8AsgSBllMe7TtyoWsk+jlWpg2twyWD95ssPhiPsVnc= -SIZE (qt/qttranslations-everywhere-src-6.11.1.tar.xz) = 1684616 +SHA256 (qt/qttranslations-everywhere-src-6.11.2.tar.xz) = AhaEwaeTep+rw7BWpmmK1ZeHlMr5rBkP1swROZ5nwBQ= +SIZE (qt/qttranslations-everywhere-src-6.11.2.tar.xz) = 1691056 diff --git a/x11/qt6/qtvirtualkeyboard/distinfo b/x11/qt6/qtvirtualkeyboard/distinfo index db07772a1dc..c15ca2ae7d6 100644 --- a/x11/qt6/qtvirtualkeyboard/distinfo +++ b/x11/qt6/qtvirtualkeyboard/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtvirtualkeyboard-everywhere-src-6.11.1.tar.xz) = ocaWezJiQ7LKjVC8e394UsOXXZqmzksYbr3zW7EAfhw= -SIZE (qt/qtvirtualkeyboard-everywhere-src-6.11.1.tar.xz) = 3293452 +SHA256 (qt/qtvirtualkeyboard-everywhere-src-6.11.2.tar.xz) = TGomc0pcTkrNX/muXxkqW4g7xFFBGPnfL88SBk5kfC8= +SIZE (qt/qtvirtualkeyboard-everywhere-src-6.11.2.tar.xz) = 3284068 diff --git a/x11/qt6/qtwayland/Makefile b/x11/qt6/qtwayland/Makefile index c67bf2707e2..2388a7fd7a9 100644 --- a/x11/qt6/qtwayland/Makefile +++ b/x11/qt6/qtwayland/Makefile @@ -2,7 +2,7 @@ QT6NAME = QtWayland COMMENT = Qt6 module for Wayland support PKGSPEC = qt6-qtwayland-${QT6_PKGSPEC} -SHARED_LIBS += Qt6WaylandCompositor 3.2 # 6.7 +SHARED_LIBS += Qt6WaylandCompositor 3.3 # 6.7 SHARED_LIBS += Qt6WaylandEglCompositorHwIntegration 2.0 # 6.7 SHARED_LIBS += Qt6WaylandCompositorIviapplication 0.0 # 0.0 SHARED_LIBS += Qt6WaylandCompositorPresentationTime 0.0 # 0.0 diff --git a/x11/qt6/qtwayland/distinfo b/x11/qt6/qtwayland/distinfo index a9f6896dce2..2ddc6161f48 100644 --- a/x11/qt6/qtwayland/distinfo +++ b/x11/qt6/qtwayland/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwayland-everywhere-src-6.11.1.tar.xz) = lXiKpQL3VEHU7fZZMrI192UjCE4T27t7nuLSB7Mr2bM= -SIZE (qt/qtwayland-everywhere-src-6.11.1.tar.xz) = 903616 +SHA256 (qt/qtwayland-everywhere-src-6.11.2.tar.xz) = jrdhXjkzKhD1BujdcPAtWVS7WUn/VPbcv4vWFoIi+d8= +SIZE (qt/qtwayland-everywhere-src-6.11.2.tar.xz) = 905288 diff --git a/x11/qt6/qtwebchannel/distinfo b/x11/qt6/qtwebchannel/distinfo index 01b9bc63fb5..b8985c41b4a 100644 --- a/x11/qt6/qtwebchannel/distinfo +++ b/x11/qt6/qtwebchannel/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebchannel-everywhere-src-6.11.1.tar.xz) = afu1C3HW5llsLWhj7pqcmEpNATeO4re0Fju0Z6AVjYI= -SIZE (qt/qtwebchannel-everywhere-src-6.11.1.tar.xz) = 193204 +SHA256 (qt/qtwebchannel-everywhere-src-6.11.2.tar.xz) = /rMUl1i9qIfwwpJlYZSBLdLCJ1lbrcj73rL7IxHFV18= +SIZE (qt/qtwebchannel-everywhere-src-6.11.2.tar.xz) = 193460 diff --git a/x11/qt6/qtwebengine/distinfo b/x11/qt6/qtwebengine/distinfo index b2cfb15b3d9..54e807c0730 100644 --- a/x11/qt6/qtwebengine/distinfo +++ b/x11/qt6/qtwebengine/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebengine-everywhere-src-6.11.1.tar.xz) = Z5xmzMbBWPwhXpxY7xYDMezSmXQjLjRcBRYYifhmcIM= -SIZE (qt/qtwebengine-everywhere-src-6.11.1.tar.xz) = 578914356 +SHA256 (qt/qtwebengine-everywhere-src-6.11.2.tar.xz) = YQHBqgD/kz0bZe5dFn926NcbmsWzeLAREndyPr2nwWM= +SIZE (qt/qtwebengine-everywhere-src-6.11.2.tar.xz) = 580351104 diff --git a/x11/qt6/qtwebengine/patches/patch-cmake_QtToolchainHelpers_cmake b/x11/qt6/qtwebengine/patches/patch-cmake_QtToolchainHelpers_cmake index 993f180b2ab..6f894fb6e73 100644 --- a/x11/qt6/qtwebengine/patches/patch-cmake_QtToolchainHelpers_cmake +++ b/x11/qt6/qtwebengine/patches/patch-cmake_QtToolchainHelpers_cmake @@ -18,7 +18,7 @@ Index: cmake/QtToolchainHelpers.cmake use_custom_libcxx_for_host=false enable_constraints=false ) -@@ -367,7 +370,7 @@ macro(append_build_type_setup) +@@ -368,7 +371,7 @@ macro(append_build_type_setup) extend_gn_list(gnArgArg ARGS enable_precompiled_headers @@ -27,7 +27,7 @@ Index: cmake/QtToolchainHelpers.cmake ) extend_gn_list(gnArgArg ARGS dcheck_always_on -@@ -393,7 +396,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -394,7 +397,7 @@ macro(append_compiler_linker_sdk_setup) extend_gn_list(gnArgArg ARGS is_clang CONDITION CLANG) extend_gn_list(gnArgArg ARGS is_mingw CONDITION MINGW) extend_gn_list(gnArgArg ARGS is_msvc CONDITION MSVC) @@ -36,7 +36,7 @@ Index: cmake/QtToolchainHelpers.cmake if(CLANG) get_clang_runtime_path_version(clang_runtime_path_version) -@@ -487,7 +490,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -492,7 +495,7 @@ macro(append_compiler_linker_sdk_setup) ) endif() get_gn_arch(cpu ${TEST_architecture_arch}) @@ -45,7 +45,7 @@ Index: cmake/QtToolchainHelpers.cmake extend_gn_list_cflag(gnArgArg ARG arm_tune -@@ -596,7 +599,7 @@ macro(append_toolchain_setup) +@@ -601,7 +604,7 @@ macro(append_toolchain_setup) endif() unset(host_cpu) unset(target_cpu) diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_base_BUILD_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_base_BUILD_gn index d4935faebce..ea695235fd3 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_base_BUILD_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_base_BUILD_gn @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn # Base and everything it depends on should be a static library rather than # a source set. Base is more of a "library" in the classic sense in that many -@@ -1139,11 +1139,29 @@ jumbo_component("base") { +@@ -1140,11 +1140,29 @@ jumbo_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -42,7 +42,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1163,7 +1181,7 @@ jumbo_component("base") { +@@ -1164,7 +1182,7 @@ jumbo_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -51,7 +51,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2181,6 +2199,22 @@ jumbo_component("base") { +@@ -2182,6 +2200,22 @@ jumbo_component("base") { ] } @@ -74,7 +74,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn # iOS if (is_ios) { sources += [ -@@ -2355,6 +2389,33 @@ jumbo_component("base") { +@@ -2356,6 +2390,33 @@ jumbo_component("base") { } } @@ -108,7 +108,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2764,7 +2825,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2765,7 +2826,7 @@ buildflag_header("protected_memory_buildflags") { header = "protected_memory_buildflags.h" header_dir = "base/memory" @@ -117,7 +117,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn (is_win || is_linux || is_android || is_mac) flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] -@@ -3270,7 +3331,7 @@ if (is_apple) { +@@ -3271,7 +3332,7 @@ if (is_apple) { } } @@ -126,7 +126,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3975,7 +4036,7 @@ test("base_unittests") { +@@ -3977,7 +4038,7 @@ test("base_unittests") { ] } @@ -135,7 +135,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3999,7 +4060,7 @@ test("base_unittests") { +@@ -4001,7 +4062,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -144,7 +144,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -4010,7 +4071,7 @@ test("base_unittests") { +@@ -4012,7 +4073,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -153,7 +153,7 @@ Index: src/3rdparty/chromium/base/BUILD.gn defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4197,7 +4258,7 @@ test("base_unittests") { +@@ -4199,7 +4260,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_BUILDCONFIG_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_BUILDCONFIG_gn index 9156bb7090c..6a2d90cb09d 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_BUILDCONFIG_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_BUILDCONFIG_gn @@ -22,16 +22,16 @@ Index: src/3rdparty/chromium/build/config/BUILDCONFIG.gn } else { assert(false, "Unsupported host_os: $host_os") } -@@ -306,6 +311,8 @@ if (target_os == "android") { - assert( - false, +@@ -308,6 +313,8 @@ if (target_os == "android") { "emscripten is not a supported target_os. It is available only as secondary toolchain.") + } else if (target_os == "ohos") { + _default_toolchain = "//build/toolchain/ohos:ohos_clang_$target_cpu" +} else if (target_os == "openbsd" || target_os == "freebsd") { -+ _default_toolchain = host_toolchain ++ _default_toolchain = host_toolchain } else { assert(false, "Unsupported target_os: $target_os") } -@@ -340,7 +347,11 @@ is_android = current_os == "android" +@@ -342,7 +349,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" @@ -42,5 +42,5 @@ Index: src/3rdparty/chromium/build/config/BUILDCONFIG.gn +is_freebsd = current_os == "freebsd" +is_bsd = host_os == "openbsd" || current_os == "freebsd" is_mac = current_os == "mac" + is_ohos = current_os == "ohos" - # TODO(crbug.com/40511454): Remove is_nacl from all build files, then diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_clang_BUILD_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_clang_BUILD_gn index d3111663e1f..534c4272b82 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_clang_BUILD_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_clang_BUILD_gn @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/build/config/clang/BUILD.gn --- src/3rdparty/chromium/build/config/clang/BUILD.gn.orig +++ src/3rdparty/chromium/build/config/clang/BUILD.gn -@@ -268,7 +268,12 @@ template("clang_lib") { +@@ -274,7 +274,12 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn index 145dafc3ec6..4bb1a4dcc1c 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_build_config_compiler_BUILD_gn @@ -37,7 +37,7 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn } # compiler --------------------------------------------------------------------- -@@ -626,6 +629,10 @@ config("compiler") { +@@ -628,6 +631,10 @@ config("compiler") { } } @@ -48,7 +48,7 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -1375,7 +1382,7 @@ config("compiler_cpu_abi") { +@@ -1377,7 +1384,7 @@ config("compiler_cpu_abi") { # CPU architecture. We may or may not be doing a cross compile now, so for # simplicity we always explicitly set the architecture. if (current_cpu == "x64") { @@ -57,16 +57,16 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn cflags += [ "--target=x86_64-unknown-linux-gnu" ] ldflags += [ "--target=x86_64-unknown-linux-gnu" ] } else { -@@ -1384,7 +1391,7 @@ config("compiler_cpu_abi") { +@@ -1386,7 +1393,7 @@ config("compiler_cpu_abi") { } cflags += [ "-msse3" ] } else if (current_cpu == "x86") { - if (is_clang && !is_android && !is_chromeos_device) { -+ if (is_clang && !is_android && !is_chromeos_device && !Is_bsd) { ++ if (is_clang && !is_android && !is_chromeos_device && !is_bsd) { cflags += [ "--target=i386-unknown-linux-gnu" ] ldflags += [ "--target=i386-unknown-linux-gnu" ] } else { -@@ -1396,7 +1403,7 @@ config("compiler_cpu_abi") { +@@ -1398,7 +1405,7 @@ config("compiler_cpu_abi") { "-msse3", ] } else if (current_cpu == "arm") { @@ -75,16 +75,16 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1411,7 +1418,7 @@ config("compiler_cpu_abi") { +@@ -1413,7 +1420,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) { -+ if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device && !is_bsd) { +- if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device && !is_ohos) { ++ if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device && !is_ohos && !is_bsd) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1810,7 +1817,7 @@ config("compiler_deterministic") { +@@ -1812,7 +1819,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -93,7 +93,7 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn current_os != "zos") { _perform_consistency_checks = current_toolchain == default_toolchain if (llvm_force_head_revision) { -@@ -2399,9 +2406,6 @@ config("default_warnings") { +@@ -2403,9 +2410,6 @@ config("default_warnings") { # TODO(crbug.com/40284799): Fix and re-enable. "-Wno-thread-safety-reference-return", @@ -103,7 +103,7 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn ] cflags += [ "-Wno-deprecated-declarations" ] -@@ -3197,7 +3201,7 @@ config("afdo_optimize_size") { +@@ -3201,7 +3205,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -112,12 +112,12 @@ Index: src/3rdparty/chromium/build/config/compiler/BUILD.gn cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -3224,7 +3228,7 @@ config("afdo") { +@@ -3228,7 +3232,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } - } else if (auto_profile_path != "" && is_a_target_toolchain) { -+ } else if (auto_profile_path != "" && is_a_target_toolchain && !is_bsd) { ++ } else if (auto_profile_path != "" && is_a_target_toolchain && !is_bsd) { cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_chrome_browser_BUILD_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_chrome_browser_BUILD_gn index 2f71d07b8c0..6cb7f4ac657 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_chrome_browser_BUILD_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_chrome_browser_BUILD_gn @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/chrome/browser/BUILD.gn --- src/3rdparty/chromium/chrome/browser/BUILD.gn.orig +++ src/3rdparty/chromium/chrome/browser/BUILD.gn -@@ -7036,6 +7036,13 @@ static_library("browser") { +@@ -7034,6 +7034,13 @@ static_library("browser") { [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ] } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_media_router_common_media_source_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_media_router_common_media_source_cc index 8d0cf9ffc4d..7d2dd27098f 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_media_router_common_media_source_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_media_router_common_media_source_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/components/media_router/common/media_source.cc --- src/3rdparty/chromium/components/media_router/common/media_source.cc.orig +++ src/3rdparty/chromium/components/media_router/common/media_source.cc -@@ -62,7 +62,7 @@ bool IsSystemAudioCaptureSupported() { +@@ -68,7 +68,7 @@ bool IsSystemAudioCaptureSupported() { #if BUILDFLAG(IS_MAC) return media::IsMacSckSystemLoopbackCaptureSupported() || base::FeatureList::IsEnabled(media::kMacCatapLoopbackAudioForCast); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_named_mojo_ipc_server_named_mojo_ipc_server_client_util_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_named_mojo_ipc_server_named_mojo_ipc_server_client_util_cc index a8d29d8e31c..12080fe8746 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_named_mojo_ipc_server_named_mojo_ipc_server_client_util_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_named_mojo_ipc_server_named_mojo_ipc_server_client_util_cc @@ -4,9 +4,9 @@ Index: src/3rdparty/chromium/components/named_mojo_ipc_server/named_mojo_ipc_ser @@ -23,7 +23,7 @@ namespace named_mojo_ipc_server { // static mojo::PlatformChannelEndpoint ConnectToServer( - const mojo::NamedPlatformChannel::ServerName& server_name) { + const mojo::NamedPlatformChannel::Options& options) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return mojo::NamedPlatformChannel::ConnectToServer(server_name); + return mojo::NamedPlatformChannel::ConnectToServer(options); #elif BUILDFLAG(IS_MAC) mojo::PlatformChannelEndpoint endpoint = diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_cc index 43e2fb8765e..05fca9ae666 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/components/password_manager/core/browser/password_autofill_manager.cc --- src/3rdparty/chromium/components/password_manager/core/browser/password_autofill_manager.cc.orig +++ src/3rdparty/chromium/components/password_manager/core/browser/password_autofill_manager.cc -@@ -308,7 +308,7 @@ void PasswordAutofillManager::DidAcceptSuggestion( +@@ -312,7 +312,7 @@ void PasswordAutofillManager::DidAcceptSuggestion( weak_ptr_factory_.GetWeakPtr(), *password_credential); if (password_credential->is_grouped_affiliation) { #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/components/password_manager/core/browser/password_a cross_domain_confirmation_controller_ = password_client_->ShowCrossDomainConfirmationPopup( last_popup_open_args_.element_bounds, -@@ -538,7 +538,7 @@ void PasswordAutofillManager::DidNavigateMainFrame() { +@@ -542,7 +542,7 @@ void PasswordAutofillManager::DidNavigateMainFrame() { manual_fallback_metrics_recorder_ = std::make_unique<PasswordManualFallbackMetricsRecorder>(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_h index ca587c10263..ebd26318282 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_autofill_manager_h @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/components/password_manager/core/browser/password_autofill_manager.h --- src/3rdparty/chromium/components/password_manager/core/browser/password_autofill_manager.h.orig +++ src/3rdparty/chromium/components/password_manager/core/browser/password_autofill_manager.h -@@ -285,7 +285,7 @@ class PasswordAutofillManager : public autofill::Autof +@@ -291,7 +291,7 @@ class PasswordAutofillManager : public autofill::Autof // Stores the controller of warning popup UI on cross domain filling. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_form_manager_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_form_manager_cc index 7fe9dcd72bc..29fc3fd5121 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_form_manager_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_password_manager_core_browser_password_form_manager_cc @@ -19,7 +19,7 @@ Index: src/3rdparty/chromium/components/password_manager/core/browser/password_f bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -931,7 +931,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -935,7 +935,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_viz_service_gl_gpu_service_impl_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_viz_service_gl_gpu_service_impl_cc index c876df9d3b1..b89012ac547 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_viz_service_gl_gpu_service_impl_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_components_viz_service_gl_gpu_service_impl_cc @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/components/viz/service/gl/gpu_service_impl.cc gpu_extra_info_.is_gmb_nv12_supported = IsGMBNV12Supported(); #endif -@@ -1276,7 +1276,7 @@ bool GpuServiceImpl::OnBeginFrameDerivedImpl(const Beg +@@ -1277,7 +1277,7 @@ bool GpuServiceImpl::OnBeginFrameDerivedImpl(const Beg return true; } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD_gn index b14eb87f037..8c2c888cb4d 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_BUILD_gn @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/browser/BUILD.gn --- src/3rdparty/chromium/content/browser/BUILD.gn.orig +++ src/3rdparty/chromium/content/browser/BUILD.gn -@@ -2605,6 +2605,14 @@ jumbo_source_set("browser") { +@@ -2607,6 +2607,14 @@ jumbo_source_set("browser") { ] } @@ -16,7 +16,7 @@ Index: src/3rdparty/chromium/content/browser/BUILD.gn if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2653,6 +2661,15 @@ jumbo_source_set("browser") { +@@ -2655,6 +2663,15 @@ jumbo_source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/oop_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom" ] diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_cc index 717a12cf813..26ead05a7f9 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_cc @@ -19,16 +19,7 @@ Index: src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_imp // 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. -@@ -107,7 +107,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( - const HandleMessageCallback& handle_message_callback) - : web_contents_(WebContents::FromRenderFrameHost(frame_host)), - handle_message_callback_(handle_message_callback) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - Observe(web_contents_); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend; -@@ -132,7 +132,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage +@@ -133,7 +133,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage handle_message_callback_.Run(std::move(message)); } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_h index 95133d69d51..9924e5cb3f7 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_devtools_devtools_frontend_host_impl_h @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.h --- src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.h.orig +++ src/3rdparty/chromium/content/browser/devtools/devtools_frontend_host_impl.h -@@ -34,7 +34,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte +@@ -33,7 +33,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte void BadMessageReceived() override; diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_cc index 975572ab31e..b8ca59f6fbd 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc --- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc.orig +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc -@@ -412,7 +412,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -427,7 +427,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_h index 8b0f537eec3..8696bfb40f1 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_h @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h --- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h.orig +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h -@@ -224,7 +224,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -233,7 +233,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_cc index 93f36641f20..0972fc94d51 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc --- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc.orig +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1712,7 +1712,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1739,7 +1739,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_h index c71a83de9c2..94657d8255d 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_data_manager_impl_private_h @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h --- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h.orig +++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h -@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -152,7 +152,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h bool IsGpuMemoryBufferNV12Supported(); #endif // BUILDFLAG(IS_LINUX) -@@ -312,7 +312,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -316,7 +316,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_process_host_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_process_host_cc index 20339e70ced..6db6822a907 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_process_host_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_gpu_gpu_process_host_cc @@ -9,7 +9,7 @@ Index: src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, -@@ -305,7 +306,7 @@ static const char* const kSwitchNames[] = { +@@ -304,7 +305,7 @@ static const char* const kSwitchNames[] = { switches::kEnableNativeGpuMemoryBuffers, switches::kRenderNodeOverride, #endif diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_renderer_host_render_widget_host_view_aura_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_renderer_host_render_widget_host_view_aura_cc index 624fdb94b7d..7de18c11d67 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_renderer_host_render_widget_host_view_aura_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_renderer_host_render_widget_host_view_aura_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc --- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -122,7 +122,7 @@ +@@ -123,7 +123,7 @@ #include "ui/gfx/gdi_util.h" #endif // BUILDFLAG(IS_WIN) @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_vi #include "ui/accessibility/platform/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -479,7 +479,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -480,7 +480,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -19,7 +19,7 @@ Index: src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_vi ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1883,7 +1883,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1908,7 +1908,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -28,7 +28,7 @@ Index: src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_vi bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2866,7 +2866,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2902,7 +2902,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -37,7 +37,7 @@ Index: src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_vi return NeedsInputGrab(); #else return false; -@@ -3050,7 +3050,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -3112,7 +3112,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_web_contents_web_contents_view_aura_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_web_contents_web_contents_view_aura_cc index bb2bf88bfe5..9701920dd36 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_web_contents_web_contents_view_aura_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_browser_web_contents_web_contents_view_aura_cc @@ -10,16 +10,16 @@ Index: src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -260,7 +260,7 @@ void PrepareDragData(const DropData& drop_data, - if (!drop_data.download_metadata.empty()) - PrepareDragForDownload(drop_data, provider, web_contents); +@@ -255,7 +255,7 @@ void PrepareDragData(RenderFrameHost& source_rfh, + PrepareDragForDownload(source_rfh, drop_data, provider); + } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // 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. -@@ -1334,7 +1334,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1336,7 +1336,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/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_cc index 86c487c1df3..14d30611d39 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/common/features.cc --- src/3rdparty/chromium/content/common/features.cc.orig +++ src/3rdparty/chromium/content/common/features.cc -@@ -178,7 +178,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, +@@ -191,7 +191,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, base::FEATURE_DISABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_h index 3d182454ea4..352c2a646ac 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_common_features_h @@ -1,12 +1,15 @@ Index: src/3rdparty/chromium/content/common/features.h --- src/3rdparty/chromium/content/common/features.h.orig +++ src/3rdparty/chromium/content/common/features.h -@@ -61,7 +61,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTr - CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWorkerOrWorkletAgentDoubleReleaseFix); +@@ -63,9 +63,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWorkerOrWorkletAg CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kDumpOnOriginHeaderMismatch); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kDumpOnUnexpectedOriginHeader); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnforceSameDocumentOriginInvariants); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnforceFileSystemManagerOpenOrigin); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_gpu_gpu_main_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_gpu_gpu_main_cc index 1870ffd05d7..eb07f327b85 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_gpu_gpu_main_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_gpu_gpu_main_cc @@ -37,7 +37,7 @@ Index: src/3rdparty/chromium/content/gpu/gpu_main.cc return StartSandboxWindows(sandbox_info_); @@ -306,7 +310,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( - gpu_preferences.message_pump_type); + gpu_preferences.message_pump_type, /*is_main_thread=*/true); } -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_public_browser_content_browser_client_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_public_browser_content_browser_client_cc index b20effd7846..5931ae0412b 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_public_browser_content_browser_client_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_public_browser_content_browser_client_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/content/public/browser/content_browser_client.cc --- src/3rdparty/chromium/content/public/browser/content_browser_client.cc.orig +++ src/3rdparty/chromium/content/public/browser/content_browser_client.cc -@@ -1401,7 +1401,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1414,7 +1414,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_utility_utility_main_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_utility_utility_main_cc index efb11989856..21b23fe8532 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_utility_utility_main_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_content_utility_utility_main_cc @@ -56,7 +56,7 @@ Index: src/3rdparty/chromium/content/utility/utility_main.cc std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -289,7 +298,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -290,7 +299,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif @@ -65,7 +65,7 @@ Index: src/3rdparty/chromium/content/utility/utility_main.cc #if BUILDFLAG(USE_LINUX_VIDEO_ACCELERATION) && BUILDFLAG(USE_VAAPI) // Regardless of the sandbox status, the VaapiWrapper needs to be initialized -@@ -304,7 +313,10 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -305,7 +314,10 @@ int UtilityMain(MainFunctionParams parameters) { // thread type change in ChildProcess constructor. It also needs to be // registered before the process has multiple threads, which may race with // application of the sandbox. @@ -76,7 +76,7 @@ Index: src/3rdparty/chromium/content/utility/utility_main.cc // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict -@@ -340,7 +352,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -341,7 +353,7 @@ int UtilityMain(MainFunctionParams parameters) { base::BindOnce(&speech::SpeechRecognitionPreSandboxHook); #endif break; @@ -85,7 +85,7 @@ Index: src/3rdparty/chromium/content/utility/utility_main.cc case sandbox::mojom::Sandbox::kOnDeviceTranslation: pre_sandbox_hook = base::BindOnce( &on_device_translation::OnDeviceTranslationSandboxHook); -@@ -356,7 +368,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -357,7 +369,7 @@ int UtilityMain(MainFunctionParams parameters) { #else NOTREACHED(); #endif @@ -94,7 +94,7 @@ Index: src/3rdparty/chromium/content/utility/utility_main.cc case sandbox::mojom::Sandbox::kVideoEffects: #if BUILDFLAG(ENABLE_VIDEO_EFFECTS) pre_sandbox_hook = -@@ -364,7 +376,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -365,7 +377,7 @@ int UtilityMain(MainFunctionParams parameters) { #endif break; #endif // BUILDFLAG(IS_LINUX) @@ -103,7 +103,7 @@ Index: src/3rdparty/chromium/content/utility/utility_main.cc case sandbox::mojom::Sandbox::kShapeDetection: pre_sandbox_hook = base::BindOnce(&shape_detection::ShapeDetectionPreSandboxHook); -@@ -399,6 +411,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -400,6 +412,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -111,7 +111,7 @@ Index: src/3rdparty/chromium/content/utility/utility_main.cc if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -406,6 +419,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -407,6 +420,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_device_gamepad_BUILD_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_device_gamepad_BUILD_gn index e08e22dd6b6..386ed494764 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_device_gamepad_BUILD_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_device_gamepad_BUILD_gn @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/device/gamepad/BUILD.gn --- src/3rdparty/chromium/device/gamepad/BUILD.gn.orig +++ src/3rdparty/chromium/device/gamepad/BUILD.gn -@@ -98,7 +98,7 @@ component("gamepad") { +@@ -99,7 +99,7 @@ component("gamepad") { "hid_writer_linux.cc", "hid_writer_linux.h", ] diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_gpu_command_buffer_service_shared_image_shared_image_factory_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_gpu_command_buffer_service_shared_image_shared_image_factory_cc index 7672bce9a02..3bf9c25cfa8 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_gpu_command_buffer_service_shared_image_shared_image_factory_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_gpu_command_buffer_service_shared_image_shared_image_factory_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc --- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -50,7 +50,7 @@ +@@ -53,7 +53,7 @@ #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" #include "gpu/vulkan/vulkan_device_queue.h" @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_imag #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" #endif -@@ -104,7 +104,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t +@@ -112,7 +112,7 @@ const char* GmbTypeToString(gfx::GpuMemoryBufferType t case gfx::IO_SURFACE_BUFFER: return "platform"; #endif @@ -19,7 +19,7 @@ Index: src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_imag case gfx::NATIVE_PIXMAP: return "platform"; #endif -@@ -125,7 +125,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -133,7 +133,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -28,7 +28,7 @@ Index: src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_imag return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -297,7 +297,7 @@ SharedImageFactory::SharedImageFactory( +@@ -310,7 +310,7 @@ SharedImageFactory::SharedImageFactory( context_state_, workarounds_); factories_.push_back(std::move(ozone_factory)); } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_cc index e070044060b..08930592a94 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_cc @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc #include "base/cpu.h" #endif -@@ -382,7 +382,7 @@ BASE_FEATURE(kUseSCContentSharingPicker, +@@ -387,7 +387,7 @@ BASE_FEATURE(kUseSCContentSharingPicker, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) @@ -19,7 +19,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -392,6 +392,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, +@@ -397,6 +397,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, BASE_FEATURE(kPulseaudioLoopbackForScreenShare, "PulseaudioLoopbackForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); @@ -48,7 +48,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc #endif // BUILDFLAG(IS_LINUX) // When enabled, MediaCapabilities will check with GPU Video Accelerator -@@ -715,7 +737,7 @@ BASE_FEATURE(kFileDialogsTuckPictureInPicture, +@@ -720,7 +742,7 @@ BASE_FEATURE(kFileDialogsTuckPictureInPicture, #endif // !BUILDFLAG(IS_ANDROID) // Show toolbar button that opens dialog for controlling media sessions. @@ -57,7 +57,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -739,7 +761,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -744,7 +766,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, #if !BUILDFLAG(IS_ANDROID) // If enabled, users can request Media Remoting without fullscreen-in-tab. @@ -66,7 +66,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -752,7 +774,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -757,7 +779,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, // Show picture-in-picture button in Global Media Controls. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -75,7 +75,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -790,7 +812,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -795,7 +817,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -84,7 +84,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default // on chromeos, but needs an experiment on linux. BASE_FEATURE(kAcceleratedVideoDecodeLinux, -@@ -1472,7 +1494,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, +@@ -1477,7 +1499,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, #endif #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -93,7 +93,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.cc // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1879,7 +1901,7 @@ bool IsSystemLoopbackCaptureSupported() { +@@ -1890,7 +1912,7 @@ bool IsSystemLoopbackCaptureSupported() { #elif BUILDFLAG(IS_MAC) return (IsMacSckSystemLoopbackCaptureSupported() || IsMacCatapSystemLoopbackCaptureSupported()); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_h index 09a948a14b1..cd6750f0b7d 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_media_switches_h @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.h --- src/3rdparty/chromium/media/base/media_switches.h.orig +++ src/3rdparty/chromium/media/base/media_switches.h -@@ -338,13 +338,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu +@@ -342,13 +342,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -29,7 +29,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.h MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -363,7 +375,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -367,7 +379,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaStreamAccurateDroppedFrameCount); @@ -38,7 +38,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.h MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux); -@@ -379,7 +391,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay +@@ -383,7 +395,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -47,7 +47,7 @@ Index: src/3rdparty/chromium/media/base/media_switches.h MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -@@ -497,7 +509,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening +@@ -501,7 +513,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kBackgroundListening MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_cc index 89f49e51898..30a361f2399 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_cc @@ -37,7 +37,7 @@ Index: src/3rdparty/chromium/media/base/video_frame.cc // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1548,7 +1548,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1568,7 +1568,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_h index b169eeaf810..b01f1c529e9 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_base_video_frame_h @@ -28,7 +28,7 @@ Index: src/3rdparty/chromium/media/base/video_frame.h // 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 -@@ -700,7 +700,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -702,7 +702,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // wait for the included sync point. scoped_refptr<gpu::ClientSharedImage> shared_image() const; @@ -37,7 +37,7 @@ Index: src/3rdparty/chromium/media/base/video_frame.h // The number of 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 // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -935,7 +935,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -937,7 +937,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. bool is_mappable_si_enabled_ = false; diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_chromeos_gl_image_processor_backend_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_chromeos_gl_image_processor_backend_cc index 8a4cc9c49ef..8e3db0a68f2 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_chromeos_gl_image_processor_backend_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_chromeos_gl_image_processor_backend_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/media/gpu/chromeos/gl_image_processor_backend.cc --- src/3rdparty/chromium/media/gpu/chromeos/gl_image_processor_backend.cc.orig +++ src/3rdparty/chromium/media/gpu/chromeos/gl_image_processor_backend.cc -@@ -28,6 +28,10 @@ +@@ -29,6 +29,10 @@ #include "ui/ozone/public/ozone_platform.h" #include "ui/ozone/public/surface_factory_ozone.h" diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_gpu_video_encode_accelerator_factory_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_gpu_video_encode_accelerator_factory_cc index 3d3b4701073..3f12f0fb094 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_gpu_video_encode_accelerator_factory_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_gpu_video_encode_accelerator_factory_cc @@ -1,21 +1,21 @@ Index: src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc --- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig +++ src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -164,7 +164,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions - } - +@@ -155,7 +155,7 @@ std::vector<VEAFactoryFunction> CreateVEAFactoryFuncti + const gpu::GPUInfo::GPUDevice& gpu_device) { + std::vector<VEAFactoryFunction> funcs; #if BUILDFLAG(USE_VAAPI) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { - vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA)); + funcs.push_back(base::BindRepeating(&CreateVaapiVEA)); } -@@ -172,7 +172,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions - vea_factory_functions->push_back(base::BindRepeating(&CreateVaapiVEA)); +@@ -163,7 +163,7 @@ std::vector<VEAFactoryFunction> CreateVEAFactoryFuncti + funcs.push_back(base::BindRepeating(&CreateVaapiVEA)); #endif #elif BUILDFLAG(USE_V4L2_CODEC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { - vea_factory_functions->push_back(base::BindRepeating(&CreateV4L2VEA)); + funcs.push_back(base::BindRepeating(&CreateV4L2VEA)); } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi_wrapper_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi_wrapper_cc index 837c0fe1add..7454c19bc7f 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi_wrapper_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi_wrapper_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc --- src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc.orig +++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc -@@ -83,7 +83,7 @@ +@@ -87,7 +87,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_mojo_mojom_video_frame_mojom_traits_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_mojo_mojom_video_frame_mojom_traits_cc index d369f1d9b4d..e961a23119d 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_mojo_mojom_video_frame_mojom_traits_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_media_mojo_mojom_video_frame_mojom_traits_cc @@ -28,7 +28,7 @@ Index: src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc // static bool StructTraits< media::mojom::ColorPlaneLayoutDataView, -@@ -440,7 +440,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, +@@ -457,7 +457,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, frame = media::VideoFrame::WrapTrackingToken( format, *metadata.tracking_token, coded_size, visible_rect, natural_size, timestamp); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel_cc index f1549f48cd3..6c2cdd6f6ef 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel_cc @@ -13,7 +13,7 @@ Index: src/3rdparty/chromium/mojo/core/channel.cc Channel::AlignedBuffer MakeAlignedBuffer(size_t size) { // Generic allocators (such as malloc) return a pointer that is suitably // aligned for storing any type of object with a fundamental alignment -@@ -1162,7 +1166,7 @@ void Channel::LogHistogramForIPCMetrics(MessageType ty +@@ -1167,7 +1171,7 @@ void Channel::LogHistogramForIPCMetrics(MessageType ty } // Currently only CrOs, Linux, and Android support upgrades. diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom_gni b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom_gni index 8edba6c3e88..891a2872c78 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom_gni +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom_gni @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni --- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig +++ src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni -@@ -762,6 +762,16 @@ template("mojom") { +@@ -767,6 +767,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_cc index 219ff07fd4b..06f144606b7 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/services/device/public/cpp/device_features.cc --- src/3rdparty/chromium/services/device/public/cpp/device_features.cc.orig +++ src/3rdparty/chromium/services/device/public/cpp/device_features.cc -@@ -154,7 +154,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { +@@ -197,7 +197,7 @@ bool IsOsLevelGeolocationPermissionSupportEnabled() { BASE_FEATURE(kAutomaticUsbDetach, "AutomaticUsbDetach", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_h b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_h index 0216aaee711..6fe40c541b0 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_h +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_public_cpp_device_features_h @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/services/device/public/cpp/device_features.h --- src/3rdparty/chromium/services/device/public/cpp/device_features.h.orig +++ src/3rdparty/chromium/services/device/public/cpp/device_features.h -@@ -55,7 +55,7 @@ extern const DEVICE_FEATURES_EXPORT +@@ -62,7 +62,7 @@ extern const DEVICE_FEATURES_EXPORT DEVICE_FEATURES_EXPORT bool IsOsLevelGeolocationPermissionSupportEnabled(); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_usb_usb_device_handle_usbfs_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_usb_usb_device_handle_usbfs_cc index 6fc3cb9dbbf..75626f97cf2 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_usb_usb_device_handle_usbfs_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_services_device_usb_usb_device_handle_usbfs_cc @@ -37,7 +37,7 @@ Index: src/3rdparty/chromium/services/device/usb/usb_device_handle_usbfs.cc if (base::FeatureList::IsEnabled(features::kAutomaticUsbDetach)) { const mojom::UsbConfigurationInfo* config = device_->GetActiveConfiguration(); -@@ -979,7 +979,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in +@@ -986,7 +986,7 @@ void UsbDeviceHandleUsbfs::ReleaseInterfaceComplete(in return; } #endif diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_common_features_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_common_features_cc index c720e208d17..8ad274e2b0a 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_common_features_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_common_features_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/third_party/blink/common/features.cc --- src/3rdparty/chromium/third_party/blink/common/features.cc.orig +++ src/3rdparty/chromium/third_party/blink/common/features.cc -@@ -684,7 +684,7 @@ BASE_FEATURE(kDevToolsImprovedNetworkError, +@@ -695,7 +695,7 @@ BASE_FEATURE(kDevToolsImprovedNetworkError, "DevToolsImprovedNetworkError", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_exported_web_view_impl_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_exported_web_view_impl_cc index 219bf7816e8..e1053c669c4 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_exported_web_view_impl_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_exported_web_view_impl_cc @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_i 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' -@@ -3441,7 +3441,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3449,7 +3449,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE); WebFontRenderStyle::SetSubpixelPositioning( renderer_preferences_.use_subpixel_positioning); diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_inspector_inspector_memory_agent_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_inspector_inspector_memory_agent_cc index 4e3fe897fb6..80c99bb7205 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_inspector_inspector_memory_agent_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_inspector_inspector_memory_agent_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc --- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig +++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -197,7 +197,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( const std::vector<const void*>& addresses) { diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_loader_mixed_content_checker_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_loader_mixed_content_checker_cc index 5b4092a3af4..0cdd35561f0 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_loader_mixed_content_checker_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_loader_mixed_content_checker_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc --- src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig +++ src/3rdparty/chromium/third_party/blink/renderer/core/loader/mixed_content_checker.cc -@@ -510,7 +510,7 @@ bool MixedContentChecker::ShouldBlockFetch( +@@ -508,7 +508,7 @@ bool MixedContentChecker::ShouldBlockFetch( switch (context_type) { case mojom::blink::MixedContentContextType::kOptionallyBlockable: diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc index aa8ad0c7bc3..e51d878e8a3 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_core_scroll_scrollbar_theme_aura_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc --- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig +++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -146,7 +146,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -147,7 +147,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // Disable snapback on desktop Linux to better integrate with the desktop // behavior. Typically, Linux apps do not implement scrollbar snapback (this // is true for at least GTK and QT apps). @@ -10,7 +10,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_th return false; #else return true; -@@ -423,7 +423,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT +@@ -429,7 +429,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) const { diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc index 81ca26619d1..1f74f70ae8a 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_modules_peerconnection_webrtc_audio_renderer_test_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc --- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig +++ src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -384,7 +384,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -386,7 +386,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_runtime_enabled_features_json5 b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_runtime_enabled_features_json5 index c6b8bd90ea5..1dbaf5787c8 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_runtime_enabled_features_json5 +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_runtime_enabled_features_json5 @@ -46,7 +46,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled base_feature: "WebAppEnableAppTitle", }, { -@@ -1724,7 +1724,7 @@ +@@ -1717,7 +1717,7 @@ { name: "DeviceBoundSessionCredentials", origin_trial_feature_name: "DeviceBoundSessionCredentials", @@ -55,7 +55,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled status: "experimental", // Killswitch is net::features::kDeviceBoundSessions base_feature: "none", -@@ -1863,7 +1863,7 @@ +@@ -1856,7 +1856,7 @@ name: "DocumentIsolationPolicy", status: "experimental", origin_trial_feature_name: "DocumentIsolationPolicy", @@ -64,7 +64,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled base_feature: "none", }, { -@@ -2120,7 +2120,7 @@ +@@ -2113,7 +2113,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -73,7 +73,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled origin_trial_allows_third_party: true, }, { -@@ -3612,7 +3612,7 @@ +@@ -3636,7 +3636,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -82,7 +82,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled status: "experimental", public: true, base_feature_status: "enabled", -@@ -5154,7 +5154,7 @@ +@@ -5178,7 +5178,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -91,7 +91,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -5357,7 +5357,7 @@ +@@ -5381,7 +5381,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -100,7 +100,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled status: "experimental", base_feature: "none", }, -@@ -5459,7 +5459,7 @@ +@@ -5477,7 +5477,7 @@ { name: "WebAuthenticationImmediateGet", origin_trial_feature_name: "WebAuthenticationImmediateGet", @@ -109,7 +109,7 @@ Index: src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled base_feature: "none", public: true, }, -@@ -5612,7 +5612,7 @@ +@@ -5630,7 +5630,7 @@ { name: "WebIdentityDigitalCredentials", origin_trial_feature_name: "WebIdentityDigitalCredentials", diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libaom_source_libaom_aom_ports_ppc_cpudetect_c b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libaom_source_libaom_aom_ports_ppc_cpudetect_c index 9d346534a05..437fee542c5 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libaom_source_libaom_aom_ports_ppc_cpudetect_c +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libaom_source_libaom_aom_ports_ppc_cpudetect_c @@ -1,35 +1,40 @@ Index: src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/ppc_cpudetect.c --- src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/ppc_cpudetect.c.orig +++ src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/ppc_cpudetect.c -@@ -9,11 +9,8 @@ +@@ -9,7 +9,7 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#include <fcntl.h> ++ #include <unistd.h> #include <stdint.h> + +@@ -17,9 +17,6 @@ + + #include "aom_ports/ppc.h" + +-#if CONFIG_RUNTIME_CPU_DETECT -#include <asm/cputable.h> -#include <linux/auxvec.h> - #include "config/aom_config.h" - -@@ -37,6 +34,12 @@ static int cpu_env_mask(void) { + static int cpu_env_flags(int *flags) { + char *env; +@@ -38,6 +35,10 @@ static int cpu_env_mask(void) { return env && *env ? (int)strtol(env, NULL, 0) : ~0; } -+#if defined(__linux__) -+ ++#if defined(CONFIG_RUNTIME_CPU_DETECT) && defined(__linux__) +#include <fcntl.h> +#include <asm/cputable.h> +#include <linux/auxvec.h> -+ int ppc_simd_caps(void) { int flags; int mask; -@@ -76,6 +79,39 @@ out_close: +@@ -76,6 +77,39 @@ out_close: + close(fd); return flags & mask; } - #else +#elif defined(__OpenBSD__) + +#include <sys/auxv.h> @@ -63,6 +68,6 @@ Index: src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/ppc_cpud + return flags & mask; +} +#endif + #else // If there is no RTCD the function pointers are not used and can not be // changed. - int ppc_simd_caps(void) { return 0; } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_zlib_BUILD_gn b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_zlib_BUILD_gn index 664b39aee85..92473271a07 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_zlib_BUILD_gn +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_zlib_BUILD_gn @@ -5,8 +5,8 @@ Index: src/3rdparty/chromium/third_party/zlib/BUILD.gn defines = [ "CRC32_ARMV8_CRC32" ] if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] -- } else if (is_linux || is_chromeos) { -+ } else if ((is_linux || is_chromeos) && !is_bsd) { +- } else if (is_linux || is_chromeos || is_ohos) { ++ } else if ((is_linux || is_chromeos || is_ohos) && !is_bsd) { defines += [ "ARMV8_OS_LINUX" ] } else if (is_mac) { defines += [ "ARMV8_OS_MACOS" ] @@ -21,7 +21,7 @@ Index: src/3rdparty/chromium/third_party/zlib/BUILD.gn } else { assert(false, "Unsupported ARM OS") } -@@ -473,7 +477,7 @@ static_library("bundled_minizip") { +@@ -475,7 +479,7 @@ static_library("bundled_minizip") { ] } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_zlib_google_zip_internal_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_zlib_google_zip_internal_cc deleted file mode 100644 index 125293e9382..00000000000 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_zlib_google_zip_internal_cc +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc ---- src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc.orig -+++ src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc -@@ -17,10 +17,12 @@ - #include "base/strings/string_util.h" - #include "base/strings/utf_string_conversions.h" - --#if defined(USE_SYSTEM_MINIZIP) -+#if defined(USE_SYSTEM_MINIZIP) || defined(__OpenBSD__) - #include <minizip/ioapi.h> - #include <minizip/unzip.h> - #include <minizip/zip.h> -+#include "zconf.h" -+#include <zlib.h> - #else - #include "third_party/zlib/contrib/minizip/unzip.h" - #include "third_party/zlib/contrib/minizip/zip.h" diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_base_x_x11_cursor_loader_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_base_x_x11_cursor_loader_cc index 583ad5b04e3..f3db92d4a72 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_base_x_x11_cursor_loader_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_base_x_x11_cursor_loader_cc @@ -22,7 +22,7 @@ Index: src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc if (!lib) return ""; -@@ -229,7 +233,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -239,7 +243,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -31,7 +31,7 @@ Index: src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -419,7 +423,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -433,7 +437,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_views_widget_root_view_cc b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_views_widget_root_view_cc index 0c65878f476..ec46e86bbeb 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_views_widget_root_view_cc +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_ui_views_widget_root_view_cc @@ -1,7 +1,7 @@ Index: src/3rdparty/chromium/ui/views/widget/root_view.cc --- src/3rdparty/chromium/ui/views/widget/root_view.cc.orig +++ src/3rdparty/chromium/ui/views/widget/root_view.cc -@@ -169,7 +169,7 @@ class AnnounceTextView : public View { +@@ -170,7 +170,7 @@ class AnnounceTextView : public View { #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. GetViewAccessibility().SetRole(ax::mojom::Role::kStaticText); diff --git a/x11/qt6/qtwebengine/patches/patch-src_core_CMakeLists_txt b/x11/qt6/qtwebengine/patches/patch-src_core_CMakeLists_txt index 7dab408415c..1250af1f591 100644 --- a/x11/qt6/qtwebengine/patches/patch-src_core_CMakeLists_txt +++ b/x11/qt6/qtwebengine/patches/patch-src_core_CMakeLists_txt @@ -41,7 +41,7 @@ Index: src/core/CMakeLists.txt ozone/egl_helper.cpp ozone/egl_helper.h ) @@ -452,7 +452,7 @@ foreach(arch ${archs}) - CONDITION QT_FEATURE_webenginedriver + CONDITION QT_FEATURE_webengine_extensions ) - if(LINUX) diff --git a/x11/qt6/qtwebengine/pkg/PLIST b/x11/qt6/qtwebengine/pkg/PLIST index 06a3b984e98..5b79edc6f6c 100644 --- a/x11/qt6/qtwebengine/pkg/PLIST +++ b/x11/qt6/qtwebengine/pkg/PLIST @@ -340,6 +340,7 @@ lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreConfigVersion.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreConfigVersionImpl.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreDependencies.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreDeploySupport.cmake +lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreExtraProperties.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreMacros.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreTargets-relwithdebinfo.cmake lib/cmake/Qt6WebEngineCore/Qt6WebEngineCoreTargets.cmake diff --git a/x11/qt6/qtwebsockets/distinfo b/x11/qt6/qtwebsockets/distinfo index 8c4c65344d7..2c030d7c7fa 100644 --- a/x11/qt6/qtwebsockets/distinfo +++ b/x11/qt6/qtwebsockets/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebsockets-everywhere-src-6.11.1.tar.xz) = JD46oRkkyMXBZF6JL2LQE8qjdmxXUSypJtW1gUZkb78= -SIZE (qt/qtwebsockets-everywhere-src-6.11.1.tar.xz) = 452228 +SHA256 (qt/qtwebsockets-everywhere-src-6.11.2.tar.xz) = K/4lw4PDf3aQ48WbAsmQfSdEz4UnsfPx/Cx4Wy/zyaM= +SIZE (qt/qtwebsockets-everywhere-src-6.11.2.tar.xz) = 452352 diff --git a/x11/qt6/qtwebview/distinfo b/x11/qt6/qtwebview/distinfo index 927c2179391..0a6b3d8df24 100644 --- a/x11/qt6/qtwebview/distinfo +++ b/x11/qt6/qtwebview/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebview-everywhere-src-6.11.1.tar.xz) = jWLI73DVgmDps+i1/BqLxISVMIpENwA6OUSDdXQnEz0= -SIZE (qt/qtwebview-everywhere-src-6.11.1.tar.xz) = 128608 +SHA256 (qt/qtwebview-everywhere-src-6.11.2.tar.xz) = fiHhCe6J2t7vLT7deGvLnWSlVi6lRvidzHmz9S+IH0w= +SIZE (qt/qtwebview-everywhere-src-6.11.2.tar.xz) = 116556

2026-08-28 15:57 Rafael Sadowski:
UPDATE: x11/qt6 (6.11.2)
- 2026-08-29 15:26 yaydn@protonmail.com:
  UPDATE: x11/qt6 (6.11.2)
- - 2026-08-30 06:00 yaydn@protonmail.com:
    UPDATE: x11/qt6 (6.11.2)