diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-03-08 10:32:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-09 11:46:27 +0000 |
| commit | 000b895fc2cde2b426f14bc1dc7885120e3e72e0 (patch) | |
| tree | 75d2d74704544b11498113e278c5940a2183fa43 | |
| parent | bc98337f8a2c614fd0b2f127304babb37dff47fe (diff) | |
| download | poky-000b895fc2cde2b426f14bc1dc7885120e3e72e0.tar.gz | |
libsecret: upgrade 0.20.4 -> 0.20.5
(From OE-Core rev: 591b547d546698ee7bb13ab18ff52921cc7d77ae)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/libsecret/libsecret/determinism.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-gnome/libsecret/libsecret_0.20.5.bb (renamed from meta/recipes-gnome/libsecret/libsecret_0.20.4.bb) | 6 |
2 files changed, 2 insertions, 41 deletions
diff --git a/meta/recipes-gnome/libsecret/libsecret/determinism.patch b/meta/recipes-gnome/libsecret/libsecret/determinism.patch deleted file mode 100644 index ad96e8f59b..0000000000 --- a/meta/recipes-gnome/libsecret/libsecret/determinism.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | secret-enum-types.c/h.template: Fix reproducibility issue | ||
| 2 | |||
| 3 | When full filenames are used in generated sources it makes the resulting | ||
| 4 | debug packages non-reproducible. Best practise is to use basename in | ||
| 5 | comments instead. | ||
| 6 | |||
| 7 | Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org | ||
| 8 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/68] | ||
| 9 | |||
| 10 | Index: libsecret-0.20.4/libsecret/secret-enum-types.c.template | ||
| 11 | =================================================================== | ||
| 12 | --- libsecret-0.20.4.orig/libsecret/secret-enum-types.c.template | ||
| 13 | +++ libsecret-0.20.4/libsecret/secret-enum-types.c.template | ||
| 14 | @@ -23,8 +23,8 @@ | ||
| 15 | /*** END file-header ***/ | ||
| 16 | |||
| 17 | /*** BEGIN file-production ***/ | ||
| 18 | -#include "@filename@" | ||
| 19 | -/* enumerations from "@filename@" */ | ||
| 20 | +#include "@basename@" | ||
| 21 | +/* enumerations from "@basename@" */ | ||
| 22 | /*** END file-production ***/ | ||
| 23 | |||
| 24 | /*** BEGIN value-header ***/ | ||
| 25 | Index: libsecret-0.20.4/libsecret/secret-enum-types.h.template | ||
| 26 | =================================================================== | ||
| 27 | --- libsecret-0.20.4.orig/libsecret/secret-enum-types.h.template | ||
| 28 | +++ libsecret-0.20.4/libsecret/secret-enum-types.h.template | ||
| 29 | @@ -27,7 +27,7 @@ G_BEGIN_DECLS | ||
| 30 | |||
| 31 | /*** BEGIN file-production ***/ | ||
| 32 | |||
| 33 | -/* enumerations from "@filename@" */ | ||
| 34 | +/* enumerations from "@basename@" */ | ||
| 35 | /*** END file-production ***/ | ||
| 36 | |||
| 37 | /*** BEGIN value-header ***/ | ||
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.5.bb index 39ecdd770a..9b09c3bee4 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.5.bb | |||
| @@ -10,13 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" | |||
| 10 | 10 | ||
| 11 | GNOMEBASEBUILDCLASS = "meson" | 11 | GNOMEBASEBUILDCLASS = "meson" |
| 12 | 12 | ||
| 13 | inherit gnomebase gtk-doc vala gobject-introspection manpages | 13 | inherit gnomebase gi-docgen vala gobject-introspection manpages |
| 14 | 14 | ||
| 15 | DEPENDS += "glib-2.0 libgcrypt gettext-native" | 15 | DEPENDS += "glib-2.0 libgcrypt gettext-native" |
| 16 | 16 | ||
| 17 | SRC_URI += " file://determinism.patch" | 17 | SRC_URI[archive.sha256sum] = "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d" |
| 18 | |||
| 19 | SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" | ||
| 20 | 18 | ||
| 21 | GTKDOC_MESON_OPTION = 'gtk_doc' | 19 | GTKDOC_MESON_OPTION = 'gtk_doc' |
| 22 | 20 | ||
