* Re: [PR PATCH] [Updated] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
@ 2022-09-07 8:52 ` dataCobra
2022-09-14 4:27 ` dataCobra
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-07 8:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 956 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages hplip
https://github.com/void-linux/void-packages/pull/39146
hplip: update to 3.22.6.
* Remove 1 patch and add 1 build dependency
* Tested both packages with hplip-scan & xsane on HP Neverstop Laser MFP 120x.
* Continue from PR hplip: update to 3.22.6 #37287
I've split the former PR into two separate branches to make sure at least hplip gets updated.
#### Testing the changes
- I tested the changes in this PR: **YES - tested by @biopsin and myself**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/39146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hplip-39146.patch --]
[-- Type: text/x-diff, Size: 5416 bytes --]
From ab3270d7f0ff07cf0c1c7dcab290431caa9b6a78 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Mon, 15 Aug 2022 12:37:36 +0200
Subject: [PATCH] hplip: update to 3.22.6.
Remove 1 patch and add 1 build dependency
Tested both packages with hplip-scan & xsane on HP Neverstop Laser MFP 120x.
Continue from PR hplip: update to 3.21.12 #35611
Close issue Package Request: hplip-plugin #34845
---
srcpkgs/hplip/patches/pysizet_clean.patch | 100 ----------------------
srcpkgs/hplip/template | 5 +-
2 files changed, 3 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 cde79c1cee18..123b5156f355 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"
@@ -36,7 +37,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
conflicts="hplip-gui"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
2022-09-07 8:52 ` [PR PATCH] [Updated] " dataCobra
@ 2022-09-14 4:27 ` dataCobra
2022-09-14 4:52 ` [PR PATCH] [Updated] " dataCobra
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-14 4:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/39146#issuecomment-1246216450
Comment:
Hey @paper42,
I use this now for several weeks without an issue.
I think it can and should be merged.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
2022-09-07 8:52 ` [PR PATCH] [Updated] " dataCobra
2022-09-14 4:27 ` dataCobra
@ 2022-09-14 4:52 ` dataCobra
2022-09-21 9:07 ` dataCobra
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-14 4:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages hplip
https://github.com/void-linux/void-packages/pull/39146
hplip: update to 3.22.6.
* Remove 1 patch and add 1 build dependency
* Tested both packages with hplip-scan & xsane on HP Neverstop Laser MFP 120x.
* Continue from PR hplip: update to 3.22.6 #37287
I've split the former PR into two separate branches to make sure at least hplip gets updated.
The corresponding `hplip-plugin` PR is #39147.
#### Testing the changes
- I tested the changes in this PR: **YES - tested by @biopsin and myself**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/39146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hplip-39146.patch --]
[-- Type: text/x-diff, Size: 5416 bytes --]
From eced977d601df911ca4b868bc3a037c9056ee618 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Mon, 15 Aug 2022 12:37:36 +0200
Subject: [PATCH] hplip: update to 3.22.6.
Remove 1 patch and add 1 build dependency
Tested both packages with hplip-scan & xsane on HP Neverstop Laser MFP 120x.
Continue from PR hplip: update to 3.21.12 #35611
Close issue Package Request: hplip-plugin #34845
---
srcpkgs/hplip/patches/pysizet_clean.patch | 100 ----------------------
srcpkgs/hplip/template | 5 +-
2 files changed, 3 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 cde79c1cee18..123b5156f355 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"
@@ -36,7 +37,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
conflicts="hplip-gui"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (2 preceding siblings ...)
2022-09-14 4:52 ` [PR PATCH] [Updated] " dataCobra
@ 2022-09-21 9:07 ` dataCobra
2022-09-21 9:08 ` dataCobra
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-21 9:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages hplip
https://github.com/void-linux/void-packages/pull/39146
hplip: update to 3.22.6.
* Remove 1 patch and add 1 build dependency
* Tested both packages with hplip-scan & xsane on HP Neverstop Laser MFP 120x.
* Continue from PR hplip: update to 3.22.6 #37287
I've split the former PR into two separate branches to make sure at least hplip gets updated.
The corresponding `hplip-plugin` PR is #39147.
#### Testing the changes
- I tested the changes in this PR: **YES - tested by @biopsin and myself**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/39146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hplip-39146.patch --]
[-- Type: text/x-diff, Size: 5776 bytes --]
From 53e03f112c628a739660ebd2d0c5478f367dc263 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
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 <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 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 <orphan@voidlinux.org>"
+maintainer="dataCobra <datacobra@thinkbot.de>"
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}"
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (3 preceding siblings ...)
2022-09-21 9:07 ` dataCobra
@ 2022-09-21 9:08 ` dataCobra
2022-09-21 10:45 ` [PR REVIEW] " ahesford
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-21 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/39146#issuecomment-1253421345
Comment:
Added myself as the maintainer for the package.
I've also corrected the commit message.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (4 preceding siblings ...)
2022-09-21 9:08 ` dataCobra
@ 2022-09-21 10:45 ` ahesford
2022-09-21 10:45 ` ahesford
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2022-09-21 10:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/39146#discussion_r976351518
Comment:
Don't adopt yet. We want to see a longer contribution history than one month, and at least a few cycles of updates to this package, before putting somebody's name on it.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (5 preceding siblings ...)
2022-09-21 10:45 ` [PR REVIEW] " ahesford
@ 2022-09-21 10:45 ` ahesford
2022-09-21 11:01 ` dataCobra
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2022-09-21 10:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/39146#discussion_r976345475
Comment:
Drop this comment. The hplip-plugin package doesn't exist. Even if it is accepted, we shouldn't demand that people keep a non-free, restricted package in sync. If HP delays or abandons releases of the plug-in package, I'd rather people update this regularly than wait on a package fee people are likely to discover and use anyway.
If the versions really must be tied, the right thing to do is add a version-restricted dependency in the hplip-plugin package.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (6 preceding siblings ...)
2022-09-21 10:45 ` ahesford
@ 2022-09-21 11:01 ` dataCobra
2022-09-21 11:01 ` dataCobra
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-21 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New review comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/39146#discussion_r976366422
Comment:
This is new to me... I'm already the maintainer for mercurial for which I've only created two PRs.
But I'll undo this change then.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (7 preceding siblings ...)
2022-09-21 11:01 ` dataCobra
@ 2022-09-21 11:01 ` dataCobra
2022-09-28 12:39 ` [PR PATCH] [Updated] " dataCobra
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-21 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New review comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/39146#discussion_r976366657
Comment:
I'll remove it.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (8 preceding siblings ...)
2022-09-21 11:01 ` dataCobra
@ 2022-09-28 12:39 ` dataCobra
2022-09-28 12:40 ` dataCobra
2022-09-28 14:01 ` [PR PATCH] [Closed]: " ahesford
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-28 12:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages hplip
https://github.com/void-linux/void-packages/pull/39146
hplip: update to 3.22.6.
* Remove 1 patch and add 1 build dependency
* Tested both packages with hplip-scan & xsane on HP Neverstop Laser MFP 120x.
* Continue from PR hplip: update to 3.22.6 #37287
I've split the former PR into two separate branches to make sure at least hplip gets updated.
The corresponding `hplip-plugin` PR is #39147.
#### Testing the changes
- I tested the changes in this PR: **YES - tested by @biopsin and myself**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/39146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hplip-39146.patch --]
[-- Type: text/x-diff, Size: 5408 bytes --]
From 14e4c01dfe9e4158d6c386bd5cd2c661d52aa0cb Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 28 Sep 2022 14:38:33 +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 | 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 38d21f5209342..0000000000000
--- 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 cde79c1cee185..9c06e7148686b 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.22.6
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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
conflicts="hplip-gui"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (9 preceding siblings ...)
2022-09-28 12:39 ` [PR PATCH] [Updated] " dataCobra
@ 2022-09-28 12:40 ` dataCobra
2022-09-28 14:01 ` [PR PATCH] [Closed]: " ahesford
11 siblings, 0 replies; 13+ messages in thread
From: dataCobra @ 2022-09-28 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/39146#issuecomment-1260846379
Comment:
@ahesford I found the time the change the things you requested. :+1:
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Closed]: hplip: update to 3.22.6.
2022-09-07 8:51 [PR PATCH] hplip: update to 3.22.6 dataCobra
` (10 preceding siblings ...)
2022-09-28 12:40 ` dataCobra
@ 2022-09-28 14:01 ` ahesford
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2022-09-28 14:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 848 bytes --]
There's a closed pull request on the void-packages repository
hplip: update to 3.22.6.
https://github.com/void-linux/void-packages/pull/39146
Description:
* Remove 1 patch and add 1 build dependency
* Tested both packages with hplip-scan & xsane on HP Neverstop Laser MFP 120x.
* Continue from PR hplip: update to 3.22.6 #37287
I've split the former PR into two separate branches to make sure at least hplip gets updated.
The corresponding `hplip-plugin` PR is #39147.
#### Testing the changes
- I tested the changes in this PR: **YES - tested by @biopsin and myself**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
^ permalink raw reply [flat|nested] 13+ messages in thread