[pkgsrc/trunk]: pkgsrc/devel/gobject-introspection Add gobject-introspection ...

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d20b6a2f7fac
branches:  trunk
changeset: 396620:d20b6a2f7fac
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Wed Jun 05 09:12:32 2019 +0000

description:
Add gobject-introspection dependency on py-expat as ElementTree defaults
to XMLParser which imports pyexpat.

diffstat:

 devel/gobject-introspection/Makefile                               |   4 +-
 devel/gobject-introspection/distinfo                               |   4 +-
 devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py |  16 ++++++++++
 devel/gobject-introspection/patches/patch-giscanner_girparser.py   |  16 ++++++++++
 4 files changed, 38 insertions(+), 2 deletions(-)

diffs (78 lines):

diff -r dfbba6522d9b -r d20b6a2f7fac devel/gobject-introspection/Makefile
--- a/devel/gobject-introspection/Makefile      Wed Jun 05 08:57:15 2019 +0000
+++ b/devel/gobject-introspection/Makefile      Wed Jun 05 09:12:32 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2019/06/03 12:29:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2019/06/05 09:12:32 prlw1 Exp $
 
 DISTNAME=      gobject-introspection-1.60.1
+PKGREVISION=   1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,6 +12,7 @@
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 USE_TOOLS+=    pkg-config flex bison
 
diff -r dfbba6522d9b -r d20b6a2f7fac devel/gobject-introspection/distinfo
--- a/devel/gobject-introspection/distinfo      Wed Jun 05 08:57:15 2019 +0000
+++ b/devel/gobject-introspection/distinfo      Wed Jun 05 09:12:32 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2019/06/03 10:47:20 prlw1 Exp $
+$NetBSD: distinfo,v 1.32 2019/06/05 09:12:32 prlw1 Exp $
 
 SHA1 (gobject-introspection-1.60.1.tar.xz) = c4c55fbc207fd777371c960274be29f7c9fe3551
 RMD160 (gobject-introspection-1.60.1.tar.xz) = 71ca6db1b174272525ee991ab723957003f66891
@@ -6,6 +6,8 @@
 Size (gobject-introspection-1.60.1.tar.xz) = 1284460 bytes
 SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
 SHA1 (patch-giscanner_ccompiler.py) = 03faf472ad9384670e7f15a647e069606d44daba
+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
diff -r dfbba6522d9b -r d20b6a2f7fac devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py        Wed Jun 05 09:12:32 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-giscanner_gdumpparser.py,v 1.1 2019/06/05 09:12:32 prlw1 Exp $
+
+cElementTree is deprecated since Python 3.3.
+(gobject-introspection requires meson 0.47.0 which requires Python 3.5.)
+
+--- giscanner/gdumpparser.py.orig      2019-01-16 18:03:21.000000000 +0000
++++ giscanner/gdumpparser.py
+@@ -22,7 +22,7 @@ import os
+ import sys
+ import tempfile
+ import subprocess
+-from xml.etree.cElementTree import parse
++from xml.etree.ElementTree import parse
+ 
+ from . import ast
+ from . import message
diff -r dfbba6522d9b -r d20b6a2f7fac devel/gobject-introspection/patches/patch-giscanner_girparser.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gobject-introspection/patches/patch-giscanner_girparser.py  Wed Jun 05 09:12:32 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-giscanner_girparser.py,v 1.1 2019/06/05 09:12:32 prlw1 Exp $
+
+cElementTree is deprecated since Python 3.3.
+(gobject-introspection requires meson 0.47.0 which requires Python 3.5.)
+
+--- giscanner/girparser.py.orig        2019-01-11 14:16:09.000000000 +0000
++++ giscanner/girparser.py
+@@ -21,7 +21,7 @@
+ import os
+ 
+ from collections import OrderedDict
+-from xml.etree.cElementTree import parse
++from xml.etree.ElementTree import parse
+ 
+ from . import ast
+ from .girwriter import COMPATIBLE_GIR_VERSION