CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtwebengine: fix conflicting files with qtpdf

Browse Source 
QtWebengine and QtPdf now generated SBOM files for both
modules. Need to remove wrong one to avoid conflicts.

Pick-to: 6.8
Task-number: QTBUG-128893
Change-Id: I9baa4460a63e72e077e1b337906eac0c2d44a9af
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7166be5225)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2025-01-14 07:01:12 +00:00 committed by Qt Cherry-pick Bot
parent 3feadcb30b
commit 60db51682c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recipes-qt/qt6/qtpdf_git.bb
View File

@ -34,6 +34,5 @@ do_install:append() {
# remove conflicting files with QtWebEngine
rm -f ${D}${libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebEngineTestsConfig.cmake
rm -f ${D}${libdir}/cmake/Qt6/Find*.cmake
# rename sbom
mv ${D}${libdir}/sbom/qtwebengine-${QT_VERSION}.spdx ${D}${libdir}/sbom/qtpdf-${QT_VERSION}.spdx
rm -f ${D}${libdir}/sbom/qtwebengine*
}

5
recipes-qt/qt6/qtwebengine_git.bb
View File

@ -74,6 +74,11 @@ PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrt
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=OFF,zlib minizip"
do_install:append() {
# remove conflicting files with QtPdf
rm -f ${D}${libdir}/sbom/qtpdf*
}
FILES:${PN} += "\
${QT6_INSTALL_TRANSLATIONSDIR} \
${QT6_INSTALL_DATADIR}/resources \