diff --git a/textproc/libxml2/files/patch-python_libxml.c b/textproc/libxml2/files/patch-python_libxml.c deleted file mode 100644 index 7bbc98d75033..000000000000 --- a/textproc/libxml2/files/patch-python_libxml.c +++ /dev/null @@ -1,35 +0,0 @@ ---- python/libxml.c.orig 2023-08-11 20:30:35 UTC -+++ python/libxml.c -@@ -1606,12 +1606,19 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, - 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); - #endif - -+#if PY_MAJOR_VERSION >= 3 -+ /* Ensure the error string doesn't start at UTF8 continuation. */ -+ while (*ptr && (*ptr & 0xc0) == 0x80) -+ ptr++; -+#endif - -+ - if (libxml_xmlPythonErrorFuncHandler == NULL) { - va_start(ap, msg); - vfprintf(stderr, msg, ap); -@@ -1625,9 +1632,11 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, - 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 = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list); -+ /* Forget any errors caused in the error handler. */ -+ PyErr_Clear(); - Py_XDECREF(list); - Py_XDECREF(result); - } diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index 84796bac21b3..7633fdebb4a1 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,32 +1,32 @@ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python interface for XML parser library for GNOME USES+= gnome python shebangfix USE_GNOME= libxml2 USE_PYTHON= flavors SHEBANG_FILES= *.py doc/*.py python/*.py python/tests/*.py # Help CMake determine the correct version of Python if # multiple versions are installed CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} MASTERDIR= ${.CURDIR}/../libxml2 DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} # Tell master port we're a slave port LIBXML2_SLAVE= python do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR} .include "${MASTERDIR}/Makefile"