gcr3: remove recipe

It will be added to meta-gnome

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>

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index d921ed0e2265bdd1be123aadfaecc905dabb7978..835ff7b5793fe6e17f6eec32702d511daf3cb1b7 100644 (file)
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -189,7 +189,6 @@ RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gcc-source-13.2.0 = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>"
-RECIPE_MAINTAINER:pn-gcr3 = "Markus Volk <f_l_k@t-online.de>"
 RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>"
 RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gdb-cross-${TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>"

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 (file)
index d3c26d9..0000000
--- a/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9b67bb18d8409e0e693cc6000507acbd73a30eab 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
-
-Existing code produces these errors:
-| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program
-| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path".
-
-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(-)
-
-diff --git a/meson.build b/meson.build
-index 3f35173..11d7fa7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -96,8 +98,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())
--conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
--conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
-+if get_option('ssh_agent')
-+  conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
-+  conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
-+endif
- conf.set10('WITH_SYSTEMD', with_systemd)
- config_file = configure_file(
-   output: 'config.h',
--- 
-2.34.1
-

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 (file)
index ba5660a..0000000
--- a/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "A library for bits of crypto UI and parsing etc"
-DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \
-accessing key stores. It also provides the viewer for crypto files on the \
-GNOME desktop."
-HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr"
-BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \
-           ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
-
-CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-GNOMEBASEBUILDCLASS = "meson"
-GTKDOC_MESON_OPTION = "gtk_doc"
-inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
-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"
-
-S = "${WORKDIR}/gcr-${PV}"
-
-PACKAGECONFIG ??= " \
-       ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
-       ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
-       ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
-"
-PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk+3"
-PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh"
-#'Use systemd socket activation for server programs'
-PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
-
-FILES:${PN} += " \
-    ${datadir}/dbus-1 \
-    ${datadir}/gcr-3 \
-    ${systemd_user_unitdir}/gcr-ssh-agent.socket \
-    ${systemd_user_unitdir}/gcr-ssh-agent.service \
-"
-
-# http://errors.yoctoproject.org/Errors/Details/20229/
-ARM_INSTRUCTION_SET:armv4 = "arm"
-ARM_INSTRUCTION_SET:armv5 = "arm"
-ARM_INSTRUCTION_SET:armv6 = "arm"
-
-EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross"
-do_write_config:append() {
-    cat >${WORKDIR}/meson-${PN}.cross <<EOF
-[binaries]
-gpg2 = '${bindir}/gpg2'
-ssh-add = '${bindir}/ssh-add'
-ssh-agent = '${bindir}/ssh-agent'
-EOF
-}