mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-10 16:40:03 +00:00
Code Issues Projects Releases Wiki Activity

gcr3: upgrade 3.41.1 -> 3.41.2

Browse Source 
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 <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
2024-01-23 08:57:50 +08:00
committed by Khem Raj
parent da580d959f
commit d34f54d087
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
+7 -9
View File
@@ -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 <alex@linutronix.de> From: Alexander Kanavin <alex@linutronix.de>
Date: Wed, 16 Nov 2022 11:27:24 +0100 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: Existing code produces these errors:
| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program | 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 <alex@linutronix.de> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ]
--- ---
meson.build | 12 ++++++++---- meson.build | 6 ++++--
1 file changed, 8 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 3f35173..11d7fa7 100644 index dd890a9..1b17b18 100644
--- a/meson.build --- a/meson.build
+++ b/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('HAVE_MLOCK', cc.has_function('mlock'))
conf.set_quoted('GPG_EXECUTABLE', gpg_path) conf.set_quoted('GPG_EXECUTABLE', gpg_path)
conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
@@ -31,6 +32,3 @@ index 3f35173..11d7fa7 100644
conf.set10('WITH_SYSTEMD', with_systemd) conf.set10('WITH_SYSTEMD', with_systemd)
config_file = configure_file( config_file = configure_file(
output: 'config.h', output: 'config.h',
--
2.34.1
meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb → meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
+1 -1
View File
@@ -23,7 +23,7 @@ UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar"
SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" 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 += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f" SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7"
S = "${WORKDIR}/gcr-${PV}" S = "${WORKDIR}/gcr-${PV}"