[PR PATCH] hplip: update to 3.21.12

[lonwillett <lonwillett@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

There is a new pull request by lonwillett against master on the void-packages repository

https://github.com/lonwillett/void-packages update-hplip
https://github.com/void-linux/void-packages/pull/35611

hplip: update to 3.21.12
#### Testing the changes
- I tested the changes in this PR: **briefly**
 
#### Local build testing
- I built this PR locally for my native architecture, x86_64



A patch file from https://github.com/void-linux/void-packages/pull/35611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-hplip-35611.patch --]
[-- Type: text/x-diff, Size: 5139 bytes --]

From 5e426bc8b236c6fc9498a35685f7cf46282bf2ec Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Mon, 14 Feb 2022 12:24:25 +0100
Subject: [PATCH] hplip: update to 3.21.12

---
 srcpkgs/hplip/patches/pysizet_clean.patch | 100 ----------------------
 srcpkgs/hplip/template                    |   4 +-
 2 files changed, 2 insertions(+), 102 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 <Python.h>
- #include <stdarg.h>
- #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 <Python.h>
- #include <structmember.h>
- #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 <Python.h>
- #include <structmember.h>
-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 339d08b463d8..b4b15b57995e 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,6 +1,6 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.21.10
+version=3.21.12
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
@@ -36,7 +36,7 @@ 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=7ef4523ef81bced71515e1c8840ef6c68c602638c159e6dd9a92691ceec64f9c
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"