summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-01-27 01:22:04 +0000
committerSam James <sam@gentoo.org>2022-01-27 01:23:21 +0000
commite47f971b066fc1655eca431dff1f3a888d91cded (patch)
treef523f5cae65972139af6a7fe3f2bffda59d6c416
parentdev-java/openjdk-bin: fix musl condition in 11.0.14 (diff)
downloadgentoo-e47f971b066fc1655eca431dff1f3a888d91cded.tar.gz
gentoo-e47f971b066fc1655eca431dff1f3a888d91cded.tar.bz2
gentoo-e47f971b066fc1655eca431dff1f3a888d91cded.zip
dev-libs/gobject-introspection: add additional meson 0.61 patches
I'd missed additional upstream commits when fixing the initial Meson 0.61 bug we had reported which led to build failures with USE=doctool not being fixed. This now includes (additionally): - https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/827494d6415b696a98fa195cbd883b50cc893bfc.patch - https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/7c1178069f1c58a05ec56a94ca6ba124215a947b.patch Bug: https://bugs.gentoo.org/831427 Closes: https://bugs.gentoo.org/831463 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-libs/gobject-introspection/Manifest1
-rw-r--r--dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch220
-rw-r--r--dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild3
3 files changed, 3 insertions, 221 deletions
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index b731b07ae14..4dd84dca0b0 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1 +1,2 @@
+DIST gobject-introspection-1.70.0-meson-0.61.patch.bz2 4211 BLAKE2B 0453266900dfdf24da3531d205fe03d8eb5f6e3d76db4b945852453dc46d26a77449f0ddd81bad6df6d8108d8a7369b60a07b7c4f8e0c01811f735da76cf4d56 SHA512 ba5861baaabfe20185d85ccbc02425d1e44c525a5d05c28ee84552c43ab30497bed4e713e6f1b2f9c6508714020b04b5228532e1489e8a732ba99ea61ca950c7
DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch
deleted file mode 100644
index df1663116cc..00000000000
--- a/dev-libs/gobject-introspection/files/gobject-introspection-1.70.0-meson-0.61.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch
-https://bugs.gentoo.org/831427
-
-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
----
- 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
---
-GitLab
-
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
index 34cad38517a..6ee20137414 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
@@ -9,6 +9,7 @@ inherit gnome.org meson python-single-r1 xdg
DESCRIPTION="Introspection system for GObject-based libraries"
HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-meson-0.61.patch.bz2"
LICENSE="LGPL-2+ GPL-2+"
SLOT="0"
@@ -49,7 +50,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}"/${P}-meson-0.61.patch
+ "${WORKDIR}"/${P}-meson-0.61.patch
)
pkg_setup() {