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