diff options
166 files changed, 2962 insertions, 540 deletions
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index befb5bfd..d9b919cd 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,14 +6,16 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native" DEPENDS:prepend = "${QT5TOOLSDEPENDS} " -do_configure() { +qmake5_do_configure() { qmake5_base_do_configure } -do_install() { +qmake5_do_install() { qmake5_base_do_install } -do_install:class-native() { +qmake5_do_install:class-native() { qmake5_base_native_do_install } + +EXPORT_FUNCTIONS do_configure do_install diff --git a/compat/legacy/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/compat/legacy/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend new file mode 100644 index 00000000..228194f4 --- /dev/null +++ b/compat/legacy/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend @@ -0,0 +1 @@ +inherit nativesdk diff --git a/compat/scarthgap/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/compat/scarthgap/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend new file mode 100644 index 00000000..7efe1aee --- /dev/null +++ b/compat/scarthgap/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend @@ -0,0 +1 @@ +inherit_defer nativesdk diff --git a/conf/layer.conf b/conf/layer.conf index 553dff31..cc07dbf5 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -27,9 +27,9 @@ BBFILE_PRIORITY_qt5-layer = "7" # cause compatibility issues with other layers LAYERVERSION_qt5-layer = "1" -LAYERDEPENDS_qt5-layer = "core" +LAYERDEPENDS_qt5-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_qt5-layer = "dunfell gatesgarth hardknott honister kirkstone" +LAYERSERIES_COMPAT_qt5-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore nanbield scarthgap" LICENSE_PATH += "${LAYERDIR}/licenses" @@ -39,3 +39,6 @@ QT_GIT_PROJECT ?= "qt" QT_GIT ?= "git://code.qt.io/${QT_GIT_PROJECT}" QT_GIT_PROTOCOL ?= "git" QT_EDITION ?= "opensource" + +# Compatibility handling to support pre-Scarthgap OE releases. +BBFILES += "${LAYERDIR}/compat/${@'scarthgap' if 'scarthgap' in d.getVar('LAYERSERIES_CORENAMES').split() else 'legacy'}/*/*/*.bbappend" diff --git a/licenses/SIP b/licenses/SIP new file mode 100644 index 00000000..9406c308 --- /dev/null +++ b/licenses/SIP @@ -0,0 +1,49 @@ +RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP + +1. This LICENSE AGREEMENT ("the SIP License") is between Riverbank Computing +Limited ("Riverbank"), and the Individual or Organization ("Licensee") +accessing and otherwise using SIP software in source or binary form and its +associated documentation. SIP comprises a software tool for generating Python +bindings for software C and C++ libraries, and a Python extension module used +at runtime by those generated bindings. This License Agreement may also be +applied to other software packages written by Riverbank. + +2. Subject to the terms and conditions of this License Agreement, Riverbank +hereby grants Licensee a nonexclusive, royalty-free, world-wide license to +reproduce, analyze, test, perform and/or display publicly, prepare derivative +works, distribute, and otherwise use SIP alone or in any derivative version, +provided, however, that Riverbank's License Agreement and Riverbank's notice of +copyright, e.g., "Copyright (c) 2015 Riverbank Computing Limited; All Rights +Reserved" are retained in SIP alone or in any derivative version prepared by +Licensee. + +3. In the event Licensee prepares a derivative work that is based on or +incorporates SIP or any part thereof, and wants to make the derivative work +available to others as provided herein, then Licensee hereby agrees to include +in any such work a brief summary of the changes made to SIP. + +4. Licensee may not use SIP to generate Python bindings for any C or C++ +library for which bindings are already provided by Riverbank. + +5. Riverbank is making SIP available to Licensee on an "AS IS" basis. +RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY +OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND DISCLAIMS ANY +REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR +PURPOSE OR THAT THE USE OF SIP WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + +6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF SIP FOR ANY +INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, +DISTRIBUTING, OR OTHERWISE USING SIP, OR ANY DERIVATIVE THEREOF, EVEN IF +ADVISED OF THE POSSIBILITY THEREOF. + +7. This License Agreement will automatically terminate upon a material breach +of its terms and conditions. + +8. Nothing in this License Agreement shall be deemed to create any relationship +of agency, partnership, or joint venture between Riverbank and Licensee. This +License Agreement does not grant permission to use Riverbank trademarks or +trade name in a trademark sense to endorse or promote products or services of +Licensee, or any third party. + +9. By copying, installing or otherwise using SIP, Licensee agrees to be bound +by the terms and conditions of this License Agreement. diff --git a/recipes-connectivity/libqofono/libqofono/0001-also-emit-modemRemoved-and-modemAdded.patch b/recipes-connectivity/libqofono/libqofono/0001-also-emit-modemRemoved-and-modemAdded.patch index f33a3912..219b5fd3 100644 --- a/recipes-connectivity/libqofono/libqofono/0001-also-emit-modemRemoved-and-modemAdded.patch +++ b/recipes-connectivity/libqofono/libqofono/0001-also-emit-modemRemoved-and-modemAdded.patch @@ -8,6 +8,7 @@ more "atomic" events too. Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> +Upstream-Status: Pending --- src/qofonomanager.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/recipes-devtools/gdb/gdb_%.bbappend b/recipes-devtools/gdb/gdb_%.bbappend deleted file mode 100644 index fa2b06ab..00000000 --- a/recipes-devtools/gdb/gdb_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Just a comment line to avoid PAK archive (application/x-pak) -PACKAGECONFIG ??= "readline python" diff --git a/recipes-python/pyqt5/python3-pyqt-builder-native_1.16.0.bb b/recipes-python/pyqt5/python3-pyqt-builder-native_1.16.0.bb new file mode 100644 index 00000000..6c0c7508 --- /dev/null +++ b/recipes-python/pyqt5/python3-pyqt-builder-native_1.16.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "The PEP 517 compliant PyQt build system" +HOMEPAGE = "https://pypi.org/project/PyQt-builder/" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://pyproject.toml;md5=62537c8c9cf72be020148e3adc658ce3;beginline=17;endline=17" + +SRC_URI[sha256sum] = "47bbd2cfa5430020108f9f40301e166cbea98b6ef3e53953350bdd4c6b31ab18" + +inherit pypi python_setuptools_build_meta native + +PYPI_PACKAGE = "PyQt-builder" + +DEPENDS += "python3-setuptools-scm-native" diff --git a/recipes-python/pyqt5/python3-pyqt5-sip_12.13.0.bb b/recipes-python/pyqt5/python3-pyqt5-sip_12.13.0.bb new file mode 100644 index 00000000..1b0da4ba --- /dev/null +++ b/recipes-python/pyqt5/python3-pyqt5-sip_12.13.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "The sip module support for PyQt5" +HOMEPAGE = "https://pypi.org/project/PyQt5-sip/" +LICENSE = "SIP | GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9cd437778ebd1c056a76b4ded73b3a6d" + +SRC_URI[sha256sum] = "7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "PyQt5_sip" + +# Fix build with gcc-14 +# http://errors.yoctoproject.org/Errors/Details/761512/ +# siplib.c:3900:20: error: assignment to 'sipSimpleWrapper *' {aka 'struct _sipSimpleWrapper *'} from incompatible pointer type 'PyObject *' {aka 'struct _object *'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb b/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb deleted file mode 100644 index b751268d..00000000 --- a/recipes-python/pyqt5/python3-pyqt5_5.15.1.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Python Qt5 Bindings" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -HOMEPAGE = "https://www.riverbankcomputing.com/software/pyqt" -SECTION = "devel/python" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ -" - -inherit pypi - -PYPI_PACKAGE = "PyQt5" - -SRC_URI[md5sum] = "b60f895e70d31d774e6cd374efd17c65" -SRC_URI[sha256sum] = "d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1" - -S = "${WORKDIR}/PyQt5-${PV}" - -inherit qmake5 -inherit python3native python3-dir - -DEPENDS = "qtbase qtdeclarative qtquickcontrols2" -DEPENDS += "sip3 sip3-native python3" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -PARALLEL_MAKEINST = "" - -DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)}" - -PYQT_MODULES = "QtCore QtGui QtNetwork QtXml QtNetwork QtQml ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)}" - -do_configure:prepend() { - cd ${S} - echo "py_platform = linux" > pyqt.cfg - echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg - echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "py_pylib_lib = python$%(py_major).%(py_minor)" >> pyqt.cfg - echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg - echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg - echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg - echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg - echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg - echo "qt_shared = True" >> pyqt.cfg - QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` - echo "[Qt $QT_VERSION]" >> pyqt.cfg - echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg - echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} -} - -do_compile() { - cd ${S} - oe_runmake -} - -do_install() { - cd ${S} - oe_runmake MAKEFLAGS='-j 1' install -} - -FILES:${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" - -RDEPENDS:${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs" -RDEPENDS:${PN} += "python3-core python3-sip3" diff --git a/recipes-python/pyqt5/python3-pyqt5_5.15.10.bb b/recipes-python/pyqt5/python3-pyqt5_5.15.10.bb new file mode 100644 index 00000000..524acbfa --- /dev/null +++ b/recipes-python/pyqt5/python3-pyqt5_5.15.10.bb @@ -0,0 +1,97 @@ +SUMMARY = "Python qt5 Bindings" +HOMEPAGE = "https://www.riverbankcomputing.com/software/pyqt" +SECTION = "devel/python" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +inherit pypi python3-dir python3native qmake5 qmake5_paths + +SRC_URI[sha256sum] = "d46b7804b1b10a4ff91753f8113e5b5580d2b4462f3226288e2d84497334898a" +PYPI_PACKAGE = "PyQt5" + +S = "${WORKDIR}/PyQt5-${PV}" + +DEPENDS = " \ + python3 \ + python3-ply-native \ + python3-pyqt-builder-native \ + python3-toml-native \ + qtbase \ + qtdeclarative \ + qtquickcontrols2 \ + sip \ + sip-native \ +" + +DISABLED_FEATURES = " \ + PyQt_Desktop_OpenGL \ + PyQt_Accessibility \ + PyQt_SessionManager \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)} \ +" + +PYQT_MODULES = " \ + QtCore \ + QtGui \ + QtNetwork \ + QtXml \ + QtNetwork \ + QtQml \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'QtQuick QtWidgets QtQuickWidgets', '', d)} \ +" + +do_configure:prepend() { + local i + local extra_args + + cd ${S} + + for i in ${DISABLED_FEATURES}; do + extra_args="${extra_args} --disabled-feature=${i}" + done + + for i in ${PYQT_MODULES}; do + extra_args="${extra_args} --enable=${i}" + done + + sip-build \ + --verbose \ + --confirm-license \ + --scripts-dir="${bindir}" \ + --build-dir="${B}" \ + --target-dir="${PYTHON_SITEPACKAGES_DIR}" \ + --qmake=${OE_QMAKE_QMAKE} \ + --no-make \ + --enable=pylupdate \ + --enable=pyrcc \ + --enable=Qt \ + --enable=QtCore \ + --no-dbus-python \ + ${extra_args} + + QMAKE_PROFILES=${B}/PyQt5.pro +} + +do_compile:append() { + sed -i "s,${STAGING_DIR_TARGET},," ${B}/inventory.txt +} + +do_install:append() { + sed -i "s,exec .*nativepython3,exec ${bindir}/python3," ${D}/${bindir}/* +} + +pyqt_fix_sources() { + find ${PKGD}${TARGET_DBGSRC_DIR} -type f -exec sed -i "s,\(${B}\|${S}\),${TARGET_DBGSRC_DIR},g" {} \; +} +PACKAGESPLITFUNCS =+ "pyqt_fix_sources" + +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${OE_QMAKE_PATH_PLUGINS}" +RDEPENDS:${PN} = " \ + python3-core \ + python3-pyqt5-sip \ + qtbase \ + qtdeclarative \ + qtquickcontrols2 \ + qtquickcontrols2-mkspecs \ + sip \ +" diff --git a/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb b/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb index 03497034..0bb84fe0 100644 --- a/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb +++ b/recipes-python/pyqtchart/python3-pyqtchart_5.15.1.bb @@ -20,7 +20,7 @@ inherit qmake5 inherit python3native python3-dir DEPENDS = "qtcharts" -DEPENDS += "sip3 sip3-native python3 python3-pyqt5" +DEPENDS += "sip sip-native python3 python3-pyqt5" export BUILD_SYS export HOST_SYS @@ -66,4 +66,4 @@ do_install() { FILES:${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/" RDEPENDS:${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs qtcharts" -RDEPENDS:${PN} += "python3-core python3-sip3 python3-pyqt5" +RDEPENDS:${PN} += "python3-core sip python3-pyqt5" diff --git a/recipes-qt/examples/cinematicexperience/fix_qt5_3_compatibility.patch b/recipes-qt/examples/cinematicexperience/fix_qt5_3_compatibility.patch index fc132ecc..c9149c41 100644 --- a/recipes-qt/examples/cinematicexperience/fix_qt5_3_compatibility.patch +++ b/recipes-qt/examples/cinematicexperience/fix_qt5_3_compatibility.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + Index: Qt5_CinematicExperience_rpi_1.0/content/SettingsView.qml =================================================================== --- Qt5_CinematicExperience_rpi_1.0.orig/content/SettingsView.qml diff --git a/recipes-qt/examples/qt5-opengles2-test_git.bb b/recipes-qt/examples/qt5-opengles2-test_git.bb index f617ee7b..3634fbae 100644 --- a/recipes-qt/examples/qt5-opengles2-test_git.bb +++ b/recipes-qt/examples/qt5-opengles2-test_git.bb @@ -13,7 +13,7 @@ DEPENDS = "qtbase qtsensors" EXCLUDE_FROM_WORLD = "1" SRC_URI = "git://github.com/smk-embedded/qt5-opengles2-test.git;branch=master;protocol=https" -SRCREV = "938390507054ed1258345f70ed55770d2fe56176" +SRCREV = "293ae5cfedf48c97178057932d06db409117e4ad" S = "${WORKDIR}/git" inherit qmake5 diff --git a/recipes-qt/examples/qt5nmapper/change-property-string.patch b/recipes-qt/examples/qt5nmapper/change-property-string.patch index dae2fdcc..46541244 100644 --- a/recipes-qt/examples/qt5nmapper/change-property-string.patch +++ b/recipes-qt/examples/qt5nmapper/change-property-string.patch @@ -1,6 +1,7 @@ qt5nmapper: Change property string to onTextString Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> diff --git a/content_org/Switch.qml b/content/Switch.qml index 08a2cba..a8b8b26 100644 diff --git a/recipes-qt/examples/qtsmarthome_1.0.bb b/recipes-qt/examples/qtsmarthome_1.0.bb index a6361aa5..2f95be4c 100644 --- a/recipes-qt/examples/qtsmarthome_1.0.bb +++ b/recipes-qt/examples/qtsmarthome_1.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ DEPENDS = "qtdeclarative qtgraphicaleffects" -SRC_URI = "http://share.basyskom.com/demos/smarthome_src.tar.gz" +SRC_URI = "https://artifacts.toradex.com/artifactory/tdxref-oe-prod-frankfurt/dunfell-5.x.y/release/4/sources/smarthome_src.tar.gz" SRC_URI[md5sum] = "883b0376239baec20ebec072e938a995" SRC_URI[sha256sum] = "fceaa813c33e462bad6c0383eaef81a6f6e586c15d1fa73898173b517fc1cda6" diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch index d86be1e1..f8f2981f 100644 --- a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch @@ -5,6 +5,7 @@ Subject: [PATCH] Fix test installations Qmake won't ignore install errors anymore. +Upstream-Status: Pending Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> --- .../ut_mattributeextensionmanager.pro | 7 ++++--- diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch index 2310e637..8f793dc5 100644 --- a/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + From fb4316ca6e44a6b34e7d109360fc716c372e1293 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 11:45:06 -0700 diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb index 36d56fd5..531bb14b 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb @@ -3,7 +3,7 @@ SUMMARY = "Host packages for the Qt5 standalone SDK or external toolchain" LICENSE = "MIT" -inherit packagegroup nativesdk +inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 35f14fd3..98f7be2c 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -105,6 +105,7 @@ RDEPENDS:${PN}:remove:toolchain-clang:riscv64 = "qttools-dev qttools-mkspecs qtt RRECOMMENDS:${PN} += " \ qtquickcontrols-qmlplugins \ + qtquickcontrols2-qmlplugins \ qttools-plugins \ " diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 47341e71..1a5cfcc9 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \ + file://LICENSE.QT-LICENSE-AGREEMENT;md5=38de3b110ade3b6ee2f0b6a95ab16f1a \ " QT_MODULE = "qtbase" @@ -25,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.3 +# 5.15.meta-qt5-shared.4 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -34,7 +34,6 @@ SRC_URI += "\ file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ - file://0008-Replace-pthread_yield-with-sched_yield.patch \ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ @@ -46,15 +45,16 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ - file://0020-qbytearraymatcher-Include-limits-header.patch \ + file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ + file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native -# 5.15.meta-qt5-native.3 +# 5.15.meta-qt5-native.4 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ - file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0023-Always-build-uic-and-qvkgen.patch \ + file://0024-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -201,4 +201,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" +SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a" diff --git a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch index 0d2f165f..2e15543a 100644 --- a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch +++ b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Fix examples build error Add workaround for QTBUG-77288 which causes examples to fail to build Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +Upstream-Status: Pending --- examples/studio3d/cppdatainput/cppdatainput.pro | 1 + examples/studio3d/dynamicelement/dynamicelement.pro | 1 + diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 310cf0ac..774d66f7 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -3,6 +3,8 @@ From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- diff --git a/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch b/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch index 9f6e1f54..82feaf2e 100644 --- a/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch +++ b/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch @@ -8,6 +8,7 @@ GCC 11 needs this since it failing to find a builtin function Fixes src/plugins/renderers/opengl/renderer/renderview.cpp:107: undefined reference to `__atomic_exchange_1' +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/plugins/renderers/opengl/opengl.pri | 2 ++ diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index da930dd4..aeb2c3d5 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -16,6 +16,12 @@ DEPENDS:class-target += "qtdeclarative qt3d-native" SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " + +# For assimp submodule +SRC_URI += " \ + git://code.qt.io/qt/qtquick3d-assimp.git;name=assimp;branch=qt6_assimp;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ +" + SRC_URI:append:riscv64 = " file://0001-renderers-opengl-Link-in-libatomic-on-riscv.patch" SRC_URI:append:riscv32 = " file://0001-renderers-opengl-Link-in-libatomic-on-riscv.patch" @@ -38,6 +44,9 @@ do_configure:prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "92853c6e1aa95dfb7d605959ff44ccc124fbd62c" +SRCREV = "67bee4599a28e1cadc14ed9ea4adc7061e250b90" +SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" + +SRCREV_FORMAT = "qt3d_assimp" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch index 25d1ae90..170ecb91 100644 --- a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch +++ b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch @@ -3,6 +3,7 @@ From: Khem Raj <raj.khem@gmail.com> Date: Tue, 16 Jan 2018 13:26:57 +0000 Subject: [PATCH] Link with libexecinfo on musl +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- diff --git a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch index e03ef5b7..a77e8fb5 100644 --- a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch +++ b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch @@ -6,7 +6,8 @@ Subject: [PATCH] clangformat: Fix build with LLVM 13 Change-Id: I5eaad17a6f240aa1e3f246492b69f093b4f59fee Reviewed-by: David Schulz <david.schulz@qt.io> -Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a] +Upstream-Status: Backport [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++ src/plugins/clangformat/clangformatutils.cpp | 4 ++++ diff --git a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch index 33761797..fe377b9d 100644 --- a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch +++ b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch @@ -6,7 +6,8 @@ Subject: [PATCH] clangformat: Fix build with LLVM 13 Change-Id: Ia9db10696fd129c8b989ecc4c9ecbb7f1f10e68c Reviewed-by: David Schulz <david.schulz@qt.io> -Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7] +Upstream-Status: Backport [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/plugins/clangformat/clangformatutils.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index 699a15e2..85bfcc35 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb @@ -17,7 +17,7 @@ inherit qmake5 pkgconfig mime-xdg DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib" DEPENDS:append:libc-musl = " libexecinfo" -SRCREV = "94d227cd434d09717de95529e5210ec530451e1c" +SRCREV = "39ac7b1bf6add473026687003311b702742b6b21" PV = "4.15.2+git${SRCPV}" # Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2 # 4.9.2.meta-qt5.1 diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index d8d60217..b4179007 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -10,8 +10,8 @@ SRC_URI = " \ ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \ " -CVE_PRODUCT = "qt" +CVE_PRODUCT:append = " qt" S = "${WORKDIR}/git" -PV = "5.15.4+git${SRCPV}" +PV = "5.15.13+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch index 283601af..d4fb132c 100644 --- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch @@ -52,6 +52,7 @@ Thread 1 "luna-next" received signal SIGSEGV, Segmentation fault. #3 0xb7afc6c1 in qLoadPlugin<QObject, QGenericPlugin, QString const&> (key=..., loader=<optimized out>) at ../../include/QtCore/../../../git/src/corelib/kernel/qobject.h:499 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending --- vboxtouch/vboxtouch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc index c96714a4..75d71ba9 100644 --- a/recipes-qt/qt5/qt5-ptest.inc +++ b/recipes-qt/qt5/qt5-ptest.inc @@ -10,6 +10,10 @@ do_compile_ptest() { oe_runmake } +DEBUG_PREFIX_MAP += "\ + -fmacro-prefix-map=${D}= \ +" + fakeroot do_install_ptest() { mkdir -p ${D}${PTEST_PATH} t=${D}${PTEST_PATH} diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 953bb7c7..52bd9c86 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \ + file://LICENSE.QT-LICENSE-AGREEMENT;md5=38de3b110ade3b6ee2f0b6a95ab16f1a \ " require qt5-native.inc @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.3 +# 5.15.meta-qt5-shared.4 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -27,7 +27,6 @@ SRC_URI += "\ file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ - file://0008-Replace-pthread_yield-with-sched_yield.patch \ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ @@ -39,20 +38,22 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ - file://0020-qbytearraymatcher-Include-limits-header.patch \ + file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ + file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ + file://0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native -# 5.15.meta-qt5-native.3 +# 5.15.meta-qt5-native.4 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ - file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0023-Always-build-uic-and-qvkgen.patch \ + file://0024-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native SRC_URI += " \ - file://0023-Bootstrap-without-linkat-feature.patch \ + file://0025-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -145,4 +146,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" +SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index f8eea812..85789f0d 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 168e5332f1f0dd4000f19b0ced0b1d68a1d65f16 Mon Sep 17 00:00:00 2001 +From 8f7ac021d483eca1b181fd9f0551f317aa7c5965 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -19,14 +19,15 @@ Upstream-Status: Inappropriate [embedded specific] Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- configure | 2 +- mkspecs/features/configure.prf | 4 +-- mkspecs/features/qt.prf | 6 ++--- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + - 6 files changed, 47 insertions(+), 7 deletions(-) + 6 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -103,10 +104,10 @@ index 7777e615bd..8d792fa70a 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c202c47fa1 +index 0000000000..087e13bb91 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -117,8 +118,9 @@ index 0000000000..c202c47fa1 + +include(../common/linux.conf) + -+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip ++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar, objcopy and strip +QMAKE_AR = $$(OE_QMAKE_AR) cqs ++QMAKE_OBJCOPY = $$(OE_QMAKE_OBJCOPY) +QMAKE_STRIP = $$(OE_QMAKE_STRIP) + +include(../common/gcc-base-unix.conf) diff --git a/recipes-qt/qt5/qtbase/0001-CVE-2023-51714-qtbase-5.15.diff b/recipes-qt/qt5/qtbase/0001-CVE-2023-51714-qtbase-5.15.diff new file mode 100644 index 00000000..c4bafb24 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-CVE-2023-51714-qtbase-5.15.diff @@ -0,0 +1,39 @@ +From ea63c28efc1d2ecb467b83a34923d12462efa96f Mon Sep 17 00:00:00 2001 +From: Marc Mutz <marc.mutz@qt.io> +Date: Tue, 12 Dec 2023 20:51:56 +0100 +Subject: [PATCH] HPack: fix a Yoda Condition + +Putting the variable on the LHS of a relational operation makes the +expression easier to read. In this case, we find that the whole +expression is nonsensical as an overflow protection, because if +name.size() + value.size() overflows, the result will exactly _not_ +be > max() - 32, because UB will have happened. + +To be fixed in a follow-up commit. + +As a drive-by, add parentheses around the RHS. + +Change-Id: I35ce598884c37c51b74756b3bd2734b9aad63c09 +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +(cherry picked from commit 658607a34ead214fbacbc2cca44915655c318ea9) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +(cherry picked from commit 4f7efd41740107f90960116700e3134f5e433867) +(cherry picked from commit 13c16b756900fe524f6d9534e8a07aa003c05e0c) +(cherry picked from commit 1d4788a39668fb2dc5912a8d9c4272dc40e99f92) +(cherry picked from commit 87de75b5cc946d196decaa6aef4792a6cac0b6db) +--- +Upstream-Status: Backport [658607a34ead214fbacbc2cca44915655c318ea9] + +diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp +index 834214f..ab166a6 100644 +--- a/src/network/access/http2/hpacktable.cpp ++++ b/src/network/access/http2/hpacktable.cpp +@@ -63,7 +63,7 @@ + // 32 octets of overhead." + + const unsigned sum = unsigned(name.size() + value.size()); +- if (std::numeric_limits<unsigned>::max() - 32 < sum) ++ if (sum > (std::numeric_limits<unsigned>::max() - 32)) + return HeaderSize(); + return HeaderSize(true, quint32(sum + 32)); + } diff --git a/recipes-qt/qt5/qtbase/0002-CVE-2023-51714-qtbase-5.15.diff b/recipes-qt/qt5/qtbase/0002-CVE-2023-51714-qtbase-5.15.diff new file mode 100644 index 00000000..78c72536 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0002-CVE-2023-51714-qtbase-5.15.diff @@ -0,0 +1,60 @@ +From 23c3fc483e8b6e21012a61f0bea884446f727776 Mon Sep 17 00:00:00 2001 +From: Marc Mutz <marc.mutz@qt.io> +Date: Tue, 12 Dec 2023 22:08:07 +0100 +Subject: [PATCH] HPack: fix incorrect integer overflow check + +This code never worked: + +For the comparison with max() - 32 to trigger, on 32-bit platforms (or +Qt 5) signed interger overflow would have had to happen in the +addition of the two sizes. The compiler can therefore remove the +overflow check as dead code. + +On Qt 6 and 64-bit platforms, the signed integer addition would be +very unlikely to overflow, but the following truncation to uint32 +would yield the correct result only in a narrow 32-value window just +below UINT_MAX, if even that. + +Fix by using the proper tool, qAddOverflow. + +Manual conflict resolutions: + - qAddOverflow doesn't exist in Qt 5, use private add_overflow + predecessor API instead + +Change-Id: I7599f2e75ff7f488077b0c60b81022591005661c +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +(cherry picked from commit ee5da1f2eaf8932aeca02ffea6e4c618585e29e3) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +(cherry picked from commit debeb8878da2dc706ead04b6072ecbe7e5313860) +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +Reviewed-by: Marc Mutz <marc.mutz@qt.io> +(cherry picked from commit 811b9eef6d08d929af8708adbf2a5effb0eb62d7) +(cherry picked from commit f931facd077ce945f1e42eaa3bead208822d3e00) +(cherry picked from commit 9ef4ca5ecfed771dab890856130e93ef5ceabef5) +Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> +--- +Upstream-Status: Backport [ee5da1f2eaf8932aeca02ffea6e4c618585e29e3] + +diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp +index ab166a6..de91fc0 100644 +--- a/src/network/access/http2/hpacktable.cpp ++++ b/src/network/access/http2/hpacktable.cpp +@@ -40,6 +40,7 @@ + #include "hpacktable_p.h" + + #include <QtCore/qdebug.h> ++#include <QtCore/private/qnumeric_p.h> + + #include <algorithm> + #include <cstddef> +@@ -62,7 +63,9 @@ + // for counting the number of references to the name and value would have + // 32 octets of overhead." + +- const unsigned sum = unsigned(name.size() + value.size()); ++ size_t sum; ++ if (add_overflow(size_t(name.size()), size_t(value.size()), &sum)) ++ return HeaderSize(); + if (sum > (std::numeric_limits<unsigned>::max() - 32)) + return HeaderSize(); + return HeaderSize(true, quint32(sum + 32)); diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index c88e7ddd..ccac9b69 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -10,6 +10,7 @@ Also update length of EXT_PREFIX and HOST_PREFIX now. Change-Id: If98dd57160efe9c98c36148cdf872f50b3d38118 Signed-off-by: Denys Dmytriyenko <denys@ti.com> +Upstream-Status: Pending --- configure.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index 4be2e746..136b4ce1 100644 --- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Disable all unknown features instead of erroring out Task-number: QTBUG-56656 Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- mkspecs/features/qt_configure.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch b/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch deleted file mode 100644 index ec8bd4aa..00000000 --- a/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 22 Aug 2022 15:01:28 +0300 -Subject: [PATCH] testlib: don't track the build or source directories - -Build tests without location of the build and sources directories. - -Upstream-Status: Inappropriate [embedded specific] -Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2 ---- - src/testlib/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt -index 03deb2edc9..972b366532 100644 ---- a/src/testlib/CMakeLists.txt -+++ b/src/testlib/CMakeLists.txt -@@ -125,8 +125,8 @@ set(qt_tc_build_dir_def - "$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>" - ) - set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS -- QT_TESTCASE_BUILDDIR="${qt_tc_build_dir_def}" -- QT_TESTCASE_SOURCEDIR="$<TARGET_PROPERTY:SOURCE_DIR>" -+ QT_TESTCASE_BUILDDIR="" -+ QT_TESTCASE_SOURCEDIR="" - ) - - # special case begin diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index c057d03f..3210f2c8 100644 --- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -4,6 +4,7 @@ Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> +Upstream-Status: Pending --- tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch deleted file mode 100644 index b338170e..00000000 --- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 2bb8b79b41eed87b843eb0159d6fa21a92c4c152 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 27 Jul 2017 08:02:51 -0700 -Subject: [PATCH] Replace pthread_yield with sched_yield - -On Linux pthead_yield is same as sched_yield implementation wise -and sched_yield is available on all libc -implementations on Linux - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- - tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -index 19b3289390..4d0cdf8b5f 100644 ---- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -@@ -35,7 +35,7 @@ - #include "tst_qvariant_common.h" - - #ifdef Q_OS_LINUX --# include <pthread.h> -+# include <sched.h> - #endif - - #include <algorithm> -@@ -369,7 +369,7 @@ protected: - const char *nm = name.constData(); - int tp = qRegisterMetaType<Bar>(nm); - #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) -- pthread_yield(); -+ sched_yield(); - #endif - QMetaType info(tp); - if (!info.isValid()) { -diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -index e397e80fe0..cdb7893e56 100644 ---- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -@@ -78,6 +78,7 @@ - #include <stdlib.h> - #include <sys/stat.h> - #include <unistd.h> -+#include <sched.h> - #endif - - #include <memory> -@@ -2200,8 +2201,8 @@ public slots: - - #if defined(Q_OS_MAC) - pthread_yield_np(); --#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID -- pthread_yield(); -+#elif defined Q_OS_LINUX -+ sched_yield(); - #endif - if (!sock->waitForConnected()) { - networkTimeout = true; diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index 3457c53f..3cebfc11 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,22 +1,23 @@ -From d47ae4638bf698c39225ff94dfb9f03ba4261b42 Mon Sep 17 00:00:00 2001 +From 9bf5632187b8f17cc0d626926df2784c38059875 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- - mkspecs/linux-oe-clang/qmake.conf | 39 ++++++++++++++++++++++++++ + mkspecs/linux-oe-clang/qmake.conf | 40 ++++++++++++++++++++++++++ mkspecs/linux-oe-clang/qplatformdefs.h | 1 + - 2 files changed, 40 insertions(+) + 2 files changed, 41 insertions(+) create mode 100644 mkspecs/linux-oe-clang/qmake.conf create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf new file mode 100644 -index 0000000000..db02ab5215 +index 0000000000..c09b132ac8 --- /dev/null +++ b/mkspecs/linux-oe-clang/qmake.conf -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -27,8 +28,9 @@ index 0000000000..db02ab5215 + +include(../common/linux.conf) + -+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip ++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar, objcopy and strip +QMAKE_AR = $$(OE_QMAKE_AR) cqs ++QMAKE_OBJCOPY = $$(OE_QMAKE_OBJCOPY) +QMAKE_STRIP = $$(OE_QMAKE_STRIP) + +include(../common/gcc-base-unix.conf) diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index 9907952c..6279dc57 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -8,6 +8,7 @@ only when its glibc < 2 and not for other libcswhich may define it as per standards but are not glibc, e.g. musl Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- mkspecs/linux-clang/qplatformdefs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index 704265ca..561cda05 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -6,6 +6,7 @@ Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc musl does not have feenableexcept function Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch index 8ecfa4f1..66945d21 100644 --- a/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch @@ -10,6 +10,7 @@ into debug packages. Task-number: QTBUG-71230 Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- mkspecs/features/ltcg.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch index 06ee7c78..aa11a4be 100644 --- a/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch +++ b/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch @@ -7,7 +7,7 @@ the FE_INEXACT, FE_UNDERFLOW, FE_OVERFLOW, FE_DIVBYZERO, FE_INVALID are defined only for platforms with fp engine. Signed-off-by: Nicola Lunghi <nick83ola@gmail.com> -Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/289447] +Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/289447] --- .../gui/painting/qpainter/tst_qpainter.cpp | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch b/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch index 63dbbaf0..93a4a6ba 100644 --- a/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch +++ b/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch @@ -16,6 +16,9 @@ causing build failures in configurations which use this | /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/cortexa8t2hf-neon-halium-webos-linux-gnueabi/qtbase/5.15.2+gitAUTOINC+40143c189b-r0/git/src/corelib/thread/qthread_unix.cpp:121:5: error: 'currentThreadData' was not declared in this scope | 121 | currentThreadData = data; | | ^~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/corelib/thread/qthread_unix.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch b/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch deleted file mode 100644 index 4054f841..00000000 --- a/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 36691306941c8835a5c77d8a7170f04c3e432a08 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 2 Mar 2021 13:18:47 -0800 -Subject: [PATCH] qbytearraymatcher: Include <limits> header - -gcc11 complains - error: 'numeric_limits' is not a class template - | 344 | template<> class numeric_limits<const QT_PREPEND_NAMESPACE(qfloat16)> - -This is because its missing right header which perhaps is included -implicitly in older compilers - -Change-Id: Ic4e697c8a4c1b6b5448ba56f1749ae7293125ccd -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/corelib/text/qbytearraymatcher.h | 1 + - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..7b80e2becd 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -40,6 +40,7 @@ - #ifndef QBYTEARRAYMATCHER_H - #define QBYTEARRAYMATCHER_H - -+#include <limits> - #include <QtCore/qbytearray.h> - - QT_BEGIN_NAMESPACE -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e9603b..e26a57ff43 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include <tuple> - #include <array> -+#include <limits> - - QT_BEGIN_NAMESPACE - diff --git a/recipes-qt/qt5/qtbase/0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch b/recipes-qt/qt5/qtbase/0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch new file mode 100644 index 00000000..521e6cc3 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch @@ -0,0 +1,29 @@ +From a2b11501812e0e34bd49b1950bac52dadd4e3cff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 15 Oct 2022 15:50:34 +0200 +Subject: [PATCH] rcc: Just dcument file name without full path to reduce qa + warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/tools/rcc/rcc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp +index c5e3d2ae4c..2d76cfd081 100644 +--- a/src/tools/rcc/rcc.cpp ++++ b/src/tools/rcc/rcc.cpp +@@ -344,7 +344,7 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset, + // some info + if (text || pass1) { + lib.writeString(" // "); +- lib.writeByteArray(m_fileInfo.absoluteFilePath().toLocal8Bit()); ++ lib.writeByteArray(m_fileInfo.baseName().toLocal8Bit()); + lib.writeString("\n "); + } + diff --git a/recipes-qt/qt5/qtbase/0022-testlib-don-t-track-the-build-or-source-directories.patch b/recipes-qt/qt5/qtbase/0022-testlib-don-t-track-the-build-or-source-directories.patch new file mode 100644 index 00000000..f16afed5 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0022-testlib-don-t-track-the-build-or-source-directories.patch @@ -0,0 +1,32 @@ +From 7d4da27df6ab641390de75dd7c04b755295a653b Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Mon, 22 Aug 2022 15:01:28 +0300 +Subject: [PATCH] testlib: don't track the build or source directories + +Build tests without location of the build and sources directories. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2 +--- + mkspecs/features/testlib_defines.prf | 2 -- + src/testlib/Qt5TestConfigExtras.cmake.in | 5 ----- + 2 files changed, 7 deletions(-) + +diff --git a/mkspecs/features/testlib_defines.prf b/mkspecs/features/testlib_defines.prf +index 901e03a91d..e69de29bb2 100644 +--- a/mkspecs/features/testlib_defines.prf ++++ b/mkspecs/features/testlib_defines.prf +@@ -1,2 +0,0 @@ +-contains(TEMPLATE, vc.*): DEFINES += QT_TESTCASE_BUILDDIR=\"$$OUT_PWD\" +-else: DEFINES += QT_TESTCASE_BUILDDIR=$$shell_quote(\"$$OUT_PWD\") +diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in +index 2a575958ae..e69de29bb2 100644 +--- a/src/testlib/Qt5TestConfigExtras.cmake.in ++++ b/src/testlib/Qt5TestConfigExtras.cmake.in +@@ -1,5 +0,0 @@ +- +-set_property(TARGET Qt5::Test +- APPEND PROPERTY +- INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" +-) diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0023-Always-build-uic-and-qvkgen.patch index 5c878d72..7a100a69 100644 --- a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0023-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 418c46b025edadc142ac60a6eb4c553dad19efed Mon Sep 17 00:00:00 2001 +From 5f415fb09ea64765e60d1d52721064f53545a413 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen @@ -9,6 +9,7 @@ as a native tool when compiling the target. Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending --- src/src.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0023-Remove-unsetting-_FILE_OFFSET_BITS.patch b/recipes-qt/qt5/qtbase/0023-Remove-unsetting-_FILE_OFFSET_BITS.patch new file mode 100644 index 00000000..423db6e4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0023-Remove-unsetting-_FILE_OFFSET_BITS.patch @@ -0,0 +1,26 @@ +Remove unsetting _FILE_OFFSET_BITS +This does not work when enabling 64bit time_t with glibc which is +enabled with -D_TIME_BITS=64, since it also needs +_FILE_OFFSET_BITS=64 and this does not work when its undefined +explicitly + +Upstream-Status: Submitted [https://github.com/madler/zlib/pull/764] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/3rdparty/zlib/src/gzguts.h ++++ b/src/3rdparty/zlib/src/gzguts.h +@@ -22,15 +22,6 @@ + #define HAVE_HIDDEN + #endif + +-#ifdef _LARGEFILE64_SOURCE +-# ifndef _LARGEFILE_SOURCE +-# define _LARGEFILE_SOURCE 1 +-# endif +-# ifdef _FILE_OFFSET_BITS +-# undef _FILE_OFFSET_BITS +-# endif +-#endif +- + #ifdef HAVE_HIDDEN + # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) + #else diff --git a/recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0024-Avoid-renameeat2-for-native-sdk-builds.patch index fab399a2..97e4ff6c 100644 --- a/recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0024-Avoid-renameeat2-for-native-sdk-builds.patch @@ -1,4 +1,4 @@ -From 9ff02d5ebc1d0969306c57cbf77df861ec3924fc Mon Sep 17 00:00:00 2001 +From 77196464454a1c66e57ad5aac237a55de211a107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sun, 14 Apr 2019 13:27:58 +0200 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds diff --git a/recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0025-Bootstrap-without-linkat-feature.patch index f5e5268b..b759214b 100644 --- a/recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0025-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From f992d0551cd14c11fdb61511ac1d36ecf853089a Mon Sep 17 00:00:00 2001 +From a052a876d0639db2f919aada2ae0afe1718928af Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -7,6 +7,7 @@ qmake does not work together with pseudo when unnamed temporary files are used with linkat. Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> [YOCTO #11996] --- src/corelib/global/qconfig-bootstrapped.h | 2 +- diff --git a/recipes-qt/qt5/qtbase/0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch b/recipes-qt/qt5/qtbase/0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch new file mode 100644 index 00000000..e6a96530 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch @@ -0,0 +1,55 @@ +From 8946e4874d0e071b182ba5ac438fb4d52d2a44d0 Mon Sep 17 00:00:00 2001 +From: Mark Hatle <mark.hatle@amd.com> +Date: Fri, 1 Dec 2023 08:17:51 -0700 +Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Disable the 4 XKB_KEY_dead functions to support libxkbcommon 1.6.0. See: + +https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70 + +The above URL points to a commit in qt which was used as a basis for the fix. + +Upstream-Status: Backport +[https://github.com/qt/qtbase/commit/8af35d27e8f02bbb99aef4ac495ed406e50e3cca] + + xkb: fix build with libxkbcommon 1.6.0 and later + + A few XKB_KEY_dead_* defines got removed from 1.6.0. See also + https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14 + https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08 + + Pick-to: 6.6 6.5 6.2 5.15 + Fixes: QTBUG-117950 + Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea + Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> + +Signed-off-by: Mark Hatle <mark.hatle@amd.com> +--- + src/platformsupport/input/xkbcommon/qxkbcommon.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +index b713c19447..ecf02de6db 100644 +--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp ++++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +@@ -273,10 +273,14 @@ static constexpr const auto KeyTbl = qMakeArray( + Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>, + Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>, + Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>, ++/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0 ++ The define check is kind of version check here. */ ++#ifdef XKB_KEY_dead_lowline + Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>, + Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>, + Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>, + Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>, ++#endif + + // Special keys from X.org - This include multimedia keys, + // wireless/bluetooth/uwb keys, special launcher keys, etc. +-- +2.34.1 + diff --git a/recipes-qt/qt5/qtbase/0028-Remove-host-paths-from-qmake.patch b/recipes-qt/qt5/qtbase/0028-Remove-host-paths-from-qmake.patch new file mode 100644 index 00000000..bb20a0ef --- /dev/null +++ b/recipes-qt/qt5/qtbase/0028-Remove-host-paths-from-qmake.patch @@ -0,0 +1,43 @@ +Remove host paths from qmake +The host paths are not useful on the target and may cause security concerns. + +Instead set them to extprefix or just plain "/" to at least remove host paths. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: James Minor <james.minor@ni.com> +--- a/configure.pri ++++ b/configure.pri +@@ -854,7 +854,7 @@ defineTest(qtConfOutput_preparePaths) { + export(config.qtbase.features.shared.available) + + hostbindir_absolute_path = $$absolute_path($$config.rel_input.hostbindir, $$config.input.hostprefix) +- config.input.hostbindir_to_hostprefix = $$relative_path($$config.input.hostprefix, $$hostbindir_absolute_path) ++ config.input.hostbindir_to_hostprefix = $$relative_path($$config.input.extprefix, $$hostbindir_absolute_path) + config.input.hostbindir_to_extprefix = $$relative_path($$config.input.extprefix, $$hostbindir_absolute_path) + + !isEmpty(PREFIX_COMPLAINTS) { +@@ -889,11 +889,11 @@ defineTest(qtConfOutput_preparePaths) { + QT_CONFIGURE_STR_OFFSETS = + QT_CONFIGURE_STRS = + +- addConfStr($$config.input.sysroot) ++ addConfStr("/") + addConfStr($$qmake_sysrootify) +- addConfStr($$config.rel_input.hostbindir) +- addConfStr($$config.rel_input.hostlibdir) +- addConfStr($$config.rel_input.hostdatadir) ++ addConfStr($$config.rel_input.bindir) ++ addConfStr($$config.rel_input.libdir) ++ addConfStr($$config.rel_input.datadir) + addConfStr($$XSPEC) + addConfStr($$[QMAKE_SPEC]) + +@@ -902,7 +902,7 @@ defineTest(qtConfOutput_preparePaths) { + "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \ + "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \ + "static const char qt_configure_ext_prefix_path_str [12+512] = \"qt_epfxpath=$$config.input.extprefix\";" \ +- "static const char qt_configure_host_prefix_path_str [12+512] = \"qt_hpfxpath=$$config.input.hostprefix\";" \ ++ "static const char qt_configure_host_prefix_path_str [12+512] = \"qt_hpfxpath=$$config.input.extprefix\";" \ + "$${LITERAL_HASH}endif" \ + "" \ + "static const short qt_configure_str_offsets[] = {" \ diff --git a/recipes-qt/qt5/qtbase/0029-Remove-ptests-with-SRCDIR.patch b/recipes-qt/qt5/qtbase/0029-Remove-ptests-with-SRCDIR.patch new file mode 100644 index 00000000..690d491c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0029-Remove-ptests-with-SRCDIR.patch @@ -0,0 +1,57 @@ +Remove ptests that leak host paths via SRCDIR +The host paths are not useful on the target and may cause security concerns. +Some auto tests run as ptests include references to external resources via +SRCDIR and fail today. + +Remove the problematic tests since they won't pass completely anyway. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: James Minor <james.minor@ni.com> +Index: git/tests/auto/corelib/tools/tools.pro +=================================================================== +--- git.orig/tests/auto/corelib/tools/tools.pro ++++ git/tests/auto/corelib/tools/tools.pro +@@ -36,7 +36,6 @@ SUBDIRS=\ + qscopedvaluerollback \ + qscopeguard \ + qset \ +- qsharedpointer \ + qsize \ + qsizef \ + qstl \ +Index: git/tests/auto/other/other.pro +=================================================================== +--- git.orig/tests/auto/other/other.pro ++++ git/tests/auto/other/other.pro +@@ -4,7 +4,6 @@ QT_FOR_CONFIG += gui-private + SUBDIRS=\ + compiler \ + gestures \ +- lancelot \ + languagechange \ + macgui \ + #macnativeevents \ +Index: git/tests/auto/widgets/dialogs/dialogs.pro +=================================================================== +--- git.orig/tests/auto/widgets/dialogs/dialogs.pro ++++ git/tests/auto/widgets/dialogs/dialogs.pro +@@ -3,7 +3,6 @@ SUBDIRS=\ + qcolordialog \ + qdialog \ + qerrormessage \ +- qfiledialog \ + qfiledialog2 \ + qfilesystemmodel \ + qfontdialog \ +Index: git/tests/auto/widgets/itemviews/itemviews.pro +=================================================================== +--- git.orig/tests/auto/widgets/itemviews/itemviews.pro ++++ git/tests/auto/widgets/itemviews/itemviews.pro +@@ -3,7 +3,6 @@ SUBDIRS=\ + qabstractitemview \ + qcolumnview \ + qdatawidgetmapper \ +- qdirmodel \ + qfileiconprovider \ + qheaderview \ + qitemdelegate \ diff --git a/recipes-qt/qt5/qtbase/CVE-2023-32762.patch b/recipes-qt/qt5/qtbase/CVE-2023-32762.patch new file mode 100644 index 00000000..866187f7 --- /dev/null +++ b/recipes-qt/qt5/qtbase/CVE-2023-32762.patch @@ -0,0 +1,56 @@ +From 1b736a815be0222f4b24289cf17575fc15707305 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> +Date: Fri, 5 May 2023 11:07:26 +0200 +Subject: [PATCH] Hsts: match header names case insensitively + +Header field names are always considered to be case-insensitive. + +Pick-to: 6.5 6.5.1 6.2 5.15 +Fixes: QTBUG-113392 +Change-Id: Ifb4def4bb7f2ac070416cdc76581a769f1e52b43 +Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> +Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> +Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> + +Upstream-Status: Backport [https://github.com/qt/qtbase/commit/1b736a815be0222f4b24289cf17575fc15707305] +CVE: CVE-2023-32762 +Signed-off-by: Vivek Kumbhar <vkumbhar@mvista.com> +--- + src/network/access/qhsts.cpp | 4 ++-- + tests/auto/network/access/hsts/tst_qhsts.cpp | 6 ++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp +index 0cef0ad3dc..be7ef7ff58 100644 +--- a/src/network/access/qhsts.cpp ++++ b/src/network/access/qhsts.cpp +@@ -364,8 +364,8 @@ quoted-pair = "\" CHAR + bool QHstsHeaderParser::parse(const QList<QPair<QByteArray, QByteArray>> &headers) + { + for (const auto &h : headers) { +- // We use '==' since header name was already 'trimmed' for us: +- if (h.first == "Strict-Transport-Security") { ++ // We compare directly because header name was already 'trimmed' for us: ++ if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) { + header = h.second; + // RFC6797, 8.1: + // +diff --git a/tests/auto/network/access/hsts/tst_qhsts.cpp b/tests/auto/network/access/hsts/tst_qhsts.cpp +index d72991a2eb..c3c5f58c22 100644 +--- a/tests/auto/network/access/hsts/tst_qhsts.cpp ++++ b/tests/auto/network/access/hsts/tst_qhsts.cpp +@@ -241,6 +241,12 @@ void tst_QHsts::testSTSHeaderParser() + QVERIFY(parser.expirationDate() > QDateTime::currentDateTimeUtc()); + QVERIFY(parser.includeSubDomains()); + ++ list.pop_back(); ++ list << Header("strict-transport-security", "includeSubDomains;max-age=1000"); ++ QVERIFY(parser.parse(list)); ++ QVERIFY(parser.expirationDate() > QDateTime::currentDateTimeUtc()); ++ QVERIFY(parser.includeSubDomains()); ++ + list.pop_back(); + // Invalid (includeSubDomains twice): + list << Header("Strict-Transport-Security", "max-age = 1000 ; includeSubDomains;includeSubDomains"); +-- +2.35.7 diff --git a/recipes-qt/qt5/qtbase/CVE-2023-32763-qtbase-5.15.diff b/recipes-qt/qt5/qtbase/CVE-2023-32763-qtbase-5.15.diff new file mode 100644 index 00000000..52056325 --- /dev/null +++ b/recipes-qt/qt5/qtbase/CVE-2023-32763-qtbase-5.15.diff @@ -0,0 +1,61 @@ +From 4964af998a1788eba15e0b4ab3382e1ebb709daf Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 10 Oct 2023 16:06:27 +0200 +Subject: [PATCH] qtbase: Pick CVE-2023-32763 fix + +CVE: CVE-2023-32763 +Upstream-Status: Backport [https://download.qt.io/official_releases/qt/5.15/CVE-2023-32763-qtbase-5.15.diff] +--- + src/gui/painting/qfixed_p.h | 9 +++++++++ + src/gui/text/qtextlayout.cpp | 9 ++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/src/gui/painting/qfixed_p.h b/src/gui/painting/qfixed_p.h +index 846592881c..57d750a4b3 100644 +--- a/src/gui/painting/qfixed_p.h ++++ b/src/gui/painting/qfixed_p.h +@@ -54,6 +54,7 @@ + #include <QtGui/private/qtguiglobal_p.h> + #include "QtCore/qdebug.h" + #include "QtCore/qpoint.h" ++#include <QtCore/private/qnumeric_p.h> + #include "QtCore/qsize.h" + + QT_BEGIN_NAMESPACE +@@ -182,6 +183,14 @@ Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return i * 64 < + Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > i * 64; } + Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return i * 64 > f.value(); } + ++inline bool qAddOverflow(QFixed v1, QFixed v2, QFixed *r) ++{ ++ int val; ++ bool result = add_overflow(v1.value(), v2.value(), &val); ++ r->setValue(val); ++ return result; ++} ++ + #ifndef QT_NO_DEBUG_STREAM + inline QDebug &operator<<(QDebug &dbg, const QFixed &f) + { return dbg << f.toReal(); } +diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp +index 26ac37b016..f6c69ff4a2 100644 +--- a/src/gui/text/qtextlayout.cpp ++++ b/src/gui/text/qtextlayout.cpp +@@ -2150,11 +2150,14 @@ found: + eng->maxWidth = qMax(eng->maxWidth, line.textWidth); + } else { + eng->minWidth = qMax(eng->minWidth, lbh.minw); +- eng->maxWidth += line.textWidth; ++ if (qAddOverflow(eng->maxWidth, line.textWidth, &eng->maxWidth)) ++ eng->maxWidth = QFIXED_MAX; + } + +- if (line.textWidth > 0 && item < eng->layoutData->items.size()) +- eng->maxWidth += lbh.spaceData.textWidth; ++ if (line.textWidth > 0 && item < eng->layoutData->items.size()) { ++ if (qAddOverflow(eng->maxWidth, lbh.spaceData.textWidth, &eng->maxWidth)) ++ eng->maxWidth = QFIXED_MAX; ++ } + + line.textWidth += trailingSpace; + if (lbh.spaceData.length) { diff --git a/recipes-qt/qt5/qtbase/CVE-2023-33285-qtbase-5.15.diff b/recipes-qt/qt5/qtbase/CVE-2023-33285-qtbase-5.15.diff new file mode 100644 index 00000000..0e545296 --- /dev/null +++ b/recipes-qt/qt5/qtbase/CVE-2023-33285-qtbase-5.15.diff @@ -0,0 +1,81 @@ +From 70be54588f7227e0100d511530170b5cdb46ee5a Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 10 Oct 2023 16:08:05 +0200 +Subject: [PATCH] qtbase: Pick CVE-2023-33285 fix + +CVE: CVE-2023-33285 +Upstream-Status: Backport [https://download.qt.io/official_releases/qt/5.15/CVE-2023-33285-qtbase-5.15.diff] +--- + src/network/kernel/qdnslookup_unix.cpp | 31 +++++++++++++++++++++----- + 1 file changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp +index 12b40fc35d..99e999d436 100644 +--- a/src/network/kernel/qdnslookup_unix.cpp ++++ b/src/network/kernel/qdnslookup_unix.cpp +@@ -227,7 +227,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + // responseLength in case of error, we still can extract the + // exact error code from the response. + HEADER *header = (HEADER*)response; +- const int answerCount = ntohs(header->ancount); + switch (header->rcode) { + case NOERROR: + break; +@@ -260,18 +259,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + return; + } + +- // Skip the query host, type (2 bytes) and class (2 bytes). + char host[PACKETSZ], answer[PACKETSZ]; + unsigned char *p = response + sizeof(HEADER); +- int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); +- if (status < 0) { ++ int status; ++ ++ if (ntohs(header->qdcount) == 1) { ++ // Skip the query host, type (2 bytes) and class (2 bytes). ++ status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); ++ if (status < 0) { ++ reply->error = QDnsLookup::InvalidReplyError; ++ reply->errorString = tr("Could not expand domain name"); ++ return; ++ } ++ if ((p - response) + status + 4 >= responseLength) ++ header->qdcount = 0xffff; // invalid reply below ++ else ++ p += status + 4; ++ } ++ if (ntohs(header->qdcount) > 1) { + reply->error = QDnsLookup::InvalidReplyError; +- reply->errorString = tr("Could not expand domain name"); ++ reply->errorString = tr("Invalid reply received"); + return; + } +- p += status + 4; + + // Extract results. ++ const int answerCount = ntohs(header->ancount); + int answerIndex = 0; + while ((p < response + responseLength) && (answerIndex < answerCount)) { + status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); +@@ -283,6 +295,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + const QString name = QUrl::fromAce(host); + + p += status; ++ ++ if ((p - response) + 10 > responseLength) { ++ // probably just a truncated reply, return what we have ++ return; ++ } + const quint16 type = (p[0] << 8) | p[1]; + p += 2; // RR type + p += 2; // RR class +@@ -290,6 +307,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + p += 4; + const quint16 size = (p[0] << 8) | p[1]; + p += 2; ++ if ((p - response) + size > responseLength) ++ return; // truncated + + if (type == QDnsLookup::A) { + if (size != 4) { diff --git a/recipes-qt/qt5/qtbase/CVE-2023-34410-qtbase-5.15.diff b/recipes-qt/qt5/qtbase/CVE-2023-34410-qtbase-5.15.diff new file mode 100644 index 00000000..0f3e288b --- /dev/null +++ b/recipes-qt/qt5/qtbase/CVE-2023-34410-qtbase-5.15.diff @@ -0,0 +1,68 @@ +From ec348cf21e3cecfda0e1d7db6f2ecf423509f55a Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 10 Oct 2023 16:09:29 +0200 +Subject: [PATCH] qtbase: Pick CVE-2023-34410 fix + +CVE: CVE-2023-34410 +Upstream-Status: Backport [https://download.qt.io/official_releases/qt/5.15/CVE-2023-34410-qtbase-5.15.diff] +--- + src/network/ssl/qsslsocket.cpp | 5 +++++ + src/network/ssl/qsslsocket_schannel.cpp | 22 ++++++++++++++++++++++ + 2 files changed, 27 insertions(+) + +diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp +index 5bb6e7ee4a..2a0b3a4f1d 100644 +--- a/src/network/ssl/qsslsocket.cpp ++++ b/src/network/ssl/qsslsocket.cpp +@@ -2221,6 +2221,10 @@ QSslSocketPrivate::QSslSocketPrivate() + , flushTriggered(false) + { + QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration); ++ // If the global configuration doesn't allow root certificates to be loaded ++ // on demand then we have to disable it for this socket as well. ++ if (!configuration.allowRootCertOnDemandLoading) ++ allowRootCertOnDemandLoading = false; + } + + /*! +@@ -2470,6 +2474,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri + ptr->sessionProtocol = global->sessionProtocol; + ptr->ciphers = global->ciphers; + ptr->caCertificates = global->caCertificates; ++ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading; + ptr->protocol = global->protocol; + ptr->peerVerifyMode = global->peerVerifyMode; + ptr->peerVerifyDepth = global->peerVerifyDepth; +diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp +index c956ce3c2b..d1b23af29b 100644 +--- a/src/network/ssl/qsslsocket_schannel.cpp ++++ b/src/network/ssl/qsslsocket_schannel.cpp +@@ -1880,6 +1880,28 @@ bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext) + if (configuration.peerVerifyDepth > 0 && DWORD(configuration.peerVerifyDepth) < verifyDepth) + verifyDepth = DWORD(configuration.peerVerifyDepth); + ++ const auto &caCertificates = q->sslConfiguration().caCertificates(); ++ ++ if (!rootCertOnDemandLoadingAllowed() ++ && !(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN) ++ && (q->peerVerifyMode() == QSslSocket::VerifyPeer ++ || (isClient && q->peerVerifyMode() == QSslSocket::AutoVerifyPeer))) { ++ // When verifying a peer Windows "helpfully" builds a chain that ++ // may include roots from the system store. But we don't want that if ++ // the user has set their own CA certificates. ++ // Since Windows claims this is not a partial chain the root is included ++ // and we have to check that it is one of our configured CAs. ++ CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1]; ++ QSslCertificate certificate = getCertificateFromChainElement(element); ++ if (!caCertificates.contains(certificate)) { ++ auto error = QSslError(QSslError::CertificateUntrusted, certificate); ++ sslErrors += error; ++ emit q->peerVerifyError(error); ++ if (q->state() != QAbstractSocket::ConnectedState) ++ return false; ++ } ++ } ++ + for (DWORD i = 0; i < verifyDepth; i++) { + CERT_CHAIN_ELEMENT *element = chain->rgpElement[i]; + QSslCertificate certificate = getCertificateFromChainElement(element); diff --git a/recipes-qt/qt5/qtbase/CVE-2023-37369-qtbase-5.15.diff b/recipes-qt/qt5/qtbase/CVE-2023-37369-qtbase-5.15.diff new file mode 100644 index 00000000..4fde5493 --- /dev/null +++ b/recipes-qt/qt5/qtbase/CVE-2023-37369-qtbase-5.15.diff @@ -0,0 +1,216 @@ +From 8b7ecba1bab3a02af1c5d5b2278b88e931e612e6 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 10 Oct 2023 16:10:40 +0200 +Subject: [PATCH] qtbase: Pick CVE-2023-37369 fix + +CVE: CVE-2023-37369 +Upstream-Status: Backport [https://download.qt.io/official_releases/qt/5.15/CVE-2023-37369-qtbase-5.15.diff] +--- + src/corelib/serialization/qxmlstream.cpp | 39 +++++++++++++++--------- + src/corelib/serialization/qxmlstream.g | 25 +++++++++++++-- + src/corelib/serialization/qxmlstream_p.h | 25 +++++++++++++-- + 3 files changed, 69 insertions(+), 20 deletions(-) + +diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp +index b2f846544d..6c98e7c013 100644 +--- a/src/corelib/serialization/qxmlstream.cpp ++++ b/src/corelib/serialization/qxmlstream.cpp +@@ -1302,15 +1302,18 @@ inline int QXmlStreamReaderPrivate::fastScanContentCharList() + return n; + } + +-inline int QXmlStreamReaderPrivate::fastScanName(int *prefix) ++// Fast scan an XML attribute name (e.g. "xml:lang"). ++inline QXmlStreamReaderPrivate::FastScanNameResult ++QXmlStreamReaderPrivate::fastScanName(Value *val) + { + int n = 0; + uint c; + while ((c = getChar()) != StreamEOF) { + if (n >= 4096) { + // This is too long to be a sensible name, and +- // can exhaust memory +- return 0; ++ // can exhaust memory, or the range of decltype(*prefix) ++ raiseNamePrefixTooLongError(); ++ return {}; + } + switch (c) { + case '\n': +@@ -1339,23 +1342,23 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix) + case '+': + case '*': + putChar(c); +- if (prefix && *prefix == n+1) { +- *prefix = 0; ++ if (val && val->prefix == n + 1) { ++ val->prefix = 0; + putChar(':'); + --n; + } +- return n; ++ return FastScanNameResult(n); + case ':': +- if (prefix) { +- if (*prefix == 0) { +- *prefix = n+2; ++ if (val) { ++ if (val->prefix == 0) { ++ val->prefix = n + 2; + } else { // only one colon allowed according to the namespace spec. + putChar(c); +- return n; ++ return FastScanNameResult(n); + } + } else { + putChar(c); +- return n; ++ return FastScanNameResult(n); + } + Q_FALLTHROUGH(); + default: +@@ -1364,12 +1367,12 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix) + } + } + +- if (prefix) +- *prefix = 0; ++ if (val) ++ val->prefix = 0; + int pos = textBuffer.size() - n; + putString(textBuffer, pos); + textBuffer.resize(pos); +- return 0; ++ return FastScanNameResult(0); + } + + enum NameChar { NameBeginning, NameNotBeginning, NotName }; +@@ -1878,6 +1881,14 @@ void QXmlStreamReaderPrivate::raiseWellFormedError(const QString &message) + raiseError(QXmlStreamReader::NotWellFormedError, message); + } + ++void QXmlStreamReaderPrivate::raiseNamePrefixTooLongError() ++{ ++ // TODO: add a ImplementationLimitsExceededError and use it instead ++ raiseError(QXmlStreamReader::NotWellFormedError, ++ QXmlStream::tr("Length of XML attribute name exceeds implemnetation limits (4KiB " ++ "characters).")); ++} ++ + void QXmlStreamReaderPrivate::parseError() + { + +diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g +index b623de9505..e431028506 100644 +--- a/src/corelib/serialization/qxmlstream.g ++++ b/src/corelib/serialization/qxmlstream.g +@@ -516,7 +516,16 @@ public: + int fastScanLiteralContent(); + int fastScanSpace(); + int fastScanContentCharList(); +- int fastScanName(int *prefix = nullptr); ++ ++ struct FastScanNameResult { ++ FastScanNameResult() : ok(false) {} ++ explicit FastScanNameResult(int len) : addToLen(len), ok(true) { } ++ operator bool() { return ok; } ++ int operator*() { Q_ASSERT(ok); return addToLen; } ++ int addToLen; ++ bool ok; ++ }; ++ FastScanNameResult fastScanName(Value *val = nullptr); + inline int fastScanNMTOKEN(); + + +@@ -525,6 +534,7 @@ public: + + void raiseError(QXmlStreamReader::Error error, const QString& message = QString()); + void raiseWellFormedError(const QString &message); ++ void raiseNamePrefixTooLongError(); + + QXmlStreamEntityResolver *entityResolver; + +@@ -1809,7 +1819,12 @@ space_opt ::= space; + qname ::= LETTER; + /. + case $rule_number: { +- sym(1).len += fastScanName(&sym(1).prefix); ++ Value &val = sym(1); ++ if (auto res = fastScanName(&val)) ++ val.len += *res; ++ else ++ return false; ++ + if (atEnd) { + resume($rule_number); + return false; +@@ -1820,7 +1835,11 @@ qname ::= LETTER; + name ::= LETTER; + /. + case $rule_number: +- sym(1).len += fastScanName(); ++ if (auto res = fastScanName()) ++ sym(1).len += *res; ++ else ++ return false; ++ + if (atEnd) { + resume($rule_number); + return false; +diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h +index 103b123b10..80e7f74080 100644 +--- a/src/corelib/serialization/qxmlstream_p.h ++++ b/src/corelib/serialization/qxmlstream_p.h +@@ -1005,7 +1005,16 @@ public: + int fastScanLiteralContent(); + int fastScanSpace(); + int fastScanContentCharList(); +- int fastScanName(int *prefix = nullptr); ++ ++ struct FastScanNameResult { ++ FastScanNameResult() : ok(false) {} ++ explicit FastScanNameResult(int len) : addToLen(len), ok(true) { } ++ operator bool() { return ok; } ++ int operator*() { Q_ASSERT(ok); return addToLen; } ++ int addToLen; ++ bool ok; ++ }; ++ FastScanNameResult fastScanName(Value *val = nullptr); + inline int fastScanNMTOKEN(); + + +@@ -1014,6 +1023,7 @@ public: + + void raiseError(QXmlStreamReader::Error error, const QString& message = QString()); + void raiseWellFormedError(const QString &message); ++ void raiseNamePrefixTooLongError(); + + QXmlStreamEntityResolver *entityResolver; + +@@ -1937,7 +1947,12 @@ bool QXmlStreamReaderPrivate::parse() + break; + + case 262: { +- sym(1).len += fastScanName(&sym(1).prefix); ++ Value &val = sym(1); ++ if (auto res = fastScanName(&val)) ++ val.len += *res; ++ else ++ return false; ++ + if (atEnd) { + resume(262); + return false; +@@ -1945,7 +1960,11 @@ bool QXmlStreamReaderPrivate::parse() + } break; + + case 263: +- sym(1).len += fastScanName(); ++ if (auto res = fastScanName()) ++ sym(1).len += *res; ++ else ++ return false; ++ + if (atEnd) { + resume(263); + return false; diff --git a/recipes-qt/qt5/qtbase/CVE-2023-38197-qtbase-5.15.diff b/recipes-qt/qt5/qtbase/CVE-2023-38197-qtbase-5.15.diff new file mode 100644 index 00000000..cb631519 --- /dev/null +++ b/recipes-qt/qt5/qtbase/CVE-2023-38197-qtbase-5.15.diff @@ -0,0 +1,231 @@ +From ae3946f38904b626a73a64f2829f60c911e2943b Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 10 Oct 2023 16:11:57 +0200 +Subject: [PATCH] qtbase: Pick CVE-2023-38197 fix + +CVE: CVE-2023-38197 +Upstream-Status: Backport [https://download.qt.io/official_releases/qt/5.15/CVE-2023-38197-qtbase-5.15.diff] +--- + src/corelib/serialization/qxmlstream.cpp | 144 +++++++++++++++++++++-- + src/corelib/serialization/qxmlstream_p.h | 11 ++ + 2 files changed, 147 insertions(+), 8 deletions(-) + +diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp +index 6c98e7c013..2553d3e09a 100644 +--- a/src/corelib/serialization/qxmlstream.cpp ++++ b/src/corelib/serialization/qxmlstream.cpp +@@ -160,7 +160,7 @@ enum { StreamEOF = ~0U }; + addData() or by waiting for it to arrive on the device(). + + \value UnexpectedElementError The parser encountered an element +- that was different to those it expected. ++ or token that was different to those it expected. + + */ + +@@ -295,13 +295,34 @@ QXmlStreamEntityResolver *QXmlStreamReader::entityResolver() const + + QXmlStreamReader is a well-formed XML 1.0 parser that does \e not + include external parsed entities. As long as no error occurs, the +- application code can thus be assured that the data provided by the +- stream reader satisfies the W3C's criteria for well-formed XML. For +- example, you can be certain that all tags are indeed nested and +- closed properly, that references to internal entities have been +- replaced with the correct replacement text, and that attributes have +- been normalized or added according to the internal subset of the +- DTD. ++ application code can thus be assured, that ++ \list ++ \li the data provided by the stream reader satisfies the W3C's ++ criteria for well-formed XML, ++ \li tokens are provided in a valid order. ++ \endlist ++ ++ Unless QXmlStreamReader raises an error, it guarantees the following: ++ \list ++ \li All tags are nested and closed properly. ++ \li References to internal entities have been replaced with the ++ correct replacement text. ++ \li Attributes have been normalized or added according to the ++ internal subset of the \l DTD. ++ \li Tokens of type \l StartDocument happen before all others, ++ aside from comments and processing instructions. ++ \li At most one DOCTYPE element (a token of type \l DTD) is present. ++ \li If present, the DOCTYPE appears before all other elements, ++ aside from StartDocument, comments and processing instructions. ++ \endlist ++ ++ In particular, once any token of type \l StartElement, \l EndElement, ++ \l Characters, \l EntityReference or \l EndDocument is seen, no ++ tokens of type StartDocument or DTD will be seen. If one is present in ++ the input stream, out of order, an error is raised. ++ ++ \note The token types \l Comment and \l ProcessingInstruction may appear ++ anywhere in the stream. + + If an error occurs while parsing, atEnd() and hasError() return + true, and error() returns the error that occurred. The functions +@@ -620,6 +641,7 @@ QXmlStreamReader::TokenType QXmlStreamReader::readNext() + d->token = -1; + return readNext(); + } ++ d->checkToken(); + return d->type; + } + +@@ -740,6 +762,14 @@ static const short QXmlStreamReader_tokenTypeString_indices[] = { + }; + + ++static const char QXmlStreamReader_XmlContextString[] = ++ "Prolog\0" ++ "Body\0"; ++ ++static const short QXmlStreamReader_XmlContextString_indices[] = { ++ 0, 7 ++}; ++ + /*! + \property QXmlStreamReader::namespaceProcessing + The namespace-processing flag of the stream reader +@@ -775,6 +805,16 @@ QString QXmlStreamReader::tokenString() const + QXmlStreamReader_tokenTypeString_indices[d->type]); + } + ++/*! ++ \internal ++ \return \param ctxt (Prolog/Body) as a string. ++ */ ++QString contextString(QXmlStreamReaderPrivate::XmlContext ctxt) ++{ ++ return QLatin1String(QXmlStreamReader_XmlContextString + ++ QXmlStreamReader_XmlContextString_indices[static_cast<int>(ctxt)]); ++} ++ + #endif // QT_NO_XMLSTREAMREADER + + QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack() +@@ -866,6 +906,8 @@ void QXmlStreamReaderPrivate::init() + + type = QXmlStreamReader::NoToken; + error = QXmlStreamReader::NoError; ++ currentContext = XmlContext::Prolog; ++ foundDTD = false; + } + + /* +@@ -4061,6 +4103,92 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader) + } + } + ++static bool isTokenAllowedInContext(QXmlStreamReader::TokenType type, ++ QXmlStreamReaderPrivate::XmlContext loc) ++{ ++ switch (type) { ++ case QXmlStreamReader::StartDocument: ++ case QXmlStreamReader::DTD: ++ return loc == QXmlStreamReaderPrivate::XmlContext::Prolog; ++ ++ case QXmlStreamReader::StartElement: ++ case QXmlStreamReader::EndElement: ++ case QXmlStreamReader::Characters: ++ case QXmlStreamReader::EntityReference: ++ case QXmlStreamReader::EndDocument: ++ return loc == QXmlStreamReaderPrivate::XmlContext::Body; ++ ++ case QXmlStreamReader::Comment: ++ case QXmlStreamReader::ProcessingInstruction: ++ return true; ++ ++ case QXmlStreamReader::NoToken: ++ case QXmlStreamReader::Invalid: ++ return false; ++ default: ++ return false; ++ } ++} ++ ++/*! ++ \internal ++ \brief QXmlStreamReader::isValidToken ++ \return \c true if \param type is a valid token type. ++ \return \c false if \param type is an unexpected token, ++ which indicates a non-well-formed or invalid XML stream. ++ */ ++bool QXmlStreamReaderPrivate::isValidToken(QXmlStreamReader::TokenType type) ++{ ++ // Don't change currentContext, if Invalid or NoToken occur in the prolog ++ if (type == QXmlStreamReader::Invalid || type == QXmlStreamReader::NoToken) ++ return false; ++ ++ // If a token type gets rejected in the body, there is no recovery ++ const bool result = isTokenAllowedInContext(type, currentContext); ++ if (result || currentContext == XmlContext::Body) ++ return result; ++ ++ // First non-Prolog token observed => switch context to body and check again. ++ currentContext = XmlContext::Body; ++ return isTokenAllowedInContext(type, currentContext); ++} ++ ++/*! ++ \internal ++ Checks token type and raises an error, if it is invalid ++ in the current context (prolog/body). ++ */ ++void QXmlStreamReaderPrivate::checkToken() ++{ ++ Q_Q(QXmlStreamReader); ++ ++ // The token type must be consumed, to keep track if the body has been reached. ++ const XmlContext context = currentContext; ++ const bool ok = isValidToken(type); ++ ++ // Do nothing if an error has been raised already (going along with an unexpected token) ++ if (error != QXmlStreamReader::Error::NoError) ++ return; ++ ++ if (!ok) { ++ raiseError(QXmlStreamReader::UnexpectedElementError, ++ QLatin1String("Unexpected token type %1 in %2.") ++ .arg(q->tokenString(), contextString(context))); ++ return; ++ } ++ ++ if (type != QXmlStreamReader::DTD) ++ return; ++ ++ // Raise error on multiple DTD tokens ++ if (foundDTD) { ++ raiseError(QXmlStreamReader::UnexpectedElementError, ++ QLatin1String("Found second DTD token in %1.").arg(contextString(context))); ++ } else { ++ foundDTD = true; ++ } ++} ++ + /*! + \fn bool QXmlStreamAttributes::hasAttribute(const QString &qualifiedName) const + \since 4.5 +diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h +index 80e7f74080..6db58386db 100644 +--- a/src/corelib/serialization/qxmlstream_p.h ++++ b/src/corelib/serialization/qxmlstream_p.h +@@ -804,6 +804,17 @@ public: + #endif + bool atEnd; + ++ enum class XmlContext ++ { ++ Prolog, ++ Body, ++ }; ++ ++ XmlContext currentContext = XmlContext::Prolog; ++ bool foundDTD = false; ++ bool isValidToken(QXmlStreamReader::TokenType type); ++ void checkToken(); ++ + /*! + \sa setType() + */ diff --git a/recipes-qt/qt5/qtbase/CVE-2023-43114-5.15.patch b/recipes-qt/qt5/qtbase/CVE-2023-43114-5.15.patch new file mode 100644 index 00000000..4b75db3a --- /dev/null +++ b/recipes-qt/qt5/qtbase/CVE-2023-43114-5.15.patch @@ -0,0 +1,128 @@ +From 7ec5e6dff1d6f6b2f3abcb1a2802f174ac189d9e Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 10 Oct 2023 16:13:57 +0200 +Subject: [PATCH] qtbase: Pick CVE-2023-43114 fix + +CVE: CVE-2023-43114 +Upstream-Status: Backport [https://download.qt.io/official_releases/qt/5.15/CVE-2023-43114-5.15.patch] +--- + .../windows/qwindowsfontdatabase.cpp | 67 ++++++++++++++----- + 1 file changed, 51 insertions(+), 16 deletions(-) + +diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp +index 09d2d916fe..0e6fe5eb84 100644 +--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp ++++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp +@@ -1471,36 +1471,70 @@ QT_WARNING_POP + return fontEngine; + } + +-static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData) ++static QList<quint32> getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel) + { + QList<quint32> offsets; +- const quint32 headerTag = *reinterpret_cast<const quint32 *>(fontData); ++ if (fileEndSentinel - fontData < 12) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ return offsets; ++ } ++ ++ const quint32 headerTag = qFromUnaligned<quint32>(fontData); + if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) { + if (headerTag != MAKE_TAG(0, 1, 0, 0) + && headerTag != MAKE_TAG('O', 'T', 'T', 'O') + && headerTag != MAKE_TAG('t', 'r', 'u', 'e') +- && headerTag != MAKE_TAG('t', 'y', 'p', '1')) ++ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) { + return offsets; ++ } + offsets << 0; + return offsets; + } ++ ++ const quint32 maximumNumFonts = 0xffff; + const quint32 numFonts = qFromBigEndian<quint32>(fontData + 8); +- for (uint i = 0; i < numFonts; ++i) { +- offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4); ++ if (numFonts > maximumNumFonts) { ++ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting."; ++ return offsets; + } ++ ++ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) { ++ for (quint32 i = 0; i < numFonts; ++i) ++ offsets << qFromBigEndian<quint32>(fontData + 12 + i * 4); ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ } ++ + return offsets; + } + +-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length) ++static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length) + { +- const quint16 numTables = qFromBigEndian<quint16>(data + 4); +- for (uint i = 0; i < numTables; ++i) { +- const quint32 offset = 12 + 16 * i; +- if (*reinterpret_cast<const quint32 *>(data + offset) == tag) { +- *table = fileBegin + qFromBigEndian<quint32>(data + offset + 8); +- *length = qFromBigEndian<quint32>(data + offset + 12); +- return; ++ if (fileEndSentinel - data >= 6) { ++ const quint16 numTables = qFromBigEndian<quint16>(data + 4); ++ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) { ++ for (quint32 i = 0; i < numTables; ++i) { ++ const quint32 offset = 12 + 16 * i; ++ if (qFromUnaligned<quint32>(data + offset) == tag) { ++ const quint32 tableOffset = qFromBigEndian<quint32>(data + offset + 8); ++ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ *table = fileBegin + tableOffset; ++ *length = qFromBigEndian<quint32>(data + offset + 12); ++ if (quintptr(fileEndSentinel - *table) < *length) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ return; ++ } ++ } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } + *table = 0; + *length = 0; +@@ -1513,8 +1547,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + QVector<QFontValues> *values) + { + const uchar *data = reinterpret_cast<const uchar *>(fontData.constData()); ++ const uchar *dataEndSentinel = data + fontData.size(); + +- QList<quint32> offsets = getTrueTypeFontOffsets(data); ++ QList<quint32> offsets = getTrueTypeFontOffsets(data, dataEndSentinel); + if (offsets.isEmpty()) + return; + +@@ -1522,7 +1557,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + const uchar *font = data + offsets.at(i); + const uchar *table; + quint32 length; +- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); + if (!table) + continue; + QFontNames names = qt_getCanonicalFontNames(table, length); +@@ -1532,7 +1567,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + families->append(std::move(names)); + + if (values || signatures) +- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); + + if (values) { + QFontValues fontValues; diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4e0d62f7..5e830f0d 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \ + file://LICENSE.QT-LICENSE-AGREEMENT;md5=38de3b110ade3b6ee2f0b6a95ab16f1a \ " # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.3 +# 5.15.meta-qt5-shared.4 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -23,7 +23,6 @@ SRC_URI += "\ file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ - file://0008-Replace-pthread_yield-with-sched_yield.patch \ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ @@ -35,10 +34,27 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ - file://0020-qbytearraymatcher-Include-limits-header.patch \ - file://0005-testlib-don-t-track-the-build-or-source-directories.patch \ + file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ + file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ + file://0023-Remove-unsetting-_FILE_OFFSET_BITS.patch \ + file://CVE-2023-32762.patch \ + file://CVE-2023-32763-qtbase-5.15.diff \ + file://CVE-2023-33285-qtbase-5.15.diff \ + file://CVE-2023-34410-qtbase-5.15.diff \ + file://CVE-2023-37369-qtbase-5.15.diff \ + file://CVE-2023-38197-qtbase-5.15.diff \ + file://CVE-2023-43114-5.15.patch \ + file://0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch \ + file://0001-CVE-2023-51714-qtbase-5.15.diff \ + file://0002-CVE-2023-51714-qtbase-5.15.diff \ + file://0028-Remove-host-paths-from-qmake.patch \ + file://0029-Remove-ptests-with-SRCDIR.patch \ " +# usually pulled by one of the optional dependencies in PACKAGECONFIG, but with very limited PACKAGECONFIG fails with: +# src/corelib/io/qresource.cpp:68:12: fatal error: zstd.h: No such file or directory +DEPENDS = "zstd" + # Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with # next major upgrade of QT LTO = "" @@ -116,11 +132,11 @@ PACKAGECONFIG[no-opengl] = "-no-opengl" PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" PACKAGECONFIG[cups] = "-cups,-no-cups,cups" PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" -PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -no-bundled-xcb-xinput,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil libxext" +PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -no-bundled-xcb-xinput -DUSE_X11=ON,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil libxext" PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase" PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5" PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql" -PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc" +PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc,unixodbc" PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds" PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" @@ -272,7 +288,8 @@ do_install:append() { echo "isEmpty(QMAKE_LINK_SHLIB): QMAKE_LINK_SHLIB = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf echo "isEmpty(QMAKE_LINK_C): QMAKE_LINK_C = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf echo "isEmpty(QMAKE_LINK_C_SHLIB): QMAKE_LINK_C_SHLIB = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf - echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${OE_QMAKE_LDFLAGS}" >> $conf + # OE_QMAKE_LFLAGS contains path of the build host, which is not useful for the target. + echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${OE_QMAKE_LDFLAGS}" | sed -e 's/-fdebug-prefix-map=[^ ]*//g' | sed -e 's/-fmacro-prefix-map=[^ ]*//g' >> $conf echo "isEmpty(QMAKE_OBJCOPY): QMAKE_OBJCOPY = ${TARGET_PREFIX}objcopy" >> $conf echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${TARGET_PREFIX}strip" >> $conf echo "isEmpty(CC_host): CC_host = ${CC_host}" >> $conf @@ -309,4 +326,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" +SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 4f5d34d2..b7d5616b 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "464eeabb4045f6372be3c0425f2c6f9c4d24f54e" +SRCREV = "3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 4d79dbb8..5c4bb963 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c22a7b05342fc6bba710f9f259cb56f84885b886" +SRCREV = "f1fed9fb2a7e5b877d8408f92040651b0cf47dbb" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index e81473b8..dacfe51a 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "3787f647cba0379594157fd771b3d0713a0e88ff" +SRCREV = "6ac6d23a8f558f36f1162b419858cc44dccd4d2b" diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmldebug-Include-limits-header.patch b/recipes-qt/qt5/qtdeclarative/0001-qmldebug-Include-limits-header.patch deleted file mode 100644 index d803a294..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-qmldebug-Include-limits-header.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ab263a3e79a36d3e6536adc900b296cdf27f09ae Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 4 Mar 2021 14:37:06 -0800 -Subject: [PATCH] qmldebug: Include limits header - -this is needed to solve -qmldebug/qqmlprofilerevent_p.h:314:65: error: 'numeric_limits' is not a member of 'std' - -Its exposed bu gcc11 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..f778628f8c 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -47,6 +47,7 @@ - #include <QtCore/qvarlengtharray.h> - #include <QtCore/qmetatype.h> - -+#include <limits> - #include <initializer_list> - #include <type_traits> - --- -2.30.1 - diff --git a/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch b/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch deleted file mode 100644 index 1a77c04b..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d99fda38487eee9a660101ce73c488680c485668 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 3 Mar 2021 07:26:21 -0800 -Subject: [PATCH] yarr: Include <limits> for numeric_limits - -Fixes -src/3rdparty/masm/yarr/Yarr.h:46:44: error: 'numeric_limits' is not a member of 'std' - 46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max(); - | ^~~~~~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/3rdparty/masm/yarr/Yarr.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h -index ccf78f9880..cbb42c60d8 100644 ---- a/src/3rdparty/masm/yarr/Yarr.h -+++ b/src/3rdparty/masm/yarr/Yarr.h -@@ -27,7 +27,7 @@ - - #pragma once - --#include <limits.h> -+#include <limits> - #include "YarrErrorCode.h" - - namespace JSC { namespace Yarr { --- -2.30.1 - diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f26571a9..48a4c697 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = " \ # 5.15.meta-qt5.1 SRC_URI += " \ file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ - file://0001-yarr-Include-limits-for-numeric_limits.patch \ - file://0001-qmldebug-Include-limits-header.patch \ " LDFLAGS:append:riscv64 = " -pthread" @@ -55,6 +53,6 @@ do_install:append:class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "eca023e1eb19c6d968701595e99f648efcd1c0c7" +SRCREV = "6ab9856ef379fc3fe44d5fac03a83f679f398511" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 62f957bc..642f8f86 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "6e2c9fe95af305cf7469afd1887dcbc3cb67c1be" +SRCREV = "44255e2ae53a14e9a3fb671da0782ec5d396220a" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index fccb5dae..ef72bf84 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS:${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "5b8120bddcc2b3835e726d3f7cf13810f4a9f130" +SRCREV = "895f9753940156dda05aa83d3c7655571514407e" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index a71b63f7..9a8dabc7 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a9857aa8d00178d6bf7b711a35705c2c7d1441f0" +SRCREV = "3c2ad3eed6fc522ad809797747c8028b3dd4778a" diff --git a/recipes-qt/qt5/qtlocation/0001-mapbox-gl-explicitly-include-cstdint-header.patch b/recipes-qt/qt5/qtlocation/0001-mapbox-gl-explicitly-include-cstdint-header.patch new file mode 100644 index 00000000..78b5468e --- /dev/null +++ b/recipes-qt/qt5/qtlocation/0001-mapbox-gl-explicitly-include-cstdint-header.patch @@ -0,0 +1,52 @@ +From 92ce461e77dad3451eb5791efe7413a989dc2c3c Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@konsulko.com> +Date: Wed, 7 Jun 2023 22:59:53 +0000 +Subject: [PATCH] mapbox-gl: explicitly include cstdint header + +Otherwise gcc13 report "undeclared" error for uint8_t and uint32_t + +Upstream-Status: Pending + +Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> +--- + include/mbgl/util/geometry.hpp | 1 + + include/mbgl/util/string.hpp | 1 + + src/mbgl/gl/stencil_mode.hpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp +index a28c59a47..92d928a37 100644 +--- a/include/mbgl/util/geometry.hpp ++++ b/include/mbgl/util/geometry.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <mapbox/geometry/geometry.hpp> + #include <mapbox/geometry/point_arithmetic.hpp> + #include <mapbox/geometry/for_each_point.hpp> +diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp +index 13498ccb9..726f7f6fc 100644 +--- a/include/mbgl/util/string.hpp ++++ b/include/mbgl/util/string.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <sstream> + #include <string> + #include <cassert> +diff --git a/src/mbgl/gl/stencil_mode.hpp b/src/mbgl/gl/stencil_mode.hpp +index bc959c9a7..2fc62bba7 100644 +--- a/src/mbgl/gl/stencil_mode.hpp ++++ b/src/mbgl/gl/stencil_mode.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <mbgl/util/variant.hpp> + + namespace mbgl { +-- +2.25.1 + diff --git a/recipes-qt/qt5/qtlocation/gcc14-const.patch b/recipes-qt/qt5/qtlocation/gcc14-const.patch new file mode 100644 index 00000000..2e2e82e5 --- /dev/null +++ b/recipes-qt/qt5/qtlocation/gcc14-const.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/914583 +https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96 +https://github.com/Tencent/rapidjson/issues/718 + +Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96] + +From 3b2441b87f99ab65f37b141a7b548ebadb607b96 Mon Sep 17 00:00:00 2001 +From: Janusz Chorko <janusz.chorko@apdu.pl> +Date: Fri, 26 Aug 2016 21:17:38 +0200 +Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718 + +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } + diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f46dc27a..2863e484 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -33,9 +33,11 @@ QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging" SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ + file://0001-mapbox-gl-explicitly-include-cstdint-header.patch;patchdir=src/3rdparty/mapbox-gl-native \ + file://gcc14-const.patch;patchdir=src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0 \ " -SRCREV_qtlocation = "8a1d08112386c165167bc5033d1a507d64110460" +SRCREV_qtlocation = "f6953a8d604b906b170fb4610e124e7c31260a18" SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 46987ec2..93a97f07 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "77137af2aa5468adebfe13f13d87490cf684cffd" +SRCREV = "62f17bbc0ae8649178ac484afc434dbad16d6351" diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 4f9e78d6..6973e235 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -7,6 +7,7 @@ Use lgl2.h instead of gl2.h and gl2ext.h, fix a "conflicting declaration" error. Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> +Upstream-Status: Pending --- src/plugins/videonode/imx6/lgl2.h | 46 +++++++++++++++++++ .../imx6/qsgvivantevideomaterial.cpp | 5 +- diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ad55583b..f6cdb833 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -40,7 +40,7 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "d07f4385c55e5abe36250c3d7f6b130a1bfb75dc" +SRCREV = "374d71e29a142bd177cd5b1b7e29a4628085ddcb" # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory do_install:append() { diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index c20dddac..2d24ba75 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "291f9106a764086f720110895f104c5e9a069d6b" +SRCREV = "ed2291d454fac207f6b1555d30b9227e51be611b" diff --git a/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch index 5e88e578..e12d8fc1 100644 --- a/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch +++ b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch @@ -1,8 +1,10 @@ -From 8214eac226762702f5a652a07f3b15d60cd09c98 Mon Sep 17 00:00:00 2001 +From b87860c14637458c5a7f5c1ca6f66f21bb87652e Mon Sep 17 00:00:00 2001 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com> Date: Tue, 8 Feb 2022 14:14:02 +0100 Subject: [PATCH] configure.json: remove python2 dependency +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/buildtools/configure.json | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch index 920d1f35..c95e7d02 100644 --- a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch +++ b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch @@ -1,8 +1,10 @@ -From f98019bb6712fdfa1f3387baefe6b604e6191a88 Mon Sep 17 00:00:00 2001 +From 6e25650c829bf1052f607b3f3edbdf88f163efe0 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com> Date: Tue, 8 Feb 2022 16:28:14 +0100 Subject: [PATCH] gn.pro: do not try to statically link stdc++ +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/buildtools/gn.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch b/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch index f5efddd4..21fe4f0b 100644 --- a/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From b9ebaa970dbb050a51021a013e8d5b6d5aac86ab Mon Sep 17 00:00:00 2001 +From 9e1036a25207f9013a13b23401feacd72866be4c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 26 Feb 2022 18:15:28 -0800 Subject: [PATCH] Fix build with clang @@ -21,19 +21,20 @@ Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - src/buildtools/gn.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/buildtools/gn.pro | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index 9632f0ef7..da85f8a26 100644 +index 9632f0ef7..5ff50cca1 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro -@@ -20,7 +20,7 @@ build_pass|!debug_and_release { +@@ -20,8 +20,7 @@ build_pass|!debug_and_release { gn_gen_args = --no-last-commit-position --out-path $$out_path \ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ - --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" \ -+ --ld \"$$which($$CXX_host) -rtlib=libgcc -unwindlib=libgcc\" --ar \"$$which(ar)\" \ - --no-static-libstdc++ +- --no-static-libstdc++ ++ --ld \"$$which($$CXX_host) -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc $$(GN_HOST_TOOLCHAIN_EXTRA_LDFLAGS)\" --ar \"$$which(ar)\" msvc:!clang_cl: gn_gen_args += --use-lto + diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb index dd77bc66..d49a5305 100644 --- a/recipes-qt/qt5/qtpdf_git.bb +++ b/recipes-qt/qt5/qtpdf_git.bb @@ -71,6 +71,7 @@ COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)" COMPATIBLE_MACHINE:armv7ve = "(.*)" COMPATIBLE_MACHINE:aarch64 = "(.*)" +COMPATIBLE_MACHINE:riscv64 = "(.*)" inherit qmake5 inherit gettext @@ -90,6 +91,7 @@ require qt5-git.inc export GN_PKG_CONFIG_HOST = "${STAGING_BINDIR_NATIVE}/pkg-config-native" export GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS = "-I${STAGING_DIR_NATIVE}/usr/include" +export GN_HOST_TOOLCHAIN_EXTRA_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE}" export NINJAFLAGS="${PARALLEL_MAKE}" do_configure() { @@ -128,8 +130,8 @@ RDEPENDS:${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "87-based" -QT_MODULE_BRANCH = "5.15.10" -PV = "5.15.10+git${SRCPV}" +QT_MODULE_BRANCH = "5.15" +PV = "5.15.13+git${SRCPV}" # Uses the same repository and couple patches as qtwebengine, but qtwebengine # still depends on python2 @@ -137,14 +139,14 @@ QT_MODULE = "qtwebengine" FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtwebengine:" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.15 +# 5.15-glibc.meta-qt5.17 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch \ + file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.15 +# 5.15.meta-qt5.17 SRC_URI:append:libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0004-musl-link-against-libexecinfo.patch \ @@ -152,7 +154,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.9 +# 87-based-glibc.meta-qt5.11 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -164,12 +166,13 @@ SRC_URI += " \ file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ - file://chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch;patchdir=src/3rdparty \ - file://chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \ + file://chromium/0013-Fix-build-with-gcc-13.patch;patchdir=src/3rdparty \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.9 +# 87-based.meta-qt5.11 SRC_URI:append:libc-musl = "\ file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ @@ -184,9 +187,8 @@ SRC_URI:append:libc-musl = "\ file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505" -# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix: -SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b" +SRCREV_qtwebengine = "d15a42baae7141952e91665bed22a7c7cfb54b95" +SRCREV_chromium = "fb66d7ca9641724670c96e999ad5b0fd6eb78d46" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" @@ -203,7 +205,7 @@ INSANE_SKIP:${PN} += "textrel" # First patch skips "python2" dependency checks for the pdf module # Second patch repairs a failing build of the `gn` buildtool due to missing (host) libstdc++ # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-qtpdf -# 5.15-qtpdf.meta-qt5.2 +# 5.15-qtpdf.meta-qt5.5 SRC_URI += " \ file://0001-configure.json-remove-python2-dependency.patch \ file://0002-gn.pro-do-not-try-to-statically-link-stdc.patch \ diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index ccc25fc8..440a66d1 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "194024fb2944bbca40fcf072cf95644f5ca439cf" +SRCREV = "7f4ead6f3e6431acee63987a0a1753ff140ac2d2" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index e3a8e140..1c99f14e 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" SRC_URI += " \ - git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ + git://code.qt.io/qt/qtquick3d-assimp.git;name=assimp;branch=qt6_assimp;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ " PACKAGECONFIG ??= "" @@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "7a8bdd666c8653f80cdee804e679783a461d5f43" +SRCREV_qtquick3d = "fbb8186383e7e3389b952c43781755346d5ce371" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch index a5512bbe..1692e2de 100644 --- a/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch +++ b/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch @@ -13,6 +13,7 @@ Reported but nobody cares. [1] Upstream-Status: Pending This reverts commit 761dba8b23b7e558acc57b3e481648ce319a4397. +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/quicktemplates2/qquickpopuppositioner.cpp | 18 +++++++-------- .../qquickpopuppositioner_p_p.h | 1 - diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c7592796..07ac0b6e 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative qtdeclarative-native" SRC_URI += "file://0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch" -SRCREV = "83cbcc244ac1c1cf65c8b407e0fd905f9d3a41ac" +SRCREV = "480694ae720490b162747b07aa0e0bb7e7abc7da" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index b0e00e69..d61a1923 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES:${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "3f0b75ac45c6377093ddec87a869bd1b8fa11857" +SRCREV = "77fbfa8d313bbdb8fb762f15dd6173a067be55e3" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 73cff70b..234c760f 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtbase qtdeclarative" -SRCREV = "06c4975d21c2b043213eb0412becbed240c9baf3" +SRCREV = "29394e35db43acb20e7b4d5e978a733f5b4232a6" diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch index 5ae00be7..90588176 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -4,6 +4,8 @@ Date: Wed, 7 Jun 2017 15:17:12 +0300 Subject: [PATCH] Allow a tools-only build Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706 +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- mkspecs/features/repccommon.pri | 2 +- qtremoteobjects.pro | 5 +++++ diff --git a/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch index 92a97b29..b0bfd34e 100644 --- a/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +++ b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -3,6 +3,8 @@ From: ibinderwolf <daniel@bluepattern.net> Date: Wed, 26 Jun 2019 09:46:48 +0200 Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index d02defc7..2933fc3c 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "d0a3719da2797efd95d90043ad2ba4572a2a8533" +SRCREV = "1d8e4d3645c437cb0a5e5cdb4862949190f89259" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 12f1af1d..ee44969e 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,5 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -# v5.15.8-lts -SRCREV = "4d8e4bd20b7100b0b7192547b19c3c239aaf7034" +SRCREV = "4f8c35a528586541ea55bb8b3361eaa6749e52b1" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index bf272371..018d8266 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "53beea814535e3f27bb2c952856632fba545b1c3" +SRCREV = "6074956c2089dd0507d2930c638fa8c930f4e21c" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15 # 5.15.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index efaccf20..3dc6da4b 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "819dc6dc360b90889b6bf9cc961659803589b2df" +SRCREV = "7f8b55744f87155a4979dd8ba405bd7feec03042" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index cf02113b..363bba7a 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "d3394c81f10e5d5c40663e88e185335549e4bc12" +SRCREV = "5efce7d821bad2f5db95ff3ada5eeddccbb58920" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index d79c8c50..83437e46 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "a90c9fc5ebce3f7d7120563c12103c605aeb8eea" +SRCREV = "fc0b6affe244e40366bd624d6e01c62712568eb8" diff --git a/recipes-qt/qt5/qtsvg/CVE-2023-32573-qtsvg-5.15.diff b/recipes-qt/qt5/qtsvg/CVE-2023-32573-qtsvg-5.15.diff new file mode 100644 index 00000000..c09e6437 --- /dev/null +++ b/recipes-qt/qt5/qtsvg/CVE-2023-32573-qtsvg-5.15.diff @@ -0,0 +1,48 @@ +From 9894206da35bde7025703f1e823f2df447ca200d Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 10 Oct 2023 15:59:40 +0200 +Subject: [PATCH] qtsvg: Pick CVE-2023-32573 fix + +CVE: CVE-2023-32573 +Upstream-Status: Backport [https://download.qt.io/official_releases/qt/5.15/CVE-2023-32573-qtsvg-5.15.diff] +--- + src/svg/qsvgfont_p.h | 5 ++--- + src/svg/qsvghandler.cpp | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h +index fd0a3fa..fcffbe8 100644 +--- a/src/svg/qsvgfont_p.h ++++ b/src/svg/qsvgfont_p.h +@@ -74,6 +74,7 @@ public: + class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted + { + public: ++ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000; + QSvgFont(qreal horizAdvX); + + void setFamilyName(const QString &name); +@@ -86,9 +87,7 @@ public: + void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const; + public: + QString m_familyName; +- qreal m_unitsPerEm; +- qreal m_ascent; +- qreal m_descent; ++ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM; + qreal m_horizAdvX; + QHash<QChar, QSvgGlyph> m_glyphs; + }; +diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp +index b2227b6..f4a00e3 100644 +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -2666,7 +2666,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent, + + qreal unitsPerEm = toDouble(unitsPerEmStr); + if (!unitsPerEm) +- unitsPerEm = 1000; ++ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM; + + if (!name.isEmpty()) + font->setFamilyName(name); diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index e3ab978d..d7992075 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "b13c2d7fe8810af13a3f9400ecff4ff7c4c7ab51" +SRCREV = "d44607f07fa66f0f5294c227eba99aac7c8dbebd" + +SRC_URI += "\ + file://CVE-2023-32573-qtsvg-5.15.diff \ +" diff --git a/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch b/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch index 93a34f2b..93d34b8d 100644 --- a/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch +++ b/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch @@ -7,6 +7,7 @@ This fixes build error for qtsystems when it tries to install files multiple times and fails with error of "Destination file exists". +Upstream-Status: Pending Signed-off-by: ansar-rasool <ansar_rasool@mentor.com> --- examples/systeminfo/inputinfo/inputinfo.pro | 3 +-- diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 8d3eca5e..4389d992 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Inappropiate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index 6f570d62..1cdfc433 100644 --- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -4,6 +4,8 @@ Date: Mon, 18 Feb 2019 10:45:03 +0200 Subject: [PATCH] linguist-tools cmake: allow overriding the location for lupdate and lrelease +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/linguist/Qt5LinguistToolsConfig.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch index 3ee3fda6..32de7de1 100644 --- a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch +++ b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch @@ -5,6 +5,7 @@ Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds it needs clang on host, so lets separate it out +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/src.pro | 2 +- diff --git a/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch b/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch index 4bc53c79..bc833e0b 100644 --- a/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch +++ b/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstrem-Statu: Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 1be3db16..cd6f2b96 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -24,6 +24,10 @@ SRC_URI:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'clang', ' FILES:${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" FILES:${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" +# Without "opengl" in DISTRO_FEATURES, the libQt5UiTools.a library isn't generated, but qttools-staticdev +# is required by packagegroup-qt5-toolchain-target. +ALLOW_EMPTY:${PN}-staticdev = "1" + PACKAGECONFIG ??= "" PACKAGECONFIG:append:toolchain-clang = " clang" @@ -39,7 +43,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " -SRCREV = "7e2102f2ebb2b42e9249bab3327f939204053100" +SRCREV = "e8c3c391de17edce4542819c79de3d27a57ff408" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 6ef215d7..acb4f111 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES:${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "8f0756f2c29cc7bb7e9a016612f15779193109ad" +SRCREV = "40aabebd04a30ccef374bf20a7bfaa1d8d665b7f" diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch new file mode 100644 index 00000000..874c079c --- /dev/null +++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch @@ -0,0 +1,66 @@ +From fe4546abf79cf2e93e151fe8cd771901f9b768d3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 7 Feb 2023 23:11:18 -0800 +Subject: [PATCH] replace deprecated std::auto_ptr with std::unique_ptr + +auto_ptr is gone with c++17 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp b/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp +index 1971a69d..894028e4 100644 +--- a/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp ++++ b/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp +@@ -96,7 +96,7 @@ LTKLoggerUtil::LTKLoggerUtil(){} + int LTKLoggerUtil::createLogger(const string& lipiLibPath) + { + void* functionHandle = NULL; +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + + int iErrorCode = a_ptrOSUtil->loadSharedLib(lipiLibPath, + LOGGER_MODULE_STR, +@@ -159,7 +159,7 @@ int LTKLoggerUtil::createLogger(const string& lipiLibPath) + *****************************************************************************/ + int LTKLoggerUtil::destroyLogger() + { +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + + if (module_destroyLogger != NULL ) + { +@@ -196,7 +196,7 @@ int LTKLoggerUtil::configureLogger(const string& logFile, LTKLogger::EDebugLevel + LTKReturnError(ELOGGER_LIBRARY_NOT_LOADED); + } + +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + + if ( logFile.length() != 0 ) + { +@@ -257,7 +257,7 @@ int LTKLoggerUtil::getAddressLoggerFunctions() + void* functionHandle = NULL; + int returnVal = SUCCESS; + +- auto_ptr<LTKOSUtil> a_ptrOSUtil; ++ unique_ptr<LTKOSUtil> a_ptrOSUtil; + + //start log + +@@ -323,7 +323,7 @@ ostream& LTKLoggerUtil::logMessage(LTKLogger::EDebugLevel logLevel, string inStr + { + if (m_libHandleLogger == NULL) + { +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + m_libHandleLogger = a_ptrOSUtil->getLibraryHandle(LOGGER_MODULE_STR); + + if (m_libHandleLogger == NULL) +-- +2.39.1 + diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index f90e4ad4..c1513a26 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " +SRC_URI += "file://0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch" + # To enabled Nuance T9 Write support, you need to provide the licensed components # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. # for example: @@ -71,4 +73,4 @@ FILES:${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "436e9407c5dd2e2aa26d7c277f0f0e614d73b8cc" +SRCREV = "80565aa7fc37ecdb1c08e585d4ae3060618e3338" diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch b/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch index 2a9516ad..ecaf5d60 100644 --- a/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch +++ b/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch @@ -8,6 +8,7 @@ vulkanserverbufferintegration.cpp:163:77: error: use of undeclared identifier 'G if (extraDebug) qDebug() << "format" << Qt::hex << m_internalFormat << GL_RGBA8; ^ +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../client/vulkan-server/vulkanserverbufferintegration.cpp | 2 +- diff --git a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch index ae205b89..854ca45c 100644 --- a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch +++ b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch @@ -7,6 +7,7 @@ build fails with libc++ otherwise tests/auto/client/seatv4/tst_seatv4.cpp:330:43: error: implicit instantiation of undefined template 'std::__1::array<const char *, 4>' +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- tests/auto/client/seatv4/tst_seatv4.cpp | 2 +- diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index d2a44621..7dbe4f3f 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -49,7 +49,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "f1e6c8764d187e9c1c642f6b11020ea513822cd1" +SRCREV = "163ea1a04d1b00c95373d69e8c907e5789082d3e" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 454d27ef..f869f279 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "fe29fe07daf7e43fcd6f5fd135b8567d83260fb4" +SRCREV = "d5eb0142112b2b058e86489f7dae2e00c0aebe4c" diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index cec6c56a..7daa801a 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From bae24edf61de8e374a43b7eede7be8c90a2a32e5 Mon Sep 17 00:00:00 2001 +From ecde45984c610529c25257324252fb2ba01fe4ca Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -14,9 +14,9 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> --- src/buildtools/config/linux.pri | 2 +- - src/buildtools/configure_host.pro | 14 +++++++------- + src/buildtools/configure_host.pro | 16 +++++++++------- src/buildtools/gn.pro | 5 ++--- - 3 files changed, 10 insertions(+), 11 deletions(-) + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri index 7507d51ef..1e078cbfe 100644 @@ -32,7 +32,7 @@ index 7507d51ef..1e078cbfe 100644 # Don't bother trying to use system libraries in this case gn_args += use_glib=false diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e327..6312c8678 100644 +index dd0d3e327..3d39198f3 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -44,7 +44,15 @@ index dd0d3e327..6312c8678 100644 !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) else: GN_TARGET_CPU = $$GN_HOST_CPU GN_OS = $$gnOS() -@@ -31,9 +31,9 @@ GN_CONTENTS = \ +@@ -24,6 +24,7 @@ contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mipsel")|contains(GN_TAR + } + + GN_HOST_EXTRA_CPPFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS) ++GN_HOST_EXTRA_LDFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_LDFLAGS) + + # We always use the gcc_toolchain, because clang_toolchain is just + # a broken wrapper around it for Google's custom clang binaries. +@@ -31,12 +32,13 @@ GN_CONTENTS = \ "import(\"//build/config/sysroot.gni\")" \ "import(\"//build/toolchain/gcc_toolchain.gni\")" \ "gcc_toolchain(\"host\") {" \ @@ -57,7 +65,11 @@ index dd0d3e327..6312c8678 100644 " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ -@@ -45,9 +45,9 @@ GN_CONTENTS = \ ++" extra_ldflags = \"$$GN_HOST_EXTRA_LDFLAGS\" " \ + " toolchain_args = { " \ + " current_os = \"$$GN_OS\" " \ + " current_cpu = \"$$GN_HOST_CPU\" " \ +@@ -45,9 +47,9 @@ GN_CONTENTS = \ " } " \ "}" \ "gcc_toolchain(\"v8_snapshot\") {" \ diff --git a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch index 48ed82e2..3a9174ad 100644 --- a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch +++ b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch @@ -1,13 +1,13 @@ -From 8031326dbf1252f76f6aac9dcef5611fd7be5fa4 Mon Sep 17 00:00:00 2001 +From cf79bf0fbd89a7273420f6dfb7715c18cc56729b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 12 Mar 2021 15:47:50 +0100 -Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.4 +Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.X * to avoid incompatibility when searching for qtwebchannel: CMake Error at /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake:116 (find_package): Could not find a configuration file for package "Qt5WebChannel" that is - compatible with requested version "5.15.4". + compatible with requested version "5.15.13". The following configuration files were considered but not accepted: @@ -17,18 +17,19 @@ Call Stack (most recent call first): /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngine/Qt5WebEngineConfig.cmake:116 (find_package) CMakeLists.txt:19 (find_package) +Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf -index 83823ceee..d5e64505d 100644 +index 461e9c733..1d0279c42 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) load(qt_build_config) CONFIG += warning_clean --MODULE_VERSION = 5.15.10 -+MODULE_VERSION = 5.15.4 +-MODULE_VERSION = 5.15.14 ++MODULE_VERSION = 5.15.13 diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 5a642486..d8044c9f 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,10 +1,11 @@ -From b136b5999396d4ee3363bfdaee4db7e571ba9aa7 Mon Sep 17 00:00:00 2001 +From a6c1cdbb588359676888b7961c063d1d13d05a2a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +Upstream-Status: Pending --- src/core/api/qtbug-61521.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch index 0d4924ea..f8f4229d 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch @@ -1,10 +1,11 @@ -From 9046f8a87da16f3605f600cc6beb039f40bdaa14 Mon Sep 17 00:00:00 2001 +From 84938d171df35970e3444b8f7b0abc9c2b275f9f Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo Change-Id: Ifada60f9c72691973612850121f6fb152d70839a Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +Upstream-Status: Pending --- src/core/core_module.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch index 2e58b43e..da4cea8d 100644 --- a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch @@ -1,8 +1,9 @@ -From 0ffba1b9cba1421c3751b2f20ba84fca356911fb Mon Sep 17 00:00:00 2001 +From d30d88b852e3b46086ce92f4dfaedfe21ee926a8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 12 Nov 2019 19:53:59 -0800 Subject: [PATCH] mkspecs: Allow builds with libc != glibc +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/buildtools/config/support.pri | 4 ---- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch index d4a355c7..6712cef6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 8eec6045850c5786b18f89b4444c5e2c68b64a31 Mon Sep 17 00:00:00 2001 +From ba309beb6cdd4a0cd343cc8043464714cd5e8c3e Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name @@ -13,6 +13,8 @@ le.rsp): Unable to create file. File name too long Task-number: QTBUG-59769 Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- gn/tools/gn/ninja_action_target_writer.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch index e232dbe2..a7d8a1c5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From a88d4dfdb0f9d27a0acc8f28167fbb09d913fd75 Mon Sep 17 00:00:00 2001 +From a67f504fcc2c96ea7e7a57e44dc9c6d559f19838 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch index 8e14d145..3dfcb1af 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From b2e7a10448d984eb62810ad5c41720d61599cecc Mon Sep 17 00:00:00 2001 +From cf19db916e8566a8c19e9a5aeeb6a9e6a7f08111 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -11,20 +11,20 @@ src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - chromium/third_party/zlib/BUILD.gn | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + chromium/third_party/zlib/BUILD.gn | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 891c2c34bfb..5ab519bd133 100644 +index 44b827155b2..16892b8d284 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -115,8 +115,11 @@ if (use_arm_neon_optimizations) { +@@ -129,8 +129,12 @@ if (use_arm_neon_optimizations) { # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: # "All implementations of the ARMv8.1 architecture are required to # implement the CRC32* instructions. These are optional in ARMv8.0." + defines = [] - if (!is_ios) { -- defines = [ "CRC32_ARMV8_CRC32" ] + if (!is_ios && !use_qt) { + defines = [ "CRC32_ARMV8_CRC32" ] + if (current_cpu == "arm64") { + defines += [ "CRC32_ARMV8_CRC32" ] + } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch index 7e7fbed2..4a82d69d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch @@ -1,4 +1,4 @@ -From 6b188e734a8cfa68f5c14e46e90fc89cbcb8313c Mon Sep 17 00:00:00 2001 +From 1dd881dafa5d61f9a260dd54092689868869f066 Mon Sep 17 00:00:00 2001 From: Johannes Pointner <johannes.pointner@br-automation.com> Date: Fri, 3 May 2019 09:12:38 +0200 Subject: [PATCH] chromium: Do not try to set the guessed values for diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch index 6170047f..8ce307c9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch @@ -1,4 +1,4 @@ -From e142cbdc339bcc73c3f41f512b67ddf7a694337e Mon Sep 17 00:00:00 2001 +From 73c864315f3d14ba232657232d145795adf25d89 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jslaby@suse.cz> Date: Thu, 11 Jul 2019 09:35:13 +0200 Subject: [PATCH] chromium: fix build after y2038 changes in glibc diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 8f18779c..b05d9163 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From bcf1d52853fc5e603ff4bca3495f860e81994108 Mon Sep 17 00:00:00 2001 +From c9c77a6fdd6679815f8c68f1e519a317472e7bc5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Nov 2019 10:07:43 -0800 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t @@ -8,6 +8,7 @@ input.h [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch index b6a9d9e6..87893de6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch @@ -1,4 +1,4 @@ -From 4b3b7ae386d300f784d44d93c875908e082af154 Mon Sep 17 00:00:00 2001 +From 851073e7af2c21567e1d8c1a15639fcc6e01be40 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 25 Dec 2019 15:41:16 -0800 Subject: [PATCH] chromium: Include cstddef for size_t definition diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch index 72dd2056..44cb1063 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch @@ -1,4 +1,4 @@ -From da832c778d013f4217e2d704c27c1d2e19a9364c Mon Sep 17 00:00:00 2001 +From 50f862c3bed6f13932d43da5c992d3dacfdfe00e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 2 Jan 2020 17:13:55 -0800 Subject: [PATCH] chromium: Move CharAllocator definition to a header file @@ -6,6 +6,7 @@ Subject: [PATCH] chromium: Move CharAllocator definition to a header file Fixes error: invalid application of 'sizeof' to an incomplete type 'cc::ListContainerHelper::CharAllocator' +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- chromium/cc/base/list_container_helper.cc | 251 --------------------- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch index c360999b..f1385890 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch @@ -1,4 +1,4 @@ -From 7f9421b4609d8a1f9590152fb3976de22e9a1b12 Mon Sep 17 00:00:00 2001 +From df7f7525ece62cde56de905098bd6000483f10d2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 1 Feb 2020 12:17:23 -0800 Subject: [PATCH] chromium: Link v8 with libatomic on x86 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch index 03856a05..7b648671 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch @@ -1,4 +1,4 @@ -From 8a0c927cdc9705e2a1c29d63c87d32e8cb089510 Mon Sep 17 00:00:00 2001 +From 7cc4c3490f01cec09f9ca63e36cf34c9977243f0 Mon Sep 17 00:00:00 2001 From: Andrej Valek <andrej.valek@siemens.com> Date: Fri, 17 Apr 2020 09:43:32 +0200 Subject: [PATCH] chromium: icu: use system library only targets @@ -13,6 +13,7 @@ On the other hand webenegine does not produce external native artifacts. So external system ICU linking is not needed. +Upstream-Status: Pending Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch deleted file mode 100644 index a3b35d30..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 308bddc0bfedb6ab222e3b626ef9bb5234c819b4 Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Tue, 20 Oct 2020 01:09:43 +0000 -Subject: [PATCH] chromium: Remove TRUE to prep landing of icu68 - -ICU 68, to work with C++20, remove the #define of TRUE -since the usage in libxml is as an int, use 1 instead. - -Upstream-Status: Backport [https://github.com/chromium/chromium/commit/e8aa87fa88f55e76ce08794690665ce30caa3183] -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> ---- - chromium/third_party/libxml/README.chromium | 2 ++ - chromium/third_party/libxml/src/encoding.c | 6 +++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/chromium/third_party/libxml/README.chromium b/chromium/third_party/libxml/README.chromium -index e1b7e1d8065..5cb589f04fd 100644 ---- a/chromium/third_party/libxml/README.chromium -+++ b/chromium/third_party/libxml/README.chromium -@@ -24,6 +24,8 @@ Modifications: - non-recursive broke a few web platform tests. - - add-fuzz-target.patch: Prevents autoreconf from failing on mac due to a - missing makefile for fuzz. -+- chromium-issue-1138555.patch: Change TRUE to 1 for ICU68 which remove the -+ #define of TRUE. - - Add helper classes in the chromium/ subdirectory. - - Delete various unused files, see chromium/roll.py - -diff --git a/chromium/third_party/libxml/src/encoding.c b/chromium/third_party/libxml/src/encoding.c -index 730e2532e45..f876e0c02de 100644 ---- a/chromium/third_party/libxml/src/encoding.c -+++ b/chromium/third_party/libxml/src/encoding.c -@@ -1882,7 +1882,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, - * @outlen: the length of @out - * @in: a pointer to an array of input bytes - * @inlen: the length of @in -- * @flush: if true, indicates end of input -+ * @flush: if 1, indicates end of input - * - * Returns 0 if success, or - * -1 by lack of space, or -@@ -1922,7 +1922,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, - *inlen = ucv_in - (const char*) in; - *outlen = ucv_out - (char *) out; - if (U_SUCCESS(err)) { -- /* reset pivot buf if this is the last call for input (flush==TRUE) */ -+ /* reset pivot buf if this is the last call for input (flush==1) */ - if (flush) - cd->pivot_source = cd->pivot_target = cd->pivot_buf; - return 0; -@@ -2028,7 +2028,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ 1); - } - #endif /* LIBXML_ICU_ENABLED */ - else { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch index 4cb7c6ea..0cd9a85f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch @@ -1,4 +1,4 @@ -From 03e9ff9a00ea85e84faeb6267d60fb9ed7c0a598 Mon Sep 17 00:00:00 2001 +From ce0d0a3961dafb0e682a47b3cc3963a23bdcea37 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 16 May 2022 20:01:49 +0000 Subject: [PATCH] chromium: skia: Fix build with gcc-12 @@ -43,13 +43,14 @@ In file included from ../../../../recipe-sysroot/usr/include/c++/12.1.0/utility: | ~~~~~~~~^~~~~~~~~~~~~ [67/9144] CXX obj/skia/skia/GrClipStack.o +Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- chromium/third_party/skia/src/utils/SkParseColor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp -index 7260365b2c6..cd07eb48650 100644 +index 0dc3497062f..f63f1800501 100644 --- a/chromium/third_party/skia/src/utils/SkParseColor.cpp +++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp @@ -7,6 +7,7 @@ @@ -58,5 +59,5 @@ index 7260365b2c6..cd07eb48650 100644 #include "include/utils/SkParse.h" +#include <vector> - static constexpr const char* gColorNames[] = { - "aliceblue", + #include <algorithm> // std::lower_bound + #include <iterator> diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch new file mode 100644 index 00000000..64a3d06b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch @@ -0,0 +1,34 @@ +From 3332ea15dfd4024eb7b95ebd1b26bf76f592b23f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Jan 2023 14:10:23 -0800 +Subject: [PATCH] Remove unsetting _FILE_OFFSET_BITS + +This does not work when enabling 64bit time_t with glibc which is enabled with -D_TIME_BITS=64, since it also needs +_FILE_OFFSET_BITS=64 and this does not work when its undefined explicitly + +Upstream-Status: Submitted [https://github.com/madler/zlib/pull/764] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + chromium/third_party/zlib/gzguts.h | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/chromium/third_party/zlib/gzguts.h b/chromium/third_party/zlib/gzguts.h +index 57faf37165a..3747f3c449d 100644 +--- a/chromium/third_party/zlib/gzguts.h ++++ b/chromium/third_party/zlib/gzguts.h +@@ -3,15 +3,6 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +-#ifdef _LARGEFILE64_SOURCE +-# ifndef _LARGEFILE_SOURCE +-# define _LARGEFILE_SOURCE 1 +-# endif +-# ifdef _FILE_OFFSET_BITS +-# undef _FILE_OFFSET_BITS +-# endif +-#endif +- + #ifdef HAVE_HIDDEN + # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) + #else diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-Fix-build-with-gcc-13.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-Fix-build-with-gcc-13.patch new file mode 100644 index 00000000..63eabfd9 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-Fix-build-with-gcc-13.patch @@ -0,0 +1,865 @@ +From 7b5789af04925751f0d498f70916ebd336240060 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 12 Apr 2023 17:53:00 +0200 +Subject: [PATCH] Fix build with gcc-13 + +* Fixes: + http://errors.yoctoproject.org/Errors/Details/699654/ + +In file included from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.cc:16: +../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h:34:6: warning: elaborated-type-specifier for a scoped enum must not use the 'class' keyword + 34 | enum class FormatConversionChar : uint8_t; + | ~~~~ ^~~~~ + | ----- + + src/3rdparty/chromium/base/check.h:61:34: error: expected primary-expression before '(' token + src/3rdparty/chromium/base/debug/profiler.h:56:21: error: 'ReturnAddressLocationResolver' was not declared in this scope + src/3rdparty/chromium/base/debug/profiler.h:56:9: error: ISO C++ forbids declaration of 'uintptr_t' with no type [-fpermissive] + src/3rdparty/chromium/base/debug/profiler.h:56:9: error: typedef 'base::debug::uintptr_t' is initialized (use 'decltype' instead) + src/3rdparty/chromium/base/debug/profiler.h:69:13: error: 'ReturnAddressLocationResolver' does not name a type + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:33:36: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:35:73: error: expression list treated as compound expression in functional cast [-fpermissive] + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:35:74: error: template argument 1 is invalid + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:42:7: error: 'uint64_t' has not been declared + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:49:11: error: 'EmbedderOriginTypeMatcher' does not name a type + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:60:7: error: 'uint64_t' has not been declared + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:62:7: error: 'uint64_t' has not been declared + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:63:53: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h:63:62: error: template argument 1 is invalid + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:14:34: error: 'uintptr_t' in namespace 'std' does not name a type + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:14:34: error: 'uintptr_t' is not a member of 'std' + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:15:34: error: 'uintptr_t' in namespace 'std' does not name a type + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:15:34: error: 'uintptr_t' is not a member of 'std' + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:26:34: error: 'uintptr_t' in namespace 'std' does not name a type + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:26:34: error: 'uintptr_t' is not a member of 'std' + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:27:34: error: 'uintptr_t' in namespace 'std' does not name a type + src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc:27:34: error: 'uintptr_t' is not a member of 'std' + src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h:88:15: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h:88:22: error: template argument 1 is invalid + src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h:88:22: error: template argument 2 is invalid + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h:11:12: error: 'PowerPreference' has not been declared + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h:11:28: error: found ':' in nested-name-specifier, expected '::' + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h:11:39: error: expected unqualified-id before '{' token + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h:18:12: error: 'DawnReturnDataType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h:18:31: error: found ':' in nested-name-specifier, expected '::' + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h:18:42: error: expected unqualified-id before '{' token + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h:21:3: error: 'DawnReturnDataType' does not name a type; did you mean 'DawnReturnDataHeader'? + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h:29:46: error: 'DawnReturnDataType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h:46:7: error: 'DawnReturnDataType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h:64:7: error: 'DawnReturnDataType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:134:3: error: 'GrContextType' does not name a type; did you mean 'ContextType'? + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:302:3: error: 'GrContextType' does not name a type; did you mean 'ContextType'? + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:77:39: error: 'GrContextType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:77:7: error: 'GrContextType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:90:12: error: 'gr_context_type_' was not declared in this scope; did you mean 'gr_context_'? + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:90:32: error: 'GrContextType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:93:12: error: 'gr_context_type_' was not declared in this scope; did you mean 'gr_context_'? + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:93:32: error: 'GrContextType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:96:12: error: 'gr_context_type_' was not declared in this scope; did you mean 'gr_context_'? + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:96:32: error: 'GrContextType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:99:12: error: 'gr_context_type_' was not declared in this scope; did you mean 'gr_context_'? + src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h:99:32: error: 'GrContextType' has not been declared + src/3rdparty/chromium/gpu/command_buffer/service/skia_utils.cc:72:18: error: redefinition of 'GrContextOptions gpu::GetDefaultGrContextOptions' + src/3rdparty/chromium/gpu/command_buffer/service/skia_utils.cc:72:45: error: 'GrContextType' was not declared in this scope; did you mean 'ContextType'? + src/3rdparty/chromium/gpu/command_buffer/service/skia_utils.h:49:28: error: 'GrContextType' was not declared in this scope; did you mean 'GrContext'? + src/3rdparty/chromium/gpu/command_buffer/service/webgpu_cmd_validation_autogen.h:14:16: error: 'PowerPreference' was not declared in this scope + src/3rdparty/chromium/gpu/command_buffer/service/webgpu_cmd_validation_autogen.h:14:31: error: template argument 1 is invalid + src/3rdparty/chromium/gpu/command_buffer/service/webgpu_cmd_validation_implementation_autogen.h:14:14: error: 'PowerPreference' does not name a type + src/3rdparty/chromium/gpu/command_buffer/service/webgpu_cmd_validation_implementation_autogen.h:21:24: error: 'valid_power_preference_table' was not declared in this scope + src/3rdparty/chromium/gpu/command_buffer/service/webgpu_cmd_validation_implementation_autogen.h:21:7: error: expression list treated as compound expression in mem-initializer [-fpermissive] + src/3rdparty/chromium/gpu/config/device_perf_info.h:48:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/gpu/config/device_perf_info.h:49:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/gpu/config/device_perf_info.h:50:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/gpu/config/gpu_feature_info.h:62:15: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/gpu/config/gpu_feature_info.h:62:23: error: template argument 1 is invalid + src/3rdparty/chromium/gpu/config/gpu_feature_info.h:62:23: error: template argument 2 is invalid + src/3rdparty/chromium/gpu/config/gpu_feature_info.h:64:15: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/gpu/config/gpu_feature_info.h:64:23: error: template argument 1 is invalid + src/3rdparty/chromium/gpu/config/gpu_feature_info.h:64:23: error: template argument 2 is invalid + src/3rdparty/chromium/gpu/config/gpu_preferences.h:139:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/gpu/config/gpu_preferences.h:142:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/gpu/config/gpu_preferences.h:145:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/gpu/config/gpu_preferences.h:148:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/gpu/config/gpu_preferences.h:212:3: error: 'GrContextType' does not name a type + src/3rdparty/chromium/gpu/config/gpu_preferences.h:215:3: error: 'VulkanImplementationName' does not name a type + src/3rdparty/chromium/gpu/config/gpu_preferences.h:32:12: error: 'VulkanImplementationName' has not been declared + src/3rdparty/chromium/gpu/config/gpu_preferences.h:32:37: error: found ':' in nested-name-specifier, expected '::' + src/3rdparty/chromium/gpu/config/gpu_preferences.h:32:48: error: expected unqualified-id before '{' token + src/3rdparty/chromium/gpu/config/gpu_preferences.h:40:12: error: 'GrContextType' has not been declared + src/3rdparty/chromium/gpu/config/gpu_preferences.h:40:26: error: found ':' in nested-name-specifier, expected '::' + src/3rdparty/chromium/gpu/config/gpu_preferences.h:40:37: error: expected unqualified-id before '{' token + src/3rdparty/chromium/gpu/config/gpu_util.cc:590:76: error: cannot convert 'const std::vector<unsigned int>' to 'int' in assignment + src/3rdparty/chromium/gpu/config/gpu_util.cc:661:31: error: cannot convert 'const std::vector<unsigned int>' to 'int' in assignment + src/3rdparty/chromium/gpu/config/gpu_util.cc:716:53: error: no match for call to '(std::string {aka std::__cxx11::basic_string<char>}) (const gpu::GPUInfo&)' + src/3rdparty/chromium/gpu/config/gpu_util.cc:821:60: error: 'gpu::IntelGpuSeriesType gpu::GetIntelGpuSeriesType(uint32_t, uint32_t)' redeclared as different kind of entity + src/3rdparty/chromium/gpu/config/gpu_util.cc:904:73: error: 'std::string gpu::GetIntelGpuGeneration(uint32_t, uint32_t)' redeclared as different kind of entity + src/3rdparty/chromium/gpu/config/gpu_util.cc:906:58: error: 'gpu::GetIntelGpuSeriesType' cannot be used as a function + src/3rdparty/chromium/gpu/config/gpu_util.cc:945:65: error: 'gpu::IntelGpuGeneration gpu::GetIntelGpuGeneration(const GPUInfo&)' redeclared as different kind of entity + src/3rdparty/chromium/gpu/config/gpu_util.cc:959:53: error: no match for call to '(std::string {aka std::__cxx11::basic_string<char>}) (const uint32_t&, uint32_t&)' + src/3rdparty/chromium/gpu/config/gpu_util.h:79:53: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/gpu/config/gpu_util.h:80:53: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/gpu/config/gpu_util.h:80:71: error: expression list treated as compound expression in initializer [-fpermissive] + src/3rdparty/chromium/gpu/config/gpu_util.h:82:46: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/gpu/config/gpu_util.h:83:46: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/gpu/config/gpu_util.h:86:76: error: 'gpu::IntelGpuGeneration gpu::GetIntelGpuGeneration(const GPUInfo&)' redeclared as different kind of entity + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:128:10: error: 'struct gpu::GpuPreferences' has no member named 'force_gpu_mem_available_bytes' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:129:10: error: 'struct gpu::GpuPreferences' has no member named 'force_gpu_mem_discardable_limit_bytes' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:131:10: error: 'struct gpu::GpuPreferences' has no member named 'force_max_texture_size' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:132:10: error: 'struct gpu::GpuPreferences' has no member named 'gpu_program_cache_size' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:161:40: error: 'struct gpu::GpuPreferences' has no member named 'gr_context_type' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:163:36: error: 'struct gpu::GpuPreferences' has no member named 'use_vulkan' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:23:51: error: 'GrContextType' is not a member of 'gpu'; did you mean 'gpu::mojom::GrContextType'? + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:23:64: error: template argument 2 is invalid + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:265:18: error: 'const struct gpu::GpuPreferences' has no member named 'force_gpu_mem_available_bytes' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:269:18: error: 'const struct gpu::GpuPreferences' has no member named 'force_gpu_mem_discardable_limit_bytes' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:272:18: error: 'const struct gpu::GpuPreferences' has no member named 'force_max_texture_size' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:275:18: error: 'const struct gpu::GpuPreferences' has no member named 'gpu_program_cache_size' + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:325:15: error: 'GrContextType' in namespace 'gpu' does not name a type + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:328:15: error: 'VulkanImplementationName' in namespace 'gpu' does not name a type + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:60:24: error: 'VulkanImplementationName' is not a member of 'gpu'; did you mean 'gpu::mojom::VulkanImplementationName'? + src/3rdparty/chromium/gpu/ipc/common/gpu_preferences_mojom_traits.h:60:48: error: template argument 2 is invalid + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:106:11: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:110:10: error: 'warning_reasons_' was not declared in this scope; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:114:10: error: 'warning_reasons_' was not declared in this scope; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:144:3: error: 'warning_reasons_' was not declared in this scope; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:148:3: error: 'warning_reasons_' was not declared in this scope; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:25:31: error: class 'net::CookieInclusionStatus' does not have any field named 'warning_reasons_' + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:25:7: error: class 'net::CookieInclusionStatus' does not have any field named 'exclusion_reasons_' + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:265:28: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:266:26: error: 'warning_reasons_' was not declared in this scope; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:272:19: error: 'class net::CookieInclusionStatus' has no member named 'exclusion_reasons_'; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:272:41: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:278:19: error: 'class net::CookieInclusionStatus' has no member named 'warning_reasons_'; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:278:39: error: 'warning_reasons_' was not declared in this scope; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:28:7: error: class 'net::CookieInclusionStatus' does not have any field named 'exclusion_reasons_' + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:32:7: error: class 'net::CookieInclusionStatus' does not have any field named 'exclusion_reasons_' + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:33:7: error: class 'net::CookieInclusionStatus' does not have any field named 'warning_reasons_' + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:37:10: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:37:38: error: 'const class net::CookieInclusionStatus' has no member named 'exclusion_reasons_'; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:38:10: error: 'warning_reasons_' was not declared in this scope; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:38:36: error: 'const class net::CookieInclusionStatus' has no member named 'warning_reasons_'; did you mean 'WarningReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:47:10: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:51:10: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:56:10: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:60:3: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:67:3: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:74:7: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.cc:86:7: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'ExclusionReason'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:228:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:229:30: error: 'uint32_t' has not been declared + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:230:5: error: 'exclusion_reasons_' was not declared in this scope; did you mean 'exclusion_reasons'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:233:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:234:28: error: 'uint32_t' has not been declared + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:235:5: error: 'warning_reasons_' was not declared in this scope; did you mean 'warning_reasons'? + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:266:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h:269:3: error: 'uint32_t' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:111:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:115:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:123:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:132:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:135:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:138:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:144:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:151:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:155:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:159:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:164:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:169:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:173:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:177:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:182:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:187:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:192:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:196:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:200:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:204:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:208:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:216:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:220:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:224:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:228:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:237:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:247:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:251:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:259:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:263:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:268:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:271:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:275:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:278:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:283:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:290:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:293:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:298:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:301:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:304:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:308:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:313:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:316:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:320:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:325:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:330:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:334:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:337:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:340:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:343:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:636:14: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:82:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:83:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:84:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:85:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:86:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:87:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:88:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h:97:7: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h:125:70: error: 'uint32_t' has not been declared + src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h:19:26: error: 'uint64_t' does not name a type + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:201:15: error: 'uint32_t' does not name a type + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:202:66: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:202:66: error: ISO C++ forbids declaration of 'type name' with no type [-fpermissive] + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:202:66: error: expected '(' before 'uint8_t' + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:202:66: error: expected '>' before 'uint8_t' + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:202:75: error: expected primary-expression before '>' token + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:202:78: error: 'kEndiannessTest' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:202:99: error: expected ')' before ';' token + src/3rdparty/chromium/third_party/angle/src/common/angleutils.h:54:14: error: 'uintptr_t' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:124:22: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:129:27: error: 'SH_REMOVE_INVARIANT_AND_CENTROID_FOR_ESSL3' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:1385:40: error: 'ShCompileOptions' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:1385:6: error: 'bool sh::TCompiler::shouldCollectVariables' is not a static data member of 'class sh::TCompiler' + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:1478:29: error: 'ShCompileOptions' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:1478:6: error: variable or field 'writePragma' declared void + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:1528:30: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:1538:26: error: 'SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:1543:49: error: 'SH_SELECT_VIEW_IN_NV_GLSL_VERTEX_SHADER' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:304:7: error: class 'sh::TCompiler' does not have any field named 'mCompileOptions' + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:309:52: error: 'ShCompileOptions' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:309:6: error: 'bool sh::TCompiler::shouldRunLoopAndIndexingValidation' is not a static data member of 'class sh::TCompiler' + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:336:48: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:343:48: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:346:5: error: 'mCompileOptions' was not declared in this scope; did you mean 'compileOptions'? + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:358:54: error: 'SH_EMULATE_GL_DRAW_ID' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:369:27: error: 'SH_EMULATE_GL_BASE_VERTEX_BASE_INSTANCE' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:381:26: error: 'SH_SOURCE_PATH' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:506:10: error: 'mCompileOptions' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:506:28: error: 'SH_VALIDATE_AST' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:521:37: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:524:27: error: 'SH_LIMIT_EXPRESSION_COMPLEXITY' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:563:27: error: 'SH_INITIALIZE_UNINITIALIZED_LOCALS' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:564:55: error: 'SH_DONT_USE_LOOPS_TO_INITIALIZE_VARIABLES' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:582:27: error: 'SH_LIMIT_CALL_STACK_DEPTH' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:595:28: error: 'SH_DONT_PRUNE_UNUSED_FUNCTIONS' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:627:26: error: 'SH_CLAMP_INDIRECT_ARRAY_BOUNDS' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:632:27: error: 'SH_INITIALIZE_BUILTINS_FOR_INSTANCED_MULTIVIEW' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:645:26: error: 'SH_REWRITE_DO_WHILE_LOOPS' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:653:26: error: 'SH_ADD_AND_TRUE_TO_LOOP_CONDITION' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:661:26: error: 'SH_UNFOLD_SHORT_CIRCUIT' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:669:26: error: 'SH_REMOVE_POW_WITH_CONSTANT_EXPONENT' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:677:26: error: 'SH_REGENERATE_STRUCT_NAMES' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:690:31: error: 'SH_EMULATE_GL_DRAW_ID' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:703:31: error: 'SH_EMULATE_GL_BASE_VERTEX_BASE_INSTANCE' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:707:67: error: 'SH_ADD_BASE_VERTEX_TO_VERTEX_ID' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:725:48: error: 'SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:802:30: error: 'SH_USE_UNUSED_STANDARD_SHARED_BLOCKS' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:809:30: error: 'SH_ENFORCE_PACKING_RESTRICTIONS' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:820:31: error: 'SH_INIT_OUTPUT_VARIABLES' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:843:28: error: 'SH_INIT_GL_POSITION' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:894:66: error: 'SH_CLAMP_POINT_SIZE' was not declared in this scope; did you mean 'GL_POINT_SIZE'? + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:902:68: error: 'SH_CLAMP_FRAG_DEPTH' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:910:26: error: 'SH_REWRITE_REPEATED_ASSIGN_TO_SWIZZLED' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:918:26: error: 'SH_REWRITE_VECTOR_SCALAR_ARITHMETIC' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:926:26: error: 'SH_REMOVE_DYNAMIC_INDEXING_OF_SWIZZLED_VECTOR' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:935:26: error: 'SH_EARLY_FRAGMENT_TESTS_OPTIMIZATION' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:949:25: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:959:5: error: 'ShCompileOptions' was not declared in this scope; did you mean 'compileOptionsIn'? + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:965:27: error: 'SH_FLATTEN_PRAGMA_STDGL_INVARIANT_ALL' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:965:9: error: 'compileOptions' was not declared in this scope; did you mean 'compileOptionsIn'? + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:969:69: error: 'compileOptions' was not declared in this scope; did you mean 'compileOptionsIn'? + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:973:30: error: 'SH_INTERMEDIATE_TREE' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:978:30: error: 'SH_OBJECT_CODE' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:991:36: error: 'SH_EMULATE_GL_DRAW_ID' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp:995:36: error: 'SH_EMULATE_GL_BASE_VERTEX_BASE_INSTANCE' was not declared in this scope + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:131:45: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:157:46: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:161:45: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:167:22: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:176:41: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:235:41: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:247:30: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:305:5: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:323:30: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:52:22: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:91:41: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.h:95:18: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/Initialize.h:26:35: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/ParseContext.h:40:19: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/ParseContext.h:620:5: error: 'ShCompileOptions' does not name a type + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorESSL.h:22:38: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorESSL.h:25:37: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorESSL.h:30:33: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorGLSL.h:22:38: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorGLSL.h:25:37: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorGLSL.h:28:33: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorGLSL.h:32:52: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorVulkan.h:29:37: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/TranslatorVulkan.h:39:41: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/angle/src/compiler/translator/tree_ops/DeclareAndInitBuiltinsForInstancedMultiview.h:45:67: error: 'ShCompileOptions' has not been declared + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.cc:48:7: error: class 'google_breakpad::MinidumpDescriptor' does not have any field named 'address_within_principal_mapping_' + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.cc:49:22: error: 'const class google_breakpad::MinidumpDescriptor' has no member named 'address_within_principal_mapping_'; did you mean 'set_address_within_principal_mapping'? + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.cc:74:3: error: 'address_within_principal_mapping_' was not declared in this scope; did you mean 'set_address_within_principal_mapping'? + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.cc:75:18: error: 'const class google_breakpad::MinidumpDescriptor' has no member named 'address_within_principal_mapping_'; did you mean 'set_address_within_principal_mapping'? + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:115:3: error: 'uintptr_t' does not name a type + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:119:7: error: 'uintptr_t' has not been declared + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:120:5: error: 'address_within_principal_mapping_' was not declared in this scope; did you mean 'address_within_principal_mapping'? + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:171:3: error: 'uintptr_t' does not name a type + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:57:9: error: class 'google_breakpad::MinidumpDescriptor' does not have any field named 'address_within_principal_mapping_' + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:66:9: error: class 'google_breakpad::MinidumpDescriptor' does not have any field named 'address_within_principal_mapping_' + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:77:9: error: class 'google_breakpad::MinidumpDescriptor' does not have any field named 'address_within_principal_mapping_' + src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h:87:9: error: class 'google_breakpad::MinidumpDescriptor' does not have any field named 'address_within_principal_mapping_' + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:34:14: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:34:25: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:35:20: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:35:31: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:43:27: error: request for member 'data' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:49:27: error: request for member 'data' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:57:44: error: request for member 'data' in '((perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:58:44: error: request for member 'data' in '((perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:64:14: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h:64:25: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:38:9: error: invalid types 'int[size_t {aka long unsigned int}]' for array subscript + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:41:18: error: invalid types 'int[int]' for array subscript + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:41:7: error: invalid types 'int[int]' for array subscript + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:43:18: error: invalid types 'int[int]' for array subscript + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:43:7: error: invalid types 'int[int]' for array subscript + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:51:36: error: request for member 'size' in '((perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:52:16: error: request for member 'data' in '((perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:60:58: error: request for member 'data' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:60:73: error: request for member 'size' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:64:23: error: request for member 'size' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:67:32: error: request for member 'size' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:70:41: error: request for member 'size' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/perfetto/src/base/uuid.cc:71:45: error: request for member 'size' in '((const perfetto::base::Uuid*)this)->perfetto::base::Uuid::data_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:106:38: error: request for member 'empty' in 'criteria.webrtc::RtpDemuxerCriteria::payload_types', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:106:65: error: request for member 'empty' in 'criteria.webrtc::RtpDemuxerCriteria::ssrcs', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:134:33: error: 'begin' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:134:33: error: 'end' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:135:19: error: request for member 'emplace' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sink_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:138:40: error: 'begin' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:138:40: error: 'end' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:139:18: error: request for member 'emplace' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sinks_by_pt_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:188:33: error: 'begin' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:188:33: error: 'end' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:189:45: error: request for member 'find' in '((const webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sink_by_ssrc_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:190:39: error: request for member 'end' in '((const webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sink_by_ssrc_', which is of non-class type 'const int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:217:6: error: no declaration matches 'bool webrtc::RtpDemuxer::AddSink(uint32_t, webrtc::RtpPacketSinkInterface*)' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:26:28: error: request for member 'begin' in '* multimap', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:26:53: error: request for member 'end' in '* multimap', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:281:17: error: invalid types 'int[uint32_t {aka unsigned int}]' for array subscript + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:286:34: error: request for member 'find' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::mid_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:287:28: error: request for member 'end' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::mid_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:28:22: error: request for member 'erase' in '* multimap', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:294:18: error: invalid types 'int[uint32_t {aka unsigned int}]' for array subscript + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:299:35: error: request for member 'find' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::rsid_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:300:29: error: request for member 'end' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::rsid_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:344:43: error: request for member 'find' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sink_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:345:37: error: request for member 'end' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sink_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:353:25: error: no declaration matches 'webrtc::RtpPacketSinkInterface* webrtc::RtpDemuxer::ResolveSinkByMid(const std::string&, uint32_t)' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:364:25: error: no declaration matches 'webrtc::RtpPacketSinkInterface* webrtc::RtpDemuxer::ResolveSinkByMidRsid(const std::string&, const std::string&, uint32_t)' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:377:25: error: no declaration matches 'webrtc::RtpPacketSinkInterface* webrtc::RtpDemuxer::ResolveSinkByRsid(const std::string&, uint32_t)' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:388:25: error: no declaration matches 'webrtc::RtpPacketSinkInterface* webrtc::RtpDemuxer::ResolveSinkByPayloadType(uint8_t, uint32_t)' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:404:6: error: no declaration matches 'void webrtc::RtpDemuxer::AddSsrcSinkBinding(uint32_t, webrtc::RtpPacketSinkInterface*)' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:40:23: error: request for member 'begin' in '* map', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:40:43: error: request for member 'end' in '* map', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:42:17: error: request for member 'erase' in '* map', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:61:20: error: 'begin' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:61:20: error: 'end' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:67:18: error: 'begin' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:67:18: error: 'end' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:98:28: error: request for member 'empty' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sink_by_ssrc_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.cc:99:27: error: request for member 'empty' in '((webrtc::RtpDemuxer*)this)->webrtc::RtpDemuxer::sinks_by_pt_', which is of non-class type 'int' + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:121:16: error: 'uint32_t' has not been declared + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:152:44: error: 'uint32_t' has not been declared + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:155:48: error: 'uint32_t' has not been declared + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:157:45: error: 'uint32_t' has not been declared + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:158:52: error: 'uint8_t' has not been declared + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:159:52: error: 'uint32_t' has not been declared + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:173:12: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:173:45: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:173:45: error: template argument 3 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:173:45: error: template argument 4 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:174:17: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:174:49: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:174:49: error: template argument 3 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:174:49: error: template argument 4 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:188:12: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:188:33: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:188:33: error: template argument 3 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:188:33: error: template argument 4 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:189:12: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:189:33: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:189:33: error: template argument 3 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:189:33: error: template argument 4 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:192:27: error: 'uint32_t' has not been declared + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:42:12: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:42:20: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:42:20: error: template argument 2 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:42:20: error: template argument 3 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:45:12: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:45:19: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:45:19: error: template argument 2 is invalid + src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h:45:19: error: template argument 3 is invalid + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:214:37: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:214:44: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:214:44: error: template argument 2 is invalid + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:216:41: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:216:41: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:216:41: error: template argument 2 is invalid + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:216:50: error: no matching function for call to 'rtc::Base64::DecodeFromArrayTemplate<<expression error> >(const char*&, size_t&, rtc::Base64::DecodeFlags&, int*&, size_t*&)' + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.cc:216:50: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h:77:43: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h:77:50: error: template argument 1 is invalid + src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h:77:50: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/base/address-region.h:22:16: error: 'class v8::base::AddressRegion' has no member named 'begin' + src/3rdparty/chromium/v8/src/base/address-region.h:22:28: error: 'class v8::base::AddressRegion' has no member named 'begin' + src/3rdparty/chromium/v8/src/base/address-region.h:26:19: error: 'uintptr_t' does not name a type + src/3rdparty/chromium/v8/src/base/address-region.h:30:34: error: expected ')' before 'address' + src/3rdparty/chromium/v8/src/base/address-region.h:33:3: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/address-region.h:34:3: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/address-region.h:41:17: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/address-region.h:42:36: error: 'Address' was not declared in this scope; did you mean 'address'? + src/3rdparty/chromium/v8/src/base/address-region.h:42:43: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/base/address-region.h:43:23: error: 'begin' was not declared in this scope; did you mean 'std::begin'? + src/3rdparty/chromium/v8/src/base/address-region.h:46:17: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/address-region.h:47:36: error: 'Address' was not declared in this scope; did you mean 'address'? + src/3rdparty/chromium/v8/src/base/address-region.h:47:43: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/base/address-region.h:48:13: error: expected ';' before 'offset' + src/3rdparty/chromium/v8/src/base/address-region.h:49:13: error: 'offset' was not declared in this scope; did you mean 'off_t'? + src/3rdparty/chromium/v8/src/base/address-region.h:53:28: error: 'class v8::base::AddressRegion' has no member named 'address_' + src/3rdparty/chromium/v8/src/base/address-region.h:57:5: error: 'Address' was not declared in this scope + src/3rdparty/chromium/v8/src/base/address-region.h:58:13: error: expected ';' before 'overlap_end' + src/3rdparty/chromium/v8/src/base/address-region.h:60:13: error: 'overlap_start' was not declared in this scope + src/3rdparty/chromium/v8/src/base/address-region.h:60:28: error: 'overlap_end' was not declared in this scope + src/3rdparty/chromium/v8/src/base/address-region.h:60:55: error: could not convert '{<expression error>, <expression error>}' from '<brace-enclosed initializer list>' to 'v8::base::AddressRegion' + src/3rdparty/chromium/v8/src/base/address-region.h:64:12: error: 'address_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/address-region.h:64:30: error: 'class v8::base::AddressRegion' has no member named 'address_' + src/3rdparty/chromium/v8/src/base/address-region.h:68:12: error: 'address_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/address-region.h:68:30: error: 'class v8::base::AddressRegion' has no member named 'address_' + src/3rdparty/chromium/v8/src/base/address-region.h:72:3: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/address-region.h:83:23: error: expected ';' before '{' token + src/3rdparty/chromium/v8/src/base/address-region.h:83:23: error: expected primary-expression before '{' token + src/3rdparty/chromium/v8/src/base/address-region.h:83:56: error: 'Address' in 'class v8::base::AddressRegion' does not name a type + src/3rdparty/chromium/v8/src/base/address-region.h:83:56: error: 'Address' is not a member of 'v8::base::AddressRegion' + src/3rdparty/chromium/v8/src/base/address-region.h:84:52: error: expected ';' before '}' token + src/3rdparty/chromium/v8/src/base/address-region.h:88:55: error: 'class v8::base::AddressRegion' has no member named 'begin' + src/3rdparty/chromium/v8/src/base/logging.h:176:34: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/logging.h:176:41: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/base/logging.h:176:51: error: 'uint16_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/logging.h:178:61: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/base/logging.h:178:61: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/base/logging.h:178:62: error: '<declaration error>' is not a template [-fpermissive] + src/3rdparty/chromium/v8/src/base/logging.h:179:40: error: 'int_t' does not name a type; did you mean 'wint_t'? + src/3rdparty/chromium/v8/src/base/macros.h:104:30: error: static assertion failed: source and dest must be same size + src/3rdparty/chromium/v8/src/base/macros.h:107:17: error: invalid conversion from 'long int (*)()' to 'const void*' [-fpermissive] + src/3rdparty/chromium/v8/src/base/macros.h:329:8: error: 'uint64_t' does not name a type + src/3rdparty/chromium/v8/src/base/macros.h:335:25: error: 'intptr_t' has not been declared + src/3rdparty/chromium/v8/src/base/macros.h:341:11: error: 'intptr_t' has not been declared + src/3rdparty/chromium/v8/src/base/macros.h:345:17: error: 'm' was not declared in this scope + src/3rdparty/chromium/v8/src/base/macros.h:351:23: error: 'intptr_t' has not been declared + src/3rdparty/chromium/v8/src/base/macros.h:355:11: error: 'intptr_t' has not been declared + src/3rdparty/chromium/v8/src/base/macros.h:358:20: error: 'm' was not declared in this scope + src/3rdparty/chromium/v8/src/base/macros.h:369:51: error: 'uintptr_t' does not name a type + src/3rdparty/chromium/v8/src/base/macros.h:370:47: error: 'uintptr_t' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.cc:124:18: error: 'Address' in 'class v8::base::RegionAllocator' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.cc:143:18: error: 'Address' in 'class v8::base::RegionAllocator' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.cc:162:40: error: 'Address' was not declared in this scope + src/3rdparty/chromium/v8/src/base/region-allocator.cc:162:6: error: 'bool v8::base::RegionAllocator::AllocateRegionAt' is not a static data member of 'class v8::base::RegionAllocator' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:162:74: error: expected primary-expression before 'size' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:163:52: error: expected primary-expression before 'region_state' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:163:64: error: expression list treated as compound expression in initializer [-fpermissive] + src/3rdparty/chromium/v8/src/base/region-allocator.cc:203:36: error: 'Address' was not declared in this scope + src/3rdparty/chromium/v8/src/base/region-allocator.cc:203:60: error: expected primary-expression before 'new_size' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:203:68: error: expression list treated as compound expression in initializer [-fpermissive] + src/3rdparty/chromium/v8/src/base/region-allocator.cc:203:8: error: 'size_t v8::base::RegionAllocator::TrimRegion' is not a static data member of 'class v8::base::RegionAllocator' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:21:33: error: expected constructor, destructor, or type conversion before '(' token + src/3rdparty/chromium/v8/src/base/region-allocator.cc:255:37: error: 'Address' was not declared in this scope + src/3rdparty/chromium/v8/src/base/region-allocator.cc:255:8: error: 'size_t v8::base::RegionAllocator::CheckRegion' is not a static data member of 'class v8::base::RegionAllocator' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:267:30: error: 'Address' was not declared in this scope + src/3rdparty/chromium/v8/src/base/region-allocator.cc:267:54: error: expected primary-expression before 'size' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:267:58: error: expression list treated as compound expression in initializer [-fpermissive] + src/3rdparty/chromium/v8/src/base/region-allocator.cc:267:6: error: 'bool v8::base::RegionAllocator::IsFree' is not a static data member of 'class v8::base::RegionAllocator' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:294:16: error: 'begin' was not declared in this scope; did you mean 'std::begin'? + src/3rdparty/chromium/v8/src/base/region-allocator.cc:294:35: error: 'end' was not declared in this scope; did you mean 'std::end'? + src/3rdparty/chromium/v8/src/base/region-allocator.cc:301:33: error: 'begin' was not declared in this scope; did you mean 'std::begin'? + src/3rdparty/chromium/v8/src/base/region-allocator.cc:301:52: error: 'end' was not declared in this scope; did you mean 'std::end'? + src/3rdparty/chromium/v8/src/base/region-allocator.cc:49:42: error: 'std::set<v8::base::RegionAllocator::Region*, v8::base::RegionAllocator::AddressEndOrder>::iterator v8::base::RegionAllocator::FindRegion' is not a static data member of 'class v8::base::RegionAllocator' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:50:22: error: expected ',' or ';' before '{' token + src/3rdparty/chromium/v8/src/base/region-allocator.cc:50:5: error: 'Address' was not declared in this scope + src/3rdparty/chromium/v8/src/base/region-allocator.cc:69:41: error: no matching function for call to 'v8::base::RegionAllocator::Region::Region(int, size_t&, v8::base::RegionAllocator::RegionState)' + src/3rdparty/chromium/v8/src/base/region-allocator.cc:94:26: error: 'class v8::base::RegionAllocator::Region' has no member named 'begin'; did you mean 'Region'? + src/3rdparty/chromium/v8/src/base/region-allocator.h:104:19: error: expected ')' before 'address' + src/3rdparty/chromium/v8/src/base/region-allocator.h:138:17: error: 'const class v8::base::RegionAllocator::Region' has no member named 'end' + src/3rdparty/chromium/v8/src/base/region-allocator.h:138:28: error: 'const class v8::base::RegionAllocator::Region' has no member named 'end' + src/3rdparty/chromium/v8/src/base/region-allocator.h:148:17: error: 'const class v8::base::RegionAllocator::Region' has no member named 'begin'; did you mean 'Region'? + src/3rdparty/chromium/v8/src/base/region-allocator.h:148:30: error: 'const class v8::base::RegionAllocator::Region' has no member named 'begin'; did you mean 'Region'? + src/3rdparty/chromium/v8/src/base/region-allocator.h:155:38: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/region-allocator.h:28:19: error: 'uintptr_t' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.h:30:20: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.h:41:26: error: expected ')' before 'address' + src/3rdparty/chromium/v8/src/base/region-allocator.h:46:3: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.h:48:3: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.h:59:25: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/region-allocator.h:65:21: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/region-allocator.h:71:21: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/region-allocator.h:75:22: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/region-allocator.h:78:15: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/region-allocator.h:80:3: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.h:81:3: error: 'Address' does not name a type + src/3rdparty/chromium/v8/src/base/region-allocator.h:84:17: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/region-allocator.h:88:17: error: 'Address' has not been declared + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:109:16: error: 'state0_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:109:26: error: 'state1_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:115:16: error: 'state0_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:115:26: error: 'state1_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:138:23: error: no declaration matches 'std::vector<long unsigned int> v8::base::RandomNumberGenerator::NextSample(uint64_t, size_t)' + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:171:23: error: no declaration matches 'std::vector<long unsigned int> v8::base::RandomNumberGenerator::NextSampleSlow(uint64_t, size_t, const std::unordered_set<long unsigned int>&)' + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:209:16: error: 'state0_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:209:26: error: 'state1_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:216:13: error: 'MurmurHash3' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:216:3: error: 'state0_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:217:3: error: 'state1_' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.cc:222:10: error: no declaration matches 'uint64_t v8::base::RandomNumberGenerator::MurmurHash3(uint64_t)' + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:100:15: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:100:23: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:100:23: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:101:7: error: 'uint64_t' has not been declared + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:102:32: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:102:40: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:102:40: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:102:40: error: template argument 3 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:102:40: error: template argument 4 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:103:30: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:103:38: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:103:38: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:103:38: error: template argument 3 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:103:38: error: template argument 4 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:111:33: error: 'uint64_t' has not been declared + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:113:18: error: 'uint64_t' does not name a type + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:114:5: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:119:34: error: 'uint64_t' has not been declared + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:119:52: error: 'uint64_t' has not been declared + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:120:5: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:121:14: error: expected ';' before 's0' + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:122:15: error: 's0' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:123:5: error: 's1' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:130:10: error: 'uint64_t' does not name a type + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:140:3: error: 'uint64_t' does not name a type + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:141:3: error: 'uint64_t' does not name a type + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:90:15: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:90:23: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:90:23: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/base/utils/random-number-generator.h:90:36: error: 'uint64_t' has not been declared + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:28:11: error: 'uint32_t' does not name a type + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:29:11: error: 'uint32_t' does not name a type + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:30:11: error: 'uint32_t' does not name a type + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:32:26: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:35:36: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:35:8: error: redefinition of 'int8_t v8::base::charToDigitDecodeForTesting' + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:38:3: error: 'uint32_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:39:3: error: 'uint64_t' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:46:47: error: 'v8::base::{anonymous}::charToDigitDecode' cannot be used as a function + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:47:26: error: 'shift' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:47:34: error: 'kContinueShift' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:51:21: error: 'kDataMask' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:51:5: error: 'res' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:54:20: error: 'kContinueMask' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.cc:55:11: error: 'res' was not declared in this scope + src/3rdparty/chromium/v8/src/base/vlq-base64.h:14:51: error: 'uint8_t' was not declared in this scope + src/3rdparty/chromium/v8/src/heap/cppgc/object-allocator.h:82:38: error: no matching function for call to 'RoundUp<cppgc::internal::kAllocationGranularity>(size_t)' + src/3rdparty/chromium/v8/src/heap/cppgc/object-allocator.h:93:38: error: no matching function for call to 'RoundUp<cppgc::internal::kAllocationGranularity>(size_t)' + src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.cc:390:26: error: ambiguating new declaration of 'std::__cxx11::basic_string<short unsigned int> v8_inspector::UTF8ToUTF16(const char*, size_t)' + src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h:13:19: error: 'uint16_t' was not declared in this scope + src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h:13:27: error: template argument 1 is invalid + src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h:13:27: error: template argument 2 is invalid + src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h:13:27: error: template argument 3 is invalid + src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h:14:31: error: 'uint16_t' does not name a type + src/3rdparty/chromium/base/debug/profiler.cc:91:1: error: 'ReturnAddressLocationResolver' does not name a type + src/core/browsing_data_remover_delegate_qt.cpp:61:39: error: 'EmbedderOriginTypeMatcher' in 'class content::BrowsingDataRemoverDelegate' does not name a type + src/core/browsing_data_remover_delegate_qt.cpp:71:6: error: no declaration matches 'void QtWebEngineCore::BrowsingDataRemoverDelegateQt::RemoveEmbedderData(const base::Time&, const base::Time&, uint64_t, content::BrowsingDataFilterBuilder*, uint64_t, base::OnceCallback<void(long unsigned int)>)' + src/core/browsing_data_remover_delegate_qt.cpp:89:26: error: no declaration matches 'std::vector<std::__cxx11::basic_string<char> > QtWebEngineCore::BrowsingDataRemoverDelegateQt::GetDomainsForDeferredCookieDeletion(uint64_t)' + src/core/browsing_data_remover_delegate_qt.h:53:43: error: 'EmbedderOriginTypeMatcher' in 'class content::BrowsingDataRemoverDelegate' does not name a type + src/core/browsing_data_remover_delegate_qt.h:58:9: error: 'uint64_t' has not been declared + src/core/browsing_data_remover_delegate_qt.h:60:9: error: 'uint64_t' has not been declared + src/core/browsing_data_remover_delegate_qt.h:61:55: error: 'uint64_t' was not declared in this scope + src/core/browsing_data_remover_delegate_qt.h:61:64: error: template argument 1 is invalid + src/core/browsing_data_remover_delegate_qt.h:62:66: error: 'uint64_t' has not been declared + gen/gpu/ipc/common/gpu_preferences.mojom-shared.h:453:32: error: 'gr_context_type' is not a member of 'mojo::internal::Serializer<gpu::mojom::GpuPreferencesDataView, gpu::GpuPreferences>::Traits' {aka 'mojo::StructTraits<gpu::mojom::GpuPreferencesDataView, gpu::GpuPreferences>'} + gen/gpu/ipc/common/gpu_preferences.mojom-shared.h:455:27: error: 'use_vulkan' is not a member of 'mojo::internal::Serializer<gpu::mojom::GpuPreferencesDataView, gpu::GpuPreferences>::Traits' {aka 'mojo::StructTraits<gpu::mojom::GpuPreferencesDataView, gpu::GpuPreferences>'} + gen/ui/gfx/x/present.h:223:16: error: declaration of 'x11::Future<void> x11::Present::Pixmap(const PixmapRequest&)' changes meaning of 'Pixmap' [-Wchanges-meaning] + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + chromium/base/debug/profiler.h | 1 + + .../content/public/browser/browsing_data_remover_delegate.h | 1 + + chromium/device/base/synchronization/one_writer_seqlock.cc | 1 + + chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 + + chromium/gpu/command_buffer/common/webgpu_cmd_enums.h | 2 ++ + chromium/gpu/config/device_perf_info.h | 1 + + chromium/gpu/config/gpu_feature_info.h | 1 + + chromium/gpu/config/gpu_preferences.h | 1 + + chromium/net/cookies/cookie_inclusion_status.h | 1 + + .../abseil-cpp/absl/strings/internal/str_format/extension.h | 1 + + chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 + + chromium/third_party/angle/src/common/angleutils.h | 1 + + .../breakpad/src/client/linux/handler/minidump_descriptor.h | 1 + + chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h | 1 + + chromium/third_party/webrtc/call/rtp_demuxer.h | 1 + + .../third_party/webrtc/rtc_base/third_party/base64/base64.h | 1 + + chromium/third_party/xcbproto/src/src/present.xml | 2 +- + chromium/v8/src/base/logging.h | 1 + + chromium/v8/src/base/macros.h | 1 + + chromium/v8/src/inspector/v8-string-conversions.h | 1 + + 20 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/chromium/base/debug/profiler.h b/chromium/base/debug/profiler.h +index 1229e06234c..5f15e2aa1f0 100644 +--- a/chromium/base/debug/profiler.h ++++ b/chromium/base/debug/profiler.h +@@ -7,6 +7,7 @@ + + #include <stddef.h> + ++#include <cstdint> + #include <string> + + #include "base/base_export.h" +diff --git a/chromium/content/public/browser/browsing_data_remover_delegate.h b/chromium/content/public/browser/browsing_data_remover_delegate.h +index 3896bc6e786..b93843dc16b 100644 +--- a/chromium/content/public/browser/browsing_data_remover_delegate.h ++++ b/chromium/content/public/browser/browsing_data_remover_delegate.h +@@ -5,6 +5,7 @@ + #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ + #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ + ++#include <cstdint> + #include <string> + #include <vector> + #include "base/callback_forward.h" +diff --git a/chromium/device/base/synchronization/one_writer_seqlock.cc b/chromium/device/base/synchronization/one_writer_seqlock.cc +index 213b6301c05..9332e37e6f8 100644 +--- a/chromium/device/base/synchronization/one_writer_seqlock.cc ++++ b/chromium/device/base/synchronization/one_writer_seqlock.cc +@@ -3,6 +3,7 @@ + // found in the LICENSE file. + + #include "device/base/synchronization/one_writer_seqlock.h" ++#include <cstdint> + + namespace device { + +diff --git a/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h +index 0c27ae71059..b64f82f7548 100644 +--- a/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h ++++ b/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h +@@ -5,6 +5,7 @@ + #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h +index 83615b30c8a..8fa9fb1f6d5 100644 +--- a/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h ++++ b/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h +@@ -5,6 +5,8 @@ + #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ + #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ + ++#include <cstdint> ++ + namespace gpu { + namespace webgpu { + +diff --git a/chromium/gpu/config/device_perf_info.h b/chromium/gpu/config/device_perf_info.h +index e33874ba3bd..824a207a224 100644 +--- a/chromium/gpu/config/device_perf_info.h ++++ b/chromium/gpu/config/device_perf_info.h +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_ + #define GPU_CONFIG_DEVICE_PERF_INFO_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/chromium/gpu/config/gpu_feature_info.h b/chromium/gpu/config/gpu_feature_info.h +index 027f1a5af3e..70759b2ae47 100644 +--- a/chromium/gpu/config/gpu_feature_info.h ++++ b/chromium/gpu/config/gpu_feature_info.h +@@ -5,6 +5,7 @@ + #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ + #define GPU_CONFIG_GPU_FEATURE_INFO_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/chromium/gpu/config/gpu_preferences.h b/chromium/gpu/config/gpu_preferences.h +index 6b8587151d6..57bda1f99d3 100644 +--- a/chromium/gpu/config/gpu_preferences.h ++++ b/chromium/gpu/config/gpu_preferences.h +@@ -6,6 +6,7 @@ + #define GPU_CONFIG_GPU_PREFERENCES_H_ + + #include <stddef.h> ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/chromium/net/cookies/cookie_inclusion_status.h b/chromium/net/cookies/cookie_inclusion_status.h +index 9e506b55501..cfb03bfe2b3 100644 +--- a/chromium/net/cookies/cookie_inclusion_status.h ++++ b/chromium/net/cookies/cookie_inclusion_status.h +@@ -5,6 +5,7 @@ + #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ + #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h +index a9b9e137deb..6f1122c42b1 100644 +--- a/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h ++++ b/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h +@@ -19,6 +19,7 @@ + #include <limits.h> + + #include <cstddef> ++#include <cstdint> + #include <cstring> + #include <ostream> + +diff --git a/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/chromium/third_party/angle/include/GLSLANG/ShaderVars.h +index 9911546b90d..48b660db36b 100644 +--- a/chromium/third_party/angle/include/GLSLANG/ShaderVars.h ++++ b/chromium/third_party/angle/include/GLSLANG/ShaderVars.h +@@ -12,6 +12,7 @@ + + #include <algorithm> + #include <array> ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/chromium/third_party/angle/src/common/angleutils.h b/chromium/third_party/angle/src/common/angleutils.h +index f669d7df308..fb9a44225c4 100644 +--- a/chromium/third_party/angle/src/common/angleutils.h ++++ b/chromium/third_party/angle/src/common/angleutils.h +@@ -18,6 +18,7 @@ + #include <climits> + #include <cstdarg> + #include <cstddef> ++#include <cstdint> + #include <set> + #include <sstream> + #include <string> +diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h +index c7e4f2b3787..e491a1f6845 100644 +--- a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h ++++ b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h +@@ -33,6 +33,7 @@ + #include <assert.h> + #include <sys/types.h> + ++#include <cstdint> + #include <string> + + #include "client/linux/handler/microdump_extra_info.h" +diff --git a/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h +index 1b4c53815bc..472042fabc4 100644 +--- a/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h ++++ b/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h +@@ -18,6 +18,7 @@ + #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ + + #include <array> ++#include <cstdint> + #include <string> + + #include "perfetto/ext/base/optional.h" +diff --git a/chromium/third_party/webrtc/call/rtp_demuxer.h b/chromium/third_party/webrtc/call/rtp_demuxer.h +index 3aa7e9df268..3cfc8d6a3e9 100644 +--- a/chromium/third_party/webrtc/call/rtp_demuxer.h ++++ b/chromium/third_party/webrtc/call/rtp_demuxer.h +@@ -11,6 +11,7 @@ + #ifndef CALL_RTP_DEMUXER_H_ + #define CALL_RTP_DEMUXER_H_ + ++#include <cstdint> + #include <map> + #include <set> + #include <string> +diff --git a/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h +index 7a936f23e78..21951a1d240 100644 +--- a/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h ++++ b/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h +@@ -12,6 +12,7 @@ + #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ + #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ + ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/chromium/third_party/xcbproto/src/src/present.xml b/chromium/third_party/xcbproto/src/src/present.xml +index fb06e73f02f..f20c11eb2c0 100644 +--- a/chromium/third_party/xcbproto/src/src/present.xml ++++ b/chromium/third_party/xcbproto/src/src/present.xml +@@ -89,7 +89,7 @@ OF THIS SOFTWARE. + </reply> + </request> + +- <request name="Pixmap" opcode="1"> ++ <request name="PresentPixmap" opcode="1"> + <required_start_align align="8" /> + <field type="WINDOW" name="window" /> + <field type="PIXMAP" name="pixmap" /> +diff --git a/chromium/v8/src/base/logging.h b/chromium/v8/src/base/logging.h +index fe39f988225..dbe130581cb 100644 +--- a/chromium/v8/src/base/logging.h ++++ b/chromium/v8/src/base/logging.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_LOGGING_H_ + #define V8_BASE_LOGGING_H_ + ++#include <cstdint> + #include <cstring> + #include <sstream> + #include <string> +diff --git a/chromium/v8/src/base/macros.h b/chromium/v8/src/base/macros.h +index 37cab78f08f..4220eacbbbf 100644 +--- a/chromium/v8/src/base/macros.h ++++ b/chromium/v8/src/base/macros.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_MACROS_H_ + #define V8_BASE_MACROS_H_ + ++#include <cstdint> + #include <limits> + #include <type_traits> + +diff --git a/chromium/v8/src/inspector/v8-string-conversions.h b/chromium/v8/src/inspector/v8-string-conversions.h +index c1d69c18f0a..eb33c6816a5 100644 +--- a/chromium/v8/src/inspector/v8-string-conversions.h ++++ b/chromium/v8/src/inspector/v8-string-conversions.h +@@ -5,6 +5,7 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include <cstdint> + #include <string> + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 72467953..27b7d16a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From a7bb1b5b26caa4b3c374c3d3f74f0dfe522d854f Mon Sep 17 00:00:00 2001 +From 4951642cc3b22379211c492759849c79a59938f5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not @@ -7,6 +7,7 @@ Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not Musl does not define this Macro Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch new file mode 100644 index 00000000..302c5130 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch @@ -0,0 +1,74 @@ +From c19489849ce57e54370dfad51ab0e1395d6dd62c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sun, 16 Jul 2023 18:18:02 +0300 +Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift + instructions within inline assembly + +Fixes assembling with binutil as >= 2.41 + +Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb] +Signed-off-by: James Almer <jamrial@gmail.com> +--- + .../ffmpeg/libavcodec/x86/mathops.h | 26 ++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h +index 6298f5ed198..ca7e2dffc10 100644 +--- a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h ++++ b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h +@@ -35,12 +35,20 @@ + static av_always_inline av_const int MULL(int a, int b, unsigned shift) + { + int rt, dummy; ++ if (__builtin_constant_p(shift)) + __asm__ ( + "imull %3 \n\t" + "shrdl %4, %%edx, %%eax \n\t" + :"=a"(rt), "=d"(dummy) +- :"a"(a), "rm"(b), "ci"((uint8_t)shift) ++ :"a"(a), "rm"(b), "i"(shift & 0x1F) + ); ++ else ++ __asm__ ( ++ "imull %3 \n\t" ++ "shrdl %4, %%edx, %%eax \n\t" ++ :"=a"(rt), "=d"(dummy) ++ :"a"(a), "rm"(b), "c"((uint8_t)shift) ++ ); + return rt; + } + +@@ -113,19 +121,31 @@ __asm__ volatile(\ + // avoid +32 for shift optimization (gcc should do that ...) + #define NEG_SSR32 NEG_SSR32 + static inline int32_t NEG_SSR32( int32_t a, int8_t s){ ++ if (__builtin_constant_p(s)) + __asm__ ("sarl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++ else ++ __asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++ ); + return a; + } + + #define NEG_USR32 NEG_USR32 + static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ ++ if (__builtin_constant_p(s)) + __asm__ ("shrl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++ else ++ __asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++ ); + return a; + } + diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 69e72db3..de9df2a6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,9 +1,10 @@ -From e0768318d6289672085b8f8f9a3425178e1475b5 Mon Sep 17 00:00:00 2001 +From 49c7efab2123eff453df1bd0bdbdc718a8292c58 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:09:06 -0700 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/base/process/process_metrics_posix.cc | 4 ++-- chromium/base/trace_event/malloc_dump_provider.cc | 2 ++ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch index 95699ad3..72cf812a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,9 +1,10 @@ -From fb0ebec2df9f7fb90d47265db90750a01fa71cbf Mon Sep 17 00:00:00 2001 +From 1150bddce8d8cb4a691b3197569d304434fa6219 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- .../tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index 3ba7a397..e10462aa 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From aef1128c27a1975168bb371337bfd59f49873546 Mon Sep 17 00:00:00 2001 +From ceb6a8ca7548ef255150e1b8d1e65b40c4949dee Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t @@ -7,6 +7,7 @@ Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t does not support the 32-bit ABI. Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- .../tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch index 479cfbff..2bba01b4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,9 +1,10 @@ -From bccfc7999135a44fce7473ee8a60333c6d5db746 Mon Sep 17 00:00:00 2001 +From b59ba5a52e29867f9ebbc4423514d50f4b36b0ae Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/base/allocator/allocator_check.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 4e3a1082..ff0a84ca 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,10 +1,11 @@ -From db3a551e932481d4ccdd315fb05cd24910807136 Mon Sep 17 00:00:00 2001 +From f82c828b2c8ffd7c5f0e884132e0f1d721295c36 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc platforms Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/net/dns/dns_config_service_posix.cc | 4 +++ chromium/net/dns/dns_reloader.cc | 4 +++ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 8691553b..ef05aa23 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From 029557f2f50714b2e87aa3c0ad82aaca48f68a50 Mon Sep 17 00:00:00 2001 +From f4b417ae2878f5ebf8d5a171669f516e1c6d4d9c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl @@ -7,6 +7,7 @@ musl libc does not have sbrk. on musl libc will only work when called with 0 as argument, so we just let it out for now Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch index 8edfb13e..86757bbd 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,9 +1,10 @@ -From 194688cb3ddc3d331b3d254b41cb6ae55d55f0f8 Mon Sep 17 00:00:00 2001 +From d41fdb34286e134d4ff871943ea54b03b2ab02d6 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/base/threading/platform_thread_linux.cc | 3 ++- .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++-- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index a0dc403c..536759d9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch @@ -1,4 +1,4 @@ -From c151ad89ab323db1730c8b3d77bd72d415c80ca1 Mon Sep 17 00:00:00 2001 +From 9808a4034b0a6354ecbc2081a2b022614acb392f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 25 Sep 2018 12:59:05 -0700 Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get @@ -6,6 +6,7 @@ Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending --- chromium/third_party/breakpad/breakpad/configure.ac | 2 +- .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 2 ++ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch index 28fb2b61..a925c0d6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch @@ -1,4 +1,4 @@ -From 2ee1af42a550fa258a2061452ff2ad2c30c91f9e Mon Sep 17 00:00:00 2001 +From e0413ce85e22a1a0a83015f22cd850add6250c9c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: musl: pread pwrite diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index 8337a956..f2b0ca0d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch @@ -1,4 +1,4 @@ -From e0b5335ced4cbc78847e63cc98e9c1a78f426c99 Mon Sep 17 00:00:00 2001 +From 78eae00a5c53cd44a4b73e6ba357088a82dd4b84 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 10 May 2020 08:16:01 -0700 Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 5587ede1..694446d8 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -148,18 +148,18 @@ RDEPENDS:${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "87-based" -QT_MODULE_BRANCH = "5.15.10" -PV = "5.15.10+git${SRCPV}" +QT_MODULE_BRANCH = "5.15" +PV = "5.15.13+git${SRCPV}" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.15 +# 5.15-glibc.meta-qt5.17 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch \ + file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.15 +# 5.15.meta-qt5.17 SRC_URI:append:libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0004-musl-link-against-libexecinfo.patch \ @@ -167,7 +167,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.9 +# 87-based-glibc.meta-qt5.11 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -179,12 +179,14 @@ SRC_URI += " \ file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ - file://chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch;patchdir=src/3rdparty \ - file://chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \ + file://chromium/0013-Fix-build-with-gcc-13.patch;patchdir=src/3rdparty \ + file://chromium/0014-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch;patchdir=src/3rdparty \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.9 +# 87-based.meta-qt5.11 SRC_URI:append:libc-musl = "\ file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ @@ -199,9 +201,8 @@ SRC_URI:append:libc-musl = "\ file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505" -# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix: -SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b" +SRCREV_qtwebengine = "d15a42baae7141952e91665bed22a7c7cfb54b95" +SRCREV_chromium = "fb66d7ca9641724670c96e999ad5b0fd6eb78d46" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index ab1001f6..70130716 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure:prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "37f4fdd9aa3315467a6c893059a9ef7270fc2388" +SRCREV = "80257933d3bf3a026455d71106e6b3e70dead765" diff --git a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch index a237d03d..91bf19de 100644 --- a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch +++ b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch @@ -1,4 +1,4 @@ -From 34018c2a61045c58f88e09a12ecd62533aa2c2f1 Mon Sep 17 00:00:00 2001 +From 34100abf0a24b3d2dadebe90926eea98d50a43b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Mon, 4 Jun 2018 10:35:46 +0200 Subject: [PATCH] Do not skip build for cross-compile diff --git a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch index bf79b363..8486a84d 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch @@ -1,4 +1,4 @@ -From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001 +From a454e27d7993de8a3aa7e5cc37d7e16803da4271 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 23 Aug 2018 04:06:17 +0000 Subject: [PATCH] Fix build with non-glibc libc on musl diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch index ffd8da0f..8ebb5894 100644 --- a/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch +++ b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch @@ -1,4 +1,4 @@ -From f6576377f8bf2c854d8079b7f309f570b3d2bde4 Mon Sep 17 00:00:00 2001 +From fb5f7d19a390c399c35f9fbaa1185e309394666d Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Fri, 31 Aug 2018 15:42:48 +0900 Subject: [PATCH] Fix build bug for armv32 BE. diff --git a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch index 14cb8aa4..bde4300b 100644 --- a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch +++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch @@ -1,4 +1,4 @@ -From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001 +From 597d54c6553cd9ffbf08e40a7a706096b8990399 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Sep 2018 02:11:10 -0700 Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths @@ -9,15 +9,16 @@ compiler does not like specifying absolute include paths pointing to build host includes Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- Source/WebKit/PlatformQt.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake -index 9aed9906e..48638aef4 100644 +index 65c1ff1c1..b7ef82f4e 100644 --- a/Source/WebKit/PlatformQt.cmake +++ b/Source/WebKit/PlatformQt.cmake -@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) +@@ -511,7 +511,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) endif () @@ -26,7 +27,7 @@ index 9aed9906e..48638aef4 100644 set(WebKit_PRI_ARGUMENTS BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" -@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) +@@ -741,7 +741,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) endif () diff --git a/recipes-qt/qt5/qtwebkit/0005-Fix-build-with-bison37.patch b/recipes-qt/qt5/qtwebkit/0005-Let-Bison-generate-the-header-directly-to-fix-build-.patch index 9262f5fe..b3671a2b 100644 --- a/recipes-qt/qt5/qtwebkit/0005-Fix-build-with-bison37.patch +++ b/recipes-qt/qt5/qtwebkit/0005-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -1,4 +1,4 @@ -From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 +From b579ee43a3f832e9b3785ed4cb03284cbc142ef1 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev <mitya57@gmail.com> Date: Tue, 4 Aug 2020 21:04:06 +0300 Subject: [PATCH] Let Bison generate the header directly, to fix build with @@ -15,15 +15,16 @@ Found at [1] [1] https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31 Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- Source/WebCore/css/makegrammar.pl | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 5d63b08102eb..9435701c7061 100644 +index 5d63b0810..9435701c7 100644 --- a/Source/WebCore/css/makegrammar.pl +++ b/Source/WebCore/css/makegrammar.pl -@@ -73,25 +73,6 @@ +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { } my $fileBase = File::Spec->join($outputDir, $filename); diff --git a/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch b/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch index 15607c0d..d5ddfeb7 100644 --- a/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch +++ b/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch @@ -1,7 +1,8 @@ -From 32eb0352d98fcf325b0a94a4f7e141d746938a4b Mon Sep 17 00:00:00 2001 +From d012406bcde49de9cba89f42a79ecba40b70a0ff Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev <annulen@yandex.ru> Date: Sun, 3 May 2020 18:50:24 +0300 -Subject: [PATCH] Disable code related to HTTP/2 when Qt is configured without SSL support +Subject: [PATCH] Disable code related to HTTP/2 when Qt is configured without + SSL support For enabling HTTP/2 by default we check if Qt uses OpenSSL and its version is 1.0.2 or higher via QSslSocket API. While it would be sufficient to @@ -29,6 +30,3 @@ index 1154d56a0..87e21ec3f 100644 #define USE_HTTP2 1 #endif --- -2.29.2 - diff --git a/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch index 4eef3451..676ea85c 100644 --- a/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch +++ b/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch @@ -1,4 +1,4 @@ -From df9f6a8c9d59996b52bfdc5ea6f780de517905e5 Mon Sep 17 00:00:00 2001 +From d478fb2ffb158e84e8705fdff3b7b2994a5d46c7 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev <annulen@yandex.ru> Date: Wed, 3 Jun 2020 15:01:42 +0300 Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to @@ -27,6 +27,3 @@ index c5dab429c..af3431275 100644 except: print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) --- -2.29.2 - diff --git a/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch index 1715c8f3..18ae4aac 100644 --- a/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch +++ b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch @@ -1,4 +1,4 @@ -From 0e94085f74b562bf8edf5418142323785a069454 Mon Sep 17 00:00:00 2001 +From 934ff3e2768a4ef2f1b21ee883acb56cb8ae898b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Wed, 2 Dec 2020 22:34:54 +0100 Subject: [PATCH] Fix build with icu >= 68 @@ -120,6 +120,3 @@ index 7aaac48c8..6ac693602 100644 namespace WebCore { // UTF16ContextAware provider --- -2.26.2 - diff --git a/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch b/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch index 2bfb72fe..2e667a78 100644 --- a/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch +++ b/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch @@ -1,8 +1,10 @@ -From b5a58d2c001689b07591fdce8820773d57a74002 Mon Sep 17 00:00:00 2001 +From 2d43706b5b607ba2fdc777ef69532a75447cccd8 Mon Sep 17 00:00:00 2001 From: Chenxi Mao <chenxi.mao2013@gmail.com> Date: Fri, 3 Apr 2020 08:33:10 +0800 -Subject: [PATCH 1/1] Riscv: Add support for riscv +Subject: [PATCH] Riscv: Add support for riscv +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- CMakeLists.txt | 2 ++ Source/JavaScriptCore/CMakeLists.txt | 1 + @@ -11,7 +13,7 @@ Subject: [PATCH 1/1] Riscv: Add support for riscv 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31a2ea1fd..516476729 100644 +index 432ae6fce..eaf3a35df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") @@ -24,10 +26,10 @@ index 31a2ea1fd..516476729 100644 message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'") endif () diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 937b3ed00..2fff29f9d 100644 +index afd76ca1a..3d184090d 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1286,6 +1286,7 @@ elseif (WTF_CPU_S390) +@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390) elseif (WTF_CPU_S390X) elseif (WTF_CPU_MIPS) elseif (WTF_CPU_SH4) @@ -78,6 +80,3 @@ index 05302e6e6..25dd352ee 100644 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) --- -2.17.1 - diff --git a/recipes-qt/qt5/qtwebkit/mips-atomic.patch b/recipes-qt/qt5/qtwebkit/0010-Fix-build-on-mips.patch index d29d85ff..fe09dded 100644 --- a/recipes-qt/qt5/qtwebkit/mips-atomic.patch +++ b/recipes-qt/qt5/qtwebkit/0010-Fix-build-on-mips.patch @@ -1,4 +1,7 @@ -fix build on mips +From 7e3e0ca548cc9c92705308dd2e0f88ada544e794 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Oct 2021 11:03:25 -0700 +Subject: [PATCH] Fix build on mips Fixes Source/WTF/wtf/Atomics.cpp:63:9: error: definition of builtin function '__sync_add_and_fetch_8' @@ -7,8 +10,15 @@ Source/WTF/wtf/Atomics.cpp:68:9: error: definition of builtin function '__sync_s int64_t __sync_sub_and_fetch_8(int64_t volatile* addend, int64_t value) Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + Source/WTF/wtf/Platform.h | 1 + + 1 file changed, 1 insertion(+) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 8fac85f72..5b8bbcb18 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -88,6 +88,7 @@ diff --git a/recipes-qt/qt5/qtwebkit/0011-Offlineasm-warnings-with-newer-Ruby-versions.patch b/recipes-qt/qt5/qtwebkit/0011-Offlineasm-warnings-with-newer-Ruby-versions.patch new file mode 100644 index 00000000..1c810be5 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0011-Offlineasm-warnings-with-newer-Ruby-versions.patch @@ -0,0 +1,47 @@ +From 3d3a5974ff31e55651bb0c47278bd15734d60be4 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <aperez@igalia.com> +Date: Wed, 15 Jan 2020 22:15:38 +0000 +Subject: [PATCH] Offlineasm warnings with newer Ruby versions + +https://bugs.webkit.org/show_bug.cgi?id=206233 + +Reviewed by Yusuke Suzuki. + +Avoid a warning about using Object#=~ on Annotation instances, which +has been deprecated in Ruby 2.7. + +* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator +to Annotation instances, which do not define it. + +Canonical link: https://commits.webkit.org/219400@main +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc +Upstream-Status: Backport +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb +index b44511245..cd1cffaec 100644 +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -584,9 +584,7 @@ class Parser + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -600,6 +598,8 @@ class Parser + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 diff --git a/recipes-qt/qt5/qtwebkit/0012-Fix-build-with-gcc-13.patch b/recipes-qt/qt5/qtwebkit/0012-Fix-build-with-gcc-13.patch new file mode 100644 index 00000000..bc489250 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0012-Fix-build-with-gcc-13.patch @@ -0,0 +1,34 @@ +From 8a82826054f55d17d9b765bc383418b750ed836b Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 12 Apr 2023 16:07:40 +0200 +Subject: [PATCH] Fix build with gcc-13 + +* fixes: + http://errors.yoctoproject.org/Errors/Details/699653/ + + TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit/5.15.9+gitAUTOINC+10cd6a106e-r0/git/Source/ThirdParty/ANGLE/src/common/mathutil.h:575:8: error: 'uint32_t' does not name a type + 575 | inline uint32_t RotL(uint32_t x, int8_t r) + | ^~~~~~~~ + TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit/5.15.9+gitAUTOINC+10cd6a106e-r0/git/Source/ThirdParty/ANGLE/src/common/mathutil.h:19:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? + 18 | #include <stdlib.h> + +++ |+#include <cstdint> + 19 | + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending +--- + Source/ThirdParty/ANGLE/src/common/mathutil.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil.h b/Source/ThirdParty/ANGLE/src/common/mathutil.h +index 7959da8bd..6a8e77b4d 100644 +--- a/Source/ThirdParty/ANGLE/src/common/mathutil.h ++++ b/Source/ThirdParty/ANGLE/src/common/mathutil.h +@@ -12,6 +12,7 @@ + #include "common/debug.h" + #include "common/platform.h" + ++#include <cstdint> + #include <limits> + #include <algorithm> + #include <string.h> diff --git a/recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch b/recipes-qt/qt5/qtwebkit/0013-link-with-libatomic.patch index 39ee847c..42ce33dc 100644 --- a/recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch +++ b/recipes-qt/qt5/qtwebkit/0013-link-with-libatomic.patch @@ -1,4 +1,7 @@ -link with libatomic +From 999affc771f761894b6fd6e491c6adac7861fcf2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 Mar 2021 18:15:47 -0800 +Subject: [PATCH] link with libatomic This fixes build with C11 @@ -6,8 +9,15 @@ lib/../Source/WTF/wtf/CMakeFiles/WTF.dir/Assertions.cpp.o:/usr/include/c++/11.0. | collect2: error: ld returned 1 exit status Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + Source/WTF/wtf/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) +diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt +index 297589b90..5b8d8c71b 100644 --- a/Source/WTF/wtf/CMakeLists.txt +++ b/Source/WTF/wtf/CMakeLists.txt @@ -245,6 +245,10 @@ if (NOT USE_SYSTEM_MALLOC) diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index ee69a6a2..ffa349d5 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -11,23 +11,25 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native flex-native" -# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13 -# 5.13.meta-qt5.1 +# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.212 +# 5.212.meta-qt5.1 SRC_URI += "\ file://0001-Do-not-skip-build-for-cross-compile.patch \ file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ file://0003-Fix-build-bug-for-armv32-BE.patch \ file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ - file://0005-Fix-build-with-bison37.patch \ + file://0005-Let-Bison-generate-the-header-directly-to-fix-build-.patch \ file://0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch \ file://0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch \ file://0008-Fix-build-with-icu-68.patch \ file://0009-Riscv-Add-support-for-riscv.patch \ - file://mips-atomic.patch \ + file://0010-Fix-build-on-mips.patch \ + file://0011-Offlineasm-warnings-with-newer-Ruby-versions.patch \ + file://0012-Fix-build-with-gcc-13.patch \ " -SRC_URI:append:riscv32 = " file://0010-webdriver-libatomic.patch " -SRC_URI:append:riscv64 = " file://0010-webdriver-libatomic.patch " +SRC_URI:append:riscv32 = " file://0013-link-with-libatomic.patch" +SRC_URI:append:riscv64 = " file://0013-link-with-libatomic.patch" inherit cmake_qt5 perlnative @@ -94,6 +96,7 @@ PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,libxcomposi PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF,fontconfig" # hyphen is only in meta-office currently! PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" +PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF," # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe PACKAGES:remove = "${PN}-examples" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 22792a9b..b18c7943 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "d57f4a2226153848bd2fd0ee6d10f5146b1e8554" +SRCREV = "6edf8323d14c531b12d5e818aa5923ca411fe6bf" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 08b0218e..98ece14d 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -23,4 +23,4 @@ python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } -SRCREV = "d7f28171b291e6a3d660b847b40cac3c55295471" +SRCREV = "3d9289d73c5c03ed5b2fe246589d0d81cfdaa22e" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 54a65ba4..6f04edd5 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "069b45405667c30fa746541d5e3cb328163cfd15" +SRCREV = "415ac0d58521be2bb00ef4cecdb16f0b9001e88c" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 5e2245c0..bc1e6883 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,6 +25,6 @@ do_configure:prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "82a7136a7caece13767c3b2808b2aad9d3d79dd3" +SRCREV = "6e0917d518e07f737cc663b8d632c8021634fd3b" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch index d405c168..57bc1b7e 100644 --- a/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch +++ b/recipes-qt/tufao/tufao/build-Fix-mkspecs-and-CMake-module-install-directori.patch @@ -5,7 +5,7 @@ Subject: [PATCH] build: Fix mkspecs and CMake module install directories Organization: O.S. Systems Software LTDA. -Upstream-Status: Inapropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Herman van Hazendonk <github.com@herrie.org> |