From 58c1d60c5f61baff798af15303fd327791ac064c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 30 Apr 2022 14:17:49 +0000
Subject: [PATCH] extra/hplip to 3.22.4-1

---
 extra/hplip/PKGBUILD                |  8 ++++----
 extra/hplip/reproducible-gzip.patch | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
index 07ba63d66..eac484f07 100644
--- a/extra/hplip/PKGBUILD
+++ b/extra/hplip/PKGBUILD
@@ -7,8 +7,8 @@
 #  - patch to remove x86-only ImageProcessor
 
 pkgname=hplip
-pkgver=3.22.2
-pkgrel=2
+pkgver=3.22.4
+pkgrel=1
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
@@ -37,7 +37,7 @@ source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.a
         hplip-configure-python.patch
         python3.diff
         reproducible-gzip.patch)
-sha512sums=('9cde954a11bae2e2ad6120d8fe103ab52409c906dde4c1e82fa7a9e5e265e0a71e0578e3117a8b4508e2c7c87f05052d32b14b39b89e3e59baf7a4055ac5579f'
+sha512sums=('8c71a7c87b8e6203dbd9c7d86fc3b926474046c69f00fae1e0f87e057f17ff17184b3c4f8b8d4c14495208b21990cbc1acb08c36d96c96749ab1707922c31923'
             'SKIP'
             'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
             '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
@@ -46,7 +46,7 @@ sha512sums=('9cde954a11bae2e2ad6120d8fe103ab52409c906dde4c1e82fa7a9e5e265e0a71e0
             '7f402ed13341ac9a01f28ecdb97effcd15f5fa9d123e554d4dd78e9f5ed01bcf7b4fe7400c53ddf5e7068f9ffd858d8fefe060e2fcacea0a0524145d78e315cc'
             '089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8'
             'b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14'
-            '7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b')
+            '379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip@hp.com>
 
 prepare() {
diff --git a/extra/hplip/reproducible-gzip.patch b/extra/hplip/reproducible-gzip.patch
index 7eeb9941b..5a25d2689 100644
--- a/extra/hplip/reproducible-gzip.patch
+++ b/extra/hplip/reproducible-gzip.patch
@@ -1,6 +1,6 @@
---- hplip-3.20.5/createPPD.sh	2020-05-11 15:34:06.000000000 +0200
-+++ hplip-3.20.5.old/createPPD.sh	2020-05-27 12:02:44.089477299 +0200
-@@ -54,15 +54,15 @@
+--- hplip-3.22.4/createPPD.sh	2022-04-26 06:16:59.000000000 +0200
++++ hplip-3.22.4/createPPD.sh.new	2022-04-30 14:42:35.877365900 +0200
+@@ -55,16 +55,16 @@
  	else
  		cp prnt/ps/hp-postscript*.ppd ppd/classppd/ps
  		for i in ppd/classppd/ps/*.ppd; do
@@ -8,7 +8,8 @@
 +			gzip -nc "$i" > "$i.gz"
  		done
  	fi
-         #cp prnt/ps/hp-postscript*.ppd.gz ppd/classppd/ps
+ 	#cp prnt/spd/*.ppd ppd/classppd/hpcups/.
+     #cp prnt/ps/hp-postscript*.ppd.gz ppd/classppd/ps
  	for i in ppd/classppd/hpcups/*.ppd; do
 -		gzip -c "$i" > "$i.gz"
 +		gzip -nc "$i" > "$i.gz"
@@ -19,7 +20,7 @@
  	#done
  
  	cat > class_cups_drv.inc <<EOF
-@@ -81,14 +81,14 @@
+@@ -83,14 +83,14 @@
  install -d ppd/hpcups
  ppdc -d ppd/hpcups prnt/drv/hpcups.drv
  for i in ppd/hpcups/*.ppd; do