Message ID | 20221130053450.95655-4-f_l_k@t-online.de |
---|---|
State | Accepted, archived |
Commit | 2dd272956f8a0450c998b584e27b75cfec00de22 |
Headers | show |
Series | [PATCHv8,1/4] graphene: import from meta-oe | expand |
Hello, This one broke: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/6249/steps/11/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/6164/steps/11/logs/stdio | Run-time dependency gcr-3 found: NO (tried pkgconfig) | | ../epiphany-42.4/meson.build:82:0: ERROR: Dependency "gcr-3" not found, tried pkgconfig | | A full log can be found at /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/epiphany/42.4-r0/build/meson-logs/meson-log.txt | WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated. | ERROR: meson failed | WARNING: exit code 1 from a shell command. On 30/11/2022 06:34:50+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> > --- > ...-add-options-to-set-ssh-binary-paths.patch | 60 +++++++++++++++++++ > ...ectly-handle-disabled-ssh_agent-opti.patch | 49 +++++++++++++++ > ...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 | 51 ++++++++++++++++ > 6 files changed, 166 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-gnome/gcr/gcr/0001-meson-add-options-to-set-ssh-binary-paths.patch > create mode 100644 meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch > 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-meson-add-options-to-set-ssh-binary-paths.patch b/meta/recipes-gnome/gcr/gcr/0001-meson-add-options-to-set-ssh-binary-paths.patch > new file mode 100644 > index 0000000000..cd3552464a > --- /dev/null > +++ b/meta/recipes-gnome/gcr/gcr/0001-meson-add-options-to-set-ssh-binary-paths.patch > @@ -0,0 +1,60 @@ > +From 89992bde916fe53dd737a5d678bc66dd51cd1f45 Mon Sep 17 00:00:00 2001 > +From: Markus Volk <f_l_k@t-online.de> > +Date: Mon, 28 Nov 2022 15:47:50 +0100 > +Subject: [PATCH] meson: add options to set ssh binary paths > + > +Signed-off-by: Markus Volk <f_l_k@t-online.de> > + > +Upstream-Status: Submitted [ https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/115/diffs?commit_id=f19dfa4fe0986f3f75b29f9c05cead59fe87cd19 ] > +--- > + meson.build | 11 +++++++++-- > + meson_options.txt | 10 ++++++++++ > + 2 files changed, 19 insertions(+), 2 deletions(-) > + > +diff --git a/meson.build b/meson.build > +index 11d7fa7..231d7e2 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -58,9 +58,16 @@ if p11_system_config_modules == '' > + error('Couldn\'t find location for pkcs11 module config') > + endif > + libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent')) > ++ > + if get_option('ssh_agent') > +- ssh_add_path = find_program('ssh-add').full_path() > +- ssh_agent_path = find_program('ssh-agent').full_path() > ++ ssh_add_path = get_option('ssh_add_path') > ++ ssh_agent_path = get_option('ssh_agent_path') > ++ if ssh_add_path == '' > ++ ssh_add_path = find_program('ssh-add').full_path() > ++ endif > ++ if ssh_agent_path == '' > ++ ssh_agent_path = find_program('ssh-agent').full_path() > ++ endif > + endif > + > + with_systemd = false > +diff --git a/meson_options.txt b/meson_options.txt > +index 6840e44..5355940 100644 > +--- a/meson_options.txt > ++++ b/meson_options.txt > +@@ -23,6 +23,16 @@ option('gpg_path', > + value: '', > + description: 'Path to gpg, autodetected if not set', > + ) > ++option('ssh_add_path', > ++ type: 'string', > ++ value: '', > ++ description: 'Path to ssh-add, autodetected if not set', > ++) > ++option('ssh_agent_path', > ++ type: 'string', > ++ value: '', > ++ description: 'Path to ssh-agent, autodetected if not set', > ++) > + option('ssh_agent', > + type: 'boolean', > + value: true, > +-- > +2.34.1 > + > diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch > new file mode 100644 > index 0000000000..940f78ebab > --- /dev/null > +++ b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch > @@ -0,0 +1,49 @@ > +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 > +@@ -58,8 +58,10 @@ if p11_system_config_modules == '' > + error('Couldn\'t find location for pkcs11 module config') > + endif > + libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent')) > +-ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path() > +-ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path() > ++if get_option('ssh_agent') > ++ ssh_add_path = find_program('ssh-add').full_path() > ++ ssh_agent_path = find_program('ssh-agent').full_path() > ++endif > + > + with_systemd = false > + libsystemd_deps = [] > +@@ -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/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..ff2f7978a9 > --- /dev/null > +++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb > @@ -0,0 +1,51 @@ > +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 += " \ > + file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch \ > + file://0001-meson-add-options-to-set-ssh-binary-paths.patch \ > +" > +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_add_path=${bindir}/ssh-add -Dssh_agent_path=${bindir}/ssh-agent,-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 += "-Dgpg_path=${bindir}/gpg2" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#173992): https://lists.openembedded.org/g/openembedded-core/message/173992 > Mute This Topic: https://lists.openembedded.org/mt/95352831/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Am Mi, 30. Nov 2022 um 16:52:34 +0100 schrieb Alexandre Belloni via
lists.openembedded.org
<alexandre.belloni=bootlin.com@lists.openembedded.org>:
> | Run-time dependency gcr-3 found: NO (tried pkgconfig)
Sent a patch for it
Last missing things: The following recipes do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file. gcr3 (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-gnome/gcr/gcr3_3.40.0.bb) gtk4 (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-gnome/gtk+/gtk4_4.6.7.bb) graphene (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-graphics/graphene/graphene_1.10.8.bb) libsass (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-support/sass/libsass_git.bb) sassc (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-support/sass/sassc_git.bb) The following recipes do not have a HOMEPAGE. Please add an entry for HOMEPAGE in the recipe. sassc (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-support/sass/sassc_git.bb) On 30/11/2022 16:58:34+0100, Markus Volk wrote: > Am Mi, 30. Nov 2022 um 16:52:34 +0100 schrieb Alexandre Belloni via > lists.openembedded.org > <alexandre.belloni=bootlin.com@lists.openembedded.org>: > > | Run-time dependency gcr-3 found: NO (tried pkgconfig) > > Sent a patch for it > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#174021): https://lists.openembedded.org/g/openembedded-core/message/174021 > Mute This Topic: https://lists.openembedded.org/mt/95352831/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
I would also request that you (Markus) run: devtool check-upgrade-status <list of newly added recipes> and verify that their upstream version check works properly. Alex On Wed, 30 Nov 2022 at 21:57, Alexandre Belloni via lists.openembedded.org <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote: > > Last missing things: > > The following recipes do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file. > gcr3 (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-gnome/gcr/gcr3_3.40.0.bb) > gtk4 (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-gnome/gtk+/gtk4_4.6.7.bb) > graphene (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-graphics/graphene/graphene_1.10.8.bb) > libsass (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-support/sass/libsass_git.bb) > sassc (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-support/sass/sassc_git.bb) > > The following recipes do not have a HOMEPAGE. Please add an entry for HOMEPAGE in the recipe. > sassc (/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/recipes-support/sass/sassc_git.bb) > > On 30/11/2022 16:58:34+0100, Markus Volk wrote: > > Am Mi, 30. Nov 2022 um 16:52:34 +0100 schrieb Alexandre Belloni via > > lists.openembedded.org > > <alexandre.belloni=bootlin.com@lists.openembedded.org>: > > > | Run-time dependency gcr-3 found: NO (tried pkgconfig) > > > > Sent a patch for it > > > > > > > > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#174029): https://lists.openembedded.org/g/openembedded-core/message/174029 > Mute This Topic: https://lists.openembedded.org/mt/95352831/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Am Mi, 30. Nov 2022 um 22:10:56 +0100 schrieb Alexander Kanavin
<alex.kanavin@gmail.com>:
> devtool check-upgrade-status <list of newly added recipes>
I never have used this feature but i checked and should now be working.
By the way it told me, that gtk4 needs to be updated, so I did, and
sorted the dependencies a little bit.
Luckily sassc-native is an outdated dependency. No need to add the sass
lang recipes to oe-core.
I disabled demo build, because the recently added node-editor has an
installed vs. shipped issue and even worse,
it has references to tmpdir in its binary.
Added some PACKAGECONFIG Options and enabled gstreamer by default,
because meson_options.txt contains:
# Media backends
# For distros: GTK guarantees support for WebM video (VP8 and VP9), so
a supported build
# should provide that.
Fixed install of the printbackends into its dynamic packages.
In gcr I have removed the patch for the ssh binary paths. Looks like
upstream wants this to be done with a meson.cross file.
I dont like that much, but at least better, than collection
inappropriate patches.
diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson-add-options-to-set-ssh-binary-paths.patch b/meta/recipes-gnome/gcr/gcr/0001-meson-add-options-to-set-ssh-binary-paths.patch new file mode 100644 index 0000000000..cd3552464a --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr/0001-meson-add-options-to-set-ssh-binary-paths.patch @@ -0,0 +1,60 @@ +From 89992bde916fe53dd737a5d678bc66dd51cd1f45 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 28 Nov 2022 15:47:50 +0100 +Subject: [PATCH] meson: add options to set ssh binary paths + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [ https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/115/diffs?commit_id=f19dfa4fe0986f3f75b29f9c05cead59fe87cd19 ] +--- + meson.build | 11 +++++++++-- + meson_options.txt | 10 ++++++++++ + 2 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 11d7fa7..231d7e2 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,9 +58,16 @@ if p11_system_config_modules == '' + error('Couldn\'t find location for pkcs11 module config') + endif + libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent')) ++ + if get_option('ssh_agent') +- ssh_add_path = find_program('ssh-add').full_path() +- ssh_agent_path = find_program('ssh-agent').full_path() ++ ssh_add_path = get_option('ssh_add_path') ++ ssh_agent_path = get_option('ssh_agent_path') ++ if ssh_add_path == '' ++ ssh_add_path = find_program('ssh-add').full_path() ++ endif ++ if ssh_agent_path == '' ++ ssh_agent_path = find_program('ssh-agent').full_path() ++ endif + endif + + with_systemd = false +diff --git a/meson_options.txt b/meson_options.txt +index 6840e44..5355940 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -23,6 +23,16 @@ option('gpg_path', + value: '', + description: 'Path to gpg, autodetected if not set', + ) ++option('ssh_add_path', ++ type: 'string', ++ value: '', ++ description: 'Path to ssh-add, autodetected if not set', ++) ++option('ssh_agent_path', ++ type: 'string', ++ value: '', ++ description: 'Path to ssh-agent, autodetected if not set', ++) + option('ssh_agent', + type: 'boolean', + value: true, +-- +2.34.1 + diff --git a/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch new file mode 100644 index 0000000000..940f78ebab --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch @@ -0,0 +1,49 @@ +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 +@@ -58,8 +58,10 @@ if p11_system_config_modules == '' + error('Couldn\'t find location for pkcs11 module config') + endif + libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent')) +-ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path() +-ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path() ++if get_option('ssh_agent') ++ ssh_add_path = find_program('ssh-add').full_path() ++ ssh_agent_path = find_program('ssh-agent').full_path() ++endif + + with_systemd = false + libsystemd_deps = [] +@@ -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/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..ff2f7978a9 --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr_4.0.0.bb @@ -0,0 +1,51 @@ +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 += " \ + file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch \ + file://0001-meson-add-options-to-set-ssh-binary-paths.patch \ +" +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_add_path=${bindir}/ssh-add -Dssh_agent_path=${bindir}/ssh-agent,-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 += "-Dgpg_path=${bindir}/gpg2"
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> --- ...-add-options-to-set-ssh-binary-paths.patch | 60 +++++++++++++++++++ ...ectly-handle-disabled-ssh_agent-opti.patch | 49 +++++++++++++++ ...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 | 51 ++++++++++++++++ 6 files changed, 166 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-gnome/gcr/gcr/0001-meson-add-options-to-set-ssh-binary-paths.patch create mode 100644 meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch 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