From d34f54d0876abe045a3201e6a518326dfebf5524 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 23 Jan 2024 08:57:50 +0800 Subject: gcr3: upgrade 3.41.1 -> 3.41.2 0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch refreshed for 3.41.2 Changelog: ============ - ui: Add gcr.gresource.xml back into the build - misc: Several memory leaks were fixed - ci: Several CI fixes - Updated translations Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...-correctly-handle-disabled-ssh_agent-opti.patch | 16 +++--- meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb | 61 ---------------------- meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb | 61 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 70 deletions(-) delete mode 100644 meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb create mode 100644 meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb (limited to 'meta-oe/recipes-gnome') diff --git a/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch index d3c26d97ae..2b2baf772e 100644 --- a/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch +++ b/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch @@ -1,7 +1,7 @@ -From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 +From 2618ab101f5faaa887c9feeeee84a7d8bc97cbda Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 16 Nov 2022 11:27:24 +0100 -Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option +Subject: [PATCH] meson.build: correctly handle disabled ssh_agent option Existing code produces these errors: | gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program @@ -10,15 +10,16 @@ Existing code produces these errors: Signed-off-by: Alexander Kanavin Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] + --- - meson.build | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 3f35173..11d7fa7 100644 +index dd890a9..1b17b18 100644 --- a/meson.build +++ b/meson.build -@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) +@@ -82,8 +82,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) conf.set('HAVE_MLOCK', cc.has_function('mlock')) conf.set_quoted('GPG_EXECUTABLE', gpg_path) conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) @@ -31,6 +32,3 @@ index 3f35173..11d7fa7 100644 conf.set10('WITH_SYSTEMD', with_systemd) config_file = configure_file( output: 'config.h', --- -2.34.1 - diff --git a/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb b/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb deleted file mode 100644 index b3438b4e6f..0000000000 --- a/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "A library for bits of crypto UI and parsing etc" -DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \ -accessing key stores. It also provides the viewer for crypto files on the \ -GNOME desktop." -HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" - -DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" - -CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" - -CFLAGS += "-D_GNU_SOURCE" - -GTKDOC_MESON_OPTION = "gtk_doc" -VALA_MESON_OPTION ?= '' - -inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg -UPSTREAM_CHECK_REGEX = "[^\d\.](?P3.(?!9\d+)\d+(\.\d+)+)\.tar" - -SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" -SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" -SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f" - -S = "${WORKDIR}/gcr-${PV}" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ -" -PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk+3" -PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh" -#'Use systemd socket activation for server programs' -PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gcr-3 \ - ${datadir}/vala \ - ${systemd_user_unitdir}/gcr-ssh-agent.socket \ - ${systemd_user_unitdir}/gcr-ssh-agent.service \ -" - -# http://errors.yoctoproject.org/Errors/Details/20229/ -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" -ARM_INSTRUCTION_SET:armv6 = "arm" - -EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross" -do_write_config:append() { - cat >${WORKDIR}/meson-${PN}.cross <${WORKDIR}/meson-${PN}.cross <