summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2023-07-27 13:38:07 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-30 09:16:53 +0100
commitfae96e779ecb50197bfd4c525d83101c9bb46786 (patch)
tree3b7509e87b48ac222ca30c3321a11ec48b6613e3 /meta/recipes-gnome
parent0b3ba1e2d9d0c6437de6ff094ae39d11e75d21da (diff)
downloadpoky-fae96e779ecb50197bfd4c525d83101c9bb46786.tar.gz
gcr3: remove recipe
It will be added to meta-gnome (From OE-Core rev: 5216bbf37d5c0c18c1c8921136906bef9c600c03) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch36
-rw-r--r--meta/recipes-gnome/gcr/gcr3_3.41.1.bb59
2 files changed, 0 insertions, 95 deletions
diff --git a/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
deleted file mode 100644
index d3c26d97ae..0000000000
--- a/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 16 Nov 2022 11:27:24 +0100
4Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option
5
6Existing code produces these errors:
7| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program
8| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path".
9
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11
12Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ]
13---
14 meson.build | 12 ++++++++----
15 1 file changed, 8 insertions(+), 4 deletions(-)
16
17diff --git a/meson.build b/meson.build
18index 3f35173..11d7fa7 100644
19--- a/meson.build
20+++ b/meson.build
21@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
22 conf.set('HAVE_MLOCK', cc.has_function('mlock'))
23 conf.set_quoted('GPG_EXECUTABLE', gpg_path)
24 conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
25-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
26-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
27+if get_option('ssh_agent')
28+ conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
29+ conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
30+endif
31 conf.set10('WITH_SYSTEMD', with_systemd)
32 config_file = configure_file(
33 output: 'config.h',
34--
352.34.1
36
diff --git a/meta/recipes-gnome/gcr/gcr3_3.41.1.bb b/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
deleted file mode 100644
index ba5660a5ed..0000000000
--- a/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
+++ /dev/null
@@ -1,59 +0,0 @@
1SUMMARY = "A library for bits of crypto UI and parsing etc"
2DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \
3accessing key stores. It also provides the viewer for crypto files on the \
4GNOME desktop."
5HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr"
6BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues"
7
8LICENSE = "GPL-2.0-only"
9LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
10
11DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \
12 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
13
14CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'"
15
16CFLAGS += "-D_GNU_SOURCE"
17
18GNOMEBASEBUILDCLASS = "meson"
19GTKDOC_MESON_OPTION = "gtk_doc"
20inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
21UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar"
22
23SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive"
24SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
25SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f"
26
27S = "${WORKDIR}/gcr-${PV}"
28
29PACKAGECONFIG ??= " \
30 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
31 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
33"
34PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk+3"
35PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh"
36#'Use systemd socket activation for server programs'
37PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
38
39FILES:${PN} += " \
40 ${datadir}/dbus-1 \
41 ${datadir}/gcr-3 \
42 ${systemd_user_unitdir}/gcr-ssh-agent.socket \
43 ${systemd_user_unitdir}/gcr-ssh-agent.service \
44"
45
46# http://errors.yoctoproject.org/Errors/Details/20229/
47ARM_INSTRUCTION_SET:armv4 = "arm"
48ARM_INSTRUCTION_SET:armv5 = "arm"
49ARM_INSTRUCTION_SET:armv6 = "arm"
50
51EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross"
52do_write_config:append() {
53 cat >${WORKDIR}/meson-${PN}.cross <<EOF
54[binaries]
55gpg2 = '${bindir}/gpg2'
56ssh-add = '${bindir}/ssh-add'
57ssh-agent = '${bindir}/ssh-agent'
58EOF
59}