summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-gnome/libsecret/libsecret/0001-meson-add-option-to-disable-pam-tests.patch7
-rw-r--r--meta/recipes-gnome/libsecret/libsecret_0.21.6.bb (renamed from meta/recipes-gnome/libsecret/libsecret_0.21.4.bb)5
2 files changed, 6 insertions, 6 deletions
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 @@
1From b90ecbdb4b91961a77a7cbb3a9b6a57128e2194b Mon Sep 17 00:00:00 2001 1From a9fd7dcddf8bc64646f2945ab564357c23111541 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de> 2From: Markus Volk <f_l_k@t-online.de>
3Date: Tue, 3 Dec 2024 15:58:17 +0100 3Date: Tue, 3 Dec 2024 15:58:17 +0100
4Subject: [PATCH] meson: add option to disable pam tests 4Subject: [PATCH] meson: add option to disable pam tests
@@ -12,7 +12,7 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
12 2 files changed, 24 insertions(+), 21 deletions(-) 12 2 files changed, 24 insertions(+), 21 deletions(-)
13 13
14diff --git a/meson_options.txt b/meson_options.txt 14diff --git a/meson_options.txt b/meson_options.txt
15index 936eff8..8fa2a4e 100644 15index 936eff8..2ae14f2 100644
16--- a/meson_options.txt 16--- a/meson_options.txt
17+++ b/meson_options.txt 17+++ b/meson_options.txt
18@@ -8,3 +8,4 @@ option('bashcompdir', type: 'string', value: '', description: 'Override default 18@@ -8,3 +8,4 @@ option('bashcompdir', type: 'string', value: '', description: 'Override default
@@ -75,6 +75,3 @@ index 8413b58..5155329 100644
75+ }, 75+ },
76+ ) 76+ )
77+endif 77+endif
78--
792.47.0
80
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.21.4.bb b/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
14DEPENDS += "glib-2.0 libgcrypt gettext-native" 14DEPENDS += "glib-2.0 libgcrypt gettext-native"
15 15
16SRC_URI += "file://0001-meson-add-option-to-disable-pam-tests.patch" 16SRC_URI += "file://0001-meson-add-option-to-disable-pam-tests.patch"
17SRC_URI[archive.sha256sum] = "163d08d783be6d4ab9a979ceb5a4fecbc1d9660d3c34168c581301cd53912b20" 17SRC_URI[archive.sha256sum] = "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090"
18 18
19EXTRA_OEMESON += "-Dpam-tests=false" 19EXTRA_OEMESON += "-Dpam-tests=false"
20 20
@@ -24,6 +24,9 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
24PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native" 24PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native"
25PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" 25PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
26 26
27PACKAGES += " ${PN}-bash-completion"
28FILES:${PN}-bash-completion += " ${datadir}/bash-completion/completions/secret-tool"
29
27# http://errors.yoctoproject.org/Errors/Details/20228/ 30# http://errors.yoctoproject.org/Errors/Details/20228/
28ARM_INSTRUCTION_SET:armv4 = "arm" 31ARM_INSTRUCTION_SET:armv4 = "arm"
29ARM_INSTRUCTION_SET:armv5 = "arm" 32ARM_INSTRUCTION_SET:armv5 = "arm"