* [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
@ 2022-11-28 11:22 Markus Volk
2022-11-28 11:25 ` Markus Volk
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Markus Volk @ 2022-11-28 11:22 UTC (permalink / raw)
To: openembedded-core; +Cc: Markus Volk
gcr-3 recipe is still needed for gnome projects that stick to gtk+3, rename to gcr3.
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
...build-fix-one-parallel-build-failure.patch | 0
...1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 0
.../gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} | 8 ++-
meta/recipes-gnome/gcr/gcr_4.0.0.bb | 58 +++++++++++++++++++
4 files changed, 64 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gcr/{gcr => gcr3}/0001-gcr-meson.build-fix-one-parallel-build-failure.patch (100%)
rename meta/recipes-gnome/gcr/{gcr => gcr3}/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch (100%)
rename meta/recipes-gnome/gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} (87%)
create mode 100644 meta/recipes-gnome/gcr/gcr_4.0.0.bb
diff --git a/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
similarity index 100%
rename from meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
rename to meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
diff --git a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
similarity index 100%
rename from meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
rename to meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
diff --git a/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
similarity index 87%
rename from meta/recipes-gnome/gcr/gcr_3.40.0.bb
rename to meta/recipes-gnome/gcr/gcr3_3.40.0.bb
index 917be5938b..5318768db6 100644
--- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb
+++ b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
@@ -20,11 +20,15 @@ GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
-SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \
- file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
+SRC_URI = " \
+ https://download.gnome.org/sources/gcr/3.40/gcr-${PV}.tar.xz;name=archive \
+ file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \
+ file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5"
+S = "${WORKDIR}/gcr-${PV}"
+
PACKAGECONFIG ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
diff --git a/meta/recipes-gnome/gcr/gcr_4.0.0.bb b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
new file mode 100644
index 0000000000..4dede60544
--- /dev/null
+++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
@@ -0,0 +1,58 @@
+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 gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
+UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
+
+SRC_URI[archive.sha256sum] = "c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c"
+
+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] = "-Dgtk4=true,-Dgtk4=false,gtk4"
+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-4 \
+ ${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'
+EOF
+}
+
+do_configure:prepend() {
+ sed -i "s|ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path()|ssh_add_path = '${bindir}/ssh-add'|" ${S}/meson.build
+ sed -i "s|ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path()|ssh_agent_path = '${bindir}/ssh-agent'|" ${S}/meson.build
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
2022-11-28 11:22 [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4 Markus Volk
@ 2022-11-28 11:25 ` Markus Volk
2022-11-28 11:28 ` Alexander Kanavin
[not found] ` <172BBC1E4D879E7E.11309@lists.openembedded.org>
2 siblings, 0 replies; 13+ messages in thread
From: Markus Volk @ 2022-11-28 11:25 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 6905 bytes --]
libsecret dependency has been moved to PACKAGECONFIG since its only
needed for the 'ssh_agent'
added the ssh_agent service files to FILES:${PN} to avoid an error if
ssh_agent PACKAGECONFIG is selected:
ERROR: gcr-4.0.0-r0 do_package: QA Issue: gcr: Files/directories were
installed but not shipped in any package:
/usr/lib/systemd
/usr/lib/systemd/user
/usr/lib/systemd/user/gcr-ssh-agent.socket
/usr/lib/systemd/user/gcr-ssh-agent.service
Am Mo, 28. Nov 2022 um 12:22:32 +0100 schrieb Markus Volk
<f_l_k@t-online.de>:
> gcr-3 recipe is still needed for gnome projects that stick to gtk+3,
> rename to gcr3.
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de
> <mailto:f_l_k@t-online.de>>
> ---
> ...build-fix-one-parallel-build-failure.patch | 0
> ...1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 0
> .../gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} | 8 ++-
> meta/recipes-gnome/gcr/gcr_4.0.0.bb | 58
> +++++++++++++++++++
> 4 files changed, 64 insertions(+), 2 deletions(-)
> rename meta/recipes-gnome/gcr/{gcr =>
> gcr3}/0001-gcr-meson.build-fix-one-parallel-build-failure.patch (100%)
> rename meta/recipes-gnome/gcr/{gcr =>
> gcr3}/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch (100%)
> rename meta/recipes-gnome/gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} (87%)
> create mode 100644 meta/recipes-gnome/gcr/gcr_4.0.0.bb
>
> diff --git
> a/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> similarity index 100%
> rename from
> meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> rename to
> meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> diff --git
> a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
> b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
> similarity index 100%
> rename from
> meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
> rename to
> meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
> diff --git a/meta/recipes-gnome/gcr/gcr_3.40.0.bb
> b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> similarity index 87%
> rename from meta/recipes-gnome/gcr/gcr_3.40.0.bb
> rename to meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> index 917be5938b..5318768db6 100644
> --- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb
> +++ b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> @@ -20,11 +20,15 @@ GTKDOC_MESON_OPTION = "gtk_doc"
> inherit gnomebase gtk-icon-cache gtk-doc features_check
> upstream-version-is-even vala gobject-introspection gettext mime
> mime-xdg
> UPSTREAM_CHECK_REGEX =
> "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
>
> -SRC_URI +=
> "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> <file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch/> \
> - file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
> <file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch/>
> +SRC_URI = " \
> + https://download.gnome.org/sources/gcr/3.40/gcr-${PV}.tar.xz;name=archive
> <https://download.gnome.org/sources/gcr/3.40/gcr-$%7BPV%7D.tar.xz;name=archive>
> \
> + file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> <file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch/> \
> + file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
> <file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch/>
>
> SRC_URI[archive.sha256sum] =
> "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5"
>
> +S = "${WORKDIR}/gcr-${PV}"
> +
> PACKAGECONFIG ??= " \
> ${@bb.utils.contains
> <mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'x11', 'gtk', '',
> d)} \
> ${@bb.utils.contains
> <mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'wayland', 'gtk',
> '', d)} \
> diff --git a/meta/recipes-gnome/gcr/gcr_4.0.0.bb
> b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
> new file mode 100644
> index 0000000000..4dede60544
> --- /dev/null
> +++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
> @@ -0,0 +1,58 @@
> +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"
> <file://copying;md5=55ca817ccb7d5b5b66355690e9abc605/>
> +
> +DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \
> + ${@bb.utils.contains
> <mailto:${@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 gtk-doc features_check
> upstream-version-is-even vala gobject-introspection gettext mime
> mime-xdg
> +UPSTREAM_CHECK_REGEX =
> "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
> +
> +SRC_URI[archive.sha256sum] =
> "c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c"
> +
> +PACKAGECONFIG ??= " \
> + ${@bb.utils.filter <mailto:${@bb.utils.filter>('DISTRO_FEATURES',
> 'systemd', d)} \
> + ${@bb.utils.contains
> <mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'x11', 'gtk', '',
> d)} \
> + ${@bb.utils.contains
> <mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'wayland', 'gtk',
> '', d)} \
> +"
> +PACKAGECONFIG[gtk] = "-Dgtk4=true,-Dgtk4=false,gtk4"
> +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-4 \
> + ${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'
> +EOF
> +}
> +
> +do_configure:prepend() {
> + sed -i "s|ssh_add_path = find_program('ssh-add', required:
> get_option('ssh_agent')).full_path()|ssh_add_path =
> '${bindir}/ssh-add'|" ${S}/meson.build
> + sed -i "s|ssh_agent_path = find_program('ssh-agent', required:
> get_option('ssh_agent')).full_path()|ssh_agent_path =
> '${bindir}/ssh-agent'|" ${S}/meson.build
> +}
> --
> 2.34.1
>
[-- Attachment #2: Type: text/html, Size: 7235 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
2022-11-28 11:22 [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4 Markus Volk
2022-11-28 11:25 ` Markus Volk
@ 2022-11-28 11:28 ` Alexander Kanavin
2022-11-28 11:42 ` Markus Volk
[not found] ` <172BBC1E4D879E7E.11309@lists.openembedded.org>
2 siblings, 1 reply; 13+ messages in thread
From: Alexander Kanavin @ 2022-11-28 11:28 UTC (permalink / raw)
To: Markus Volk; +Cc: openembedded-core
On Mon, 28 Nov 2022 at 12:22, Markus Volk <f_l_k@t-online.de> wrote:
> +do_configure:prepend() {
> + sed -i "s|ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path()|ssh_add_path = '${bindir}/ssh-add'|" ${S}/meson.build
> + sed -i "s|ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path()|ssh_agent_path = '${bindir}/ssh-agent'|" ${S}/meson.build
> +}
This needs to be explained. And we need to find a better way to do it,
preferably one that is acceptable upstream.
Alex
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
2022-11-28 11:28 ` Alexander Kanavin
@ 2022-11-28 11:42 ` Markus Volk
2022-11-28 11:45 ` Alexander Kanavin
0 siblings, 1 reply; 13+ messages in thread
From: Markus Volk @ 2022-11-28 11:42 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
Am Mo, 28. Nov 2022 um 12:28:31 +0100 schrieb Alexander Kanavin
<alex.kanavin@gmail.com>:
> This needs to be explained. And we need to find a better way to do it,
> preferably one that is acceptable upstream.
Now thats somehow problematic. I had this issue also with seahorse,
that wants to know at build time what targets ssh-keygen path would be.
We need a way to look for the targets ssh binary paths but since
openssh for whatever reason doesn't support pkgconfig i guess we are
forced to hack it.
Another possibility would be to add an openssh-native recipe. I sent a
patch for that but it was rejected for valid reasons.
[-- Attachment #2: Type: text/html, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
2022-11-28 11:42 ` Markus Volk
@ 2022-11-28 11:45 ` Alexander Kanavin
2022-11-28 12:07 ` Markus Volk
0 siblings, 1 reply; 13+ messages in thread
From: Alexander Kanavin @ 2022-11-28 11:45 UTC (permalink / raw)
To: Markus Volk; +Cc: openembedded-core
For gcr I suppose we can just disable the ssh stuff if it's not
strictly required.
Alex
On Mon, 28 Nov 2022 at 12:42, Markus Volk <f_l_k@t-online.de> wrote:
>
> Am Mo, 28. Nov 2022 um 12:28:31 +0100 schrieb Alexander Kanavin <alex.kanavin@gmail.com>:
>
> This needs to be explained. And we need to find a better way to do it, preferably one that is acceptable upstream.
>
>
> Now thats somehow problematic. I had this issue also with seahorse, that wants to know at build time what targets ssh-keygen path would be. We need a way to look for the targets ssh binary paths but since openssh for whatever reason doesn't support pkgconfig i guess we are forced to hack it.
> Another possibility would be to add an openssh-native recipe. I sent a patch for that but it was rejected for valid reasons.
^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <172BBC1E4D879E7E.11309@lists.openembedded.org>]
* Re: [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
[not found] ` <172BBC1E4D879E7E.11309@lists.openembedded.org>
@ 2022-11-28 11:32 ` Alexander Kanavin
0 siblings, 0 replies; 13+ messages in thread
From: Alexander Kanavin @ 2022-11-28 11:32 UTC (permalink / raw)
To: alex.kanavin; +Cc: Markus Volk, openembedded-core
Ah is it the same issue? Then please backport.
https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/114
Alex
On Mon, 28 Nov 2022 at 12:28, Alexander Kanavin via
lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
wrote:
>
> On Mon, 28 Nov 2022 at 12:22, Markus Volk <f_l_k@t-online.de> wrote:
>
> > +do_configure:prepend() {
> > + sed -i "s|ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path()|ssh_add_path = '${bindir}/ssh-add'|" ${S}/meson.build
> > + sed -i "s|ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path()|ssh_agent_path = '${bindir}/ssh-agent'|" ${S}/meson.build
> > +}
>
> This needs to be explained. And we need to find a better way to do it,
> preferably one that is acceptable upstream.
>
> Alex
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#173908): https://lists.openembedded.org/g/openembedded-core/message/173908
> Mute This Topic: https://lists.openembedded.org/mt/95287600/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
@ 2022-11-27 12:27 Markus Volk
2022-11-27 19:11 ` Alexandre Belloni
0 siblings, 1 reply; 13+ messages in thread
From: Markus Volk @ 2022-11-27 12:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Markus Volk
gcr-3 recipe is still needed for gnome projects that stick to gtk+3, rename to gcr3.
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
...build-fix-one-parallel-build-failure.patch | 0
...1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 0
.../gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} | 8 ++-
meta/recipes-gnome/gcr/gcr_4.0.0.bb | 56 +++++++++++++++++++
4 files changed, 62 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gcr/{gcr => gcr3}/0001-gcr-meson.build-fix-one-parallel-build-failure.patch (100%)
rename meta/recipes-gnome/gcr/{gcr => gcr3}/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch (100%)
rename meta/recipes-gnome/gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} (87%)
create mode 100644 meta/recipes-gnome/gcr/gcr_4.0.0.bb
diff --git a/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
similarity index 100%
rename from meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
rename to meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
diff --git a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
similarity index 100%
rename from meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
rename to meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
diff --git a/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
similarity index 87%
rename from meta/recipes-gnome/gcr/gcr_3.40.0.bb
rename to meta/recipes-gnome/gcr/gcr3_3.40.0.bb
index 917be5938b..5318768db6 100644
--- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb
+++ b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
@@ -20,11 +20,15 @@ GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
-SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \
- file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
+SRC_URI = " \
+ https://download.gnome.org/sources/gcr/3.40/gcr-${PV}.tar.xz;name=archive \
+ file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \
+ file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5"
+S = "${WORKDIR}/gcr-${PV}"
+
PACKAGECONFIG ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
diff --git a/meta/recipes-gnome/gcr/gcr_4.0.0.bb b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
new file mode 100644
index 0000000000..fafc85e6a3
--- /dev/null
+++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
@@ -0,0 +1,56 @@
+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 libsecret \
+ ${@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 gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
+UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
+
+SRC_URI[archive.sha256sum] = "c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c"
+
+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] = "-Dgtk4=true,-Dgtk4=false,gtk4"
+PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,,openssh"
+#'Use systemd socket activation for server programs'
+PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
+
+FILES:${PN} += " \
+ ${datadir}/dbus-1 \
+ ${datadir}/gcr-4 \
+"
+
+# 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'
+EOF
+}
+
+do_configure:prepend() {
+ sed -i "s|ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path()|ssh_add_path = '${bindir}/ssh-add'|" ${S}/meson.build
+ sed -i "s|ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path()|ssh_agent_path = '${bindir}/ssh-agent'|" ${S}/meson.build
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4
2022-11-27 12:27 Markus Volk
@ 2022-11-27 19:11 ` Alexandre Belloni
2022-11-27 19:38 ` Markus Volk
0 siblings, 1 reply; 13+ messages in thread
From: Alexandre Belloni @ 2022-11-27 19:11 UTC (permalink / raw)
To: Markus Volk; +Cc: openembedded-core
Hello,
This causes:
stdio: WARNING: Nothing PROVIDES 'gtk4' (but /home/pokybuild/yocto-worker/a-full/build/meta/recipes-gnome/gcr/gcr_4.0.0.bb DEPENDS on or otherwise requires it)
stdio: WARNING: Nothing RPROVIDES 'gcr' (but /home/pokybuild/yocto-worker/a-full/build/meta/recipes-gnome/gcr/gcr_4.0.0.bb RDEPENDS on or otherwise requires it)
stdio: WARNING: Nothing RPROVIDES 'gcr-dev' (but /home/pokybuild/yocto-worker/a-full/build/meta/recipes-gnome/gcr/gcr_4.0.0.bb RDEPENDS on or otherwise requires it)
On 27/11/2022 13:27:44+0100, Markus Volk wrote:
> gcr-3 recipe is still needed for gnome projects that stick to gtk+3, rename to gcr3.
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
> ...build-fix-one-parallel-build-failure.patch | 0
> ...1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 0
> .../gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} | 8 ++-
> meta/recipes-gnome/gcr/gcr_4.0.0.bb | 56 +++++++++++++++++++
> 4 files changed, 62 insertions(+), 2 deletions(-)
> rename meta/recipes-gnome/gcr/{gcr => gcr3}/0001-gcr-meson.build-fix-one-parallel-build-failure.patch (100%)
> rename meta/recipes-gnome/gcr/{gcr => gcr3}/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch (100%)
> rename meta/recipes-gnome/gcr/{gcr_3.40.0.bb => gcr3_3.40.0.bb} (87%)
> create mode 100644 meta/recipes-gnome/gcr/gcr_4.0.0.bb
>
> diff --git a/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> similarity index 100%
> rename from meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> rename to meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
> diff --git a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
> similarity index 100%
> rename from meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
> rename to meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
> diff --git a/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> similarity index 87%
> rename from meta/recipes-gnome/gcr/gcr_3.40.0.bb
> rename to meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> index 917be5938b..5318768db6 100644
> --- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb
> +++ b/meta/recipes-gnome/gcr/gcr3_3.40.0.bb
> @@ -20,11 +20,15 @@ GTKDOC_MESON_OPTION = "gtk_doc"
> inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
> UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
>
> -SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \
> - file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
> +SRC_URI = " \
> + https://download.gnome.org/sources/gcr/3.40/gcr-${PV}.tar.xz;name=archive \
> + file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \
> + file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
>
> SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5"
>
> +S = "${WORKDIR}/gcr-${PV}"
> +
> PACKAGECONFIG ??= " \
> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
> diff --git a/meta/recipes-gnome/gcr/gcr_4.0.0.bb b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
> new file mode 100644
> index 0000000000..fafc85e6a3
> --- /dev/null
> +++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb
> @@ -0,0 +1,56 @@
> +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 libsecret \
> + ${@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 gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
> +UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
> +
> +SRC_URI[archive.sha256sum] = "c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c"
> +
> +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] = "-Dgtk4=true,-Dgtk4=false,gtk4"
> +PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,,openssh"
> +#'Use systemd socket activation for server programs'
> +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
> +
> +FILES:${PN} += " \
> + ${datadir}/dbus-1 \
> + ${datadir}/gcr-4 \
> +"
> +
> +# 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'
> +EOF
> +}
> +
> +do_configure:prepend() {
> + sed -i "s|ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path()|ssh_add_path = '${bindir}/ssh-add'|" ${S}/meson.build
> + sed -i "s|ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path()|ssh_agent_path = '${bindir}/ssh-agent'|" ${S}/meson.build
> +}
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#173839): https://lists.openembedded.org/g/openembedded-core/message/173839
> Mute This Topic: https://lists.openembedded.org/mt/95287600/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-11-28 13:34 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-28 11:22 [oe-core][PATCHv2] gcr: add recipe for gcr-4, needed to build with gtk4 Markus Volk
2022-11-28 11:25 ` Markus Volk
2022-11-28 11:28 ` Alexander Kanavin
2022-11-28 11:42 ` Markus Volk
2022-11-28 11:45 ` Alexander Kanavin
2022-11-28 12:07 ` Markus Volk
2022-11-28 13:13 ` Alexander Kanavin
2022-11-28 13:34 ` Markus Volk
[not found] ` <172BBC1E4D879E7E.11309@lists.openembedded.org>
2022-11-28 11:32 ` Alexander Kanavin
-- strict thread matches above, loose matches on Subject: below --
2022-11-27 12:27 Markus Volk
2022-11-27 19:11 ` Alexandre Belloni
2022-11-27 19:38 ` Markus Volk
2022-11-27 20:35 ` Alexander Kanavin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.