diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-19 11:40:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-20 11:57:28 +0000 |
commit | 80a6e76eb4cac62721a1a7d63f17bcaab25a6550 (patch) | |
tree | d93fd70a4bda8c7c6a390f0a8a425e0ec5550a52 /meta/recipes-gnome/gcr | |
parent | bc0c43cf16d846187e8069938222261fc1838f5f (diff) | |
download | poky-80a6e76eb4cac62721a1a7d63f17bcaab25a6550.tar.gz |
meson: update 0.60.3 -> 0.61.1
Backport patches to epiphany/gcr/g-i to address failures with new meson.
(From OE-Core rev: 2ab302edc33681f94b2cd85b564f6feebe154392)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gcr')
-rw-r--r-- | meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | 61 | ||||
-rw-r--r-- | meta/recipes-gnome/gcr/gcr_3.40.0.bb | 3 |
2 files changed, 63 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch new file mode 100644 index 0000000000..ae4e2ac1eb --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch | |||
@@ -0,0 +1,61 @@ | |||
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/gcr_3.40.0.bb b/meta/recipes-gnome/gcr/gcr_3.40.0.bb index a05e753ee9..d617454058 100644 --- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.40.0.bb | |||
@@ -17,7 +17,8 @@ GNOMEBASEBUILDCLASS = "meson" | |||
17 | GTKDOC_MESON_OPTION = "gtk_doc" | 17 | GTKDOC_MESON_OPTION = "gtk_doc" |
18 | inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg | 18 | inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg |
19 | 19 | ||
20 | SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch" | 20 | SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \ |
21 | file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch" | ||
21 | 22 | ||
22 | SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5" | 23 | SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5" |
23 | 24 | ||