From 8f34ed7fedbfd39dcd3faba45790f05e7298d2de Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 12 Apr 2020 20:29:08 +0000 Subject: gobject-introspection: update to 1.64.1. 1.64.1 - 2020-04-05 ------------------- * Replace calls to deprecated xml.etree.cElementTree removed in Python 3.9 :mr:`202` (:user:`Stephen Gallagher `) * gimarshallingtests: Use g_assert_cmpfloat_with_epsilon. Fixes tests on some architectures :mr:`200` (:user:`Iain Lane `) --- devel/gobject-introspection/Makefile | 4 ++-- devel/gobject-introspection/distinfo | 12 +++++------- .../patches/patch-giscanner_gdumpparser.py | 16 ---------------- .../patches/patch-giscanner_girparser.py | 16 ---------------- 4 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py delete mode 100644 devel/gobject-introspection/patches/patch-giscanner_girparser.py (limited to 'devel') diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 1b42eac4896..6c552d1a589 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.69 2020/03/11 10:09:36 wiz Exp $ +# $NetBSD: Makefile,v 1.70 2020/04/12 20:29:08 wiz Exp $ -DISTNAME= gobject-introspection-1.64.0 +DISTNAME= gobject-introspection-1.64.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index e946047a922..2752224aed8 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,13 +1,11 @@ -$NetBSD: distinfo,v 1.36 2020/03/11 10:09:36 wiz Exp $ +$NetBSD: distinfo,v 1.37 2020/04/12 20:29:08 wiz Exp $ -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 (gobject-introspection-1.64.1.tar.xz) = f5be2ccbf48f5c9b6c32fa8400b6a14d608b4e03 +RMD160 (gobject-introspection-1.64.1.tar.xz) = 8e3907ab56cba474aff0728542b5059e0e6c4fb5 +SHA512 (gobject-introspection-1.64.1.tar.xz) = 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c +Size (gobject-introspection-1.64.1.tar.xz) = 1000280 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-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94 diff --git a/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py b/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py deleted file mode 100644 index b1290f34a3e..00000000000 --- a/devel/gobject-introspection/patches/patch-giscanner_gdumpparser.py +++ /dev/null @@ -1,16 +0,0 @@ -$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 --git a/devel/gobject-introspection/patches/patch-giscanner_girparser.py b/devel/gobject-introspection/patches/patch-giscanner_girparser.py deleted file mode 100644 index 01d22247a39..00000000000 --- a/devel/gobject-introspection/patches/patch-giscanner_girparser.py +++ /dev/null @@ -1,16 +0,0 @@ -$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 -- cgit v1.2.3