From 35665dad23ccf7870e42ffe3f7ca17e24ee47ae1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 30 Sep 2021 16:42:23 +0200 Subject: [PATCH] qtwebengine: inherit pkgconfig Newer oe-core doesn't pull many default dependencies anymore: https://lists.openembedded.org/g/openembedded-core/message/156185 add explicit dependency on pkgconfig through pkgconfig.bbclass as we're using it here. Fixes: | ERROR: Feature "webengine_system_icu": Forcing to "ON" breaks its condition: | ICU_FOUND | Condition values dump: | ICU_FOUND = "" | | ERROR: Feature "webengine_system_libwebp": Forcing to "ON" breaks its condition: | UNIX AND WEBP_FOUND | Condition values dump: | UNIX = "1" | WEBP_FOUND = "" | | ERROR: Feature "webengine_system_opus": Forcing to "ON" breaks its condition: | UNIX AND OPUS_FOUND | Condition values dump: | UNIX = "1" | OPUS_FOUND = "" | | ERROR: Feature "webengine_system_glib": Forcing to "ON" breaks its condition: | UNIX AND GLIB_FOUND | Condition values dump: | UNIX = "1" | GLIB_FOUND = "" | | ERROR: Feature "webengine_system_zlib": Forcing to "ON" breaks its condition: | UNIX AND QT_FEATURE_system_zlib AND ZLIB_FOUND | Condition values dump: | UNIX = "1" | QT_FEATURE_system_zlib = "ON" | ZLIB_FOUND = "" | | ERROR: Feature "webengine_system_libevent": Forcing to "ON" breaks its condition: | UNIX AND LIBEVENT_FOUND | Condition values dump: | UNIX = "1" | LIBEVENT_FOUND = "" | | ERROR: Feature "webengine_system_lcms2": Forcing to "ON" breaks its condition: | UNIX AND LCMS2_FOUND | Condition values dump: | UNIX = "1" | LCMS2_FOUND = "" | | ERROR: Feature "webengine_system_libpng": Forcing to "ON" breaks its condition: | UNIX AND TARGET Qt::Gui AND PNG_FOUND AND QT_FEATURE_system_png | Condition values dump: | UNIX = "1" | TARGET Qt::Gui found | PNG_FOUND = "" | QT_FEATURE_system_png = "ON" | | ERROR: Feature "webengine_system_libjpeg": Forcing to "ON" breaks its condition: | UNIX AND TARGET Qt::Gui AND TEST_jpeg AND QT_FEATURE_system_jpeg | Condition values dump: | UNIX = "1" | TARGET Qt::Gui found | TEST_jpeg = "FALSE" | QT_FEATURE_system_jpeg = "ON" | | ERROR: Feature "webengine_system_harfbuzz": Forcing to "ON" breaks its condition: | UNIX AND TARGET Qt::Gui AND HARFBUZZ_FOUND AND QT_FEATURE_system_harfbuzz | Condition values dump: | UNIX = "1" | TARGET Qt::Gui found | HARFBUZZ_FOUND = "" | QT_FEATURE_system_harfbuzz = "ON" | | ERROR: Feature "webengine_system_freetype": Forcing to "ON" breaks its condition: | UNIX AND TARGET Qt::Gui AND TEST_freetype AND QT_FEATURE_system_freetype | Condition values dump: | UNIX = "1" | TARGET Qt::Gui found | TEST_freetype = "FALSE" | QT_FEATURE_system_freetype = "ON" | | ERROR: Feature "webengine_system_libpci": Forcing to "ON" breaks its condition: | UNIX AND LIBPCI_FOUND | Condition values dump: | UNIX = "1" | LIBPCI_FOUND = "" Already fixed in meta-qt5 with: https://github.com/meta-qt5/meta-qt5/commit/bf2daefeb57ac4c3e4bc39af3ddbfa6719978931 Pick-to: 6.2 Change-Id: I20add60b601bd85a7f5eb8b6e6f63e1bc729a893 Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qtwebengine.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 0e13545..695c1c6 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -inherit qt6-cmake +inherit qt6-cmake pkgconfig include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc