summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch37
-rw-r--r--meta-oe/recipes-gnome/gcab/gcab_1.6.bb1
2 files changed, 38 insertions, 0 deletions
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 @@
1From 6fa1b6d3f72caf6d0cf61752b522dc19fb9933b7 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Fri, 30 Aug 2024 10:44:17 +0200
4Subject: [PATCH] gcab-enums.c.etemplate: include @basename@ instead of full
5 path from @filename@
6
7* fixes:
8 ERROR: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths]
9
10lib32-gcab/1.6/package $ grep -R styhead .
11./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-file.h"
12./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-folder.h"
13
14glib-mkenum supports also @basename@ since 2.22 which would avoid this QA issue
15 @filename@ name of current input file
16 @basename@ base name of the current input file (Since: 2.22)
17
18Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
19---
20Upstream-Status: Pending
21
22 libgcab/gcab-enums.c.etemplate | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/libgcab/gcab-enums.c.etemplate b/libgcab/gcab-enums.c.etemplate
26index 194b1e0..2e85824 100644
27--- a/libgcab/gcab-enums.c.etemplate
28+++ b/libgcab/gcab-enums.c.etemplate
29@@ -21,7 +21,7 @@
30 /*** END file-header ***/
31
32 /*** BEGIN file-production ***/
33-#include "@filename@"
34+#include "@basename@"
35 /*** END file-production ***/
36
37
diff --git a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb
index 4278fc9453..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"
7 7
8SRC_URI = "\ 8SRC_URI = "\
9 ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ 9 ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \
10 file://0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch \
10 file://run-ptest \ 11 file://run-ptest \
11" 12"
12SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b" 13SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b"