pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc py-libxml2: remove patch-python_libxml__wrap....



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c27b6d4dcf11
branches:  trunk
changeset: 371185:c27b6d4dcf11
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Mon Nov 06 16:01:59 2017 +0000

description:
py-libxml2: remove patch-python_libxml__wrap.h - the cause of PR pkg/52690

$ python3.6
Python 3.6.3 (default, Oct 27 2017, 17:16:29)
[GCC 5.4.0] on netbsd8
Type "help", "copyright", "credits" or "license" for more information.
>>> import libxml2
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/usr/pkg/lib/python3.6/site-packages/libxml2.py", line 1, in <module>
    import libxml2mod
ImportError: /usr/pkg/lib/python3.6/site-packages/libxml2mod.so: Undefined PLT symbol "PyCObject_Check" (symnum = 488)

diffstat:

 textproc/libxml2/distinfo                            |   3 +-
 textproc/libxml2/patches/patch-python_libxml__wrap.h |  22 --------------------
 textproc/py-libxml2/Makefile                         |   3 +-
 3 files changed, 3 insertions(+), 25 deletions(-)

diffs (55 lines):

diff -r 65dd2491fe5f -r c27b6d4dcf11 textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Mon Nov 06 13:43:34 2017 +0000
+++ b/textproc/libxml2/distinfo Mon Nov 06 16:01:59 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.119 2017/10/31 13:15:44 fhajny Exp $
+$NetBSD: distinfo,v 1.120 2017/11/06 16:01:59 prlw1 Exp $
 
 SHA1 (libxml2-2.9.6.tar.gz) = 4ab4605fce0f82a004c3b2aeb368efc8f356e020
 RMD160 (libxml2-2.9.6.tar.gz) = 99616c77b5991a00e83abca708338cfa09beef29
@@ -11,5 +11,4 @@
 SHA1 (patch-ae) = 4eede9719724f94402e850ee6d6043a74aaf62b2
 SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096
 SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
-SHA1 (patch-python_libxml__wrap.h) = d7dc1c23cbca3481dcc5c2ff5cbb764b0f97de56
 SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1
diff -r 65dd2491fe5f -r c27b6d4dcf11 textproc/libxml2/patches/patch-python_libxml__wrap.h
--- a/textproc/libxml2/patches/patch-python_libxml__wrap.h      Mon Nov 06 13:43:34 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-python_libxml__wrap.h,v 1.1 2017/10/31 13:15:44 fhajny Exp $
-
-fix for Python-2.6
-
---- python/libxml_wrap.h.orig  2014-10-03 09:00:54.000000000 +0000
-+++ python/libxml_wrap.h
-@@ -28,7 +28,6 @@
-  * and don't use Capsule but CObjects
-  */
- #if PY_VERSION_HEX < 0x02070000
--#ifndef PyBytes_Check
- #define PyBytes_Check PyString_Check
- #define PyBytes_Size PyString_Size
- #define PyBytes_AsString PyString_AsString
-@@ -40,7 +39,6 @@
- #define PyCapsule_CheckExact PyCObject_Check
- #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
- #endif
--#endif
- 
- /**
-  * ATTRIBUTE_UNUSED:
diff -r 65dd2491fe5f -r c27b6d4dcf11 textproc/py-libxml2/Makefile
--- a/textproc/py-libxml2/Makefile      Mon Nov 06 13:43:34 2017 +0000
+++ b/textproc/py-libxml2/Makefile      Mon Nov 06 16:01:59 2017 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2017/10/31 13:15:44 fhajny Exp $
+# $NetBSD: Makefile,v 1.58 2017/11/06 16:02:00 prlw1 Exp $
 
 .include "../../textproc/libxml2/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 
 COMMENT=       Python wrapper for libxml2
 LICENSE=       modified-bsd



Home | Main Index | Thread Index | Old Index