Index: head/textproc/libxml2/files/patch-python_libxml.c =================================================================== --- head/textproc/libxml2/files/patch-python_libxml.c (nonexistent) +++ head/textproc/libxml2/files/patch-python_libxml.c (revision 495019) @@ -0,0 +1,35 @@ +# Workaround https://bugzilla.gnome.org/show_bug.cgi?id=789714 +# Obtained from openSuse / Fedora + +--- python/libxml.c.orig 2016-06-07 10:04:14 UTC ++++ python/libxml.c +@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + #ifdef DEBUG_ERROR + printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); +@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + str[999] = 0; + va_end(ap); + ++#if PY_MAJOR_VERSION >= 3 ++ /* Ensure the error string doesn't start at UTF8 continuation. */ ++ while (*ptr && (*ptr & 0xc0) == 0x80) ++ ptr++; ++#endif ++ + list = PyTuple_New(2); + PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); + Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); +- message = libxml_charPtrConstWrap(str); ++ message = libxml_charPtrConstWrap(ptr); + PyTuple_SetItem(list, 1, message); + result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); ++ /* Forget any errors caused in the error handler. */ ++ PyErr_Clear(); + Py_XDECREF(list); + Py_XDECREF(result); + } Property changes on: head/textproc/libxml2/files/patch-python_libxml.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/py-libxml2/Makefile =================================================================== --- head/textproc/py-libxml2/Makefile (revision 495018) +++ head/textproc/py-libxml2/Makefile (revision 495019) @@ -1,34 +1,34 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface for XML parser library for GNOME MASTERDIR= ${.CURDIR}/../libxml2 BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME= libxml2 USES= python gettext-runtime USE_PYTHON= autoplist distutils CPPFLAGS+= `${PYTHON_CMD}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_CMD}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-python=${PYTHON_CMD} DOCSDIR= ${PREFIX}/share/doc/py-libxml2 EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2 post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so .include "${MASTERDIR}/Makefile"