| 1 |
commit: 11dbcf457bf4b7ec83c26e1d4eb3d7b9366b7e13 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 12:35:44 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 12:35:44 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11dbcf45 |
| 7 |
|
| 8 |
www-servers/uwsgi: add additional Python 3.10 patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/829204 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch | 23 ++++++++++++++++++++++ |
| 14 |
www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild | 1 + |
| 15 |
2 files changed, 24 insertions(+) |
| 16 |
|
| 17 |
diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..d175a99c65fb |
| 20 |
--- /dev/null |
| 21 |
+++ b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch |
| 22 |
@@ -0,0 +1,23 @@ |
| 23 |
+https://github.com/unbit/uwsgi/commit/94b28b156c26d5b0b4ba93fedb057e9aebf59545.patch |
| 24 |
+ |
| 25 |
+From 94b28b156c26d5b0b4ba93fedb057e9aebf59545 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Thea Flowers <me@××××.codes> |
| 27 |
+Date: Tue, 2 Nov 2021 16:29:36 -0400 |
| 28 |
+Subject: [PATCH] Add PY_SSIZE_T_CLEAN define for Python 3.10 support |
| 29 |
+ |
| 30 |
+--- |
| 31 |
+ plugins/python/uwsgi_python.h | 2 ++ |
| 32 |
+ 1 file changed, 2 insertions(+) |
| 33 |
+ |
| 34 |
+diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h |
| 35 |
+index aca1f83b7..ec64ad80c 100644 |
| 36 |
+--- a/plugins/python/uwsgi_python.h |
| 37 |
++++ b/plugins/python/uwsgi_python.h |
| 38 |
+@@ -1,4 +1,6 @@ |
| 39 |
+ #include <uwsgi.h> |
| 40 |
++/* See https://docs.python.org/3.10/whatsnew/3.10.html#id2 */ |
| 41 |
++#define PY_SSIZE_T_CLEAN |
| 42 |
+ #include <Python.h> |
| 43 |
+ |
| 44 |
+ #include <frameobject.h> |
| 45 |
+ |
| 46 |
|
| 47 |
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild |
| 48 |
index c547c3316a71..089c51e499e2 100644 |
| 49 |
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild |
| 50 |
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild |
| 51 |
@@ -131,6 +131,7 @@ BDEPEND="virtual/pkgconfig" |
| 52 |
PATCHES=( |
| 53 |
"${FILESDIR}/${P}-py310-fix.patch" |
| 54 |
"${FILESDIR}/${P}-pynode-compile.patch" |
| 55 |
+ "${FILESDIR}/${P}-py310-fix-2.patch" |
| 56 |
) |
| 57 |
|
| 58 |
S="${WORKDIR}/${MY_P}" |
Archives