> -----Original Message-----
> From: [email protected] 
> <[email protected]> On Behalf Of Simone Weiß via 
> lists.openembedded.org
> Sent: den 3 februari 2025 21:01
> To: [email protected]
> Cc: Simone Weiß <[email protected]>
> Subject: [OE-core] [PATCH] libsecret: upgrade 0.21.4 -> 0.21.6
> 
> From: Simone Weiß <[email protected]>
> 
> Upgrade per AUH failed as with 0.21.6 libsecret now also comes with
> bash-completions. Put those to an additional package, as systems might
> come without bash, so not everyone might want them.
> 
> Changelog
> ---------
> 0.21.6
>  * meson: Make dbus-run-session optional [!157]
>  * meson: Actually include bash-completion subdir [!158]
> 
> 0.21.5
>  * session: Tolerate non-approved DH parameter usage in FIPS mode [!145]
>  * Add some missing GIR annotations [!140]
>  * meson: Create default test setup with D-Bus [!115]
>  * meson: Use env.prepend() for test environment setup [!141]
>  * meson: Fix license field [!139]
>  * build: Remove self-inclusion from secret-item.h [!149]
>  * build: Fix compiler warnings in Vala tests [!153]
>  * tests: Fix "\|" used in test-secret-tool.sh not portable [!150]
>  * Fix typo in D-Bus XML [!152]
>  * docs: Fix minor gi-docgen reference [!142]
>  * docs: Fix Python example [!144]
>  * docs: Mention file backend [!146]
>  * docs: Fix link in README [!147]
>  * Several CI-related updates
>  * Updated translations
> 
> Signed-off-by: Simone Weiß <[email protected]>
> ---
>  .../0001-meson-add-option-to-disable-pam-tests.patch       | 7 ++-----
>  .../libsecret/{libsecret_0.21.4.bb => libsecret_0.21.6.bb} | 5 ++++-
>  2 files changed, 6 insertions(+), 6 deletions(-)
>  rename meta/recipes-gnome/libsecret/{libsecret_0.21.4.bb => 
> libsecret_0.21.6.bb} (84%)
> 
> diff --git 
> a/meta/recipes-gnome/libsecret/libsecret/0001-meson-add-option-to-disable-pam-tests.patch
>  
> b/meta/recipes-gnome/libsecret/libsecret/0001-meson-add-option-to-disable-pam-tests.patch
> index 1bd49bbc38..da5ed1fd32 100644
> --- 
> a/meta/recipes-gnome/libsecret/libsecret/0001-meson-add-option-to-disable-pam-tests.patch
> +++ 
> b/meta/recipes-gnome/libsecret/libsecret/0001-meson-add-option-to-disable-pam-tests.patch
> @@ -1,4 +1,4 @@
> -From b90ecbdb4b91961a77a7cbb3a9b6a57128e2194b Mon Sep 17 00:00:00 2001
> +From a9fd7dcddf8bc64646f2945ab564357c23111541 Mon Sep 17 00:00:00 2001
>  From: Markus Volk <[email protected]>
>  Date: Tue, 3 Dec 2024 15:58:17 +0100
>  Subject: [PATCH] meson: add option to disable pam tests
> @@ -12,7 +12,7 @@ Signed-off-by: Markus Volk <[email protected]>
>   2 files changed, 24 insertions(+), 21 deletions(-)
> 
>  diff --git a/meson_options.txt b/meson_options.txt
> -index 936eff8..8fa2a4e 100644
> +index 936eff8..2ae14f2 100644
>  --- a/meson_options.txt
>  +++ b/meson_options.txt
>  @@ -8,3 +8,4 @@ option('bashcompdir', type: 'string', value: '', 
> description: 'Override default
> @@ -75,6 +75,3 @@ index 8413b58..5155329 100644
>  +    },
>  +  )
>  +endif
> ---
> -2.47.0
> -
> diff --git a/meta/recipes-gnome/libsecret/libsecret_0.21.4.bb 
> b/meta/recipes-gnome/libsecret/libsecret_0.21.6.bb
> similarity index 84%
> rename from meta/recipes-gnome/libsecret/libsecret_0.21.4.bb
> rename to meta/recipes-gnome/libsecret/libsecret_0.21.6.bb
> index d356681252..e99201228a 100644
> --- a/meta/recipes-gnome/libsecret/libsecret_0.21.4.bb
> +++ b/meta/recipes-gnome/libsecret/libsecret_0.21.6.bb
> @@ -14,7 +14,7 @@ inherit gnomebase gi-docgen vala gobject-introspection 
> manpages
>  DEPENDS += "glib-2.0 libgcrypt gettext-native"
> 
>  SRC_URI += "file://0001-meson-add-option-to-disable-pam-tests.patch"
> -SRC_URI[archive.sha256sum] = 
> "163d08d783be6d4ab9a979ceb5a4fecbc1d9660d3c34168c581301cd53912b20"
> +SRC_URI[archive.sha256sum] = 
> "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090"
> 
>  EXTRA_OEMESON += "-Dpam-tests=false"
> 
> @@ -24,6 +24,9 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 
> 'pam', d)}"
>  PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native 
> xmlto-native"
>  PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
> 
> +PACKAGES += " ${PN}-bash-completion"
> +FILES:${PN}-bash-completion += " 
> ${datadir}/bash-completion/completions/secret-tool"
> +

Please inherit bash-completion instead.

>  # http://errors.yoctoproject.org/Errors/Details/20228/
>  ARM_INSTRUCTION_SET:armv4 = "arm"
>  ARM_INSTRUCTION_SET:armv5 = "arm"
> --
> 2.39.5

//Peter

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#210789): 
https://lists.openembedded.org/g/openembedded-core/message/210789
Mute This Topic: https://lists.openembedded.org/mt/110978872/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to