CVS commit: pkgsrc/devel/gobject-introspection

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 11 10:09:36 UTC 2020

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile PLIST distinfo
        pkgsrc/devel/gobject-introspection/patches: patch-gir_meson.build
            patch-tools_meson.build
Removed Files:
        pkgsrc/devel/gobject-introspection/patches: patch-meson.build

Log Message:
gobject-introspection: update to 1.64.0.

1.64.0 - 2020-03-07
-------------------

* Update glib annotations (:user:`Rico Tzschichholz <ricotz>`)
* Fix regress scanner tests for non-gcc/clang compilers :mr:`197` (:user:`Chun-wei Fan <fanc999>`)
* Document how to update glib GIR :mr:`199` (:user:`Bastien Nocera <hadess>`)

1.63.2 - 2020-01-17
-------------------

* Update glib annotations (:user:`Rico Tzschichholz <ricotz>`)
* Add GMemoryMonitor to glib annotations :mr:`193` (:user:`Bastien Nocera <hadess>`)
* Fix build reproducibility :mr:`192` (:user:`Joshua Watt <jpewhacker>`)
* Drop deprecated xml.etree.ElementTree.Element.getchildren() calls :mr:`194` (:user:`Miro Hrončok <hroncok>`)
* Support Python 3.8.x+ on Windows :mr:`195` (:user:`Chun-wei Fan <fanc999>`)
* Cross compile support :mr:`64` (:user:`Alexander Kanavin <alex.kanavin>`)
* meson: Visual Studio builds: Use -utf-8 where available :mr:`196` (:user:`Chun-wei Fan <fanc999>`)

1.63.1 - 2019-11-24
-------------------

* Update glib annotations (:user:`Rico Tzschichholz <ricotz>`)
* build: require meson 0.50.1
* build: use proper dylib versioning on macOS :mr:`177` (:user:`Tom Schoonjans  <tschoonj>`)
* scanner: Support array arguments with static keyword :mr:`176` (:user:`Emmanuele Bassi <ebassi>`)
* website: Add Ruby-GNOME to user list :mr:`178` (:user:`kojix2`)
* Fix non-libtool code being run with no nob-libtool dependencies :mr:`179` (:user:`Alistair Buxton <ali1234>`)
* meson: change "cairo" from a boolean to a feature option :mr:`180`
* meson: change "doctool" from a boolean to a feature option :mr:`181`
* Fix a memory leak in g_irepository_get_object_gtype_interfaces() :mr:`182` (:user:`Philip Chimento <ptomato>`)
* ccompiler.py: Fix macro defines with quotes on MSVC :mr:`183` (:user:`Chun-wei Fan <fanc999>`)
* tests: Actually test libregress by specifying the LD_LIBRARY_PATH :mr:`174` (:user:`Corentin Noël <tintou>`)
* examples: Make self contained and add build system integration examples :mr:`189`
* autotools: Make INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR respect prefix/datadir/libdir :mr:`190`
* girepository: Also store GType cache misses :mr:`191` (:user:`Carlos Garnacho <carlosg>`)
* docs: Document GI_CROSS_LAUNCHER envvar :mr:`175` (:user:`Emmanuele Bassi <ebassi>`)


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/gobject-introspection/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build \
    pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/gobject-introspection/patches/patch-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.68 pkgsrc/devel/gobject-introspection/Makefile:1.69
--- pkgsrc/devel/gobject-introspection/Makefile:1.68    Sun Mar  8 16:42:25 2020
+++ pkgsrc/devel/gobject-introspection/Makefile Wed Mar 11 10:09:36 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2020/03/08 16:42:25 bsiegert Exp $
+# $NetBSD: Makefile,v 1.69 2020/03/11 10:09:36 wiz Exp $
 
-DISTNAME=      gobject-introspection-1.62.0
-PKGREVISION=   1
+DISTNAME=      gobject-introspection-1.64.0
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/gobject-introspection/PLIST
diff -u pkgsrc/devel/gobject-introspection/PLIST:1.13 pkgsrc/devel/gobject-introspection/PLIST:1.14
--- pkgsrc/devel/gobject-introspection/PLIST:1.13       Mon Oct 14 03:28:01 2019
+++ pkgsrc/devel/gobject-introspection/PLIST    Wed Mar 11 10:09:36 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2019/10/14 03:28:01 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.14 2020/03/11 10:09:36 wiz Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -166,3 +166,20 @@ share/gir-1.0/xlib-2.0.gir
 share/gir-1.0/xrandr-1.3.gir
 share/gobject-introspection-1.0/Makefile.introspection
 share/gobject-introspection-1.0/gdump.c
+share/gobject-introspection-1.0/tests/annotation.c
+share/gobject-introspection-1.0/tests/annotation.h
+share/gobject-introspection-1.0/tests/drawable.c
+share/gobject-introspection-1.0/tests/drawable.h
+share/gobject-introspection-1.0/tests/everything.c
+share/gobject-introspection-1.0/tests/everything.h
+share/gobject-introspection-1.0/tests/foo.c
+share/gobject-introspection-1.0/tests/foo.h
+share/gobject-introspection-1.0/tests/gimarshallingtests.c
+share/gobject-introspection-1.0/tests/gimarshallingtests.h
+share/gobject-introspection-1.0/tests/gitestmacros.h
+share/gobject-introspection-1.0/tests/regress.c
+share/gobject-introspection-1.0/tests/regress.h
+share/gobject-introspection-1.0/tests/utility.c
+share/gobject-introspection-1.0/tests/utility.h
+share/gobject-introspection-1.0/tests/warnlib.c
+share/gobject-introspection-1.0/tests/warnlib.h

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.35 pkgsrc/devel/gobject-introspection/distinfo:1.36
--- pkgsrc/devel/gobject-introspection/distinfo:1.35    Tue Feb 18 16:00:22 2020
+++ pkgsrc/devel/gobject-introspection/distinfo Wed Mar 11 10:09:36 2020
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.35 2020/02/18 16:00:22 jperkin Exp $
+$NetBSD: distinfo,v 1.36 2020/03/11 10:09:36 wiz Exp $
 
-SHA1 (gobject-introspection-1.62.0.tar.xz) = 6c51a15d3c067bb99b4b5c799d449c82c873f2b7
-RMD160 (gobject-introspection-1.62.0.tar.xz) = d9f1d8b15259ca9e77c5103b3bf79df4f7976ee2
-SHA512 (gobject-introspection-1.62.0.tar.xz) = b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
-Size (gobject-introspection-1.62.0.tar.xz) = 980732 bytes
-SHA1 (patch-gir_meson.build) = c2835a743c73fb2d511a51f83d450ca73384c3c1
+SHA1 (gobject-introspection-1.64.0.tar.xz) = b94dc13a1df2a3f6d5ab7e8f1c9df757ee7af6dc
+RMD160 (gobject-introspection-1.64.0.tar.xz) = 3c99ca767c3daf89478ff17302d96a29bdd3f144
+SHA512 (gobject-introspection-1.64.0.tar.xz) = d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
+Size (gobject-introspection-1.64.0.tar.xz) = 1000240 bytes
+SHA1 (patch-gir_meson.build) = 428739a91aad88fcc003f0e3aaca68f1f8631a91
 SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
 SHA1 (patch-giscanner_gdumpparser.py) = 83d6c72d070b2e32d90131148b566a1a2fb9aa77
 SHA1 (patch-giscanner_girparser.py) = 1156b7146568667dcb56ae7fecfc0f1be91b78ec
-SHA1 (patch-meson.build) = eb67bfe1a9dd46986b9b6e0d296c385e2924a0e8
 SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
 SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
-SHA1 (patch-tools_meson.build) = 6b9f2f1b11d1eca62fbc136c3ac56692db7cacde
+SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14

Index: pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
diff -u pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.1 pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.2
--- pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.1        Tue Feb 18 16:00:22 2020
+++ pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build    Wed Mar 11 10:09:36 2020
@@ -1,16 +1,15 @@
-$NetBSD: patch-gir_meson.build,v 1.1 2020/02/18 16:00:22 jperkin Exp $
+$NetBSD: patch-gir_meson.build,v 1.2 2020/03/11 10:09:36 wiz Exp $
 
 gircompiler requires libraries from the build area.
 
---- gir/meson.build.orig       2019-09-09 19:22:10.000000000 +0000
+--- gir/meson.build.orig       2020-03-07 14:13:21.645308500 +0000
 +++ gir/meson.build
-@@ -433,7 +433,8 @@ foreach gir : gir_files
-     input: gir,
-     output: '@BASENAME@.typelib',
-     depends: [gobject_gir, ],
--    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
-+    command: ['env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
-+              gircompiler, '-o', '@OUTPUT@', '@INPUT@',
-               '--includedir', meson.current_build_dir(),
-               '--includedir', meson.current_source_dir(),
-     ],
+@@ -446,7 +446,7 @@ typelibs = []
+ if get_option('gi_cross_binary_wrapper') != ''
+     gircompiler_command = [get_option('gi_cross_binary_wrapper'), gircompiler.full_path(), ]
+ else
+-    gircompiler_command = [gircompiler, ]
++    gircompiler_command = ['env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository', gircompiler ]
+ endif
+ 
+ gircompiler_command += [ '-o', '@OUTPUT@', '@INPUT@',
Index: pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build
diff -u pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build:1.1 pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build:1.2
--- pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build:1.1      Mon Jun  3 10:47:20 2019
+++ pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build  Wed Mar 11 10:09:36 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-tools_meson.build,v 1.1 2019/06/03 10:47:20 prlw1 Exp $
+$NetBSD: patch-tools_meson.build,v 1.2 2020/03/11 10:09:36 wiz Exp $
 
 After testing for the meson_option "python", meson.build then overwrites it.
 
---- tools/meson.build.orig     2019-01-11 14:16:09.000000000 +0000
+--- tools/meson.build.orig     2020-03-07 14:13:21.693311500 +0000
 +++ tools/meson.build
 @@ -12,7 +12,7 @@ endif
  if cc.get_id() == 'msvc'
-   python_cmd = '/usr/bin/env ' + python.get_variable('prefix') + '\\python.exe'
+   python_cmd = '/usr/bin/env ' + python.path()
  else
 -  python_cmd = '/usr/bin/env python@0@'.format(python.language_version().split('.')[0])
 +  python_cmd = python.path()