diff mbox series

[2/2] gcr: update 4.0.0 -> 4.1.0

Message ID 20230502152008.113566-2-f_l_k@t-online.de
State Accepted, archived
Commit 9c7f54c70541a9a5be6f1312b4ef5247b25f37fa
Headers show
Series [1/2] gtk4: update 4.10.0 -> 4.10.3 | expand

Commit Message

Markus Volk May 2, 2023, 3:20 p.m. UTC 
- remove backported patch

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...ectly-handle-disabled-ssh_agent-opti.patch | 49 -------------------
 .../gcr/{gcr_4.0.0.bb => gcr_4.1.0.bb}        |  3 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
 rename meta/recipes-gnome/gcr/{gcr_4.0.0.bb => gcr_4.1.0.bb} (92%)
diff mbox series

Patch

diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
deleted file mode 100644
index 940f78ebab..0000000000
--- a/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
+++ /dev/null
@@ -1,49 +0,0 @@ 
-From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Wed, 16 Nov 2022 11:27:24 +0100
-Subject: [PATCH 1/2] 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
-| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path".
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
-Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ]
----
- meson.build | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3f35173..11d7fa7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -58,8 +58,10 @@ if p11_system_config_modules == ''
-   error('Couldn\'t find location for pkcs11 module config')
- endif
- libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent'))
--ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path()
--ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path()
-+if get_option('ssh_agent')
-+  ssh_add_path = find_program('ssh-add').full_path()
-+  ssh_agent_path = find_program('ssh-agent').full_path()
-+endif
- 
- with_systemd = false
- libsystemd_deps = []
-@@ -96,8 +98,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())
--conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
--conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
-+if get_option('ssh_agent')
-+  conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
-+  conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
-+endif
- conf.set10('WITH_SYSTEMD', with_systemd)
- config_file = configure_file(
-   output: 'config.h',
--- 
-2.34.1
-
diff --git a/meta/recipes-gnome/gcr/gcr_4.0.0.bb b/meta/recipes-gnome/gcr/gcr_4.1.0.bb
similarity index 92%
rename from meta/recipes-gnome/gcr/gcr_4.0.0.bb
rename to meta/recipes-gnome/gcr/gcr_4.1.0.bb
index 7821e31b52..0cc466b614 100644
--- a/meta/recipes-gnome/gcr/gcr_4.0.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_4.1.0.bb
@@ -22,8 +22,7 @@  UPSTREAM_CHECK_REGEX = "gcr-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz"
 
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}"
 
-SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
-SRC_URI[archive.sha256sum] = "c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c"
+SRC_URI[archive.sha256sum] = "9ceaad29284ba919b9216e2888c18ec67240c2c93b3a4856bc5488bbc1f3a383"
 
 PACKAGECONFIG ??= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \