mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

print/hplip: Port pcardext module to Python 3.x

Browse Source
This commit is contained in:
Tijl Coosemans 2023-02-10 21:22:42 +01:00
parent 230cf3bad6
commit 67d92e052a
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
print/hplip/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= hplip
PORTVERSION= 3.22.10
PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF

54
print/hplip/files/patch-pcard_pcardext_pcardext.c Normal file
View File

@ -0,0 +1,54 @@
--- pcard/pcardext/pcardext.c.orig 2022-10-27 13:08:44 UTC
+++ pcard/pcardext/pcardext.c
@@ -59,7 +59,7 @@ int ReadSector(int sector, int nsector, void *buf, int
if( result )
{
Py_ssize_t len = 0;
- PyString_AsStringAndSize( result, &result_str, &len );
+ PyBytes_AsStringAndSize( result, &result_str, &len );
if( len < nsector*FAT_HARDSECT )
{
@@ -83,7 +83,7 @@ int WriteSector(int sector, int nsector, void *buf, in
{
result = PyObject_CallFunction( writesectorFunc, "iis#", sector, nsector, buf, size );
- return PyInt_AS_LONG( result );
+ return PyLong_AS_LONG( result );
}
return 1;
@@ -208,7 +208,7 @@ PyObject * pcardext_read( PyObject * self, PyObject *
if( FatReadFileExt( name, offset, len, buffer ) == len )
{
- return PyString_FromStringAndSize( (char *)buffer, len );
+ return PyBytes_FromStringAndSize( (char *)buffer, len );
}
else
{
@@ -234,16 +234,16 @@ static PyMethodDef pcardext_methods[] =
};
-static char pcardext_documentation[] = "Python extension for HP photocard services";
+PyDoc_STRVAR(pcardext_documentation, "Python extension for HP photocard services");
-void initpcardext( void )
+static struct PyModuleDef pcardext_module = {
+ PyModuleDef_HEAD_INIT, "pcardext", pcardext_documentation, -1,
+ pcardext_methods,
+};
+
+PyMODINIT_FUNC PyInit_pcardext( void )
{
- PyObject * mod = Py_InitModule4( "pcardext", pcardext_methods,
- pcardext_documentation, (PyObject*)NULL,
- PYTHON_API_VERSION );
-
- if (mod == NULL)
- return;
+ return PyModule_Create(&pcardext_module);
}