Compare commits
No commits in common. "c8s" and "c9s" have entirely different histories.
96
.gitignore
vendored
96
.gitignore
vendored
@ -1,2 +1,96 @@
|
|||||||
SOURCES/gobject-introspection-1.56.1.tar.xz
|
/gobject-introspection-0.10.4.tar.bz2
|
||||||
|
/gobject-introspection-0.10.5.tar.bz2
|
||||||
|
/gobject-introspection-0.10.6.tar.bz2
|
||||||
|
/gobject-introspection-0.10.7.tar.bz2
|
||||||
|
/gobject-introspection-0.10.8.tar.bz2
|
||||||
|
/gobject-introspection-1.29.0.tar.xz
|
||||||
|
/gobject-introspection-1.29.16.tar.xz
|
||||||
|
/gobject-introspection-1.29.17.tar.xz
|
||||||
|
/gobject-introspection-1.30.0.tar.xz
|
||||||
|
/gobject-introspection-1.31.0.tar.xz
|
||||||
|
/gobject-introspection-1.31.1.tar.xz
|
||||||
|
/gobject-introspection-1.31.6.tar.xz
|
||||||
|
/gobject-introspection-1.31.10.tar.xz
|
||||||
|
/gobject-introspection-1.31.20.tar.xz
|
||||||
|
/gobject-introspection-1.31.22.tar.xz
|
||||||
|
/gobject-introspection-1.32.0.tar.xz
|
||||||
|
/gobject-introspection-1.32.1.tar.xz
|
||||||
|
/gobject-introspection-1.33.2.tar.xz
|
||||||
|
/gobject-introspection-1.33.3.tar.xz
|
||||||
|
/gobject-introspection-1.33.4.tar.xz
|
||||||
|
/gobject-introspection-1.33.9.tar.xz
|
||||||
|
/gobject-introspection-1.33.10.tar.xz
|
||||||
|
/gobject-introspection-1.33.14.tar.xz
|
||||||
|
/gobject-introspection-1.34.0.tar.xz
|
||||||
|
/gobject-introspection-1.34.1.tar.xz
|
||||||
|
/gobject-introspection-1.34.1.1.tar.xz
|
||||||
|
/gobject-introspection-1.34.2.tar.xz
|
||||||
|
/gobject-introspection-1.35.2.tar.xz
|
||||||
|
/gobject-introspection-1.35.3.tar.xz
|
||||||
|
/gobject-introspection-1.35.4.tar.xz
|
||||||
|
/gobject-introspection-1.35.8.tar.xz
|
||||||
|
/gobject-introspection-1.35.9.tar.xz
|
||||||
|
/gobject-introspection-1.36.0.tar.xz
|
||||||
|
/gobject-introspection-1.37.1.tar.xz
|
||||||
|
/gobject-introspection-1.37.4.tar.xz
|
||||||
|
/gobject-introspection-1.37.6.tar.xz
|
||||||
|
/gobject-introspection-1.38.0.tar.xz
|
||||||
|
/gobject-introspection-1.39.0.tar.xz
|
||||||
|
/gobject-introspection-1.39.3.tar.xz
|
||||||
|
/gobject-introspection-1.39.90.tar.xz
|
||||||
|
/gobject-introspection-1.40.0.tar.xz
|
||||||
|
/gobject-introspection-1.41.3.tar.xz
|
||||||
|
/gobject-introspection-1.41.4.tar.xz
|
||||||
|
/gobject-introspection-1.41.91.tar.xz
|
||||||
|
/gobject-introspection-1.42.0.tar.xz
|
||||||
|
/gobject-introspection-1.43.3.tar.xz
|
||||||
|
/gobject-introspection-1.43.91.tar.xz
|
||||||
|
/gobject-introspection-1.43.92.tar.xz
|
||||||
|
/gobject-introspection-1.44.0.tar.xz
|
||||||
|
/gobject-introspection-1.45.2.tar.xz
|
||||||
|
/gobject-introspection-1.45.3.tar.xz
|
||||||
|
/gobject-introspection-1.45.4.tar.xz
|
||||||
|
/gobject-introspection-1.46.0.tar.xz
|
||||||
|
/gobject-introspection-1.47.1.tar.xz
|
||||||
|
/gobject-introspection-1.47.92.tar.xz
|
||||||
|
/gobject-introspection-1.48.0.tar.xz
|
||||||
|
/gobject-introspection-1.49.1.tar.xz
|
||||||
|
/gobject-introspection-1.49.2.tar.xz
|
||||||
|
/gobject-introspection-1.50.0.tar.xz
|
||||||
|
/gobject-introspection-1.51.1.tar.xz
|
||||||
|
/gobject-introspection-1.51.2.tar.xz
|
||||||
|
/gobject-introspection-1.51.3.tar.xz
|
||||||
|
/gobject-introspection-1.51.5.tar.xz
|
||||||
|
/gobject-introspection-1.52.0.tar.xz
|
||||||
|
/gobject-introspection-1.52.1.tar.xz
|
||||||
|
/gobject-introspection-1.53.3.tar.xz
|
||||||
|
/gobject-introspection-1.53.4.tar.xz
|
||||||
|
/gobject-introspection-1.53.5.tar.xz
|
||||||
|
/gobject-introspection-1.53.7.tar.xz
|
||||||
|
/gobject-introspection-1.54.0.tar.xz
|
||||||
|
/gobject-introspection-1.54.1.tar.xz
|
||||||
|
/gobject-introspection-1.55.2.tar.xz
|
||||||
|
/gobject-introspection-1.56.0.tar.xz
|
||||||
/gobject-introspection-1.56.1.tar.xz
|
/gobject-introspection-1.56.1.tar.xz
|
||||||
|
/gobject-introspection-1.57.2.tar.xz
|
||||||
|
/gobject-introspection-1.58.0.tar.xz
|
||||||
|
/gobject-introspection-1.58.1.tar.xz
|
||||||
|
/gobject-introspection-1.58.2.tar.xz
|
||||||
|
/gobject-introspection-1.58.3.tar.xz
|
||||||
|
/gobject-introspection-1.59.2.tar.xz
|
||||||
|
/gobject-introspection-1.59.3.tar.xz
|
||||||
|
/gobject-introspection-1.59.4.tar.xz
|
||||||
|
/gobject-introspection-1.59.5.tar.xz
|
||||||
|
/gobject-introspection-1.60.0.tar.xz
|
||||||
|
/gobject-introspection-1.60.1.tar.xz
|
||||||
|
/gobject-introspection-1.61.1.tar.xz
|
||||||
|
/gobject-introspection-1.61.2.tar.xz
|
||||||
|
/gobject-introspection-1.62.0.tar.xz
|
||||||
|
/gobject-introspection-1.63.1.tar.xz
|
||||||
|
/gobject-introspection-1.63.2.tar.xz
|
||||||
|
/gobject-introspection-1.64.0.tar.xz
|
||||||
|
/gobject-introspection-1.64.1.tar.xz
|
||||||
|
/gobject-introspection-1.66.0.tar.xz
|
||||||
|
/gobject-introspection-1.66.1.tar.xz
|
||||||
|
/gobject-introspection-1.67.1.tar.xz
|
||||||
|
/gobject-introspection-1.68.0.tar.xz
|
||||||
|
217
0001-build-Avoid-the-doctemplates-hack.patch
Normal file
217
0001-build-Avoid-the-doctemplates-hack.patch
Normal file
@ -0,0 +1,217 @@
|
|||||||
|
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
|
||||||
|
--
|
||||||
|
2.37.3
|
||||||
|
|
77
0001-doctool-Add-templates_dir-CLI-argument.patch
Normal file
77
0001-doctool-Add-templates_dir-CLI-argument.patch
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
From 827494d6415b696a98fa195cbd883b50cc893bfc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emmanuele Bassi <ebassi@gnome.org>
|
||||||
|
Date: Tue, 11 Jan 2022 15:47:50 +0000
|
||||||
|
Subject: [PATCH] doctool: Add templates_dir CLI argument
|
||||||
|
|
||||||
|
We can find the templates directory using the module file once
|
||||||
|
installed, but when running uninstalled we need to have a way to specify
|
||||||
|
where the templates can be found in the sources directory.
|
||||||
|
---
|
||||||
|
giscanner/docmain.py | 4 +++-
|
||||||
|
giscanner/docwriter.py | 14 ++++++++------
|
||||||
|
2 files changed, 11 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
|
||||||
|
index dab063ef..88430f05 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 d0cd610f..b72ab2ac 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(),
|
||||||
|
--
|
||||||
|
2.37.3
|
||||||
|
|
31
0001-scanner-Add-more-float-types.patch
Normal file
31
0001-scanner-Add-more-float-types.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 60b0cf2fc2fdc74d13832d1fdde21cfdc813b84e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emmanuele Bassi <ebassi@gnome.org>
|
||||||
|
Date: Mon, 26 Apr 2021 10:59:52 +0100
|
||||||
|
Subject: [PATCH] scanner: Add more float types
|
||||||
|
|
||||||
|
The scanner is chocking on the `__float80` and `__float128` types that
|
||||||
|
are provided by GCC as extensions to ISO/IEC TS 18661-3:2015:
|
||||||
|
|
||||||
|
https://gcc.gnu.org/onlinedocs/gcc/Floating-Types.html
|
||||||
|
|
||||||
|
Fixes: #384
|
||||||
|
---
|
||||||
|
giscanner/scannerlexer.l | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
|
||||||
|
index cfec4d58..b6cc6499 100644
|
||||||
|
--- a/giscanner/scannerlexer.l
|
||||||
|
+++ b/giscanner/scannerlexer.l
|
||||||
|
@@ -224,6 +224,8 @@ stringtext ([^\\\"])|(\\.)
|
||||||
|
"_Float32x" { return BASIC_TYPE; }
|
||||||
|
"_Float64x" { return BASIC_TYPE; }
|
||||||
|
"_Float128x" { return BASIC_TYPE; }
|
||||||
|
+"__float80" { return BASIC_TYPE; }
|
||||||
|
+"__float128" { return BASIC_TYPE; }
|
||||||
|
"for" { return FOR; }
|
||||||
|
"goto" { return GOTO; }
|
||||||
|
"if" { return IF; }
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
--- !Policy
|
--- !Policy
|
||||||
product_versions:
|
product_versions:
|
||||||
- rhel-8
|
- rhel-9
|
||||||
decision_context: osci_compose_gate
|
decision_context: osci_compose_gate
|
||||||
rules:
|
rules:
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||||
|
@ -1,19 +1,21 @@
|
|||||||
%global glib2_version 2.56.1
|
%global glib2_version 2.58.0
|
||||||
|
|
||||||
%global __python %{__python3}
|
|
||||||
|
|
||||||
Name: gobject-introspection
|
Name: gobject-introspection
|
||||||
Version: 1.56.1
|
Version: 1.68.0
|
||||||
Release: 1%{?dist}
|
Release: 11%{?dist}
|
||||||
Summary: Introspection system for GObject-based libraries
|
Summary: Introspection system for GObject-based libraries
|
||||||
|
|
||||||
License: GPLv2+, LGPLv2+, MIT
|
License: GPLv2+ and LGPLv2+ and MIT
|
||||||
URL: https://wiki.gnome.org/Projects/GObjectIntrospection
|
URL: https://wiki.gnome.org/Projects/GObjectIntrospection
|
||||||
Source0: https://download.gnome.org/sources/gobject-introspection/1.56/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/gobject-introspection/1.68/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch0: 0001-scanner-Add-more-float-types.patch
|
||||||
|
Patch1: 0001-build-Avoid-the-doctemplates-hack.patch
|
||||||
|
Patch2: 0001-doctool-Add-templates_dir-CLI-argument.patch
|
||||||
|
|
||||||
|
BuildRequires: gcc
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: cairo-gobject-devel
|
BuildRequires: cairo-gobject-devel
|
||||||
BuildRequires: chrpath
|
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: fontconfig-devel
|
BuildRequires: fontconfig-devel
|
||||||
BuildRequires: freetype-devel
|
BuildRequires: freetype-devel
|
||||||
@ -26,8 +28,10 @@ BuildRequires: libXfixes-devel
|
|||||||
BuildRequires: libXft-devel
|
BuildRequires: libXft-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: mesa-libGL-devel
|
BuildRequires: mesa-libGL-devel
|
||||||
|
BuildRequires: meson
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-mako
|
BuildRequires: python3-mako
|
||||||
|
BuildRequires: python3-markdown
|
||||||
|
|
||||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||||
|
|
||||||
@ -44,6 +48,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
Requires: libtool
|
Requires: libtool
|
||||||
# For g-ir-doctool
|
# For g-ir-doctool
|
||||||
Requires: python3-mako
|
Requires: python3-mako
|
||||||
|
Requires: python3-markdown
|
||||||
|
# This package only works with the Python version it was built with
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1691064
|
||||||
|
Requires: (python(abi) = %{python3_version} if python3)
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1915339
|
||||||
|
%ifarch x86_64
|
||||||
|
Conflicts: gobject-introspection-devel(x86-32) <= %{version}-%{release}
|
||||||
|
%else
|
||||||
|
%ifarch i686
|
||||||
|
Conflicts: gobject-introspection-devel(x86-64) <= %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Libraries and headers for gobject-introspection
|
Libraries and headers for gobject-introspection
|
||||||
@ -52,24 +68,15 @@ Libraries and headers for gobject-introspection
|
|||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-gtk-doc --enable-doctool --with-python=%{__python3}
|
%meson -Ddoctool=enabled -Dgtk_doc=true -Dpython=%{__python3}
|
||||||
%make_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%meson_install
|
||||||
|
|
||||||
# Remove lib64 rpaths
|
|
||||||
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-compiler
|
|
||||||
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-generate
|
|
||||||
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-inspect
|
|
||||||
|
|
||||||
# Die libtool, die.
|
|
||||||
find $RPM_BUILD_ROOT -type f -name "*.la" -print -delete
|
|
||||||
find $RPM_BUILD_ROOT -type f -name "*.a" -print -delete
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%doc NEWS README.rst
|
||||||
|
%license COPYING COPYING.GPL COPYING.LGPL
|
||||||
%{_libdir}/lib*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
%dir %{_libdir}/girepository-1.0
|
%dir %{_libdir}/girepository-1.0
|
||||||
%{_libdir}/girepository-1.0/*.typelib
|
%{_libdir}/girepository-1.0/*.typelib
|
||||||
@ -83,10 +90,167 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -print -delete
|
|||||||
%{_datadir}/gir-1.0
|
%{_datadir}/gir-1.0
|
||||||
%{_datadir}/gobject-introspection-1.0/
|
%{_datadir}/gobject-introspection-1.0/
|
||||||
%{_datadir}/aclocal/introspection.m4
|
%{_datadir}/aclocal/introspection.m4
|
||||||
%{_mandir}/man1/*.gz
|
%dir %{_datadir}/gtk-doc
|
||||||
|
%dir %{_datadir}/gtk-doc/html
|
||||||
%{_datadir}/gtk-doc/html/gi/
|
%{_datadir}/gtk-doc/html/gi/
|
||||||
|
%{_mandir}/man1/g-ir-compiler.1*
|
||||||
|
%{_mandir}/man1/g-ir-generate.1*
|
||||||
|
%{_mandir}/man1/g-ir-scanner.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 4 2022 Tomas Popela <tpopela@redhat.com> - 1.68.0-11
|
||||||
|
- Fix FTBFS for a possible Meson rebase
|
||||||
|
- Resolves: rhbz#2140108
|
||||||
|
|
||||||
|
* Thu Oct 14 2021 David King <amigadave@amigadave.com> - 1.68.0-10
|
||||||
|
- Change Conflicts syntax (#1915339)
|
||||||
|
|
||||||
|
* Fri Oct 08 2021 David King <amigadave@amigadave.com> - 1.68.0-9
|
||||||
|
- Add Conflicts for i686/x86_64 devel subpackage (#1915339)
|
||||||
|
|
||||||
|
* Wed Aug 18 2021 Carlos O'Donell <codonell@redhat.com> - 1.68.0-8
|
||||||
|
- Rebuilt for libffi 3.4.2 SONAME transition. Related: rhbz#1891914
|
||||||
|
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Sat Jul 10 2021 David King <amigadave@amigadave.com> - 1.68.0-6
|
||||||
|
- Add Requires on python-markdown for g-ir-doc-tool (#1979144)
|
||||||
|
- Add license texts and documentation files (#1979144)
|
||||||
|
|
||||||
|
* Wed Apr 28 2010 Matthias Clasen <mclasen@redhat.com - 1.68.0-5
|
||||||
|
- Fix license field to follow the rules
|
||||||
|
- Related: rhbz#1915340
|
||||||
|
|
||||||
|
* Tue Apr 27 2010 Matthias Clasen <mclasen@redhat.com - 1.68.0-4
|
||||||
|
- Fix spec file oversight
|
||||||
|
- Related: rhbz#1915340
|
||||||
|
|
||||||
|
* Tue Apr 27 2010 Matthias Clasen <mclasen@redhat.com - 1.68.0-3
|
||||||
|
- Add upstream patch to support __float128 as used in graphene
|
||||||
|
- Related: rhbz#1915340
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.68.0-2
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 1.68.0-1
|
||||||
|
- Update to 1.68.0
|
||||||
|
|
||||||
|
* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 1.67.1-1
|
||||||
|
- Update to 1.67.1
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.66.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 04 2020 Kalev Lember <klember@redhat.com> - 1.66.1-2
|
||||||
|
- Backport an upstream MR to fix the build with Python 3.10 (#1893194)
|
||||||
|
|
||||||
|
* Mon Oct 5 2020 Kalev Lember <klember@redhat.com> - 1.66.1-1
|
||||||
|
- Update to 1.66.1
|
||||||
|
|
||||||
|
* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 1.66.0-1
|
||||||
|
- Update to 1.66.0
|
||||||
|
|
||||||
|
* Wed Sep 09 2020 Than Ngo <than@redhat.com> - 1.64.1-5
|
||||||
|
- Rebuild
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.64.1-4
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.64.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.64.1-2
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Sun Apr 05 2020 Kalev Lember <klember@redhat.com> - 1.64.1-1
|
||||||
|
- Update to 1.64.1
|
||||||
|
|
||||||
|
* Thu Mar 26 2020 Kalev Lember <klember@redhat.com> - 1.64.0-2
|
||||||
|
- Fix the build with Python 3.9 (#1817649)
|
||||||
|
|
||||||
|
* Sat Mar 07 2020 Kalev Lember <klember@redhat.com> - 1.64.0-1
|
||||||
|
- Update to 1.64.0
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.63.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 17 2020 Kalev Lember <klember@redhat.com> - 1.63.2-1
|
||||||
|
- Update to 1.63.2
|
||||||
|
|
||||||
|
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 1.63.1-1
|
||||||
|
- Update to 1.63.1
|
||||||
|
|
||||||
|
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 1.62.0-1
|
||||||
|
- Update to 1.62.0
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Kalev Lember <klember@redhat.com> - 1.61.2-1
|
||||||
|
- Update to 1.61.2
|
||||||
|
|
||||||
|
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.61.1-2
|
||||||
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 1.61.1-1
|
||||||
|
- Update to 1.61.1
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.60.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue May 07 2019 Miro Hrončok <mhroncok@redhat.com> - 1.60.1-3
|
||||||
|
- Require the Python version this was built with
|
||||||
|
|
||||||
|
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 1.60.1-2
|
||||||
|
- Rebuild with Meson fix for #1699099
|
||||||
|
|
||||||
|
* Mon Apr 08 2019 Kalev Lember <klember@redhat.com> - 1.60.1-1
|
||||||
|
- Update to 1.60.1
|
||||||
|
|
||||||
|
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 1.60.0-1
|
||||||
|
- Update to 1.60.0
|
||||||
|
|
||||||
|
* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 1.59.5-1
|
||||||
|
- Update to 1.59.5
|
||||||
|
|
||||||
|
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 1.59.4-1
|
||||||
|
- Update to 1.59.4
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.59.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 08 2019 Kalev Lember <klember@redhat.com> - 1.59.3-1
|
||||||
|
- Update to 1.59.3
|
||||||
|
|
||||||
|
* Sat Jan 05 2019 Kalev Lember <klember@redhat.com> - 1.59.2-1
|
||||||
|
- Update to 1.59.2
|
||||||
|
- Switch to the meson build system
|
||||||
|
- Fix gtk-doc directory ownership
|
||||||
|
|
||||||
|
* Sun Dec 30 2018 Kalev Lember <klember@redhat.com> - 1.58.3-1
|
||||||
|
- Update to 1.58.3
|
||||||
|
|
||||||
|
* Mon Dec 10 2018 Kalev Lember <klember@redhat.com> - 1.58.2-1
|
||||||
|
- Update to 1.58.2
|
||||||
|
|
||||||
|
* Sat Nov 17 2018 Kalev Lember <klember@redhat.com> - 1.58.1-1
|
||||||
|
- Update to 1.58.1
|
||||||
|
|
||||||
|
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 1.58.0-2
|
||||||
|
- Rebuilt against fixed atk (#1626575)
|
||||||
|
|
||||||
|
* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 1.58.0-1
|
||||||
|
- Update to 1.58.0
|
||||||
|
|
||||||
|
* Sun Aug 12 2018 Kalev Lember <klember@redhat.com> - 1.57.2-1
|
||||||
|
- Update to 1.57.2
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.56.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.56.1-2
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
* Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 1.56.1-1
|
* Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 1.56.1-1
|
||||||
- Update to 1.56.1
|
- Update to 1.56.1
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (gobject-introspection-1.56.1.tar.xz) = 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
|
SHA512 (gobject-introspection-1.68.0.tar.xz) = d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
|
||||||
|
Loading…
Reference in New Issue
Block a user