diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2024-01-23 08:57:50 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-01-22 18:02:27 -0800 |
| commit | d34f54d0876abe045a3201e6a518326dfebf5524 (patch) | |
| tree | f1a75601f45aadf7d453af5f000334932cd490b7 | |
| parent | da580d959fb7427a0ccbf2139138abb17ba04adb (diff) | |
| download | meta-openembedded-d34f54d0876abe045a3201e6a518326dfebf5524.tar.gz | |
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 <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch | 16 | ||||
| -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 @@ | |||
| 1 | From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 | 1 | From 2618ab101f5faaa887c9feeeee84a7d8bc97cbda Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Wed, 16 Nov 2022 11:27:24 +0100 | 3 | Date: Wed, 16 Nov 2022 11:27:24 +0100 |
| 4 | Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option | 4 | Subject: [PATCH] meson.build: correctly handle disabled ssh_agent option |
| 5 | 5 | ||
| 6 | Existing code produces these errors: | 6 | Existing 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: | |||
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 11 | 11 | ||
| 12 | Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] | 12 | Upstream-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 | ||
| 17 | diff --git a/meson.build b/meson.build | 18 | diff --git a/meson.build b/meson.build |
| 18 | index 3f35173..11d7fa7 100644 | 19 | index 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 | -- | ||
| 35 | 2.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 | ||
| 24 | SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" | 24 | SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" |
| 25 | SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" | 25 | SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" |
| 26 | SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f" | 26 | SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7" |
| 27 | 27 | ||
| 28 | S = "${WORKDIR}/gcr-${PV}" | 28 | S = "${WORKDIR}/gcr-${PV}" |
| 29 | 29 | ||
