From 53e03f112c628a739660ebd2d0c5478f367dc263 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Wed, 21 Sep 2022 11:02:22 +0200 Subject: [PATCH] hplip: update to 3.22.6. Remove 1 patch and add 1 build dependency. Add dataCobra as maintainer for the package. Tested on Neverstop Laser MFP 120x and OfficeJet Pro 901x. Scanning (hplip-scan and xsane) tested with both devices. Continue from PR hplip: update to 3.21.12 #35611. --- srcpkgs/hplip/patches/pysizet_clean.patch | 100 ---------------------- srcpkgs/hplip/template | 7 +- 2 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 srcpkgs/hplip/patches/pysizet_clean.patch diff --git a/srcpkgs/hplip/patches/pysizet_clean.patch b/srcpkgs/hplip/patches/pysizet_clean.patch deleted file mode 100644 index 38d21f520934..000000000000 --- a/srcpkgs/hplip/patches/pysizet_clean.patch +++ /dev/null @@ -1,100 +0,0 @@ -Based on patch by Zdenek Dohnal obtained from -https://bugs.launchpad.net/hplip/+bug/1933973 - -diff -pru hplip-3.21.8/io/mudext/hpmudext.c hplip-3.21.8-patched/io/mudext/hpmudext.c ---- hplip-3.21.8/io/mudext/hpmudext.c 2021-09-01 16:10:17.000000000 +0100 -+++ hplip-3.21.8-patched/io/mudext/hpmudext.c 2021-10-22 08:30:38.600922861 +0100 -@@ -24,6 +24,8 @@ Authors: Don Welch, David Suffield, Naga - - \*****************************************************************************/ - -+#define PY_SSIZE_T_CLEAN -+ - #include - #include - #include "hpmud.h" -@@ -187,14 +189,22 @@ static PyObject *write_channel(PyObject - HPMUD_CHANNEL cd; - int timeout = 30; - char * buf; -- int buf_size = 0; -+ Py_ssize_t buf_size = 0; -+ int buf_size_asInt = 0; - int bytes_written = 0; - - if (!PyArg_ParseTuple(args, "iis#|i", &dd, &cd, &buf, &buf_size, &timeout)) - return NULL; - -+ if (buf_size < INT_MIN) -+ buf_size_asInt = INT_MIN; -+ else if (buf_size > INT_MAX) -+ buf_size_asInt = INT_MAX; -+ else -+ buf_size_asInt = (int)buf_size; -+ - Py_BEGIN_ALLOW_THREADS -- result = hpmud_write_channel(dd, cd, buf, buf_size, timeout, &bytes_written); -+ result = hpmud_write_channel(dd, cd, buf, buf_size_asInt, timeout, &bytes_written); - Py_END_ALLOW_THREADS - - return Py_BuildValue("(ii)", result, bytes_written); -@@ -231,14 +241,22 @@ static PyObject *set_pml(PyObject *self, - char * oid; - int type; - char * data; -- int data_size; -+ Py_ssize_t data_size = 0; -+ int data_size_asInt = 0; - int pml_result; - - if (!PyArg_ParseTuple(args, "iisis#", &dd, &cd, &oid, &type, &data, &data_size)) - return NULL; - -+ if (data_size < INT_MIN) -+ data_size_asInt = INT_MIN; -+ else if (data_size > INT_MAX) -+ data_size_asInt = INT_MAX; -+ else -+ data_size_asInt = (int)data_size; -+ - Py_BEGIN_ALLOW_THREADS -- result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size, &pml_result); -+ result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size_asInt, &pml_result); - Py_END_ALLOW_THREADS - - return Py_BuildValue("(ii)", result, pml_result); -diff -pru hplip-3.21.8/pcard/pcardext/pcardext.c hplip-3.21.8-patched/pcard/pcardext/pcardext.c ---- hplip-3.21.8/pcard/pcardext/pcardext.c 2021-09-01 16:10:17.000000000 +0100 -+++ hplip-3.21.8-patched/pcard/pcardext/pcardext.c 2021-10-22 08:24:11.010798381 +0100 -@@ -24,6 +24,8 @@ Author: Don Welch - - \*****************************************************************************/ - -+#define PY_SSIZE_T_CLEAN -+ - #include - #include - #include "../fat.h" -diff -pru hplip-3.21.8/prnt/cupsext/cupsext.c hplip-3.21.8-patched/prnt/cupsext/cupsext.c ---- hplip-3.21.8/prnt/cupsext/cupsext.c 2021-09-01 16:10:17.000000000 +0100 -+++ hplip-3.21.8-patched/prnt/cupsext/cupsext.c 2021-10-22 08:26:30.975843330 +0100 -@@ -73,6 +73,7 @@ Yashwant Kumar Sahu - Sanjay Kumar - */ - -+#define PY_SSIZE_T_CLEAN - - #include - #include -diff -pru hplip-3.21.8/scan/scanext/scanext.c hplip-3.21.8-patched/scan/scanext/scanext.c ---- hplip-3.21.8/scan/scanext/scanext.c 2021-09-01 16:10:17.000000000 +0100 -+++ hplip-3.21.8-patched/scan/scanext/scanext.c 2021-10-21 21:31:23.074739743 +0100 -@@ -45,6 +45,8 @@ PERFORMANCE OF THIS SOFTWARE. - *******************************************************************/ - - -+#define PY_SSIZE_T_CLEAN -+ - /* _ScanDevice objects */ - - #include "Python.h" diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index cde79c1cee18..5b1af75dedb1 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,6 +1,7 @@ # Template file for 'hplip' +# Must be in sync with hplip-plugin package pkgname=hplip -version=3.21.10 +version=3.22.6 revision=1 build_style=gnu-configure pycompile_dirs="usr/share/hplip" @@ -31,12 +32,12 @@ makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel depends="python3-gobject python3-dbus desktop-file-utils foomatic-db foomatic-db-engine python3-distro" short_desc="HP Linux Imaging and Printing" -maintainer="Orphaned " +maintainer="dataCobra " license="GPL-2.0-only, BSD-3-Clause, MIT" homepage="https://developers.hp.com/hp-linux-imaging-and-printing" changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes" distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz" -checksum=de230e1fdd1e718fc718417265612e0c882949e08fe045ee56f9f9882e6b6a60 +checksum=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4 conflicts="hplip-gui" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"