From 430146567418ce083c2e99ce48270be9d0f7741c Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 13 Dec 2024 11:15:17 +0100 Subject: [PATCH] Revert "packagegroup-qt6-addons: only add qtpdf when "webengine" is a DISTRO_FEATURE" After commit 732975b7222c, which synced our qt6 recipes with meta-imx, there are no longer any compilation error when building qtpdf. Undo our removal of this package to minimize the amount of changes done to the qt6 packagegroups. Don't undo the change in the copyright years This reverts commit 3bf06c2c6f7a4ef73e24bcf4818b76adeed56941. Signed-off-by: Gabriel Valcazar --- .../packagegroups/packagegroup-qt6-addons.bbappend | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend index b69c9d8f9..e4a985f49 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend +++ b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend @@ -3,17 +3,3 @@ # qtdeviceutilities provides a networksettings module that depends # on "connman". This conflicts with NetworkManager RDEPENDS:${PN}:remove:dey = "qtdeviceutilities" - -# Historically, qtpdf was added to this packagegroup only when "webengine" is -# in DISTRO_FEATURES, but now it always gets added and causes build errors. -# Restore this logic to prevent the errors while respecting the specific -# architecture overrides from the original recipe. -RDEPENDS:${PN}:remove:dey = "qtpdf" -RDEPENDS:${PN}:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}" -RDEPENDS:${PN}:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}" -RDEPENDS:${PN}:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}" -RDEPENDS:${PN}:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}" -RDEPENDS:${PN}:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}" - -# qtdoc has a hardcoded dependency with qtpdf, so remove it as well -RDEPENDS:${PN}:remove:dey = "qtdoc"