From 958cb1592a28c0cfbabebc7062e787991f350153 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 25 Oct 2024 09:00:53 +0000
Subject: [PATCH] Include SBOM files in -dev packages

Qt now produces SBOM (Software Bill of Material) files, include
those in the -dev packages.
The file cointains references to buildpaths, get rid of those
until fixed upstream.

Pick-to: 6.8
Change-Id: Ibe2972649db74925aab3fbe0307fd679e1ea53bf
Reviewed-by: Alex Bu <alex.bu@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
---
 classes/qt6-cmake.bbclass | 9 +++++++++
 recipes-qt/qt6/qt6.inc    | 1 +
 2 files changed, 10 insertions(+)

diff --git a/classes/qt6-cmake.bbclass b/classes/qt6-cmake.bbclass
index 0479a62..b0e5518 100644
--- a/classes/qt6-cmake.bbclass
+++ b/classes/qt6-cmake.bbclass
@@ -45,6 +45,15 @@ do_install:append() {
                -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
                -e '/QMAKE_PRL_BUILD_DIR/d' \
                -e '\|${WORKDIR}|d' {} \;
+
+    # Remove buildpaths from SBOM files
+    # QTBUG-130557
+    if [ -e ${D}${QT6_INSTALL_LIBDIR}/sbom ]; then
+        sed -i ${D}${QT6_INSTALL_LIBDIR}/sbom/*.spdx \
+            -e 's|${STAGING_DIR_NATIVE}||' \
+            -e 's|${S}||g' \
+            -e 's|${B}||'
+    fi
 }
 
 export QT_DISABLE_SHADER_DISK_CACHE = "1"
diff --git a/recipes-qt/qt6/qt6.inc b/recipes-qt/qt6/qt6.inc
index c71172a..244add9 100644
--- a/recipes-qt/qt6/qt6.inc
+++ b/recipes-qt/qt6/qt6.inc
@@ -87,6 +87,7 @@ FILES:${PN}-dev += " \
     ${QT6_INSTALL_LIBDIR}/cmake \
     ${QT6_INSTALL_LIBDIR}/metatypes \
     ${QT6_INSTALL_LIBDIR}/pkgconfig \
+    ${QT6_INSTALL_LIBDIR}/sbom \
     ${QT6_INSTALL_MKSPECSDIR} \
     ${QT6_INSTALL_QMLDIR}/*.qmltypes \
     ${QT6_INSTALL_QMLDIR}/*/*.qmltypes \