Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "packagegroup-qt6-addons: only add qtpdf when "webengine" is a DISTRO_FEATURE" 

After commit 732975b722, 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 3bf06c2c6f.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2024-12-13 11:15:17 +01:00
parent db67bb7b82
commit 4301465674
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-addons.bbappend
View File

@ -3,17 +3,3 @@
# qtdeviceutilities provides a networksettings module that depends # qtdeviceutilities provides a networksettings module that depends
# on "connman". This conflicts with NetworkManager # on "connman". This conflicts with NetworkManager
RDEPENDS:${PN}:remove:dey = "qtdeviceutilities" 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"