diff options
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch | 37 | ||||
-rw-r--r-- | meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch | 36 | ||||
-rw-r--r-- | meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 61 | ||||
-rw-r--r-- | meta/recipes-gnome/gcr/gcr3_3.41.1.bb (renamed from meta/recipes-gnome/gcr/gcr3_3.40.0.bb) | 19 |
4 files changed, 48 insertions, 105 deletions
diff --git a/meta/recipes-gnome/gcr/gcr3/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 deleted file mode 100644 index 81c4bdbbcc..0000000000 --- a/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From cb3708bad88e713e4ccf705cb8c14c5996cd9d06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Fri, 23 Apr 2021 16:32:38 +0800 | ||
4 | Subject: [PATCH] gcr/meson.build: fix one parallel build failure | ||
5 | |||
6 | ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing | ||
7 | dependency, following error occurred intermittently during doing parallel | ||
8 | build: | ||
9 | |||
10 | -o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c ../gcr-3.38.1/ui/gcr-live-search.c | ||
11 | ../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No such file or directory | ||
12 | 32 | #include "gcr/gcr-marshal.h" | ||
13 | | ^~~~~~~~~~~~~~~~~~~ | ||
14 | compilation terminated. | ||
15 | |||
16 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/68/diffs] | ||
17 | |||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | --- | ||
20 | gcr/meson.build | 1 + | ||
21 | 1 file changed, 1 insertion(+) | ||
22 | |||
23 | diff --git a/gcr/meson.build b/gcr/meson.build | ||
24 | index 06c3a63..d9d4b8f 100644 | ||
25 | --- a/gcr/meson.build | ||
26 | +++ b/gcr/meson.build | ||
27 | @@ -181,6 +181,7 @@ gcr_base_dep = declare_dependency( | ||
28 | sources: [ | ||
29 | gcr_enums_gen[1], | ||
30 | gcr_oids[1], | ||
31 | + gcr_marshal_gen[1], | ||
32 | ], | ||
33 | ) | ||
34 | |||
35 | -- | ||
36 | 2.17.1 | ||
37 | |||
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 new file mode 100644 index 0000000000..d3c26d97ae --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 16 Nov 2022 11:27:24 +0100 | ||
4 | Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option | ||
5 | |||
6 | Existing 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 | |||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | |||
12 | Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] | ||
13 | --- | ||
14 | meson.build | 12 ++++++++---- | ||
15 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index 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 | -- | ||
35 | 2.34.1 | ||
36 | |||
diff --git a/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch deleted file mode 100644 index ae4e2ac1eb..0000000000 --- a/meta/recipes-gnome/gcr/gcr3/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jakub Jirutka <jakub@jirutka.cz> | ||
3 | Date: Wed, 12 Jan 2022 00:24:20 +0100 | ||
4 | Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir | ||
5 | |||
6 | This argument has been removed in Meson 0.61.0: | ||
7 | |||
8 | gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" | ||
9 | |||
10 | https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: | ||
11 | |||
12 | > The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. | ||
13 | |||
14 | Fixes #89 | ||
15 | Upstream-Status: Backport | ||
16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
17 | --- | ||
18 | gck/meson.build | 1 - | ||
19 | gcr/meson.build | 1 - | ||
20 | ui/meson.build | 1 - | ||
21 | 3 files changed, 3 deletions(-) | ||
22 | |||
23 | diff --git a/gck/meson.build b/gck/meson.build | ||
24 | index 756b486..a21a1e9 100644 | ||
25 | --- a/gck/meson.build | ||
26 | +++ b/gck/meson.build | ||
27 | @@ -131,7 +131,6 @@ if get_option('introspection') | ||
28 | sources: gck_gir_sources, | ||
29 | namespace: 'Gck', | ||
30 | nsversion: '@0@'.format(gck_major_version), | ||
31 | - packages: gck_deps, | ||
32 | export_packages: 'gck-@0@'.format(gck_major_version), | ||
33 | includes: [ 'GObject-2.0', 'Gio-2.0' ], | ||
34 | header: 'gck/gck.h', | ||
35 | diff --git a/gcr/meson.build b/gcr/meson.build | ||
36 | index 2233a44..c83641b 100644 | ||
37 | --- a/gcr/meson.build | ||
38 | +++ b/gcr/meson.build | ||
39 | @@ -190,7 +190,6 @@ if get_option('introspection') | ||
40 | sources: [ gcr_base_public_sources, gcr_base_headers ], | ||
41 | namespace: 'Gcr', | ||
42 | nsversion: '@0@'.format(gcr_major_version), | ||
43 | - packages: gcr_base_deps, | ||
44 | export_packages: 'gcr-base-@0@'.format(gcr_major_version), | ||
45 | includes: [ | ||
46 | 'GObject-2.0', | ||
47 | diff --git a/ui/meson.build b/ui/meson.build | ||
48 | index e656ea2..32ee057 100644 | ||
49 | --- a/ui/meson.build | ||
50 | +++ b/ui/meson.build | ||
51 | @@ -152,7 +152,6 @@ if get_option('introspection') | ||
52 | export_packages: 'gcr-ui-@0@'.format(gcr_major_version), | ||
53 | identifier_prefix: 'Gcr', | ||
54 | symbol_prefix: 'gcr', | ||
55 | - packages: gcr_ui_deps, | ||
56 | includes: [ | ||
57 | 'GObject-2.0', | ||
58 | 'Gio-2.0', | ||
59 | -- | ||
60 | GitLab | ||
61 | |||
diff --git a/meta/recipes-gnome/gcr/gcr3_3.40.0.bb b/meta/recipes-gnome/gcr/gcr3_3.41.1.bb index 8d0f1e972a..ba5660a5ed 100644 --- a/meta/recipes-gnome/gcr/gcr3_3.40.0.bb +++ b/meta/recipes-gnome/gcr/gcr3_3.41.1.bb | |||
@@ -17,27 +17,30 @@ CFLAGS += "-D_GNU_SOURCE" | |||
17 | 17 | ||
18 | GNOMEBASEBUILDCLASS = "meson" | 18 | GNOMEBASEBUILDCLASS = "meson" |
19 | GTKDOC_MESON_OPTION = "gtk_doc" | 19 | GTKDOC_MESON_OPTION = "gtk_doc" |
20 | inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg | 20 | inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg |
21 | UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar" | 21 | UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar" |
22 | 22 | ||
23 | SRC_URI = " \ | 23 | SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" |
24 | https://download.gnome.org/sources/gcr/3.40/gcr-${PV}.tar.xz;name=archive \ | 24 | SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" |
25 | file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \ | 25 | SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f" |
26 | file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch" | ||
27 | |||
28 | SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5" | ||
29 | 26 | ||
30 | S = "${WORKDIR}/gcr-${PV}" | 27 | S = "${WORKDIR}/gcr-${PV}" |
31 | 28 | ||
32 | PACKAGECONFIG ??= " \ | 29 | PACKAGECONFIG ??= " \ |
30 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | ||
33 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ | 31 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ |
34 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ | 32 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ |
35 | " | 33 | " |
36 | PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk+3" | 34 | PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk+3" |
35 | PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh" | ||
36 | #'Use systemd socket activation for server programs' | ||
37 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" | ||
37 | 38 | ||
38 | FILES:${PN} += " \ | 39 | FILES:${PN} += " \ |
39 | ${datadir}/dbus-1 \ | 40 | ${datadir}/dbus-1 \ |
40 | ${datadir}/gcr-3 \ | 41 | ${datadir}/gcr-3 \ |
42 | ${systemd_user_unitdir}/gcr-ssh-agent.socket \ | ||
43 | ${systemd_user_unitdir}/gcr-ssh-agent.service \ | ||
41 | " | 44 | " |
42 | 45 | ||
43 | # http://errors.yoctoproject.org/Errors/Details/20229/ | 46 | # http://errors.yoctoproject.org/Errors/Details/20229/ |
@@ -50,5 +53,7 @@ do_write_config:append() { | |||
50 | cat >${WORKDIR}/meson-${PN}.cross <<EOF | 53 | cat >${WORKDIR}/meson-${PN}.cross <<EOF |
51 | [binaries] | 54 | [binaries] |
52 | gpg2 = '${bindir}/gpg2' | 55 | gpg2 = '${bindir}/gpg2' |
56 | ssh-add = '${bindir}/ssh-add' | ||
57 | ssh-agent = '${bindir}/ssh-agent' | ||
53 | EOF | 58 | EOF |
54 | } | 59 | } |