public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/, www-servers/uwsgi/files/
Date: Thu, 20 Jan 2022 12:36:04 +0000 (UTC)	[thread overview]
Message-ID: <1642682144.11dbcf457bf4b7ec83c26e1d4eb3d7b9366b7e13.sam@gentoo> (raw)

commit:     11dbcf457bf4b7ec83c26e1d4eb3d7b9366b7e13
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 12:35:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 12:35:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11dbcf45

www-servers/uwsgi: add additional Python 3.10 patch

Bug: https://bugs.gentoo.org/829204
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch   | 23 ++++++++++++++++++++++
 www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild       |  1 +
 2 files changed, 24 insertions(+)

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
new file mode 100644
index 000000000000..d175a99c65fb
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch
@@ -0,0 +1,23 @@
+https://github.com/unbit/uwsgi/commit/94b28b156c26d5b0b4ba93fedb057e9aebf59545.patch
+
+From 94b28b156c26d5b0b4ba93fedb057e9aebf59545 Mon Sep 17 00:00:00 2001
+From: Thea Flowers <me@thea.codes>
+Date: Tue, 2 Nov 2021 16:29:36 -0400
+Subject: [PATCH] Add PY_SSIZE_T_CLEAN define for Python 3.10 support
+
+---
+ plugins/python/uwsgi_python.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h
+index aca1f83b7..ec64ad80c 100644
+--- a/plugins/python/uwsgi_python.h
++++ b/plugins/python/uwsgi_python.h
+@@ -1,4 +1,6 @@
+ #include <uwsgi.h>
++/* See https://docs.python.org/3.10/whatsnew/3.10.html#id2 */
++#define PY_SSIZE_T_CLEAN
+ #include <Python.h>
+ 
+ #include <frameobject.h>
+

diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild
index c547c3316a71..089c51e499e2 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild
@@ -131,6 +131,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${P}-py310-fix.patch"
 	"${FILESDIR}/${P}-pynode-compile.patch"
+	"${FILESDIR}/${P}-py310-fix-2.patch"
 )
 
 S="${WORKDIR}/${MY_P}"


             reply	other threads:[~2022-01-20 12:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-20 12:36 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-04-28  0:59 [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/, www-servers/uwsgi/files/ Sam James
2023-04-13  3:03 Sam James
2022-01-20 12:36 Sam James
2016-05-13 15:57 Alexys Jacob

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1642682144.11dbcf457bf4b7ec83c26e1d4eb3d7b9366b7e13.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox