Signed-off-by: Martin Jansa <[email protected]> --- RFC: sending as a RFC because Mikko claimed that meson generates the full path by purpose
...mplate-include-basename-instead-of-f.patch | 37 +++++++++++++++++++ meta-oe/recipes-gnome/gcab/gcab_1.6.bb | 6 +-- 2 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch diff --git a/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch new file mode 100644 index 0000000000..dd6ae1b427 --- /dev/null +++ b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch @@ -0,0 +1,37 @@ +From 6fa1b6d3f72caf6d0cf61752b522dc19fb9933b7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Fri, 30 Aug 2024 10:44:17 +0200 +Subject: [PATCH] gcab-enums.c.etemplate: include @basename@ instead of full + path from @filename@ + +* fixes: + ERROR: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths] + +lib32-gcab/1.6/package $ grep -R styhead . +./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-file.h" +./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-folder.h" + +glib-mkenum supports also @basename@ since 2.22 which would avoid this QA issue + @filename@ name of current input file + @basename@ base name of the current input file (Since: 2.22) + +Signed-off-by: Martin Jansa <[email protected]> +--- +Upstream-Status: Pending + + libgcab/gcab-enums.c.etemplate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgcab/gcab-enums.c.etemplate b/libgcab/gcab-enums.c.etemplate +index 194b1e0..2e85824 100644 +--- a/libgcab/gcab-enums.c.etemplate ++++ b/libgcab/gcab-enums.c.etemplate +@@ -21,7 +21,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" ++#include "@basename@" + /*** END file-production ***/ + + diff --git a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb index 0d9410b4d5..503d25271f 100644 --- a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb +++ b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb @@ -7,6 +7,7 @@ DEPENDS = "glib-2.0" SRC_URI = "\ ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ + file://0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b" @@ -22,8 +23,3 @@ PACKAGECONFIG[nls] = "-Dnls=true,-Dnls=false" PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false" BBCLASSEXTEND = "native" - -# meson embeds absolute paths to generated files on purpose -# ERROR: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths] -ERROR_QA:remove = "buildpaths" -WARN_QA:append = " buildpaths"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#112052): https://lists.openembedded.org/g/openembedded-devel/message/112052 Mute This Topic: https://lists.openembedded.org/mt/108176090/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
