From 60db51682c65901727a1934c0238dc44e5c4f3c3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 14 Jan 2025 07:01:12 +0000 Subject: [PATCH] qtwebengine: fix conflicting files with qtpdf 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 (cherry picked from commit 7166be52253769a3510b8cad40f6590a458c25e9) Reviewed-by: Qt Cherry-pick Bot --- recipes-qt/qt6/qtpdf_git.bb | 3 +-- recipes-qt/qt6/qtwebengine_git.bb | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt6/qtpdf_git.bb b/recipes-qt/qt6/qtpdf_git.bb index a1159d0..0fa6d54 100644 --- a/recipes-qt/qt6/qtpdf_git.bb +++ b/recipes-qt/qt6/qtpdf_git.bb @@ -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* } diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index c82738b..49485c0 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -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 \