Fix for Python >= 3.10

3 files changed, 48 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index accb5f6494dd..715283336735 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-linux-gpib
 	pkgdesc = A support package for GPIB (IEEE 488) hardware - Python 3 bindings
 	pkgver = 4.3.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://linux-gpib.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -9,7 +9,8 @@ pkgbase = python-linux-gpib
 	depends = linux-gpib
 	depends = python
 	source = http://downloads.sourceforge.net/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/4.3.4/linux-gpib-4.3.4.tar.gz
+	source = 0001-python310-fix.patch
 	md5sums = d42b04d3b27a601c9b893915d5fded37
+	md5sums = 614cbe749998198cdfbee443fcc0ae12
 
 pkgname = python-linux-gpib
-
diff --git a/0001-python310-fix.patch b/0001-python310-fix.patch
new file mode 100644
index 000000000000..e9164f0d9381
--- /dev/null
+++ b/0001-python310-fix.patch
@@ -0,0 +1,38 @@
+--- a/linux-gpib-user/language/python/gpibinter.c
++++ b/linux-gpib-user/language/python/gpibinter.c
+@@ -3,7 +3,7 @@
+  * Python wrapper module for gpib library functions.
+  ************************************************************/
+ 
+-
++#define PY_SSIZE_T_CLEAN
+ #include "Python.h"
+ 
+ #ifdef USE_INES
+@@ -283,7 +283,7 @@
+ static PyObject* gpib_write(PyObject *self, PyObject *args)
+ {
+ 	char *command;
+-	int command_len;
++	Py_ssize_t command_len;
+ 	int  device;
+ 	int sta;
+ 
+@@ -309,7 +309,7 @@
+ static PyObject* gpib_write_async(PyObject *self, PyObject *args)
+ {
+ 	char *command;
+-	int  command_len;
++	Py_ssize_t  command_len;
+ 	int  device;
+ 	int  sta;
+ 
+@@ -336,7 +336,7 @@
+ static PyObject* gpib_command(PyObject *self, PyObject *args)
+ {
+ 	char *command;
+-	int  command_len;
++	Py_ssize_t  command_len;
+ 	int  device;
+ 	int  sta;
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 8e38e0cec5d5..1c925aae2082 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,24 @@ pkgname=('python-linux-gpib')
 _pkgname=('linux-gpib')
 pkgver=4.3.4
 _pkgver=4.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A support package for GPIB (IEEE 488) hardware - Python 3 bindings'
 arch=('i686' 'x86_64')
 url='http://linux-gpib.sourceforge.net/'
 license=('GPL')
 depends=('linux-gpib' 'python')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}%20for%203.x.x%20and%202.6.x%20kernels/${_pkgver}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('d42b04d3b27a601c9b893915d5fded37')
+source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}%20for%203.x.x%20and%202.6.x%20kernels/${_pkgver}/${_pkgname}-${pkgver}.tar.gz"
+        "0001-python310-fix.patch")
+md5sums=('d42b04d3b27a601c9b893915d5fded37'
+         '614cbe749998198cdfbee443fcc0ae12')
 
 prepare() {
 
     msg "Unpacking userland utils source"
     cd "${srcdir}/${_pkgname}-${pkgver}"
     tar xvfz "${_pkgname}-user-${pkgver}.tar.gz"
+    cd ${_pkgname}-user-${pkgver}
+    patch -p2 < ${srcdir}/0001-python310-fix.patch
 
 }