diff options
| author | joerg <joerg@pkgsrc.org> | 2012-05-05 22:16:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-05-05 22:16:14 +0000 |
| commit | 57d13a7efa08a1687ff5dd810734a88b89f44a60 (patch) | |
| tree | ed3eacb9b5051720bf6b61993e719d077a8a0bf6 | |
| parent | cecb69abbbefbe01e2639d834d79fd6a8d99c35f (diff) | |
| download | pkgsrc-57d13a7efa08a1687ff5dd810734a88b89f44a60.tar.gz | |
Fix build of py26-expat against expat-2.0. Bump revision.
| -rw-r--r-- | lang/python26/distinfo | 3 | ||||
| -rw-r--r-- | lang/python26/patches/patch-Modules_pyexpat.c | 18 | ||||
| -rw-r--r-- | textproc/py-expat/Makefile | 4 |
3 files changed, 22 insertions, 3 deletions
diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 4bd7c2bab8b..990bebe4536 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2012/04/14 10:47:17 obache Exp $ +$NetBSD: distinfo,v 1.46 2012/05/05 22:16:14 joerg Exp $ SHA1 (Python-2.6.8.tar.bz2) = 348b727a9818146a57aa43203f37d8c6b462fe79 RMD160 (Python-2.6.8.tar.bz2) = fcfa3554af415cbddd3e8d68aead46f1e7b8e616 @@ -6,6 +6,7 @@ Size (Python-2.6.8.tar.bz2) = 11127915 bytes SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94 SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365 +SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3 SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113 SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5 diff --git a/lang/python26/patches/patch-Modules_pyexpat.c b/lang/python26/patches/patch-Modules_pyexpat.c new file mode 100644 index 00000000000..68fbc2f53f3 --- /dev/null +++ b/lang/python26/patches/patch-Modules_pyexpat.c @@ -0,0 +1,18 @@ +$NetBSD: patch-Modules_pyexpat.c,v 1.1 2012/05/05 22:16:15 joerg Exp $ + +--- Modules/pyexpat.c.orig 2012-05-05 17:15:36.000000000 +0000 ++++ Modules/pyexpat.c +@@ -1355,8 +1355,13 @@ newxmlparseobject(char *encoding, char * + else { + self->itself = XML_ParserCreate(encoding); + } ++#if ((XML_MAJOR_VERSION >= 2) && (XML_MINOR_VERSION >= 1)) || defined(XML_HAS_SET_HASH_SALT) ++ /* This feature was added upstream in libexpat 2.1.0. Our expat copy ++ * has a backport of this feature where we also define XML_HAS_SET_HASH_SALT ++ * to indicate that we can still use it. */ + XML_SetHashSalt(self->itself, + (unsigned long)_Py_HashSecret.prefix); ++#endif + self->intern = intern; + Py_XINCREF(self->intern); + #ifdef Py_TPFLAGS_HAVE_GC diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index 1ee5538b7d3..d5d6f8aba65 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2012/04/15 22:01:04 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2012/05/05 22:16:14 joerg Exp $ # PKGNAME= ${PYPKGPREFIX}-expat-0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= textproc python MAINTAINER= pkgsrc-users@NetBSD.org |