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

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

[-- 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
+}