Merge tag 'v6.2.7-lts' into '6.2'

meta-qt6 v6.2.7-lts release Change-Id: Ic22bf718ec53cd9d8d472e61c14ff430af91885e
2026-01-01 13:58:07 +00:00 · 2023-09-29 11:23:07 +03:00 · 2023-09-29 11:23:07 +03:00 · 4e50e99e25
commit 4e50e99e25
parent 425290b96f 3e317c07ec
13 changed files with 143 additions and 82 deletions
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@ -49,7 +49,7 @@ target2: &target2
      variableValue: honister.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs pre-inclusive wayland mingw lts
+      variableValue: ci configs pre-inclusive wayland mingw no-webengine lts
  enable_if:
      condition: property
      property: target.arch
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@ -54,7 +54,7 @@ PACKAGECONFIG:append:pn-qtimageformats = " jasper"
 PACKAGECONFIG:append:pn-qmlcompilerplus = " examples"
 PACKAGECONFIG:append:pn-qt3d = " examples"
 PACKAGECONFIG:append:pn-qt5compat = " examples"
-#PACKAGECONFIG:append:pn-qtapplicationmanager = " examples"
+PACKAGECONFIG:append:pn-qtapplicationmanager = " examples"
 PACKAGECONFIG:append:pn-qtbase = " examples"
 PACKAGECONFIG:append:pn-qtcharts = " examples"
 PACKAGECONFIG:append:pn-qtcoap = " examples"
--- a/coin/test-gatesgarth.inc
+++ b/coin/test-gatesgarth.inc
@ -1 +0,0 @@
-DISTRO_FEATURES_remove = "webengine"
--- a/coin/test-no-webengine.inc
+++ b/coin/test-no-webengine.inc
@ -1 +1 @@
-DISTRO_FEATURES_remove = "webengine"
+DISTRO_FEATURES:remove = "webengine"
--- a/recipes-core/minizip/minizip_1.2.11.bb
+++ b/recipes-core/minizip/minizip_1.2.11.bb
@ -0,0 +1,21 @@
+SUMMARY = "Minizip Compression Library"
+DESCRIPTION = "Minizip is a part of Zlib, which is a general-purpose, patent-free, lossless data compression \
+library which is used by many different programs."
+HOMEPAGE = "http://www.winimage.com/zLibDll/minizip.html"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz"
+UPSTREAM_CHECK_URI = "http://zlib.net/"
+
+S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
+
+SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
+SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
+
+DEPENDS = "zlib"
+
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-qt/qt6/chromium-gn.inc
+++ b/recipes-qt/qt6/chromium-gn.inc
@ -8,7 +8,6 @@ COMPATIBLE_MACHINE:aarch64 = "(.*)"
 COMPATIBLE_MACHINE:armv6 = "(.*)"
 COMPATIBLE_MACHINE:armv7a = "(.*)"
 COMPATIBLE_MACHINE:armv7ve = "(.*)"
-COMPATIBLE_MACHINE:x86 = "(.*)"
 COMPATIBLE_MACHINE:x86-64 = "(.*)"

 # By default, passing is_official_build=true to GN causes its symbol_level
@ -57,7 +56,7 @@ python do_create_v8_qemu_wrapper () {
                    d.expand('${STAGING_DIR_HOST}${base_libdir}')]
    qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST', True),
                                    qemu_libdirs)
-    wrapper_path = d.expand('${B}/src/core/Release/${TARGET_ARCH}')
+    wrapper_path = d.expand('${B}')
    bb.utils.mkdirhier(wrapper_path)
    wrapper_path = os.path.join(wrapper_path, "v8-qemu-wrapper.sh")
    with open(wrapper_path, 'w') as wrapper_file:
@ -78,7 +77,7 @@ python do_create_v8_qemu_wrapper () {
 # to build. Instead of using QEMU, change the wrapper to try to run the
 # tools directly, using the target dynloader.
 python do_create_v8_qemu_wrapper:x86-64 () {
-    wrapper_path = d.expand('${B}/src/core/Release/${TARGET_ARCH}')
+    wrapper_path = d.expand('${B}')
    bb.utils.mkdirhier(wrapper_path)
    wrapper_path = os.path.join(wrapper_path, "v8-qemu-wrapper.sh")
    with open(wrapper_path, 'w') as wrapper_file:
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@ -12,49 +12,49 @@ CVE_PRODUCT = "qt"

 S = "${WORKDIR}/git"

-PV = "6.2.6"
+PV = "6.2.7"

 SRCREV = "${SRCREV_${QT_MODULE}}"

-SRCREV_tqtc-qmlcompilerplus = "a2b295c30fb5fedece20776a7e3982f5eea120d2"
-SRCREV_qt3d = "8abdd9f24bdb02b6342d22c76fd2b382dab44dc2"
+SRCREV_tqtc-qmlcompilerplus = "fbaa907ac917349ebd56186a71e614573c50a8c7"
+SRCREV_qt3d = "3f753f8afb5dabe4df0799d3c022ec4ca2fcbd29"
 SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
-SRCREV_qt5compat = "d29b15982b1d788c4d1122a3e2320b426d2f95fd"
-SRCREV_qtbase = "4ad98906e9931b50a51080a7880951a173c4c3f9"
-SRCREV_qtapplicationmanager = "76d16eb1cba6f3686fdc2e86be1d3105dfe3f08e"
-SRCREV_qtcharts = "b2659a414f88ffa9d71701e54aedde3475cccefe"
-SRCREV_qtcoap = "efdd525695f7d9b8ff9dbead67a4af98ccaa1807"
-SRCREV_qtconnectivity = "af01b3db4fad2a68e1daf35f68b81fc81d1c8873"
-SRCREV_qtdatavis3d = "07bb9e2776992b770f6f74a4f658824a14542e98"
-SRCREV_qtdeclarative = "4a6dfcd838a62ed7b3500326af6099c00a5cbf49"
-SRCREV_qtdeviceutilities = "2aa3c2610f4f7bb2a1062621c851e6845142bacf"
-SRCREV_qtimageformats = "babbecad19c604200abae61b82c2b7db8f59d139"
-SRCREV_qtinterfaceframework = "e878f691d988647948e93ebbe648d9dd0bc0a16b"
-SRCREV_qtlottie = "c4542917ec6f38a5dde98a2718853b4109036109"
-SRCREV_qtmqtt = "ebd61819390f0c4df4db5a21b39c72c3e1240019"
-SRCREV_qtmultimedia = "6186737e9f3a6b4b3fcbc5840b80baeb91cf13fc"
-SRCREV_qtnetworkauth = "204d37f5527fa8b465b7b40d00265f18c2e83a24"
-SRCREV_qtopcua = "010ef8d9f5cecba190c73ac2bdce54864ae58357"
-SRCREV_qtpositioning = "cdc47bc867ee8eba61c3f7b9433a26611b90d18c"
-SRCREV_qtquick3d = "3fce8bb21c2add4dc398299c97b4ba0cd200d42b"
+SRCREV_qt5compat = "71f1fbd4921b923c6cd3eb63091cb8dc30c6cf3a"
+SRCREV_qtbase = "938cdd2629732988bb815b5ceb14dab4563311d7"
+SRCREV_qtapplicationmanager = "22c59456804b22e205a5d5c14de7fb88305eaa1b"
+SRCREV_qtcharts = "619ac5ee9abaf286ea26793ba5f382f978026d87"
+SRCREV_qtcoap = "473cb3b3941e905f918577eaf96746012959d584"
+SRCREV_qtconnectivity = "3b8f1f5811b6e7e0b7a694ce4944f52667cadb6d"
+SRCREV_qtdatavis3d = "83c2629ce10fe975b31457a7c7a04660c66a98eb"
+SRCREV_qtdeclarative = "b65d9135ebd43d5bf3cc882a94230a305893fd6a"
+SRCREV_qtdeviceutilities = "ea50d0f319991227eb0904532e26ca9ef354c711"
+SRCREV_qtimageformats = "ee6a337a4ba71630f148e1701614fb6171910b74"
+SRCREV_qtinterfaceframework = "8229be1c0905b2315d1a5ba071f59830f014afcf"
+SRCREV_qtlottie = "a7b793dcda7357b3fac6ef63428ea13c7e61a79b"
+SRCREV_qtmqtt = "a2f0686a04501fc11d0518cd431be8ba7f208e9e"
+SRCREV_qtmultimedia = "3dac584901aff0e9e45476b5a7a38a6b1c3d1d0c"
+SRCREV_qtnetworkauth = "068d46cd3d98e4465e8030a57838b9c00db79b75"
+SRCREV_qtopcua = "d4c3c6f108e52c87f50d5388494f6ce202af56f8"
+SRCREV_qtpositioning = "9a3024bd3ca6aac5c0ff77c72e2946f821493dc7"
+SRCREV_qtquick3d = "a91213913fe2df783b2766dfbf61c757bc4e8b69"
 SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
-SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a"
-SRCREV_qtquicktimeline = "3abeee576bed28568577f6ea51d36da7b23108d8"
-SRCREV_qtremoteobjects = "7424e53dde422bfbed670479dbd9c68b6d481fd3"
-SRCREV_qtscxml = "6b727b53949033ad024d179716fc93489ddef323"
-SRCREV_qtsensors = "659995d1dd0c3c85010d1664533560e2a13796f8"
-SRCREV_qtserialbus = "ae3bb9f7ecb275fe4e0c1cdcb14c15f8d5fb008c"
-SRCREV_qtserialport = "14e2a458c1a380c55de92286a66f27ec835c80f3"
-SRCREV_qtshadertools = "dce5b2498e3c2a8f195a0b4eb85cf6f7b43ddb80"
-SRCREV_qtsvg = "31e8468c4e6bbc3d84459910f14be385e5a2464e"
-SRCREV_qttools = "df27c1eff5abe66b11d529b2e74f2f98d71d2733"
+SRCREV_qtquickdesigner-components = "eef765c5ed34eac8c1294fbeda55d273f916ca86"
+SRCREV_qtquicktimeline = "bbbe83f9d1c05cf63e898891b8f54b49d800e596"
+SRCREV_qtremoteobjects = "b1df47926ead3aadd4336e313fa83216cc50b771"
+SRCREV_qtscxml = "bdeb455627e180c12b69c0d8afe7c64c2a40ee6f"
+SRCREV_qtsensors = "0023445e5458cd6b2f198add79cd1ac24406e22d"
+SRCREV_qtserialbus = "6d67898227fe2fccb4923b22ecefa4e2d934ef8e"
+SRCREV_qtserialport = "950fda28d55287a5983ebe455fef6844e9f6cdc2"
+SRCREV_qtshadertools = "46b0f976b38007c31f557820d226b1deeab55766"
+SRCREV_qtsvg = "b0fb7359d2cc89792590a3331dc06a8d06e0c7fe"
+SRCREV_qttools = "1f59d6f96eca88711091ded7f026476c409da739"
 SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38"
 SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01"
-SRCREV_qttranslations = "a914a0b2f2d9e86647cade26cd2f479e1aa4dcef"
-SRCREV_qtvirtualkeyboard = "d4475702b08242f4325fd2994d809621382852af"
-SRCREV_qtwayland = "f0d81ab86c5d6383dcae566503a913f74558219f"
-SRCREV_qtwebchannel = "e001baeff9ea2aa18f9b20df8afdf249a02e2424"
-SRCREV_qtwebengine = "d72c6f2c65e3111a841cbc6cfdd1c1e005f56458"
-SRCREV_qtwebengine-chromium = "cee5373e6119a7ee20ba5e941185f4a22104d46d"
-SRCREV_qtwebsockets = "39c650382a2be9e3268c44bf3a8633225041c9e2"
-SRCREV_qtwebview = "ac2b5a55fb9ab37f796f1842f2351386c131ebf4"
+SRCREV_qttranslations = "0bdc3c3c454f67f98ece0f5cd78ecc68eb78b517"
+SRCREV_qtvirtualkeyboard = "c9f8aa7018f31a82f3de0ff56efbabe12dd814e7"
+SRCREV_qtwayland = "0213c6cbda0b1d65f8d4dfc76f4d88a085540aba"
+SRCREV_qtwebchannel = "e1a6989e85781fde4c617ebb9437ef62e10ed3b8"
+SRCREV_qtwebengine = "46aad3d05bc8944286f603b70be88b341e71119a"
+SRCREV_qtwebengine-chromium = "a0f47d475cd2411cacc985ebee6f20c0692a2969"
+SRCREV_qtwebsockets = "9f1e0aad40d386b9c0664498b0b4f1e92ba6d73a"
+SRCREV_qtwebview = "e76c03c73667dc288a1ecae71e2918f0dc5778b9"
--- a/recipes-qt/qt6/qt6-ptest.inc
+++ b/recipes-qt/qt6/qt6-ptest.inc
@ -6,7 +6,16 @@ inherit ptest
 QT_PTEST_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}"
 PTEST_ENABLED = "${QT_PTEST_ENABLED}"

+DEBUG_PREFIX_MAP += "\
+ -fmacro-prefix-map=${D}= \
+"
+
 fakeroot do_install_ptest() {
+    cat >${WORKDIR}/toolchain-ptest.cmake <<EOF
+include(${WORKDIR}/toolchain.cmake)
+list(PREPEND CMAKE_FIND_ROOT_PATH ${D})
+EOF
+
    if [ -n "${OE_QMAKE_QMAKE}" ]; then
        # qmake project
        B_PTEST=${B}
@ -21,13 +30,13 @@ fakeroot do_install_ptest() {
        cd ${B_PTEST}
        cmake \
            ${OECMAKE_GENERATOR_ARGS} \
-            -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-ptest.cmake \
            -DPython3_EXECUTABLE=${PYTHON} \
            ${EXTRA_OECMAKE} \
            -DQT_BUILD_STANDALONE_TESTS=ON \
-            -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH="${D}${QT6_INSTALL_LIBDIR}/cmake;${RECIPE_SYSROOT}/${QT6_INSTALL_LIBDIR}/cmake" \
            -DCMAKE_STAGING_PREFIX=${D}${prefix} \
            -DCMAKE_SKIP_RPATH=ON \
+            -DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON \
            ${S} \
            -Wno-dev
        ${CMAKE_VERBOSE} cmake --build ${B_PTEST} --target all
--- a/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch
+++ b/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch
@ -0,0 +1,28 @@
+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
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@ -19,6 +19,7 @@ SRC_URI += "\
    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
    file://0003-tests-disable-failing-tests.patch \
    file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
+    file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "

 DEPENDS += "\
@ -28,7 +29,10 @@ DEPENDS += "\
 DEPENDS:remove:class-native = "qtbase-native"
 RDEPENDS_${PN}:remove:class-native = "libssl-native"

-PACKAGECONFIG:class-native ?= "gui widgets png dbus no-opengl openssl"
+PACKAGECONFIG:class-native ?= "\
+    gui widgets png dbus no-opengl openssl \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
+"
 PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
    ${PACKAGECONFIG_DEFAULT} \
@ -52,7 +56,7 @@ PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""
 PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl  \
-    jpeg png dbus libinput fontconfig harfbuzz \
+    jpeg png dbus libinput fontconfig harfbuzz zlib \
    ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
 "
@ -76,6 +80,7 @@ PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_develop
 PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups"
 PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
 PACKAGECONFIG[udev] = "-DFEATURE_libudev=ON,-DFEATURE_libudev=OFF,udev"
+PACKAGECONFIG[zlib] = "-DFEATURE_system_zlib=ON,-DFEATURE_system_zlib=OFF,zlib"
 PACKAGECONFIG[zstd] = "-DFEATURE_zstd=ON,-DFEATURE_zstd=OFF,zstd"

 # corelib
@ -126,12 +131,12 @@ PACKAGECONFIG[sql-sqlite] = "-DFEATURE_system_sqlite=ON,-DFEATURE_sql_sqlite=OFF
 EXTRA_OECMAKE += "\
    -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
    -DQT_EDITION=${QT_EDITION} \
+    -DQT_AVOID_CMAKE_ARCHIVING_API=ON \
 "

 EXTRA_OECMAKE:append:class-target = "\
    -DFEATURE_rpath=OFF \
    -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
-    -DQT_AVOID_CMAKE_ARCHIVING_API=ON \
    ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \
 "

--- a/recipes-qt/qt6/qtwebengine.inc
+++ b/recipes-qt/qt6/qtwebengine.inc
@ -1,11 +1,12 @@
-LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0-only | The-Qt-Company-Commercial )"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
-    file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
-    file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+    file://LICENSE.Chromium;md5=d64fde5d347c3a68afe70f5e2e31fe83 \
 "

 inherit qt6-cmake
@ -22,7 +23,7 @@ def gettext_oeconf(d):
    return ""

 QT_MODULE = "qtwebengine"
-QT_MODULE_BRANCH_CHROMIUM = "94-based"
+QT_MODULE_BRANCH_CHROMIUM = "102-based"

 FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"

--- a/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch
+++ b/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch
@ -1,4 +1,4 @@
-From 87769922a455bec09951f95e8cd3402cf646ee33 Mon Sep 17 00:00:00 2001
+From 23d02fd87c766b6aef2a5aa81186b3db3f13b82a Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Tue, 7 Nov 2017 15:24:32 +0100
 Subject: [PATCH] v8: qemu wrapper
@ -16,50 +16,50 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
 2 files changed, 5 insertions(+)

 diff --git a/chromium/tools/v8_context_snapshot/BUILD.gn b/chromium/tools/v8_context_snapshot/BUILD.gn
-index 6e86a543558..eee89b37064 100644
+index d868696dbf2..298273818ef 100644
 --- a/chromium/tools/v8_context_snapshot/BUILD.gn
 +++ b/chromium/tools/v8_context_snapshot/BUILD.gn
-@@ -56,6 +56,7 @@ if (use_v8_context_snapshot) {
-     output_path = rebase_path(output_file, root_build_dir)
+@@ -72,6 +72,7 @@ if (use_v8_context_snapshot) {
+       output_path = rebase_path(output_file, root_build_dir)
 
-     args = [
-+      "./v8-qemu-wrapper.sh",
-       "./" + rebase_path(
-               get_label_info(
-                       ":v8_context_snapshot_generator($v8_snapshot_toolchain)",
+       args = [
+        "../../../../v8-qemu-wrapper.sh",
+         "./" + rebase_path(get_label_info(":v8_context_snapshot_generator",
+                                           "root_out_dir") +
+                                "/v8_context_snapshot_generator",
 diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
-index db762c8c300..11e96d1ea3b 100644
+index 2f99c3d70b0..9b28cf2ed4c 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -1521,6 +1521,7 @@ template("run_torque") {
+@@ -1870,6 +1870,7 @@ template("run_torque") {
     }
 
     args = [
-+      "./v8-qemu-wrapper.sh",
+      "../../../../v8-qemu-wrapper.sh",
       "./" + rebase_path(
               get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
               root_build_dir),
-@@ -1637,6 +1638,7 @@ action("generate_bytecode_builtins_list") {
+@@ -2002,6 +2003,7 @@ action("generate_bytecode_builtins_list") {
   outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
   deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
   args = [
-+    "./v8-qemu-wrapper.sh",
+    "../../../../v8-qemu-wrapper.sh",
     "./" + rebase_path(
             get_label_info(
                     ":bytecode_builtins_list_generator($v8_generator_toolchain)",
-@@ -1682,6 +1684,7 @@ template("run_mksnapshot") {
+@@ -2047,6 +2049,7 @@ template("run_mksnapshot") {
     data = []
 
     args = [
-+      "./v8-qemu-wrapper.sh",
+      "../../../../v8-qemu-wrapper.sh",
       "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
                                         "root_out_dir") + "/mksnapshot",
                          root_build_dir),
-@@ -5133,6 +5136,7 @@ if (v8_enable_i18n_support) {
+@@ -5849,6 +5852,7 @@ if (v8_enable_i18n_support) {
     outputs = [ output_file ]
 
     args = [
-+      "./v8-qemu-wrapper.sh",
+      "../../../../v8-qemu-wrapper.sh",
       "./" + rebase_path(
               get_label_info(
                       ":gen-regexp-special-case($v8_generator_toolchain)",
--- a/recipes-qt/qt6/qtwebengine_git.bb
+++ b/recipes-qt/qt6/qtwebengine_git.bb
@ -36,9 +36,9 @@ PACKAGECONFIG ??= "\
    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', '${PACKAGECONFIG_OPENEMBEDDED}', '', d)} \
    geolocation \
    webchannel \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'multimedia-layer', 'webrtc-pipewire', '', d)} \
    printing-and-pdf \
    pepper-plugins \
+    spellchecker \
 "
 PACKAGECONFIG_OPENEMBEDDED ?= "\
    lcms2 \
@ -61,11 +61,10 @@ PACKAGECONFIG[libpng] = "-DFEATURE_webengine_system_libpng=ON,-DFEATURE_webengin
 PACKAGECONFIG[libvpx] = "-DFEATURE_webengine_system_libvpx=ON,-DFEATURE_webengine_system_libvpx=OFF,libvpx"
 PACKAGECONFIG[libwebp] = "-DFEATURE_webengine_system_libwebp=ON,-DFEATURE_webengine_system_libwebp=OFF,libwebp"
 PACKAGECONFIG[libxml] = "-DFEATURE_webengine_system_libxml=ON,-DFEATURE_webengine_system_libxml=OFF,libxml2 libxslt"
-PACKAGECONFIG[minizip] = "-DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_minizip=OFF,minizip"
 PACKAGECONFIG[opus] = "-DFEATURE_webengine_system_opus=ON,-DFEATURE_webengine_system_opus=OFF,libopus"
 PACKAGECONFIG[libpci] = "-DFEATURE_webengine_system_libpci=ON,-DFEATURE_webengine_system_libpci=OFF,pciutils"
 PACKAGECONFIG[pepper-plugins] = "-DFEATURE_webengine_pepper_plugins=ON,-DFEATURE_webengine_pepper_plugins=OFF"
-PACKAGECONFIG[printing-and-pdf] = "-DFEATURE_webengine_printing_and_pdf=ON,-DFEATURE_webengine_printing_and_pdf=OFF"
+PACKAGECONFIG[printing-and-pdf] = "-DFEATURE_webengine_printing_and_pdf=ON,-DFEATURE_webengine_printing_and_pdf=OFF,cups"
 PACKAGECONFIG[proprietary-codecs] = "-DFEATURE_webengine_proprietary_codecs=ON,-DFEATURE_webengine_proprietary_codecs=OFF"
 PACKAGECONFIG[pulseaudio] = "-DFEATURE_webengine_system_pulseaudio=ON,-DFEATURE_webengine_system_pulseaudio=OFF,pulseaudio"
 PACKAGECONFIG[re2] = "-DFEATURE_webengine_system_re2=ON,-DFEATURE_webengine_system_re2=OFF,re2"
@ -73,8 +72,8 @@ PACKAGECONFIG[snappy] = "-DFEATURE_webengine_system_snappy=ON,-DFEATURE_webengin
 PACKAGECONFIG[spellchecker] = "-DFEATURE_webengine_spellchecker=ON,-DFEATURE_webengine_spellchecker=OFF"
 PACKAGECONFIG[webchannel] = "-DFEATURE_webengine_webchannel=ON,-DFEATURE_webengine_webchannel=OFF,qtwebchannel"
 PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrtc=OFF,libvpx"
-PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0"
-PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON,-DFEATURE_webengine_system_zlib=OFF,zlib"
+PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0 libepoxy virtual/libgbm"
+PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON -DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_zlib=OFF -DFEATURE_webengine_system_minizip,zlib minizip"

 FILES:${PN} += "\
    ${QT6_INSTALL_TRANSLATIONSDIR} \