summaryrefslogtreecommitdiff
path: root/textproc/libxml2
diff options
context:
space:
mode:
authorprlw1 <prlw1@pkgsrc.org>2017-11-08 22:51:54 +0000
committerprlw1 <prlw1@pkgsrc.org>2017-11-08 22:51:54 +0000
commitd2e432431f92a6711a8959e0a7689b6bb63fdf58 (patch)
tree46e20f798031454bc202c53c02babf70ba59d58d /textproc/libxml2
parentaea8900fe9b0384f284c0958632a06928040b360 (diff)
downloadpkgsrc-d2e432431f92a6711a8959e0a7689b6bb63fdf58.tar.gz
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
Diffstat (limited to 'textproc/libxml2')
-rw-r--r--textproc/libxml2/distinfo3
-rw-r--r--textproc/libxml2/patches/patch-python_libxml2.py16
2 files changed, 18 insertions, 1 deletions
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 577639b9aa4..a41b7e2acac 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -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) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
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
diff --git a/textproc/libxml2/patches/patch-python_libxml2.py b/textproc/libxml2/patches/patch-python_libxml2.py
new file mode 100644
index 00000000000..c53582744bf
--- /dev/null
+++ b/textproc/libxml2/patches/patch-python_libxml2.py
@@ -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":