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 | |
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')
6 files changed, 319 insertions, 1 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_41.3.bb b/meta/recipes-gnome/epiphany/epiphany_41.3.bb index 634ba8a1b9..befd817165 100644 --- a/meta/recipes-gnome/epiphany/epiphany_41.3.bb +++ b/meta/recipes-gnome/epiphany/epiphany_41.3.bb | |||
@@ -24,6 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" | |||
24 | 24 | ||
25 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 25 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ |
26 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ | 26 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ |
27 | file://bfbb5f7bab38301d8a4a444173acdae8d9692146.patch \ | ||
27 | file://migrator.patch \ | 28 | file://migrator.patch \ |
28 | file://distributor.patch \ | 29 | file://distributor.patch \ |
29 | " | 30 | " |
diff --git a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch b/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch new file mode 100644 index 0000000000..f20975c3bd --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 | ||
2 | From: rvalue <i@rvalue.moe> | ||
3 | Date: Wed, 24 Nov 2021 04:52:42 +0000 | ||
4 | Subject: [PATCH] Remove incorrect args for i18n.merge_file | ||
5 | |||
6 | Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031> | ||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | data/meson.build | 2 -- | ||
11 | 1 file changed, 2 deletions(-) | ||
12 | |||
13 | diff --git a/data/meson.build b/data/meson.build | ||
14 | index 46df3fd80..eac6b8224 100644 | ||
15 | --- a/data/meson.build | ||
16 | +++ b/data/meson.build | ||
17 | @@ -16,7 +16,6 @@ install_data( | ||
18 | desktop_conf = configuration_data() | ||
19 | desktop_conf.set('icon', application_id) | ||
20 | desktop = i18n.merge_file( | ||
21 | - 'desktop', | ||
22 | input: configure_file( | ||
23 | input: files('org.gnome.Epiphany.desktop.in.in'), | ||
24 | output: 'org.gnome.Epiphany.desktop.in', | ||
25 | @@ -32,7 +31,6 @@ desktop = i18n.merge_file( | ||
26 | appdata_conf = configuration_data() | ||
27 | appdata_conf.set('appid', application_id) | ||
28 | appdata = i18n.merge_file( | ||
29 | - 'appdata', | ||
30 | input: configure_file( | ||
31 | input: files('org.gnome.Epiphany.appdata.xml.in.in'), | ||
32 | output: 'org.gnome.Epiphany.appdata.xml.in', | ||
33 | -- | ||
34 | GitLab | ||
35 | |||
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 | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-build-Avoid-the-doctemplates-hack.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-build-Avoid-the-doctemplates-hack.patch new file mode 100644 index 0000000000..b7d31ccfb0 --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-build-Avoid-the-doctemplates-hack.patch | |||
@@ -0,0 +1,219 @@ | |||
1 | From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Emmanuele Bassi <ebassi@gnome.org> | ||
3 | Date: Tue, 11 Jan 2022 15:51:10 +0000 | ||
4 | Subject: [PATCH] build: Avoid the doctemplates hack | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | The hack that copies the doctemplates directory into the build | ||
10 | directory has stopped working with newer versions of Meson; while it's | ||
11 | possible to copy files, custom_target() cannot depend on a directory. | ||
12 | Additionally, the dependency has always been broken. | ||
13 | |||
14 | Instead, we enumerate the template files—after all, it's not like they | ||
15 | change a lot—and then we list them as dependencies for the test targets. | ||
16 | |||
17 | Fixes: #414 | ||
18 | Upstream-Status: Backport | ||
19 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
20 | --- | ||
21 | giscanner/doctemplates/devdocs/meson.build | 19 +++++++ | ||
22 | giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ | ||
23 | giscanner/meson.build | 14 ++--- | ||
24 | tests/scanner/meson.build | 24 +++++---- | ||
25 | 4 files changed, 98 insertions(+), 22 deletions(-) | ||
26 | create mode 100644 giscanner/doctemplates/devdocs/meson.build | ||
27 | create mode 100644 giscanner/doctemplates/mallard/meson.build | ||
28 | |||
29 | diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build | ||
30 | new file mode 100644 | ||
31 | index 00000000..2037182a | ||
32 | --- /dev/null | ||
33 | +++ b/giscanner/doctemplates/devdocs/meson.build | ||
34 | @@ -0,0 +1,19 @@ | ||
35 | +doc_templates += files([ | ||
36 | + 'Gjs/_doc.tmpl', | ||
37 | + 'Gjs/_index.tmpl', | ||
38 | + 'Gjs/_method.tmpl', | ||
39 | + 'Gjs/_methods.tmpl', | ||
40 | + 'Gjs/_properties.tmpl', | ||
41 | + 'Gjs/_signals.tmpl', | ||
42 | + 'Gjs/_staticmethods.tmpl', | ||
43 | + 'Gjs/_vfuncs.tmpl', | ||
44 | + 'Gjs/base.tmpl', | ||
45 | + 'Gjs/callback.tmpl', | ||
46 | + 'Gjs/class.tmpl', | ||
47 | + 'Gjs/default.tmpl', | ||
48 | + 'Gjs/enum.tmpl', | ||
49 | + 'Gjs/function.tmpl', | ||
50 | + 'Gjs/interface.tmpl', | ||
51 | + 'Gjs/method.tmpl', | ||
52 | + 'Gjs/namespace.tmpl', | ||
53 | +]) | ||
54 | diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build | ||
55 | new file mode 100644 | ||
56 | index 00000000..5fe4e2af | ||
57 | --- /dev/null | ||
58 | +++ b/giscanner/doctemplates/mallard/meson.build | ||
59 | @@ -0,0 +1,63 @@ | ||
60 | +base_templates = files([ | ||
61 | + 'base.tmpl', | ||
62 | + 'class.tmpl', | ||
63 | + 'namespace.tmpl', | ||
64 | +]) | ||
65 | + | ||
66 | +c_templates = files([ | ||
67 | + 'C/callback.tmpl', | ||
68 | + 'C/class.tmpl', | ||
69 | + 'C/constructor.tmpl', | ||
70 | + 'C/default.tmpl', | ||
71 | + 'C/enum.tmpl', | ||
72 | + 'C/field.tmpl', | ||
73 | + 'C/function.tmpl', | ||
74 | + 'C/interface.tmpl', | ||
75 | + 'C/method.tmpl', | ||
76 | + 'C/namespace.tmpl', | ||
77 | + 'C/property.tmpl', | ||
78 | + 'C/record.tmpl', | ||
79 | + 'C/signal.tmpl', | ||
80 | + 'C/vfunc.tmpl', | ||
81 | +]) | ||
82 | + | ||
83 | +gjs_templates = files([ | ||
84 | + 'Gjs/callback.tmpl', | ||
85 | + 'Gjs/class.tmpl', | ||
86 | + 'Gjs/constructor.tmpl', | ||
87 | + 'Gjs/default.tmpl', | ||
88 | + 'Gjs/enum.tmpl', | ||
89 | + 'Gjs/field.tmpl', | ||
90 | + 'Gjs/function.tmpl', | ||
91 | + 'Gjs/interface.tmpl', | ||
92 | + 'Gjs/method.tmpl', | ||
93 | + 'Gjs/namespace.tmpl', | ||
94 | + 'Gjs/property.tmpl', | ||
95 | + 'Gjs/record.tmpl', | ||
96 | + 'Gjs/signal.tmpl', | ||
97 | + 'Gjs/vfunc.tmpl', | ||
98 | +]) | ||
99 | + | ||
100 | +py_templates = files([ | ||
101 | + 'Python/callback.tmpl', | ||
102 | + 'Python/class.tmpl', | ||
103 | + 'Python/constructor.tmpl', | ||
104 | + 'Python/default.tmpl', | ||
105 | + 'Python/enum.tmpl', | ||
106 | + 'Python/field.tmpl', | ||
107 | + 'Python/function.tmpl', | ||
108 | + 'Python/interface.tmpl', | ||
109 | + 'Python/method.tmpl', | ||
110 | + 'Python/namespace.tmpl', | ||
111 | + 'Python/property.tmpl', | ||
112 | + 'Python/record.tmpl', | ||
113 | + 'Python/signal.tmpl', | ||
114 | + 'Python/vfunc.tmpl', | ||
115 | +]) | ||
116 | + | ||
117 | +doc_templates += [ | ||
118 | + base_templates, | ||
119 | + c_templates, | ||
120 | + gjs_templates, | ||
121 | + py_templates, | ||
122 | +] | ||
123 | diff --git a/giscanner/meson.build b/giscanner/meson.build | ||
124 | index 41edcd44..3d7dc678 100644 | ||
125 | --- a/giscanner/meson.build | ||
126 | +++ b/giscanner/meson.build | ||
127 | @@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', | ||
128 | |||
129 | install_subdir('doctemplates', install_dir: giscannerdir) | ||
130 | |||
131 | -# XXX: this doesn't track the input, but there is nothing to copy many files | ||
132 | -# in meson. | ||
133 | -doc_templates = custom_target('copy-templates', | ||
134 | - input : 'doctemplates', | ||
135 | - output : 'doctemplates', | ||
136 | - command : [ | ||
137 | - python, '-c', | ||
138 | - 'import sys, shutil;' + | ||
139 | - 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + | ||
140 | - 'shutil.copytree(sys.argv[1], sys.argv[2])', | ||
141 | - '@INPUT@', '@OUTPUT@']) | ||
142 | +doc_templates = [] | ||
143 | +subdir('doctemplates/devdocs') | ||
144 | +subdir('doctemplates/mallard') | ||
145 | |||
146 | flex = find_program('flex', 'win_flex') | ||
147 | bison = find_program('bison', 'win_bison') | ||
148 | diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build | ||
149 | index 5176b957..b81b3fd5 100644 | ||
150 | --- a/tests/scanner/meson.build | ||
151 | +++ b/tests/scanner/meson.build | ||
152 | @@ -525,19 +525,26 @@ foreach gir : test_girs | ||
153 | endforeach | ||
154 | |||
155 | if has_girdoctool and glib_dep.type_name() == 'pkgconfig' | ||
156 | + doctool_env = environment() | ||
157 | + doctool_env.set('srcdir', meson.current_source_dir()) | ||
158 | + doctool_env.set('builddir', meson.current_build_dir()) | ||
159 | + | ||
160 | foreach language : ['C', 'Python', 'Gjs'] | ||
161 | regress_docs = custom_target( | ||
162 | 'generate-docs-' + language, | ||
163 | input: regress_gir, | ||
164 | - depends: [doc_templates], | ||
165 | + depend_files: doc_templates, | ||
166 | build_by_default: not cairo_deps_found, | ||
167 | + env: doctool_env, | ||
168 | output: 'Regress-1.0-' + language, | ||
169 | command: [ | ||
170 | python, girdoctool, | ||
171 | '--add-include-path=' + join_paths(build_root, 'gir'), | ||
172 | '--add-include-path=' + meson.current_build_dir(), | ||
173 | '--language', language, | ||
174 | - '@INPUT@', '-o', '@OUTPUT@'], | ||
175 | + '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), | ||
176 | + '@INPUT@', '-o', '@OUTPUT@', | ||
177 | + ], | ||
178 | ) | ||
179 | |||
180 | if cairo_deps_found | ||
181 | @@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' | ||
182 | python, | ||
183 | args: [gi_tester, 'Regress-1.0-' + language], | ||
184 | depends: [regress_docs], | ||
185 | - env: [ | ||
186 | - 'srcdir=' + meson.current_source_dir(), | ||
187 | - 'builddir=' + meson.current_build_dir(), | ||
188 | - ], | ||
189 | + env: doctool_env, | ||
190 | ) | ||
191 | endif | ||
192 | endforeach | ||
193 | @@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' | ||
194 | regress_sections = custom_target( | ||
195 | 'generate-docs-sections', | ||
196 | input: regress_gir, | ||
197 | - depends: [doc_templates], | ||
198 | + depend_files: [doc_templates], | ||
199 | build_by_default: not cairo_deps_found, | ||
200 | output: 'Regress-1.0-sections.txt', | ||
201 | + env: doctool_env, | ||
202 | command: [ | ||
203 | python, girdoctool, | ||
204 | '--add-include-path=' + join_paths(build_root, 'gir'), | ||
205 | @@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' | ||
206 | python, | ||
207 | args: [gi_tester, 'Regress-1.0-sections.txt'], | ||
208 | depends: [regress_sections], | ||
209 | - env: [ | ||
210 | - 'srcdir=' + meson.current_source_dir(), | ||
211 | - 'builddir=' + meson.current_build_dir(), | ||
212 | - ], | ||
213 | + env: doctool_env, | ||
214 | ) | ||
215 | endif | ||
216 | endif | ||
217 | -- | ||
218 | 2.20.1 | ||
219 | |||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb index d96caf08d8..d4ee03d33c 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb | |||
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ | |||
15 | 15 | ||
16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ |
17 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ | 17 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ |
18 | file://0001-build-Avoid-the-doctemplates-hack.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI[sha256sum] = "902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a" | 21 | SRC_URI[sha256sum] = "902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a" |