pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/gobject-introspection
Module Name: pkgsrc
Committed By: wiz
Date: Tue Feb 15 17:34:32 UTC 2022
Modified Files:
pkgsrc/devel/gobject-introspection: Makefile PLIST distinfo
pkgsrc/devel/gobject-introspection/patches:
patch-tests_scanner_meson.build
Added Files:
pkgsrc/devel/gobject-introspection/patches:
patch-giscanner_doctemplates_devdocs_meson.build
patch-giscanner_doctemplates_mallard_meson.build
patch-giscanner_meson.build
Removed Files:
pkgsrc/devel/gobject-introspection/patches: patch-gir_meson.build
patch-tests_meson.build patch-tests_offsets_meson.build
Log Message:
gobject-introspection: update to 1.70.0.
Add upstream patch to fix build with latest meson.
1.70.0 - 2021-09-17
-------------------
* Update the GIR data for GLib, GObject, and GIO
1.69.0 - 2021-08-24
-------------------
* Fix build when gobject-introspection is a subproject :mr:`266`
* Add more float types :issue:`384`, :mr:`269`
* Make test suite work with cross-related options :issue:`227`
* Fix several leaks found by Coverity :mr:`272`
* Fix enum member c:identifier :mr:`264`
* Add g-ir-doc-tool man page :mr:`284`
* Export warnlib sources as variables :mr:`287`
* Update the GLib annotations :mr:`288`
* Add "final" class attribute :mr:`257`, :mr:`291`
* Add option to make .gir files installation paths configurable :mr:`63`
* Handle constructors with mismatched GTypes :issue:`399`, :mr:`292`
* Add property accessors annotations :issue:`13`, :mr:`279`
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/gobject-introspection/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.5 -r0 \
pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_devdocs_meson.build \
pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_mallard_meson.build \
pkgsrc/devel/gobject-introspection/patches/patch-giscanner_meson.build
cvs rdiff -u -r1.1 -r0 \
pkgsrc/devel/gobject-introspection/patches/patch-tests_meson.build \
pkgsrc/devel/gobject-introspection/patches/patch-tests_offsets_meson.build
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/gobject-introspection/Makefile
diff -u pkgsrc/devel/gobject-introspection/Makefile:1.78 pkgsrc/devel/gobject-introspection/Makefile:1.79
--- pkgsrc/devel/gobject-introspection/Makefile:1.78 Thu Jan 20 17:08:33 2022
+++ pkgsrc/devel/gobject-introspection/Makefile Tue Feb 15 17:34:32 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2022/01/20 17:08:33 nros Exp $
+# $NetBSD: Makefile,v 1.79 2022/02/15 17:34:32 wiz Exp $
-DISTNAME= gobject-introspection-1.68.0
-PKGREVISION= 1
+DISTNAME= gobject-introspection-1.70.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
@@ -49,6 +48,9 @@ MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/o
# Disable cache to keep fake homedir clean
MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes
+post-install:
+ cd ${DESTDIR}${PREFIX} && find . -name *.orig -rm
+
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.58.0
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0
Index: pkgsrc/devel/gobject-introspection/PLIST
diff -u pkgsrc/devel/gobject-introspection/PLIST:1.15 pkgsrc/devel/gobject-introspection/PLIST:1.16
--- pkgsrc/devel/gobject-introspection/PLIST:1.15 Mon Mar 22 07:05:31 2021
+++ pkgsrc/devel/gobject-introspection/PLIST Tue Feb 15 17:34:32 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2021/03/22 07:05:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2022/02/15 17:34:32 wiz Exp $
bin/g-ir-annotation-tool
bin/g-ir-compiler
bin/g-ir-generate
@@ -71,6 +71,7 @@ lib/gobject-introspection/giscanner/doct
lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/interface.tmpl
lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/method.tmpl
lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/meson.build
lib/gobject-introspection/giscanner/doctemplates/mallard/C/callback.tmpl
lib/gobject-introspection/giscanner/doctemplates/mallard/C/class.tmpl
lib/gobject-introspection/giscanner/doctemplates/mallard/C/constructor.tmpl
@@ -115,6 +116,7 @@ lib/gobject-introspection/giscanner/doct
lib/gobject-introspection/giscanner/doctemplates/mallard/Python/vfunc.tmpl
lib/gobject-introspection/giscanner/doctemplates/mallard/base.tmpl
lib/gobject-introspection/giscanner/doctemplates/mallard/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/meson.build
lib/gobject-introspection/giscanner/doctemplates/mallard/namespace.tmpl
lib/gobject-introspection/giscanner/docwriter.py
lib/gobject-introspection/giscanner/dumper.py
@@ -141,6 +143,7 @@ lib/libgirepository-1.0.so.1.0.0
lib/pkgconfig/gobject-introspection-1.0.pc
lib/pkgconfig/gobject-introspection-no-export-1.0.pc
man/man1/g-ir-compiler.1
+man/man1/g-ir-doc-tool.1
man/man1/g-ir-generate.1
man/man1/g-ir-scanner.1
share/aclocal/introspection.m4
Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.46 pkgsrc/devel/gobject-introspection/distinfo:1.47
--- pkgsrc/devel/gobject-introspection/distinfo:1.46 Sun Oct 31 23:05:47 2021
+++ pkgsrc/devel/gobject-introspection/distinfo Tue Feb 15 17:34:32 2022
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.46 2021/10/31 23:05:47 tnn Exp $
+$NetBSD: distinfo,v 1.47 2022/02/15 17:34:32 wiz Exp $
-BLAKE2s (gobject-introspection-1.68.0.tar.xz) = f702638b2a8ddf0e3f692a11e112a437128da0f89b6c40efa3b3acf07ef79fd6
-SHA512 (gobject-introspection-1.68.0.tar.xz) = d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
-Size (gobject-introspection-1.68.0.tar.xz) = 1019732 bytes
-SHA1 (patch-gir_meson.build) = 787c0372b3c0679b91e711f22a936d6134793561
+BLAKE2s (gobject-introspection-1.70.0.tar.xz) = 079f927cf357bc24d4df1d8130c61b9a1f3e5249f53bcf7cfe9db0989e28a4ea
+SHA512 (gobject-introspection-1.70.0.tar.xz) = 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
+Size (gobject-introspection-1.70.0.tar.xz) = 1029372 bytes
SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
SHA1 (patch-giscanner_ccompiler.py) = f65622421968e9daef19bafc4bd3c3d210546389
-SHA1 (patch-tests_meson.build) = 7d7b090c81624a7a09d0d4afc68fc47b47aa7b90
-SHA1 (patch-tests_offsets_meson.build) = 13f91c775e7658136b1c31c472cf7407039cb905
+SHA1 (patch-giscanner_doctemplates_devdocs_meson.build) = d65e229db068a99ecf78e03ff0dfae809e731612
+SHA1 (patch-giscanner_doctemplates_mallard_meson.build) = 71e65065b66ae3e58d5212642ac284854da3c13d
+SHA1 (patch-giscanner_meson.build) = f3f482ef460ea725cb45f385cd09eaab5063c46d
SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
-SHA1 (patch-tests_scanner_meson.build) = 32209234d1c7c7499a336f3c313e9e943bc6576b
+SHA1 (patch-tests_scanner_meson.build) = 85fbe12f24516bf37c24bcd73974162a9249740d
SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14
Index: pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
diff -u pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build:1.1 pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build:1.2
--- pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build:1.1 Sun Oct 31 23:05:47 2021
+++ pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build Tue Feb 15 17:34:32 2022
@@ -1,16 +1,72 @@
-$NetBSD: patch-tests_scanner_meson.build,v 1.1 2021/10/31 23:05:47 tnn Exp $
+$NetBSD: patch-tests_scanner_meson.build,v 1.2 2022/02/15 17:34:32 wiz Exp $
-gircompiler requires libraries from the build area.
+Fix build with latest meson.
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2
---- tests/scanner/meson.build.orig 2021-03-19 14:22:12.000000000 +0000
+--- tests/scanner/meson.build.orig 2021-09-17 16:02:42.597052800 +0000
+++ tests/scanner/meson.build
-@@ -105,6 +105,9 @@ regress_lib = shared_library('regress-1.
- python_path = run_command(python, ['-c', 'import sys; sys.stdout.write(sys.executable)']).stdout()
+@@ -525,19 +525,26 @@ foreach gir : test_girs
+ endforeach
- gircompiler_command = [
-+ 'env',
-+ 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../../girepository',
-+ 'DYLD_LIBRARY_PATH=' + meson.current_build_dir() + '/../../girepository',
- gircompiler, '-o', '@OUTPUT@', '@INPUT@',
- '--includedir', join_paths(build_root, 'gir'),
- '--includedir', meson.current_build_dir(),
+ 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
Added files:
Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_devdocs_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_devdocs_meson.build:1.1
--- /dev/null Tue Feb 15 17:34:32 2022
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_devdocs_meson.build Tue Feb 15 17:34:32 2022
@@ -0,0 +1,27 @@
+$NetBSD: patch-giscanner_doctemplates_devdocs_meson.build,v 1.1 2022/02/15 17:34:32 wiz Exp $
+
+Fix build with latest meson.
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2
+
+--- giscanner/doctemplates/devdocs/meson.build.orig 2022-02-15 17:25:16.653304392 +0000
++++ 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',
++])
Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_mallard_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_mallard_meson.build:1.1
--- /dev/null Tue Feb 15 17:34:32 2022
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_doctemplates_mallard_meson.build Tue Feb 15 17:34:32 2022
@@ -0,0 +1,71 @@
+$NetBSD: patch-giscanner_doctemplates_mallard_meson.build,v 1.1 2022/02/15 17:34:32 wiz Exp $
+
+Fix build with latest meson.
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2
+
+--- giscanner/doctemplates/mallard/meson.build.orig 2022-02-15 17:25:16.653497644 +0000
++++ 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,
++]
Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_meson.build:1.1
--- /dev/null Tue Feb 15 17:34:32 2022
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_meson.build Tue Feb 15 17:34:32 2022
@@ -0,0 +1,28 @@
+$NetBSD: patch-giscanner_meson.build,v 1.1 2022/02/15 17:34:32 wiz Exp $
+
+Fix build with latest meson.
+https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2
+
+--- giscanner/meson.build.orig 2021-09-17 16:02:42.526052200 +0000
++++ giscanner/meson.build
+@@ -53,17 +53,9 @@ configure_file(input : '../girepository/
+
+ 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')
Home |
Main Index |
Thread Index |
Old Index