From 574f981fd8f832aca2ee9915ab579638b61b0361 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Feb 2021 15:19:22 +0000 Subject: libsecret: Improve determimism (From OE-Core rev: 28175c44e7402397a24a00a4b056eef39b0a03fa) Signed-off-by: Richard Purdie --- .../libsecret/libsecret/determinism.patch | 37 ++++++++++++++++++++++ meta/recipes-gnome/libsecret/libsecret_0.20.4.bb | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-gnome/libsecret/libsecret/determinism.patch (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/libsecret/libsecret/determinism.patch b/meta/recipes-gnome/libsecret/libsecret/determinism.patch new file mode 100644 index 0000000000..ad96e8f59b --- /dev/null +++ b/meta/recipes-gnome/libsecret/libsecret/determinism.patch @@ -0,0 +1,37 @@ +secret-enum-types.c/h.template: Fix reproducibility issue + +When full filenames are used in generated sources it makes the resulting +debug packages non-reproducible. Best practise is to use basename in +comments instead. + +Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/68] + +Index: libsecret-0.20.4/libsecret/secret-enum-types.c.template +=================================================================== +--- libsecret-0.20.4.orig/libsecret/secret-enum-types.c.template ++++ libsecret-0.20.4/libsecret/secret-enum-types.c.template +@@ -23,8 +23,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" +-/* enumerations from "@filename@" */ ++#include "@basename@" ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +Index: libsecret-0.20.4/libsecret/secret-enum-types.h.template +=================================================================== +--- libsecret-0.20.4.orig/libsecret/secret-enum-types.h.template ++++ libsecret-0.20.4/libsecret/secret-enum-types.h.template +@@ -27,7 +27,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb index 96f6460181..4b6b2172e4 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb @@ -13,6 +13,8 @@ inherit gnomebase gtk-doc vala gobject-introspection manpages DEPENDS += "glib-2.0 libgcrypt gettext-native" +SRC_URI += " file://determinism.patch" + SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" GTKDOC_MESON_OPTION = 'gtk_doc' -- cgit v1.2.3-54-g00ecf