summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpyros Stathopoulos2015-12-08 15:17:18 +0200
committerSpyros Stathopoulos2015-12-08 15:17:18 +0200
commitfee7fcf509a49cdb7982d380184334615049f011 (patch)
tree5935aca23ac79758dc52f20bb20c1aaf0ad5aee7
parentb25e49ac0d80b614933edd54a51409d22fc9b4ca (diff)
downloadaur-fee7fcf509a49cdb7982d380184334615049f011.tar.gz
Update to version 4.0.2
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD13
-rw-r--r--python3.patch229
3 files changed, 10 insertions, 246 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 41e70705fba..b9e7702d821 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
-# Generated by makepkg 4.2.1
-# Mon Apr 6 16:01:49 UTC 2015
+# Generated by mksrcinfo v8
+# Tue Dec 8 13:16:44 UTC 2015
pkgbase = python-linux-gpib
pkgdesc = A support package for GPIB (IEEE 488) hardware - Python 3 bindings
- pkgver = 3.2.21
- pkgrel = 4
+ pkgver = 4.0.2
+ pkgrel = 1
url = http://linux-gpib.sourceforge.net/
arch = i686
arch = x86_64
license = GPL
depends = linux-gpib
depends = python
- source = http://downloads.sourceforge.net/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/3.2.21/linux-gpib-3.2.21.tar.gz
- source = python3.patch
- md5sums = 91e15d1a30c6e3fd79fc6762e8c1120e
- md5sums = ba0a8b2bfbf7605b1b480ad424e3b7d3
+ source = http://downloads.sourceforge.net/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/4.0.2/linux-gpib-4.0.2.tar.gz
+ md5sums = dee2981476bd9c9f467efd3010095935
pkgname = python-linux-gpib
diff --git a/PKGBUILD b/PKGBUILD
index 25e2500c8df..b03cfd2bfaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,16 @@
pkgname=('python-linux-gpib')
_pkgname=('linux-gpib')
-pkgver=3.2.21
-pkgrel=4
+pkgver=4.0.2
+pkgrel=1
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"
- "python3.patch")
-
-md5sums=('91e15d1a30c6e3fd79fc6762e8c1120e'
- 'ba0a8b2bfbf7605b1b480ad424e3b7d3')
+source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}%20for%203.x.x%20and%202.6.x%20kernels/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('dee2981476bd9c9f467efd3010095935')
build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -p1 < ../python3.patch
cd "${srcdir}/${_pkgname}-${pkgver}/language/python/"
python setup.py build
}
diff --git a/python3.patch b/python3.patch
deleted file mode 100644
index febfc8b639d..00000000000
--- a/python3.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- a/language/python/gpibinter.c 2014-12-13 12:27:49.000000000 +0200
-+++ b/language/python/gpibinter.c 2015-03-12 17:20:57.712141182 +0200
-@@ -98,7 +98,7 @@
- _SetGpibError("find");
- return NULL;
- }
-- return PyInt_FromLong(ud);
-+ return PyLong_FromLong(ud);
- }
-
- static char gpib_dev__doc__[] =
-@@ -126,7 +126,7 @@
- _SetGpibError("dev");
- return NULL;
- }
-- return PyInt_FromLong(ud);
-+ return PyLong_FromLong(ud);
- }
-
-
-@@ -149,7 +149,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(result);
-+ return PyLong_FromLong(result);
- }
-
-
-@@ -177,7 +177,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
- static char gpib_listener__doc__[] =
-@@ -220,7 +220,7 @@
- No copying needed, more efficient. (yes, this is legal, see
- http://www.python.org/doc/current/api/stringObjects.html) */
-
-- retval = PyString_FromStringAndSize(NULL, len);
-+ retval = PyUnicode_FromStringAndSize(NULL, len);
- if(retval == NULL)
- {
- PyErr_SetString(GpibError, "Read Error: can't get Memory.");
-@@ -228,7 +228,7 @@
- }
-
- Py_BEGIN_ALLOW_THREADS
-- sta = ibrd(device, PyString_AS_STRING(retval), len);
-+ sta = ibrd(device, PyUnicode_AS_UNICODE(retval), len);
- Py_END_ALLOW_THREADS
-
- if( sta & ERR )
-@@ -238,7 +238,7 @@
- return NULL;
- }
-
-- _PyString_Resize(&retval, ThreadIbcntl());
-+ PyUnicode_Resize(&retval, ThreadIbcntl());
- return retval;
- }
-
-@@ -265,7 +265,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
- static char gpib_write_async__doc__[] =
-@@ -291,7 +291,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
-
-@@ -318,7 +318,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
- static char gpib_remote_enable__doc__[] =
-@@ -343,7 +343,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
-
-@@ -368,7 +368,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
-
-@@ -393,7 +393,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
-
-@@ -418,7 +418,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
-
-@@ -443,7 +443,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
- static char gpib_wait__doc__[] =
-@@ -468,7 +468,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
- static char gpib_timeout__doc__[] =
-@@ -492,7 +492,7 @@
- _SetGpibError("tmo");
- return NULL;
- }
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
- static char gpib_serial_poll__doc__[] =
-@@ -541,7 +541,7 @@
- return NULL;
- }
-
-- return PyInt_FromLong(sta);
-+ return PyLong_FromLong(sta);
- }
-
- static char gpib_ibsta__doc__[] =
-@@ -550,7 +550,7 @@
-
- static PyObject* gpib_ibsta(PyObject *self, PyObject *args)
- {
-- return PyInt_FromLong(ThreadIbsta());
-+ return PyLong_FromLong(ThreadIbsta());
- }
-
- static char gpib_ibcnt__doc__[] =
-@@ -559,7 +559,7 @@
-
- static PyObject* gpib_ibcnt(PyObject *self, PyObject *args)
- {
-- return PyInt_FromLong(ThreadIbcntl());
-+ return PyLong_FromLong(ThreadIbcntl());
- }
-
- /* List of methods defined in the module */
-@@ -598,13 +598,24 @@
- "As in the C API, all functions return the value of ibsta,\n"
- "except where otherwise specified.";
-
--void initgpib(void)
-+static struct PyModuleDef moduledef = {
-+ PyModuleDef_HEAD_INIT,
-+ "gpib",
-+ gpib_module_documentation,
-+ -1,
-+ gpib_methods,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL,
-+};
-+
-+PyMODINIT_FUNC PyInit_gpib(void)
- {
- PyObject *m;
-
- /* Create the module and add the functions */
-- m = Py_InitModule4("gpib", gpib_methods, gpib_module_documentation,
-- (PyObject*)NULL, PYTHON_API_VERSION);
-+ m = PyModule_Create(&moduledef);
-
- /* Add GpibError exception to the module */
- GpibError = PyErr_NewException("gpib.GpibError", NULL, NULL);
-@@ -697,4 +708,6 @@
- /* Check for errors */
- if (PyErr_Occurred())
- Py_FatalError("can't initialize module gpib");
-+
-+ return m;
- }
-
---- a/language/python/Gpib.py (original)
-+++ b/language/python/Gpib.py (refactored)
-@@ -17,7 +17,7 @@
-
- def __init__(self, name = 'gpib0', pad = None, sad = 0, timeout = 13, send_eoi = 1, eos_mode = 0):
- self._own = False
-- if isinstance(name, basestring):
-+ if isinstance(name, str):
- self.id = gpib.find(name)
- self._own = True
- elif pad is None: