diff mbox series

[meta-oe] gcr3: upgrade 3.41.1 -> 3.41.2

Message ID 1705971470-24422-1-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe] gcr3: upgrade 3.41.1 -> 3.41.2 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 23, 2024, 12:57 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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>
---
 ...orrectly-handle-disabled-ssh_agent-opti.patch | 16 +++++++---------
 .../gcr/{gcr3_3.41.1.bb => gcr3_3.41.2.bb}       |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename meta-oe/recipes-gnome/gcr/{gcr3_3.41.1.bb => gcr3_3.41.2.bb} (95%)
diff mbox series

Patch

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 d3c26d97a..2b2baf772 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 <alex@linutronix.de>
 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 <alex@linutronix.de>
 
 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.2.bb
similarity index 95%
rename from meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb
rename to meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
index b3438b4e6..0fd30f742 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"
 
 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"
+SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7"
 
 S = "${WORKDIR}/gcr-${PV}"