diff --git a/0001-Fix-PyTuple_SET_ITEM-usage-no-return-value.patch b/0001-Fix-PyTuple_SET_ITEM-usage-no-return-value.patch new file mode 100644 index 0000000000000000000000000000000000000000..cb2bf7579f43e4c568ae068b17a6ce3c686c9843 --- /dev/null +++ b/0001-Fix-PyTuple_SET_ITEM-usage-no-return-value.patch @@ -0,0 +1,46 @@ +From 5ea2f8709b4d091700750661231f8a3ddce0fc7c Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 10 Dec 2020 16:00:50 +0100 +Subject: [PATCH] Fix PyTuple_SET_ITEM() usage - no return value + +As noted in bpo-30459 (link bellow) the PyTuple_SET_ITEM() macro +has not a return value. Let's make code compatible with python 3.10. + +Link: https://bugs.python.org/issue30459 +BugLink: https://github.com/alsa-project/alsa-python/issues/2 +Signed-off-by: Jaroslav Kysela +--- + pyalsa/alsahcontrol.c | 4 ++-- + pyalsa/alsamixer.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyalsa/alsahcontrol.c b/pyalsa/alsahcontrol.c +index ebee1b7..7c9321f 100644 +--- a/pyalsa/alsahcontrol.c ++++ b/pyalsa/alsahcontrol.c +@@ -1543,8 +1543,8 @@ static int element_callback(snd_hctl_elem_t *elem, unsigned int mask) + + t = PyTuple_New(2); + if (t) { +- if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem)) +- Py_INCREF(pyhelem); ++ PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem); ++ Py_INCREF(pyhelem); + PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask)); + r = PyObject_CallObject(o, t); + Py_DECREF(t); +diff --git a/pyalsa/alsamixer.c b/pyalsa/alsamixer.c +index 39d7387..91fe198 100644 +--- a/pyalsa/alsamixer.c ++++ b/pyalsa/alsamixer.c +@@ -1348,8 +1348,8 @@ static int element_callback(snd_mixer_elem_t *elem, unsigned int mask) + + t = PyTuple_New(2); + if (t) { +- if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem)) +- Py_INCREF(pyelem); ++ PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem); ++ Py_INCREF(pyelem); + PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask)); + r = PyObject_CallObject(o, t); + Py_DECREF(t); diff --git a/python-alsa.spec b/python-alsa.spec index a305e272f37274649e63eae04120f1f6ddd8935f..5d3943d973abe8f1011ce608d8ac08fc94fce00a 100644 --- a/python-alsa.spec +++ b/python-alsa.spec @@ -1,11 +1,12 @@ Name: python-alsa Version: 1.1.6 -Release: 3 +Release: 4 Summary: Python binding for the ALSA library License: LGPLv2+ URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/pyalsa/pyalsa-%{version}.tar.bz2 +Patch1: 0001-Fix-PyTuple_SET_ITEM-usage-no-return-value.patch BuildRequires: alsa-lib-devel >= %{version} gcc %description @@ -21,7 +22,7 @@ Requires: python3 Python3 bindings for the ALSA library. %prep -%autosetup -n pyalsa-%{version} +%autosetup -n pyalsa-%{version} -p1 %build %py3_build @@ -33,6 +34,9 @@ Python3 bindings for the ALSA library. %{python3_sitearch}/* %changelog +* Mon Jun 27 2022 zhouwenpei - 1.1.6-4 +- Fix PyTuple_SET_ITEM() usage no return value + * Thu Sep 16 2021 caodongxia - 1.1.6-3 - Remove redundant provides python-webob