You've already forked macports-ports
mirror of
https://github.com/encounter/macports-ports.git
synced 2026-03-30 11:29:27 -07:00
Blair Zajac
77 lines
2.5 KiB
Diff
77 lines
2.5 KiB
Diff
# From https://gitlab.gnome.org/GNOME/libxml2/-/commit/e4fb36841800038c289997432ca547c9bfef9db1 .
|
|
# Also see
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1808343
|
|
# https://src.fedoraproject.org/rpms/libxml2/pull-request/9
|
|
# https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/71
|
|
|
|
diff -ru ../../libxml2-2.9.10.orig/python/libxml.c ./libxml.c
|
|
--- ../../libxml2-2.9.10.orig/python/libxml.c 2019-10-22 11:46:01.000000000 -0700
|
|
+++ ./libxml.c 2021-01-28 21:48:09.818199191 -0800
|
|
@@ -294,7 +294,7 @@
|
|
lenread = PyBytes_Size(ret);
|
|
data = PyBytes_AsString(ret);
|
|
#ifdef PyUnicode_Check
|
|
- } else if PyUnicode_Check (ret) {
|
|
+ } else if (PyUnicode_Check (ret)) {
|
|
#if PY_VERSION_HEX >= 0x03030000
|
|
Py_ssize_t size;
|
|
const char *tmp;
|
|
@@ -359,7 +359,7 @@
|
|
lenread = PyBytes_Size(ret);
|
|
data = PyBytes_AsString(ret);
|
|
#ifdef PyUnicode_Check
|
|
- } else if PyUnicode_Check (ret) {
|
|
+ } else if (PyUnicode_Check (ret)) {
|
|
#if PY_VERSION_HEX >= 0x03030000
|
|
Py_ssize_t size;
|
|
const char *tmp;
|
|
diff -ru ../../libxml2-2.9.10.orig/python/types.c ./types.c
|
|
--- ../../libxml2-2.9.10.orig/python/types.c 2019-10-22 11:46:01.000000000 -0700
|
|
+++ ./types.c 2021-01-28 21:48:09.818965318 -0800
|
|
@@ -602,16 +602,16 @@
|
|
if (obj == NULL) {
|
|
return (NULL);
|
|
}
|
|
- if PyFloat_Check (obj) {
|
|
+ if (PyFloat_Check (obj)) {
|
|
ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
|
|
- } else if PyLong_Check(obj) {
|
|
+ } else if (PyLong_Check(obj)) {
|
|
#ifdef PyLong_AS_LONG
|
|
ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
|
|
#else
|
|
ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
|
|
#endif
|
|
#ifdef PyBool_Check
|
|
- } else if PyBool_Check (obj) {
|
|
+ } else if (PyBool_Check (obj)) {
|
|
|
|
if (obj == Py_True) {
|
|
ret = xmlXPathNewBoolean(1);
|
|
@@ -620,14 +620,14 @@
|
|
ret = xmlXPathNewBoolean(0);
|
|
}
|
|
#endif
|
|
- } else if PyBytes_Check (obj) {
|
|
+ } else if (PyBytes_Check (obj)) {
|
|
xmlChar *str;
|
|
|
|
str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
|
|
PyBytes_GET_SIZE(obj));
|
|
ret = xmlXPathWrapString(str);
|
|
#ifdef PyUnicode_Check
|
|
- } else if PyUnicode_Check (obj) {
|
|
+ } else if (PyUnicode_Check (obj)) {
|
|
#if PY_VERSION_HEX >= 0x03030000
|
|
xmlChar *str;
|
|
const char *tmp;
|
|
@@ -650,7 +650,7 @@
|
|
ret = xmlXPathWrapString(str);
|
|
#endif
|
|
#endif
|
|
- } else if PyList_Check (obj) {
|
|
+ } else if (PyList_Check (obj)) {
|
|
int i;
|
|
PyObject *node;
|
|
xmlNodePtr cur;
|