861ac185a6
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
68 lines
2 KiB
Diff
68 lines
2 KiB
Diff
--- a/python/libxml.c 2020-10-07 14:41:45.226029584 -0400
|
|
+++ b/python/libxml.c 2020-10-07 14:42:58.965113111 -0400
|
|
@@ -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;
|
|
--- a/python/types.c 2020-10-07 14:41:49.393034304 -0400
|
|
+++ b/python/types.c 2020-10-07 14:42:23.496072934 -0400
|
|
@@ -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;
|