gcab: fix buildpaths QA issue

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2024-08-30 10:52:09 +02:00 committed by Khem Raj
parent 154f5bb134
commit 6644c4a420
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 38 additions and 5 deletions

View File

@ -0,0 +1,37 @@
From 6fa1b6d3f72caf6d0cf61752b522dc19fb9933b7 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
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 <martin.jansa@gmail.com>
---
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 ***/

View File

@ -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"