From 75adab58e3d979cce2a549ac2c2277a31b30253d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 24 May 2023 20:38:56 -0700 Subject: [PATCH] eog: Fix absolute src paths in generated files Fixes WARNING: eog-44.1-r0 do_package_qa: QA Issue: File /usr/src/debug/eog/44.1-r0/src/eog-enum-types.h in package eog-src contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- .../0001-Replace-filename-with-basename.patch | 48 +++++++++++++++++++ meta-gnome/recipes-gnome/eog/eog_44.1.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch diff --git a/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch b/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch new file mode 100644 index 0000000000..26d75780b2 --- /dev/null +++ b/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch @@ -0,0 +1,48 @@ +From d00edda1f57f904e1590828bea3cedb53d789c48 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 24 May 2023 20:33:59 -0700 +Subject: [PATCH] Replace filename with basename + +This avoids emitting absolute paths into generated sourcecode, it +improves reproducibility. See [1] + +[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/eog/-/merge_requests/154] +Signed-off-by: Khem Raj +--- + src/eog-enum-types.c.template | 4 ++-- + src/eog-enum-types.h.template | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/eog-enum-types.c.template b/src/eog-enum-types.c.template +index 0249baf..1013dcf 100644 +--- a/src/eog-enum-types.c.template ++++ b/src/eog-enum-types.c.template +@@ -4,8 +4,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + + /*** END file-production ***/ + +diff --git a/src/eog-enum-types.h.template b/src/eog-enum-types.h.template +index bc3c195..8f4e916 100644 +--- a/src/eog-enum-types.h.template ++++ b/src/eog-enum-types.h.template +@@ -8,7 +8,7 @@ G_BEGIN_DECLS + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* Enumerations from "@filename@" */ ++/* Enumerations from "@basename@" */ + + /*** END file-production ***/ + +-- +2.40.1 + diff --git a/meta-gnome/recipes-gnome/eog/eog_44.1.bb b/meta-gnome/recipes-gnome/eog/eog_44.1.bb index fad7de6b28..95e421c883 100644 --- a/meta-gnome/recipes-gnome/eog/eog_44.1.bb +++ b/meta-gnome/recipes-gnome/eog/eog_44.1.bb @@ -21,6 +21,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea REQUIRED_DISTRO_FEATURES = "opengl" +SRC_URI += "file://0001-Replace-filename-with-basename.patch" SRC_URI[archive.sha256sum] = "e2c963f232fe5a1091dcc18bec25a730e91b02af6e466601efa55e500cd74cab" GTKDOC_MESON_OPTION = "gtk_doc"