From 000b895fc2cde2b426f14bc1dc7885120e3e72e0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 8 Mar 2022 10:32:20 +0100 Subject: libsecret: upgrade 0.20.4 -> 0.20.5 (From OE-Core rev: 591b547d546698ee7bb13ab18ff52921cc7d77ae) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libsecret/libsecret/determinism.patch | 37 ---------------------- meta/recipes-gnome/libsecret/libsecret_0.20.4.bb | 28 ---------------- meta/recipes-gnome/libsecret/libsecret_0.20.5.bb | 26 +++++++++++++++ 3 files changed, 26 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-gnome/libsecret/libsecret/determinism.patch delete mode 100644 meta/recipes-gnome/libsecret/libsecret_0.20.4.bb create mode 100644 meta/recipes-gnome/libsecret/libsecret_0.20.5.bb 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 @@ -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 deleted file mode 100644 index 39ecdd770a..0000000000 --- a/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "libsecret is a library for storing and retrieving passwords and other secrets" -DESCRIPTION = "A GObject-based library for accessing the Secret Service API of \ -the freedesktop.org project, a cross-desktop effort to access passwords, \ -tokens and other types of secrets. libsecret provides a convenient wrapper \ -for these methods so consumers do not have to call the low-level DBus methods." -LICENSE = "LGPL-2.1-only" -HOMEPAGE = "https://github.com/GNOME/libsecret" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues" -LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" - -GNOMEBASEBUILDCLASS = "meson" - -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' - -PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native" - -# http://errors.yoctoproject.org/Errors/Details/20228/ -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" -ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.5.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.5.bb new file mode 100644 index 0000000000..9b09c3bee4 --- /dev/null +++ b/meta/recipes-gnome/libsecret/libsecret_0.20.5.bb @@ -0,0 +1,26 @@ +SUMMARY = "libsecret is a library for storing and retrieving passwords and other secrets" +DESCRIPTION = "A GObject-based library for accessing the Secret Service API of \ +the freedesktop.org project, a cross-desktop effort to access passwords, \ +tokens and other types of secrets. libsecret provides a convenient wrapper \ +for these methods so consumers do not have to call the low-level DBus methods." +LICENSE = "LGPL-2.1-only" +HOMEPAGE = "https://github.com/GNOME/libsecret" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues" +LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gi-docgen vala gobject-introspection manpages + +DEPENDS += "glib-2.0 libgcrypt gettext-native" + +SRC_URI[archive.sha256sum] = "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native" + +# http://errors.yoctoproject.org/Errors/Details/20228/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" -- cgit v1.2.3-54-g00ecf