Merge ~ahasenack/ubuntu/+source/pyx3:jammy-pyx3-sizet into ubuntu/+source/pyx3:ubuntu/devel

[Andreas Hasenack]

Upstream patch to fix SystemError: PY_SSIZE_T_CLEAN macro must be defined for '#' formats

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/py310-collections/+packages
Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1005028
Salsa PR: https://salsa.debian.org/debian/pyx3/-/merge_requests/3

[Utkarsh Gupta (utkarsh)]

+1, looks good.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded

diff --git a/debian/changelog b/debian/changelog
index c6e9bff..9d838e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyx3 (0.15-5ubuntu1) jammy; urgency=medium
+
+  * d/p/py310-py_ssize_t_clean.patch: fix t1 extension with Python 3.10
+    (LP: #1960092)
+
+ -- Andreas Hasenack <[e-mail]>  Sat, 05 Feb 2022 18:25:58 +0000
+
 pyx3 (0.15-5) unstable; urgency=medium
 
   * Use lintian-brush/janitor to update packaging:
diff --git a/debian/control b/debian/control
index b293854..f62f59d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: pyx3
-Maintainer: Stuart Prescott <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Stuart Prescott <[e-mail]>
 Standards-Version: 4.6.0
 Section: python
 Priority: optional
diff --git a/debian/patches/py310-py_ssize_t_clean.patch b/debian/patches/py310-py_ssize_t_clean.patch
new file mode 100644
index 0000000..e974e86
--- /dev/null
+++ b/debian/patches/py310-py_ssize_t_clean.patch
@@ -0,0 +1,68 @@
+From 0f2834330f7c86dbb5de9f75f9c7c8b7ab4ebabf Mon Sep 17 00:00:00 2001
+From: Michael J Gruber <[e-mail]>
+Date: Mon, 15 Nov 2021 10:38:13 +0100
+Subject: [PATCH] fix t1 extension with Python 3.10
+
+For all # variants of formats (s#, y#, etc.), the macro PY_SSIZE_T_CLEAN
+must be defined before including Python.h. On Python 3.9 and older, the
+type of the length argument is Py_ssize_t if the PY_SSIZE_T_CLEAN macro
+is defined, or int otherwise. [https://docs.python.org/3.10/c-api/arg.html]
+
+So, on Python 3.9, PyX worked because PY_SSIZE_T_CLEAN was not defined
+(even though it was recommended), so that the deprecated return type of
+int (for the string length) was used.
+
+Python 3.10 finally pulls the trigger on the ints, so finally adjust to
+that announced change.
+---
+ CHANGES            |  4 +++-
+ pyx/font/_t1code.c | 12 ++++++++----
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+Origin: upstream, https://github.com/pyx-project/pyx/commit/0f2834330f7c86dbb5de9f75f9c7c8b7ab4ebabf
+Bug-Debian: https://bugs.debian.org/1005028
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pyx3/+bug/1960092
+Last-Update: 2022-02-05
+diff --git a/pyx/font/_t1code.c b/pyx/font/_t1code.c
+index d8ecc173..eacb3fa1 100644
+--- a/pyx/font/_t1code.c
++++ b/pyx/font/_t1code.c
+@@ -10,6 +10,8 @@
+  *  USA.
+  */
+ 
++#define PY_SSIZE_T_CLEAN
++
+ #include <Python.h>
+ #include <stdlib.h>
+ #include <stdint.h>
+@@ -32,11 +34,12 @@ def decoder(code, r, n):
+ static PyObject *py_decoder(PyObject *self, PyObject *args)
+ {
+     unsigned char *code;
+-    int lcode, pr, n;
++    Py_ssize_t lcode;
++    int pr, n;
+ 
+     if (PyArg_ParseTuple(args, "y#ii", (char **) &code, &lcode, &pr, &n)) {
+       unsigned char *data;
+-      int i;
++      Py_ssize_t i;
+       unsigned char x;
+       uint16_t r=pr;
+       PyObject *result;
+@@ -74,11 +77,12 @@ static PyObject *py_encoder(PyObject *self, PyObject *args)
+ {
+     unsigned char *data;
+     unsigned char *random;
+-    int ldata, pr, lrandom;
++    Py_ssize_t ldata, lrandom;
++    int pr;
+ 
+     if (PyArg_ParseTuple(args, "y#iy#", (char **) &data, &ldata, &pr, (char **) &random, &lrandom)) {
+       unsigned char *code;
+-      int i;
++      Py_ssize_t i;
+       uint16_t r=pr;
+       PyObject *result;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 480588f..924b746 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ reproducible-timestamps.patch
 reproducible-image-name.patch
 reproducible-elements.patch
 texlive2020-horiz-alignment.patch
+py310-py_ssize_t_clean.patch