summaryrefslogtreecommitdiff
path: root/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gobject-introspection/patches/patch-tests_scanner_meson.build')
-rw-r--r--devel/gobject-introspection/patches/patch-tests_scanner_meson.build72
1 files changed, 0 insertions, 72 deletions
diff --git a/devel/gobject-introspection/patches/patch-tests_scanner_meson.build b/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
deleted file mode 100644
index 634ce5feb44..00000000000
--- a/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-tests_scanner_meson.build,v 1.2 2022/02/15 17:34:32 wiz Exp $
-
-Fix build with latest meson.
-https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2
-
---- tests/scanner/meson.build.orig 2021-09-17 16:02:42.597052800 +0000
-+++ 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
- 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
- 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
- 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