summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch16
-rw-r--r--meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb (renamed from meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb)2
2 files changed, 8 insertions, 10 deletions
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 @@
1From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 1From 2618ab101f5faaa887c9feeeee84a7d8bc97cbda Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 16 Nov 2022 11:27:24 +0100 3Date: Wed, 16 Nov 2022 11:27:24 +0100
4Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option 4Subject: [PATCH] meson.build: correctly handle disabled ssh_agent option
5 5
6Existing code produces these errors: 6Existing code produces these errors:
7| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program 7| 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:
10Signed-off-by: Alexander Kanavin <alex@linutronix.de> 10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11 11
12Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] 12Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ]
13
13--- 14---
14 meson.build | 12 ++++++++---- 15 meson.build | 6 ++++--
15 1 file changed, 8 insertions(+), 4 deletions(-) 16 1 file changed, 4 insertions(+), 2 deletions(-)
16 17
17diff --git a/meson.build b/meson.build 18diff --git a/meson.build b/meson.build
18index 3f35173..11d7fa7 100644 19index dd890a9..1b17b18 100644
19--- a/meson.build 20--- a/meson.build
20+++ b/meson.build 21+++ b/meson.build
21@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) 22@@ -82,8 +82,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
22 conf.set('HAVE_MLOCK', cc.has_function('mlock')) 23 conf.set('HAVE_MLOCK', cc.has_function('mlock'))
23 conf.set_quoted('GPG_EXECUTABLE', gpg_path) 24 conf.set_quoted('GPG_EXECUTABLE', gpg_path)
24 conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) 25 conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
@@ -31,6 +32,3 @@ index 3f35173..11d7fa7 100644
31 conf.set10('WITH_SYSTEMD', with_systemd) 32 conf.set10('WITH_SYSTEMD', with_systemd)
32 config_file = configure_file( 33 config_file = configure_file(
33 output: 'config.h', 34 output: 'config.h',
34--
352.34.1
36
diff --git a/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb b/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
index b3438b4e6f..0fd30f7424 100644
--- a/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb
+++ b/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
@@ -23,7 +23,7 @@ UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar"
23 23
24SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" 24SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive"
25SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" 25SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
26SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f" 26SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7"
27 27
28S = "${WORKDIR}/gcr-${PV}" 28S = "${WORKDIR}/gcr-${PV}"
29 29