forked from calculate/calculate-overlay
parent
5866b8dae4
commit
bf31b037ce
@ -0,0 +1 @@
|
|||||||
|
DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
|
@ -0,0 +1,220 @@
|
|||||||
|
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
|
||||||
|
|
@ -0,0 +1,62 @@
|
|||||||
|
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
|
||||||
|
index dab063ef2ead1f91b262eca1feab30936aba5d74..88430f05819a2133c488a2b736bcc9c2cf691b5e 100644
|
||||||
|
--- a/giscanner/docmain.py
|
||||||
|
+++ b/giscanner/docmain.py
|
||||||
|
@@ -51,6 +51,8 @@ def doc_main(args):
|
||||||
|
parser.add_argument("-s", "--write-sections-file",
|
||||||
|
action="store_const", dest="format", const="sections",
|
||||||
|
help="Backwards-compatible equivalent to -f sections")
|
||||||
|
+ parser.add_argument("--templates-dir",
|
||||||
|
+ action="store")
|
||||||
|
|
||||||
|
args = parser.parse_args(args[1:])
|
||||||
|
if not args.output:
|
||||||
|
@@ -74,7 +76,7 @@ def doc_main(args):
|
||||||
|
with open(args.output, 'w', encoding='utf-8') as fp:
|
||||||
|
write_sections_file(fp, sections_file)
|
||||||
|
else:
|
||||||
|
- writer = DocWriter(transformer, args.language, args.format)
|
||||||
|
+ writer = DocWriter(transformer, args.language, args.format, args.templates_dir)
|
||||||
|
writer.write(args.output)
|
||||||
|
|
||||||
|
return 0
|
||||||
|
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
|
||||||
|
index d0cd610f2f343fd1263532127fdd3994cdeb059c..b72ab2ac9bc6a036623c996f6b96eeacf820b83a 100644
|
||||||
|
--- a/giscanner/docwriter.py
|
||||||
|
+++ b/giscanner/docwriter.py
|
||||||
|
@@ -1288,7 +1288,7 @@ LANGUAGES = {
|
||||||
|
|
||||||
|
|
||||||
|
class DocWriter(object):
|
||||||
|
- def __init__(self, transformer, language, output_format):
|
||||||
|
+ def __init__(self, transformer, language, output_format, templates_dir=None):
|
||||||
|
self._transformer = transformer
|
||||||
|
|
||||||
|
try:
|
||||||
|
@@ -1300,18 +1300,20 @@ class DocWriter(object):
|
||||||
|
self._formatter = formatter_class(self._transformer)
|
||||||
|
self._language = self._formatter.language
|
||||||
|
self._output_format = output_format
|
||||||
|
+ self._templates_dir = templates_dir
|
||||||
|
|
||||||
|
self._lookup = self._get_template_lookup()
|
||||||
|
|
||||||
|
def _get_template_lookup(self):
|
||||||
|
- if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
|
||||||
|
+ if self._templates_dir is not None:
|
||||||
|
+ srcdir = self._templates_dir
|
||||||
|
+ elif 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
|
||||||
|
top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
|
||||||
|
- srcdir = os.path.join(top_srcdir, 'giscanner')
|
||||||
|
+ srcdir = os.path.join(top_srcdir, 'giscanner', 'doctemplates')
|
||||||
|
else:
|
||||||
|
- srcdir = os.path.dirname(__file__)
|
||||||
|
+ srcdir = os.path.join(os.path.dirname(__file__), 'doctemplates')
|
||||||
|
|
||||||
|
- template_dir = os.path.join(srcdir, 'doctemplates',
|
||||||
|
- self._formatter.output_format)
|
||||||
|
+ template_dir = os.path.join(srcdir, self._formatter.output_format)
|
||||||
|
|
||||||
|
return TemplateLookup(directories=[template_dir],
|
||||||
|
module_directory=tempfile.mkdtemp(),
|
||||||
|
|
@ -0,0 +1,82 @@
|
|||||||
|
# Copyright 1999-2022 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python3_{8..10} )
|
||||||
|
PYTHON_REQ_USE="xml"
|
||||||
|
inherit gnome.org meson python-single-r1 xdg
|
||||||
|
|
||||||
|
DESCRIPTION="Introspection system for GObject-based libraries"
|
||||||
|
HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2+ GPL-2+"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="doctool gtk-doc test"
|
||||||
|
RESTRICT="!test? ( test )"
|
||||||
|
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||||
|
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||||
|
|
||||||
|
# virtual/pkgconfig needed at runtime, bug #505408
|
||||||
|
RDEPEND="
|
||||||
|
>=dev-libs/gobject-introspection-common-${PV}
|
||||||
|
>=dev-libs/glib-2.58.0:2
|
||||||
|
dev-libs/libffi:=
|
||||||
|
doctool? (
|
||||||
|
$(python_gen_cond_dep '
|
||||||
|
dev-python/mako[${PYTHON_USEDEP}]
|
||||||
|
dev-python/markdown[${PYTHON_USEDEP}]
|
||||||
|
')
|
||||||
|
)
|
||||||
|
virtual/pkgconfig
|
||||||
|
${PYTHON_DEPS}
|
||||||
|
"
|
||||||
|
# Wants real bison, not virtual/yacc
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
gtk-doc? ( >=dev-util/gtk-doc-1.19
|
||||||
|
app-text/docbook-xml-dtd:4.3
|
||||||
|
app-text/docbook-xml-dtd:4.5
|
||||||
|
)
|
||||||
|
sys-devel/bison
|
||||||
|
sys-devel/flex
|
||||||
|
test? (
|
||||||
|
x11-libs/cairo[glib]
|
||||||
|
$(python_gen_cond_dep '
|
||||||
|
dev-python/mako[${PYTHON_USEDEP}]
|
||||||
|
dev-python/markdown[${PYTHON_USEDEP}]
|
||||||
|
')
|
||||||
|
)
|
||||||
|
"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${P}-meson-0.61.patch
|
||||||
|
"${FILESDIR}"/${P}-templates.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
python-single-r1_pkg_setup
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
local emesonargs=(
|
||||||
|
$(meson_feature test cairo)
|
||||||
|
$(meson_feature doctool)
|
||||||
|
#-Dglib_src_dir
|
||||||
|
$(meson_use gtk-doc gtk_doc)
|
||||||
|
#-Dcairo_libname
|
||||||
|
-Dpython="${EPYTHON}"
|
||||||
|
#-Dgir_dir_prefix
|
||||||
|
)
|
||||||
|
meson_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
meson_src_install
|
||||||
|
python_fix_shebang "${ED}"/usr/bin/
|
||||||
|
python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
|
||||||
|
|
||||||
|
# Prevent collision with gobject-introspection-common
|
||||||
|
rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
|
||||||
|
"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
|
||||||
|
rmdir "${ED}"/usr/share/aclocal || die
|
||||||
|
}
|
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<maintainer type="project">
|
||||||
|
<email>gnome@gentoo.org</email>
|
||||||
|
<name>Gentoo GNOME Desktop</name>
|
||||||
|
</maintainer>
|
||||||
|
<use>
|
||||||
|
<flag name="doctool">Install g-ir-doc-tool for generating documentation
|
||||||
|
from introspected data</flag>
|
||||||
|
</use>
|
||||||
|
</pkgmetadata>
|
Loading…
Reference in new issue