mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
gobject-introspection: upgrade 1.70.0 -> 1.72.0
0001-build-Avoid-the-doctemplates-hack.patch removed since it's included in 1.72.0 (From OE-Core rev: db92a30a463e72833252294d693ad2a105843729) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
wangmy
Richard Purdie
-219
@@ -1,219 +0,0 @@
|
|||||||
From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Emmanuele Bassi <ebassi@gnome.org>
|
|
||||||
Date: Tue, 11 Jan 2022 15:51:10 +0000
|
|
||||||
Subject: [PATCH] build: Avoid the doctemplates hack
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The hack that copies the doctemplates directory into the build
|
|
||||||
directory has stopped working with newer versions of Meson; while it's
|
|
||||||
possible to copy files, custom_target() cannot depend on a directory.
|
|
||||||
Additionally, the dependency has always been broken.
|
|
||||||
|
|
||||||
Instead, we enumerate the template files—after all, it's not like they
|
|
||||||
change a lot—and then we list them as dependencies for the test targets.
|
|
||||||
|
|
||||||
Fixes: #414
|
|
||||||
Upstream-Status: Backport
|
|
||||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
||||||
---
|
|
||||||
giscanner/doctemplates/devdocs/meson.build | 19 +++++++
|
|
||||||
giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++
|
|
||||||
giscanner/meson.build | 14 ++---
|
|
||||||
tests/scanner/meson.build | 24 +++++----
|
|
||||||
4 files changed, 98 insertions(+), 22 deletions(-)
|
|
||||||
create mode 100644 giscanner/doctemplates/devdocs/meson.build
|
|
||||||
create mode 100644 giscanner/doctemplates/mallard/meson.build
|
|
||||||
|
|
||||||
diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..2037182a
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/giscanner/doctemplates/devdocs/meson.build
|
|
||||||
@@ -0,0 +1,19 @@
|
|
||||||
+doc_templates += files([
|
|
||||||
+ 'Gjs/_doc.tmpl',
|
|
||||||
+ 'Gjs/_index.tmpl',
|
|
||||||
+ 'Gjs/_method.tmpl',
|
|
||||||
+ 'Gjs/_methods.tmpl',
|
|
||||||
+ 'Gjs/_properties.tmpl',
|
|
||||||
+ 'Gjs/_signals.tmpl',
|
|
||||||
+ 'Gjs/_staticmethods.tmpl',
|
|
||||||
+ 'Gjs/_vfuncs.tmpl',
|
|
||||||
+ 'Gjs/base.tmpl',
|
|
||||||
+ 'Gjs/callback.tmpl',
|
|
||||||
+ 'Gjs/class.tmpl',
|
|
||||||
+ 'Gjs/default.tmpl',
|
|
||||||
+ 'Gjs/enum.tmpl',
|
|
||||||
+ 'Gjs/function.tmpl',
|
|
||||||
+ 'Gjs/interface.tmpl',
|
|
||||||
+ 'Gjs/method.tmpl',
|
|
||||||
+ 'Gjs/namespace.tmpl',
|
|
||||||
+])
|
|
||||||
diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..5fe4e2af
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/giscanner/doctemplates/mallard/meson.build
|
|
||||||
@@ -0,0 +1,63 @@
|
|
||||||
+base_templates = files([
|
|
||||||
+ 'base.tmpl',
|
|
||||||
+ 'class.tmpl',
|
|
||||||
+ 'namespace.tmpl',
|
|
||||||
+])
|
|
||||||
+
|
|
||||||
+c_templates = files([
|
|
||||||
+ 'C/callback.tmpl',
|
|
||||||
+ 'C/class.tmpl',
|
|
||||||
+ 'C/constructor.tmpl',
|
|
||||||
+ 'C/default.tmpl',
|
|
||||||
+ 'C/enum.tmpl',
|
|
||||||
+ 'C/field.tmpl',
|
|
||||||
+ 'C/function.tmpl',
|
|
||||||
+ 'C/interface.tmpl',
|
|
||||||
+ 'C/method.tmpl',
|
|
||||||
+ 'C/namespace.tmpl',
|
|
||||||
+ 'C/property.tmpl',
|
|
||||||
+ 'C/record.tmpl',
|
|
||||||
+ 'C/signal.tmpl',
|
|
||||||
+ 'C/vfunc.tmpl',
|
|
||||||
+])
|
|
||||||
+
|
|
||||||
+gjs_templates = files([
|
|
||||||
+ 'Gjs/callback.tmpl',
|
|
||||||
+ 'Gjs/class.tmpl',
|
|
||||||
+ 'Gjs/constructor.tmpl',
|
|
||||||
+ 'Gjs/default.tmpl',
|
|
||||||
+ 'Gjs/enum.tmpl',
|
|
||||||
+ 'Gjs/field.tmpl',
|
|
||||||
+ 'Gjs/function.tmpl',
|
|
||||||
+ 'Gjs/interface.tmpl',
|
|
||||||
+ 'Gjs/method.tmpl',
|
|
||||||
+ 'Gjs/namespace.tmpl',
|
|
||||||
+ 'Gjs/property.tmpl',
|
|
||||||
+ 'Gjs/record.tmpl',
|
|
||||||
+ 'Gjs/signal.tmpl',
|
|
||||||
+ 'Gjs/vfunc.tmpl',
|
|
||||||
+])
|
|
||||||
+
|
|
||||||
+py_templates = files([
|
|
||||||
+ 'Python/callback.tmpl',
|
|
||||||
+ 'Python/class.tmpl',
|
|
||||||
+ 'Python/constructor.tmpl',
|
|
||||||
+ 'Python/default.tmpl',
|
|
||||||
+ 'Python/enum.tmpl',
|
|
||||||
+ 'Python/field.tmpl',
|
|
||||||
+ 'Python/function.tmpl',
|
|
||||||
+ 'Python/interface.tmpl',
|
|
||||||
+ 'Python/method.tmpl',
|
|
||||||
+ 'Python/namespace.tmpl',
|
|
||||||
+ 'Python/property.tmpl',
|
|
||||||
+ 'Python/record.tmpl',
|
|
||||||
+ 'Python/signal.tmpl',
|
|
||||||
+ 'Python/vfunc.tmpl',
|
|
||||||
+])
|
|
||||||
+
|
|
||||||
+doc_templates += [
|
|
||||||
+ base_templates,
|
|
||||||
+ c_templates,
|
|
||||||
+ gjs_templates,
|
|
||||||
+ py_templates,
|
|
||||||
+]
|
|
||||||
diff --git a/giscanner/meson.build b/giscanner/meson.build
|
|
||||||
index 41edcd44..3d7dc678 100644
|
|
||||||
--- a/giscanner/meson.build
|
|
||||||
+++ b/giscanner/meson.build
|
|
||||||
@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c',
|
|
||||||
|
|
||||||
install_subdir('doctemplates', install_dir: giscannerdir)
|
|
||||||
|
|
||||||
-# XXX: this doesn't track the input, but there is nothing to copy many files
|
|
||||||
-# in meson.
|
|
||||||
-doc_templates = custom_target('copy-templates',
|
|
||||||
- input : 'doctemplates',
|
|
||||||
- output : 'doctemplates',
|
|
||||||
- command : [
|
|
||||||
- python, '-c',
|
|
||||||
- 'import sys, shutil;' +
|
|
||||||
- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
|
|
||||||
- 'shutil.copytree(sys.argv[1], sys.argv[2])',
|
|
||||||
- '@INPUT@', '@OUTPUT@'])
|
|
||||||
+doc_templates = []
|
|
||||||
+subdir('doctemplates/devdocs')
|
|
||||||
+subdir('doctemplates/mallard')
|
|
||||||
|
|
||||||
flex = find_program('flex', 'win_flex')
|
|
||||||
bison = find_program('bison', 'win_bison')
|
|
||||||
diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
|
|
||||||
index 5176b957..b81b3fd5 100644
|
|
||||||
--- a/tests/scanner/meson.build
|
|
||||||
+++ b/tests/scanner/meson.build
|
|
||||||
@@ -525,19 +525,26 @@ foreach gir : test_girs
|
|
||||||
endforeach
|
|
||||||
|
|
||||||
if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
|
|
||||||
+ doctool_env = environment()
|
|
||||||
+ doctool_env.set('srcdir', meson.current_source_dir())
|
|
||||||
+ doctool_env.set('builddir', meson.current_build_dir())
|
|
||||||
+
|
|
||||||
foreach language : ['C', 'Python', 'Gjs']
|
|
||||||
regress_docs = custom_target(
|
|
||||||
'generate-docs-' + language,
|
|
||||||
input: regress_gir,
|
|
||||||
- depends: [doc_templates],
|
|
||||||
+ depend_files: doc_templates,
|
|
||||||
build_by_default: not cairo_deps_found,
|
|
||||||
+ env: doctool_env,
|
|
||||||
output: 'Regress-1.0-' + language,
|
|
||||||
command: [
|
|
||||||
python, girdoctool,
|
|
||||||
'--add-include-path=' + join_paths(build_root, 'gir'),
|
|
||||||
'--add-include-path=' + meson.current_build_dir(),
|
|
||||||
'--language', language,
|
|
||||||
- '@INPUT@', '-o', '@OUTPUT@'],
|
|
||||||
+ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
|
|
||||||
+ '@INPUT@', '-o', '@OUTPUT@',
|
|
||||||
+ ],
|
|
||||||
)
|
|
||||||
|
|
||||||
if cairo_deps_found
|
|
||||||
@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
|
|
||||||
python,
|
|
||||||
args: [gi_tester, 'Regress-1.0-' + language],
|
|
||||||
depends: [regress_docs],
|
|
||||||
- env: [
|
|
||||||
- 'srcdir=' + meson.current_source_dir(),
|
|
||||||
- 'builddir=' + meson.current_build_dir(),
|
|
||||||
- ],
|
|
||||||
+ env: doctool_env,
|
|
||||||
)
|
|
||||||
endif
|
|
||||||
endforeach
|
|
||||||
@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
|
|
||||||
regress_sections = custom_target(
|
|
||||||
'generate-docs-sections',
|
|
||||||
input: regress_gir,
|
|
||||||
- depends: [doc_templates],
|
|
||||||
+ depend_files: [doc_templates],
|
|
||||||
build_by_default: not cairo_deps_found,
|
|
||||||
output: 'Regress-1.0-sections.txt',
|
|
||||||
+ env: doctool_env,
|
|
||||||
command: [
|
|
||||||
python, girdoctool,
|
|
||||||
'--add-include-path=' + join_paths(build_root, 'gir'),
|
|
||||||
@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
|
|
||||||
python,
|
|
||||||
args: [gi_tester, 'Regress-1.0-sections.txt'],
|
|
||||||
depends: [regress_sections],
|
|
||||||
- env: [
|
|
||||||
- 'srcdir=' + meson.current_source_dir(),
|
|
||||||
- 'builddir=' + meson.current_build_dir(),
|
|
||||||
- ],
|
|
||||||
+ env: doctool_env,
|
|
||||||
)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
+2
-4
@@ -13,11 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
|
|||||||
file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27 \
|
file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27 \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
|
SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz"
|
||||||
file://0001-build-Avoid-the-doctemplates-hack.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a"
|
SRC_URI[sha256sum] = "02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc"
|
||||||
|
|
||||||
SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
|
SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
|
||||||
|
|
||||||
Reference in New Issue
Block a user