Received: by mail.netbsd.org (Postfix, from userid 605) id D34E784D81; Wed, 8 Nov 2017 22:51:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5EE6684D3C for ; Wed, 8 Nov 2017 22:51:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ssgX57xe8yrF for ; Wed, 8 Nov 2017 22:51:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 593EF84C86 for ; Wed, 8 Nov 2017 22:51:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0B5A5FBDE; Wed, 8 Nov 2017 22:51:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151018151522840" MIME-Version: 1.0 Date: Wed, 8 Nov 2017 22:51:55 +0000 From: "Patrick Welche" Subject: CVS commit: pkgsrc/textproc To: pkgsrc-changes@NetBSD.org Reply-To: prlw1@netbsd.org X-Mailer: log_accum Message-Id: <20171108225155.0B5A5FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151018151522840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: prlw1 Date: Wed Nov 8 22:51:54 UTC 2017 Modified Files: pkgsrc/textproc/libxml2: distinfo pkgsrc/textproc/py-libxml2: Makefile Added Files: pkgsrc/textproc/libxml2/patches: patch-python_libxml2.py Log Message: py-libxml2: in nodeWrap deal with name is None case Should fix gtk-doc build with itstool 2.0.4: Error: Could not merge translations: 'NoneType' object is not subscriptable To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 pkgsrc/textproc/libxml2/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/libxml2/patches/patch-python_libxml2.py cvs rdiff -u -r1.59 -r1.60 pkgsrc/textproc/py-libxml2/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_151018151522840 Content-Disposition: inline Content-Length: 2827 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/libxml2/distinfo diff -u pkgsrc/textproc/libxml2/distinfo:1.122 pkgsrc/textproc/libxml2/distinfo:1.123 --- pkgsrc/textproc/libxml2/distinfo:1.122 Mon Nov 6 16:16:53 2017 +++ pkgsrc/textproc/libxml2/distinfo Wed Nov 8 22:51:54 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.122 2017/11/06 16:16:53 prlw1 Exp $ +$NetBSD: distinfo,v 1.123 2017/11/08 22:51:54 prlw1 Exp $ SHA1 (libxml2-2.9.7.tar.gz) = ab3325e6cdda50ab2382fdfe0bdb6f7d1b9224a6 RMD160 (libxml2-2.9.7.tar.gz) = f596599cbcac6d3175482177c3320a56e68b49a2 @@ -11,5 +11,6 @@ SHA1 (patch-ad) = d65b7e3be9694147e96ce4 SHA1 (patch-ae) = 4eede9719724f94402e850ee6d6043a74aaf62b2 SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096 SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675 +SHA1 (patch-python_libxml2.py) = 209d105b0f3aedb834091390a7c6819705108e34 SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1 SHA1 (patch-python_types.c) = e8d73ddc4ee249e62359a517dd7cedc3da0a829c Index: pkgsrc/textproc/py-libxml2/Makefile diff -u pkgsrc/textproc/py-libxml2/Makefile:1.59 pkgsrc/textproc/py-libxml2/Makefile:1.60 --- pkgsrc/textproc/py-libxml2/Makefile:1.59 Mon Nov 6 16:16:53 2017 +++ pkgsrc/textproc/py-libxml2/Makefile Wed Nov 8 22:51:54 2017 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.59 2017/11/06 16:16:53 prlw1 Exp $ +# $NetBSD: Makefile,v 1.60 2017/11/08 22:51:54 prlw1 Exp $ .include "../../textproc/libxml2/Makefile.common" PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 COMMENT= Python wrapper for libxml2 LICENSE= modified-bsd @@ -26,7 +27,7 @@ EGG_NAME= ${DISTNAME:S/-/_python-/} BUILD_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat -BUILDLINK_API_DEPENDS.libxml2+= libxml2>=${PKGVERSION} +BUILDLINK_API_DEPENDS.libxml2+= libxml2>=${PKGVERSION_NOREV} .include "../../textproc/libxml2/buildlink3.mk" .include "../../lang/python/distutils.mk" Added files: Index: pkgsrc/textproc/libxml2/patches/patch-python_libxml2.py diff -u /dev/null pkgsrc/textproc/libxml2/patches/patch-python_libxml2.py:1.1 --- /dev/null Wed Nov 8 22:51:54 2017 +++ pkgsrc/textproc/libxml2/patches/patch-python_libxml2.py Wed Nov 8 22:51:54 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-python_libxml2.py,v 1.1 2017/11/08 22:51:54 prlw1 Exp $ + +name[0:8] will fail if name is None. +https://bugzilla.gnome.org/show_bug.cgi?id=790071 + +--- python/libxml2.py.orig 2017-10-30 07:39:09.000000000 +0000 ++++ python/libxml2.py +@@ -573,6 +573,8 @@ class xmlCoreBreadthFirstItertor: + def nodeWrap(o): + # TODO try to cast to the most appropriate node class + name = libxml2mod.type(o) ++ if name is None: ++ return xmlNode(_obj=o) + if name == "element" or name == "text": + return xmlNode(_obj=o) + if name == "attribute": --_----------=_151018151522840--