Skip to content

Commit 93d3625

Browse files
committed
Update lxml patch
1 parent 8d4267c commit 93d3625

File tree

2 files changed

+44
-14
lines changed

2 files changed

+44
-14
lines changed

graalpython/lib-graalpython/patches/Cython/Cython-0.29.32.patch

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,30 @@ index 202dea7..1e83e66 100644
112112
# integers. Silently reduce values larger than PY_SSIZE_T_MAX to
113113
# PY_SSIZE_T_MAX, silently boost the start and stop values less than
114114
diff --git a/Cython/Utility/Coroutine.c b/Cython/Utility/Coroutine.c
115-
index 474e6d2..e15f984 100644
115+
index 474e6d2..4aeb19c 100644
116116
--- a/Cython/Utility/Coroutine.c
117117
+++ b/Cython/Utility/Coroutine.c
118-
@@ -1299,7 +1299,7 @@ static void __Pyx_Coroutine_del(PyObject *self) {
118+
@@ -527,8 +527,7 @@ static int __Pyx_PyGen__FetchStopIterationValue(CYTHON_UNUSED PyThreadState *$lo
119+
}
120+
#if PY_VERSION_HEX >= 0x030300A0
121+
else if (Py_TYPE(ev) == (PyTypeObject*)PyExc_StopIteration) {
122+
- value = ((PyStopIterationObject *)ev)->value;
123+
- Py_INCREF(value);
124+
+ value = PyObject_GetAttrString(ev, "value");
125+
Py_DECREF(ev);
126+
}
127+
#endif
128+
@@ -573,8 +572,7 @@ static int __Pyx_PyGen__FetchStopIterationValue(CYTHON_UNUSED PyThreadState *$lo
129+
Py_XDECREF(tb);
130+
Py_DECREF(et);
131+
#if PY_VERSION_HEX >= 0x030300A0
132+
- value = ((PyStopIterationObject *)ev)->value;
133+
- Py_INCREF(value);
134+
+ value = PyObject_GetAttrString(ev, "value");
135+
Py_DECREF(ev);
136+
#else
137+
{
138+
@@ -1299,7 +1297,7 @@ static void __Pyx_Coroutine_del(PyObject *self) {
119139
_Py_NewReference(self);
120140
__Pyx_SET_REFCNT(self, refcnt);
121141
}

graalpython/lib-graalpython/patches/lxml/sdist/lxml-4.9.1.patch

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
1-
From 40ef0c8015fc9fae1e8825c1cf563d249afcc8a0 Mon Sep 17 00:00:00 2001
2-
From: Michael Simacek <[email protected]>
3-
Date: Mon, 12 Dec 2022 14:07:03 +0100
4-
Subject: [PATCH] Adapt
5-
6-
---
7-
src/lxml/etree.c | 4 ++++
8-
1 file changed, 4 insertions(+)
9-
1+
diff --git a/pyproject.toml b/pyproject.toml
2+
new file mode 100644
3+
index 0000000..9175509
4+
--- /dev/null
5+
+++ b/pyproject.toml
6+
@@ -0,0 +1,3 @@
7+
+[build-system]
8+
+requires = ["setuptools >= 40.6.0", "wheel", "Cython"]
9+
+build-backend = "setuptools.build_meta:__legacy__"
10+
diff --git a/setupinfo.py b/setupinfo.py
11+
index 6758914..288d09e 100644
12+
--- a/setupinfo.py
13+
+++ b/setupinfo.py
14+
@@ -537,7 +537,7 @@ OPTION_WITH_UNICODE_STRINGS = has_option('with-unicode-strings')
15+
OPTION_WITHOUT_ASSERT = has_option('without-assert')
16+
OPTION_WITHOUT_THREADING = has_option('without-threading')
17+
OPTION_WITHOUT_CYTHON = has_option('without-cython')
18+
-OPTION_WITH_CYTHON = has_option('with-cython')
19+
+OPTION_WITH_CYTHON = True # GraalVM change
20+
OPTION_WITH_CYTHON_GDB = has_option('cython-gdb')
21+
OPTION_WITH_REFNANNY = has_option('with-refnanny')
22+
OPTION_WITH_COVERAGE = has_option('with-coverage')
1023
diff --git a/src/lxml/etree.c b/src/lxml/etree.c
1124
index 28ad548..cb066dc 100644
1225
--- a/src/lxml/etree.c
@@ -22,6 +35,3 @@ index 28ad548..cb066dc 100644
2235

2336
/* "src/lxml/xmlerror.pxi":724
2437
* format_count += 1
25-
--
26-
2.38.1
27-

0 commit comments

Comments
 (0)