CVS commit: pkgsrc/devel/gobject-introspection

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Wed Jun  5 09:12:32 UTC 2019

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile distinfo
Added Files:
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_gdumpparser.py patch-giscanner_girparser.py

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


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_girparser.py

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.60 pkgsrc/devel/gobject-introspection/Makefile:1.61
--- pkgsrc/devel/gobject-introspection/Makefile:1.60    Mon Jun  3 12:29:40 2019
+++ pkgsrc/devel/gobject-introspection/Makefile Wed Jun  5 09:12:32 2019
@@ -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 @@ COMMENT=      GObject Introspection
 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
 

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.31 pkgsrc/devel/gobject-introspection/distinfo:1.32
--- pkgsrc/devel/gobject-introspection/distinfo:1.31    Mon Jun  3 10:47:20 2019
+++ pkgsrc/devel/gobject-introspection/distinfo Wed Jun  5 09:12:32 2019
@@ -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 @@ SHA512 (gobject-introspection-1.60.1.tar
 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

Added files:

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py:1.1
--- /dev/null   Wed Jun  5 09:12:32 2019
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py   Wed Jun  5 09:12:32 2019
@@ -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
Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_girparser.py
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_girparser.py:1.1
--- /dev/null   Wed Jun  5 09:12:32 2019
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_girparser.py     Wed Jun  5 09:12:32 2019
@@ -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