[PR PATCH] hplip: update to 3.22.10.

[PR PATCH] hplip: update to 3.22.10.

[dataCobra]

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

There is a new 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/40434

hplip: update to 3.22.10.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From 8c4e7128749974ccf43c764be54b7149c35f845b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Nov 2022 08:16:16 +0100
Subject: [PATCH] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 063581e4e899..0fd338c7f680 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=2
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
@@ -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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"

Re: [PR REVIEW] hplip: update to 3.22.10.

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1018905211

Comment:
is this still necessary?

Re: [PR REVIEW] hplip: update to 3.22.10.

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1018933304

Comment:
I'll check. :+1:

Re: hplip: update to 3.22.10.

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1310165380

Comment:
@dataCobra I'll manage test + the plugin pkg this weekend fyi

Re: [PR PATCH] [Updated] hplip: update to 3.22.10.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 596 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/40434

hplip: update to 3.22.10.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From 651138b83f36e04871df155e679681797f46519d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 11 Nov 2022 09:04:00 +0100
Subject: [PATCH] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 063581e4e899..40321a396ede 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=2
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +18,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +33,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"

Re: [PR REVIEW] hplip: update to 3.22.10.

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1019974283

Comment:
The python versioning does no longer break things. :+1:

I've fixed it with the recent push.

Re: [PR PATCH] [Updated] hplip: update to 3.22.10.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 596 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/40434

hplip: update to 3.22.10.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From 255df62e9020c0f2bac57f0c290f0e29b10f8a39 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Nov 2022 06:56:23 +0100
Subject: [PATCH 1/2] New package: hplip-plugin-3.22.10

---
 srcpkgs/hplip-plugin/template | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..a7fe4808c985
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,61 @@
+# Template file for 'hplip-plugin'
+# Must be in sync with main hplip package
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+		--noexec --target ${wrksrc}
+}
+
+do_install() {
+	vmkdir usr/share/hplip/data/firmware
+	vmkdir usr/share/hplip/fax/plugins
+	vmkdir usr/share/hplip/prnt/plugins
+	vmkdir usr/share/hplip/scan/plugins
+	vmkdir usr/share/licenses/hplip-plugin
+	vmkdir var/lib/hp
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vcopy plugin.spec usr/share/hplip/
+	vcopy hp_laserjet_*.fw.gz usr/share/hplip/data/firmware/
+	vcopy fax_marvell-"$_arch".so usr/share/hplip/fax/plugins/
+	vcopy hbpl1-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy lj-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy bb_*-"$_arch".so usr/share/hplip/scan/plugins/
+	vlicense license.txt
+
+	cat << EOF > hplip.state
+[plugin]
+installed = 1
+eula = 1
+version = ${version}
+EOF
+	vcopy hplip.state var/lib/hp
+
+	find "${DESTDIR}/usr/share/hplip" -type f -name "*.so" | while read f; do
+		lib_dir="${f%/*}"
+		lib_name="${f##*/}"
+		ln -sf "$lib_name" "$lib_dir/${lib_name%%-*}.so"
+	done
+}

From babce630aeff5a5f6a2228b0f1f89aab5d0bb927 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 11 Nov 2022 09:04:00 +0100
Subject: [PATCH 2/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 063581e4e899..40321a396ede 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=2
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +18,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +33,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"

Re: [PR PATCH] [Updated] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 632 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/40434

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From 255df62e9020c0f2bac57f0c290f0e29b10f8a39 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 10 Nov 2022 06:56:23 +0100
Subject: [PATCH 1/2] New package: hplip-plugin-3.22.10

---
 srcpkgs/hplip-plugin/template | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..a7fe4808c985
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,61 @@
+# Template file for 'hplip-plugin'
+# Must be in sync with main hplip package
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+		--noexec --target ${wrksrc}
+}
+
+do_install() {
+	vmkdir usr/share/hplip/data/firmware
+	vmkdir usr/share/hplip/fax/plugins
+	vmkdir usr/share/hplip/prnt/plugins
+	vmkdir usr/share/hplip/scan/plugins
+	vmkdir usr/share/licenses/hplip-plugin
+	vmkdir var/lib/hp
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vcopy plugin.spec usr/share/hplip/
+	vcopy hp_laserjet_*.fw.gz usr/share/hplip/data/firmware/
+	vcopy fax_marvell-"$_arch".so usr/share/hplip/fax/plugins/
+	vcopy hbpl1-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy lj-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy bb_*-"$_arch".so usr/share/hplip/scan/plugins/
+	vlicense license.txt
+
+	cat << EOF > hplip.state
+[plugin]
+installed = 1
+eula = 1
+version = ${version}
+EOF
+	vcopy hplip.state var/lib/hp
+
+	find "${DESTDIR}/usr/share/hplip" -type f -name "*.so" | while read f; do
+		lib_dir="${f%/*}"
+		lib_name="${f##*/}"
+		ln -sf "$lib_name" "$lib_dir/${lib_name%%-*}.so"
+	done
+}

From babce630aeff5a5f6a2228b0f1f89aab5d0bb927 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 11 Nov 2022 09:04:00 +0100
Subject: [PATCH 2/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 063581e4e899..40321a396ede 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=2
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +18,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +33,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"

Re: [PR PATCH] [Updated] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 632 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/40434

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From 192f363bd2e73e3383321de25ac12ab5f8ce9126 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 16 Nov 2022 15:12:22 +0100
Subject: [PATCH 1/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 063581e4e899..40321a396ede 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=2
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +18,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +33,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 conflicts="hplip-gui"
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"

From 44caa8f2f9a80a565157a478541363f714640cb8 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 16 Nov 2022 15:25:42 +0100
Subject: [PATCH 2/2] New package: hplip-plugin 3.22.10

---
 srcpkgs/hplip-plugin/template | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..a7fe4808c985
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,61 @@
+# Template file for 'hplip-plugin'
+# Must be in sync with main hplip package
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+		--noexec --target ${wrksrc}
+}
+
+do_install() {
+	vmkdir usr/share/hplip/data/firmware
+	vmkdir usr/share/hplip/fax/plugins
+	vmkdir usr/share/hplip/prnt/plugins
+	vmkdir usr/share/hplip/scan/plugins
+	vmkdir usr/share/licenses/hplip-plugin
+	vmkdir var/lib/hp
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vcopy plugin.spec usr/share/hplip/
+	vcopy hp_laserjet_*.fw.gz usr/share/hplip/data/firmware/
+	vcopy fax_marvell-"$_arch".so usr/share/hplip/fax/plugins/
+	vcopy hbpl1-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy lj-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy bb_*-"$_arch".so usr/share/hplip/scan/plugins/
+	vlicense license.txt
+
+	cat << EOF > hplip.state
+[plugin]
+installed = 1
+eula = 1
+version = ${version}
+EOF
+	vcopy hplip.state var/lib/hp
+
+	find "${DESTDIR}/usr/share/hplip" -type f -name "*.so" | while read f; do
+		lib_dir="${f%/*}"
+		lib_name="${f##*/}"
+		ln -sf "$lib_name" "$lib_dir/${lib_name%%-*}.so"
+	done
+}

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1317189256

Comment:
Would you mind testing this update with the changes in https://github.com/void-linux/void-packages/pull/40559 to see if they are viable?

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1317218371

Comment:
> Would you mind testing this update with the changes in #40559 to see if they are viable?

I don't mind. I'll try it out when I've spare time. :+1:

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1317245162

Comment:
Also noticed while back when installing the hplip pkg there are some binaries following that depend on QT5. 
Should these be moved to the hplip-gui pkg?

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1317262546

Comment:
Binaries? I see no metnion of Qt in shlib-requires. If there are python scripts that require Qt, please let me know.

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1318562628

Comment:
@ahesford mhm your right they are symlinks to py-scripts which trigger
```
warning: GUI mode disabled in build.
error: hp-print requires GUI support (try running with --qt3). Exiting.
```
```
warning: GUI mode disabled in build.
error: hp-printsettings requires Qt4 GUI support. Exiting.
```
```
warning: GUI mode disabled in build.
error: hp-wificonfig -u/--gui requires Qt4 GUI support. Exiting.
```
```
warning: GUI mode disabled in build.
error: hp-pqdiag -u/--gui requires Qt4 GUI support. Exiting.
```
Think these are all

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1318562628

Comment:
@ahesford mhm your right they are symlinks to py-scripts which trigger
```
warning: GUI mode disabled in build.
error: hp-print requires GUI support (try running with --qt3). Exiting.
```
```
warning: GUI mode disabled in build.
error: hp-printsettings requires Qt4 GUI support. Exiting.
```
```
warning: GUI mode disabled in build.
error: hp-wificonfig -u/--gui requires Qt4 GUI support. Exiting.
```
```
warning: GUI mode disabled in build.
error: hp-pqdiag -u/--gui requires Qt4 GUI support. Exiting.
```
Think these are all

ah also on pkg install check.py has some warnings
```
[*] Configuring unpacked packages
hplip-3.22.10_1: configuring ...
Byte-compiling python code in usr/share/hplip...
./usr/share/hplip/check-plugin.py:116: SyntaxWarning: "is" with a literal. Did you mean "=="?
  if log_level is 'debug':
./usr/share/hplip/check.py:685: SyntaxWarning: "is not" with a literal. Did you mean "!="?
  if 'getfacl' not in g and '' is not g and 'file' not in g:
./usr/share/hplip/check-plugin.py:116: SyntaxWarning: "is" with a literal. Did you mean "=="?
  if log_level is 'debug':
./usr/share/hplip/check.py:685: SyntaxWarning: "is not" with a literal. Did you mean "!="?
  if 'getfacl' not in g and '' is not g and 'file' not in g:
Updating ldconfig(8) cache...
hplip-3.22.10_1: updated successfully.

```

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1318604029

Comment:
Qt4 and Qt3 are way too old (2001, 2005) and are not available on Void anymore, we should not build them or if that's not possible, remove them

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1318604029

Comment:
Qt3 and Qt4 are way too old (2001, 2005) and are not available on Void anymore, we should not build them or if that's not possible, remove them

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1318622221

Comment:
@paper42 not necessary 
```
./upgrade.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), True)
./testpage.py:                        (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./align.py:                        (INTERACTIVE_MODE, GUI_MODE), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./makecopies.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), False, False, True)
./diagnose_queues.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5),
./uiscan.py:mod = module.Module(__mod__, __title__, __version__, __doc__, None, (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./toolbox.py:                    (GUI_MODE,), (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./fab.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./clean.py:                        (INTERACTIVE_MODE, GUI_MODE), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./plugin.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), True)
./diagnose_plugin.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), True)
./print.py:                    (GUI_MODE,), (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./systray.py:                       (GUI_MODE,), (UI_TOOLKIT_QT5, UI_TOOLKIT_QT4, UI_TOOLKIT_QT3))
./wificonfig.py:                       (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./base/codes.py:UI_TOOLKIT_QT5 = 2
./base/module.py:            self.installed_ui_toolkits.append(UI_TOOLKIT_QT5)
./base/module.py:                 (UI_TOOLKIT_QT5 in self.supported_ui_toolkits and self.default_ui_toolkit == 'qt5' and UI_TOOLKIT_QT5 in self.installed_ui_toolkits):
./base/module.py:                if UI_TOOLKIT_QT5 in self.supported_ui_toolkits and UI_TOOLKIT_QT5 in self.installed_ui_toolkits:
./base/module.py:            if UI_TOOLKIT_QT5 in self.supported_ui_toolkits and UI_TOOLKIT_QT5 in self.installed_ui_toolkits:
./base/module.py:            if UI_TOOLKIT_QT5 in self.supported_ui_toolkits and UI_TOOLKIT_QT5 in self.installed_ui_toolkits:
./base/module.py:                            UI_TOOLKIT_QT5 in self.supported_ui_toolkits and prop.gui_build and \
./base/module.py:                            UI_TOOLKIT_QT5 in self.installed_ui_toolkits:
./pqdiag.py:                        (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), False, False, True)
./doctor.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), True)
./printsettings.py:                        (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./devicesettings.py:                       (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./firmware.py:                        (UI_TOOLKIT_QT5, UI_TOOLKIT_QT4, UI_TOOLKIT_QT3), True, True)
./info.py:                        (INTERACTIVE_MODE, GUI_MODE), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5),
./check-plugin.py:    (INTERACTIVE_MODE, GUI_MODE), (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5), run_as_root_ok=True, quiet=True)
./faxsetup.py:                        (GUI_MODE,), (UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
./setup.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5),
./sendfax.py:                    (UI_TOOLKIT_QT3, UI_TOOLKIT_QT4, UI_TOOLKIT_QT5))
```

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1310165380

Comment:
@dataCobra I'll manage test + the plugin pkg this weekend fyi

Ive completed my print and scan test with xsane on HP_Neverstop_Laser_MFP_120x, all workin

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1319068805

Comment:
Let's take any further discussion about the `hplip`/`hplip-gui` to the corresponding PR.

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1319822026

Comment:
Sadly I don't have the time to get into it this weekend.

Re: [PR PATCH] [Updated] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 632 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/40434

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From a8163349a5bcd33fd0901b22d9a1d324b1087d21 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 16 Nov 2022 15:12:22 +0100
Subject: [PATCH 1/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 16c186f378a1..319f25d6b55c 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=3
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -36,7 +34,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
 

From 189a43909286225f0e26baf87a6f1fac6426df51 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 16 Nov 2022 15:25:42 +0100
Subject: [PATCH 2/2] New package: hplip-plugin 3.22.10

---
 srcpkgs/hplip-plugin/template | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..a7fe4808c985
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,61 @@
+# Template file for 'hplip-plugin'
+# Must be in sync with main hplip package
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+		--noexec --target ${wrksrc}
+}
+
+do_install() {
+	vmkdir usr/share/hplip/data/firmware
+	vmkdir usr/share/hplip/fax/plugins
+	vmkdir usr/share/hplip/prnt/plugins
+	vmkdir usr/share/hplip/scan/plugins
+	vmkdir usr/share/licenses/hplip-plugin
+	vmkdir var/lib/hp
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vcopy plugin.spec usr/share/hplip/
+	vcopy hp_laserjet_*.fw.gz usr/share/hplip/data/firmware/
+	vcopy fax_marvell-"$_arch".so usr/share/hplip/fax/plugins/
+	vcopy hbpl1-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy lj-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy bb_*-"$_arch".so usr/share/hplip/scan/plugins/
+	vlicense license.txt
+
+	cat << EOF > hplip.state
+[plugin]
+installed = 1
+eula = 1
+version = ${version}
+EOF
+	vcopy hplip.state var/lib/hp
+
+	find "${DESTDIR}/usr/share/hplip" -type f -name "*.so" | while read f; do
+		lib_dir="${f%/*}"
+		lib_name="${f##*/}"
+		ln -sf "$lib_name" "$lib_dir/${lib_name%%-*}.so"
+	done
+}

Re: [PR PATCH] [Updated] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 632 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/40434

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From 56548ac85c144548a419fbe7b122a7d19d2581a4 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 18 Dec 2022 12:49:05 +0100
Subject: [PATCH 1/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 16c186f378a1..7d1ff5f5f5ff 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=3
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +18,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip-nogui.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +33,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
 

From 4ec99217652538091f54776184642431adddf1d4 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 18 Dec 2022 12:49:21 +0100
Subject: [PATCH 2/2] New package: hplip-plugin 3.22.10

---
 srcpkgs/hplip-plugin/template | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..a7fe4808c985
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,61 @@
+# Template file for 'hplip-plugin'
+# Must be in sync with main hplip package
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+		--noexec --target ${wrksrc}
+}
+
+do_install() {
+	vmkdir usr/share/hplip/data/firmware
+	vmkdir usr/share/hplip/fax/plugins
+	vmkdir usr/share/hplip/prnt/plugins
+	vmkdir usr/share/hplip/scan/plugins
+	vmkdir usr/share/licenses/hplip-plugin
+	vmkdir var/lib/hp
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vcopy plugin.spec usr/share/hplip/
+	vcopy hp_laserjet_*.fw.gz usr/share/hplip/data/firmware/
+	vcopy fax_marvell-"$_arch".so usr/share/hplip/fax/plugins/
+	vcopy hbpl1-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy lj-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy bb_*-"$_arch".so usr/share/hplip/scan/plugins/
+	vlicense license.txt
+
+	cat << EOF > hplip.state
+[plugin]
+installed = 1
+eula = 1
+version = ${version}
+EOF
+	vcopy hplip.state var/lib/hp
+
+	find "${DESTDIR}/usr/share/hplip" -type f -name "*.so" | while read f; do
+		lib_dir="${f%/*}"
+		lib_name="${f##*/}"
+		ln -sf "$lib_name" "$lib_dir/${lib_name%%-*}.so"
+	done
+}

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

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

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1356786636

Comment:
I've finally was able to test the packages. Everything works as expected with the changes made in #40559.

For me this is good to go.

Please review one more time to make sure I didn't forget anything.

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1356803202

Comment:
Thank you @dataCobra 
Hopefully I'll test it later today

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1364512143

Comment:
Tested (x86_64-glibc) xsane and printing on HP_Neverstop_Laser_MFP_120x : all good here.

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1356803202

Comment:
Thank you @dataCobra 
Hopefully I'll test it later today

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1056881814

Comment:
```suggestion
	/bin/sh ${wrksrc}/hplip-${version}-plugin.run \
```
or even this if it's possible
```suggestion
	/bin/sh ./hplip-${version}-plugin.run \
```

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1056881923

Comment:
also add this notice to the hplip package

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1056889130

Comment:
If we note this is the main hplip package, it should probably be a bit milder:

> When possible, keep this in sync with hplip-plugin.

In case there are some troubles updating the plugin, we might not want to deter people from updating the main package.

Re: [PR PATCH] [Updated] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 632 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/40434

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From e83d9506d02372c05c4e37ab039592faf02f982d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 18 Dec 2022 12:49:05 +0100
Subject: [PATCH 1/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 16c186f378a1..7d1ff5f5f5ff 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=3
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +18,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip-nogui.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +33,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
 

From 1d7a444e4ebf19f98e1345e65a18878f1daa7f87 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sun, 18 Dec 2022 12:49:21 +0100
Subject: [PATCH 2/2] New package: hplip-plugin 3.22.10

---
 srcpkgs/hplip-plugin/template | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..a7fe4808c985
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,61 @@
+# Template file for 'hplip-plugin'
+# Must be in sync with main hplip package
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+		--noexec --target ${wrksrc}
+}
+
+do_install() {
+	vmkdir usr/share/hplip/data/firmware
+	vmkdir usr/share/hplip/fax/plugins
+	vmkdir usr/share/hplip/prnt/plugins
+	vmkdir usr/share/hplip/scan/plugins
+	vmkdir usr/share/licenses/hplip-plugin
+	vmkdir var/lib/hp
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vcopy plugin.spec usr/share/hplip/
+	vcopy hp_laserjet_*.fw.gz usr/share/hplip/data/firmware/
+	vcopy fax_marvell-"$_arch".so usr/share/hplip/fax/plugins/
+	vcopy hbpl1-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy lj-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy bb_*-"$_arch".so usr/share/hplip/scan/plugins/
+	vlicense license.txt
+
+	cat << EOF > hplip.state
+[plugin]
+installed = 1
+eula = 1
+version = ${version}
+EOF
+	vcopy hplip.state var/lib/hp
+
+	find "${DESTDIR}/usr/share/hplip" -type f -name "*.so" | while read f; do
+		lib_dir="${f%/*}"
+		lib_name="${f##*/}"
+		ln -sf "$lib_name" "$lib_dir/${lib_name%%-*}.so"
+	done
+}

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1058151710

Comment:
I've tested both of these suggestions but neither worked.

Because of this I've not changed this with the latest push.  

Re: [PR PATCH] [Updated] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 632 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/40434

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From d27b42d3cf2d58ac0be42b8f3d7b32474e3df61c Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 28 Dec 2022 08:16:45 +0100
Subject: [PATCH 1/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 16c186f378a1..7d1ff5f5f5ff 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,9 @@
 # Template file for 'hplip'
 pkgname=hplip
-version=3.22.6
-revision=3
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +18,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip-nogui.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +33,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
 

From 2266774d76ccb72e293f4e9a077c997d947ce0b7 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 28 Dec 2022 09:31:47 +0100
Subject: [PATCH 2/2] New package: hplip-plugin 3.22.10

---
 srcpkgs/hplip-plugin/template | 61 +++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..692ed2be2857
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,61 @@
+# Template file for 'hplip-plugin'
+# When possible, keep this in sync with hplip-plugin.
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+	--noexec --target ${wrksrc}
+}
+
+do_install() {
+	vmkdir usr/share/hplip/data/firmware
+	vmkdir usr/share/hplip/fax/plugins
+	vmkdir usr/share/hplip/prnt/plugins
+	vmkdir usr/share/hplip/scan/plugins
+	vmkdir usr/share/licenses/hplip-plugin
+	vmkdir var/lib/hp
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vcopy plugin.spec usr/share/hplip/
+	vcopy hp_laserjet_*.fw.gz usr/share/hplip/data/firmware/
+	vcopy fax_marvell-"$_arch".so usr/share/hplip/fax/plugins/
+	vcopy hbpl1-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy lj-"$_arch".so usr/share/hplip/prnt/plugins/
+	vcopy bb_*-"$_arch".so usr/share/hplip/scan/plugins/
+	vlicense license.txt
+
+	cat << EOF > hplip.state
+[plugin]
+installed = 1
+eula = 1
+version = ${version}
+EOF
+	vcopy hplip.state var/lib/hp
+
+	find "${DESTDIR}/usr/share/hplip" -type f -name "*.so" | while read f; do
+		lib_dir="${f%/*}"
+		lib_name="${f##*/}"
+		ln -sf "$lib_name" "$lib_dir/${lib_name%%-*}.so"
+	done
+}

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

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

New review comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1058241452

Comment:
If changed the comment to `# When possible, keep this in sync with hplip-plugin.`

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New review comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1058448624

Comment:
I will test a out of sync version of the plugin later this week; as I remember some time ago it would not let me scan without the update.

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1058451911

Comment:
```suggestion
# Template file for 'hplip'
# When possible, keep this package in sync with hplip-plugin
```

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1058464119

Comment:
Use `vinstall`, that's what it was made for. Not only does it make directories as needed, but we can remove the group-write bit from all of these files.

Also, I don't see why we need the original `-${_arch}` in the names if you're just going to symlink these to generic names (presumably `hplip` expects to find generic names anyway), so just drop the symlink and install the files with their generic names in the first place. (If that doesn't work, just drop the fourth argument from `vinstall` and keep your `find` loop.)

```suggestion
	local _arch _f

	case "$XBPS_TARGET_MACHINE" in
		i686) _arch='x86_32' ;;
		x86_64) _arch='x86_64' ;;
		armv[67]l) _arch='arm32' ;;
		aarch64) _arch='arm64' ;;
	esac

	vinstall plugin.spec 0644 usr/share/hplip

	for _f in hp_laserjet_*.fw.gz; do
		vinstall "${_f}" 0644 usr/share/hplip/data/firmware
	done

	vinstall "fax_marvell-${_arch}.so" 0755 \
		usr/share/hplip/fax/plugins fax_marvell.so

	vinstall "hbpl1-${_arch}.so" 0755 \
		usr/share/hplip/prnt/plugins hbpl1.so

	vinstall "lj-${_arch}.so" 0755 \
		usr/share/hplip/prnt/plugins lj.so

	for _f in bb_*-"${_arch}.so"; do
		vinstall "${_f}" 0755 \
			usr/share/hplip/scan/plugins "${_f/-${_arch}}"
	done

	vlicense license.txt

	cat <<-EOF > hplip.state
		[plugin]
		installed = 1
		eula = 1
		version = ${version}
		EOF

	vinstall hplip.state 0644 var/lib/hp
```

Re: [PR REVIEW] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#discussion_r1058451488

Comment:
```suggestion
# This package must be kept in sync with hplip
```

Re: [PR PATCH] [Updated] hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 632 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/40434

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

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

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

From 548c15ebdfb62398aedff042f8696c4b9401b2a7 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 4 Jan 2023 08:40:28 +0100
Subject: [PATCH 1/2] hplip: update to 3.22.10.

---
 srcpkgs/hplip/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 16c186f378a1..0d9cd0b87ec1 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,11 +1,10 @@
 # Template file for 'hplip'
+# When possible, keep this package in sync with hplip-plugin
 pkgname=hplip
-version=3.22.6
-revision=3
+version=3.22.10
+revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
 configure_args="
  --enable-gui-build
  --disable-qt4
@@ -20,8 +19,7 @@ configure_args="
  --enable-foomatic-drv-install
  --enable-pp-build
  --disable-imageProcessor-build
- --with-mimedir=/usr/share/cups/mime
- am_cv_python_version=${py3_ver}"
+ --with-mimedir=/usr/share/cups/mime"
 conf_files="/etc/hp/hplip-nogui.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
@@ -36,7 +34,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=27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4
+checksum=533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
 
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"
 

From 00f6ff5edbce687a07875d8edb5c552342967599 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 4 Jan 2023 08:43:52 +0100
Subject: [PATCH 2/2] New package: hplip-plugin 3.22.10

---
 srcpkgs/hplip-plugin/template | 65 +++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 srcpkgs/hplip-plugin/template

diff --git a/srcpkgs/hplip-plugin/template b/srcpkgs/hplip-plugin/template
new file mode 100644
index 000000000000..e24cfa1955d0
--- /dev/null
+++ b/srcpkgs/hplip-plugin/template
@@ -0,0 +1,65 @@
+# Template file for 'hplip-plugin'
+# This package must be kept in sync with hplip
+pkgname=hplip-plugin
+version=3.22.10
+revision=1
+archs="i686 x86_64 armv[67]l aarch64"
+hostmakedepends="tar"
+short_desc="Binary plugin for HPs hplip printer driver library"
+maintainer="biopsin <biopsin@teknik.io>"
+license="custom:proprietary"
+homepage="https://developers.hp.com/hp-linux-imaging-and-printing/binary_plugin.html"
+changelog="https://developers.hp.com/hp-linux-imaging-and-printing/release_notes"
+distfiles="https://developers.hp.com/sites/default/files/hplip-${version}-plugin.run"
+checksum=bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
+repository=nonfree
+restricted=yes
+
+ignore_elf_dirs="/usr/share/hplip"
+
+do_extract() {
+	/bin/sh ${XBPS_SRCDISTDIR}/${pkgname}-${version}/hplip-${version}-plugin.run \
+	--noexec --target ${wrksrc}
+}
+
+do_install() {
+	local _arch _f
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _arch='x86_32' ;;
+		x86_64) _arch='x86_64' ;;
+		armv[67]l) _arch='arm32' ;;
+		aarch64) _arch='arm64' ;;
+	esac
+
+	vinstall plugin.spec 0644 usr/share/hplip
+
+	for _f in hp_laserjet_*.fw.gz; do
+		vinstall "${_f}" 0644 usr/share/hplip/data/firmware
+	done
+
+	vinstall "fax_marvell-${_arch}.so" 0755 \
+		usr/share/hplip/fax/plugins fax_marvell.so
+
+	vinstall "hbpl1-${_arch}.so" 0755 \
+		usr/share/hplip/prnt/plugins hbpl1.so
+
+	vinstall "lj-${_arch}.so" 0755 \
+		usr/share/hplip/prnt/plugins lj.so
+
+	for _f in bb_*-"${_arch}.so"; do
+		vinstall "${_f}" 0755 \
+			usr/share/hplip/scan/plugins "${_f/-${_arch}}"
+	done
+
+	vlicense license.txt
+
+	cat <<-EOF > hplip.state
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${version}
+		EOF
+
+	vinstall hplip.state 0644 var/lib/hp
+}

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[biopsin]

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

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1381512004

Comment:
Tested offsynced hplip -3.22.10 against hplip-plugin-3.22.6 and it definitely fails, therefore its a _**must keep in sync**_.

![23-01-13--1673600751_675x126_scrot](https://user-images.githubusercontent.com/60029989/212281244-5760bcf8-bf32-4152-894f-eff6dd875e5b.png)

else all test good regarding last changes to template.

Re: [PR PATCH] [Merged]: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

There's a merged pull request on the void-packages repository

hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10
https://github.com/void-linux/void-packages/pull/40434

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)

Re: hplip: update to 3.22.10. + New package: hplip-plugin 3.22.10

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/40434#issuecomment-1381745267

Comment:
I don't dispute that the plugin fails to work when the version doesn't match. My objection to "must" language in `hplip` is that it is officially maintained and distributed while the plugin package is non-free and restricted. People should not be scared away from updating an officially maintained package by unequivocal language if something should prevent them from updating the plugin package. We should be aware of the link and make a best effort to keep the plugin synced ("when possible"), but it's better to provide up-to-date free packages to the broader user base than keep them stale for compatibility with restricted content.

The restricted package will break locally with every update anyway. If somebody overlooks a plugin update, an affected user can fix the oversight when discovered. If something more complex comes into play (*e.g*., upstream doesn't release new plugins in a timely manner), the operator will have to decide between holding back the free package or removing the plugin. That's one of the pitfalls of trying to commingle restricted packages with an open-source, rolling-release operating system that provides an official repository.