updpkg: libre/hplip 1:3.22.6-1.par1

Signed-off-by: David P <megver83@parabola.nu>

9 files changed, 765 insertions, 1484 deletions

diff --git a/libre/hplip/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch b/libre/hplip/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch
new file mode 100644
index 000000000..d42d9bd3b
--- /dev/null
+++ b/libre/hplip/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch
@@ -0,0 +1,622 @@
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 31 Jan 2020 13:50:05 +0100
+Subject: models.dat: Re-add drivers missing from 3.19.1
+
+several printers were removed in 3.19.1, but actually someone still uses them
+reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
+bugzillas 1742949, 1740132, 1739855
+
+Origin: https://src.fedoraproject.org/rpms/hplip/blob/master/f/hplip-missing-drivers.patch
+---
+ Makefile.in            |   4 +
+ cups_drv.inc           |   2 +
+ data/models/models.dat | 477 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ prnt/drv/hpcups.drv.in |  16 ++
+ 4 files changed, 490 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index aef0fbc..cdee8e7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1621,6 +1621,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
++	ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_m1005.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
+@@ -1738,6 +1739,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
++	ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
+ 	ppd/hpcups/hp-laserjet_tank_250x.ppd.gz \
+@@ -4106,6 +4108,7 @@ dist_unrel_DATA =
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
++@HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_m1005.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
+@@ -4222,6 +4225,7 @@ dist_unrel_DATA =
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
++@HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
+ @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
+diff --git a/cups_drv.inc b/cups_drv.inc
+index a87ea98..e39bde4 100644
+--- a/cups_drv.inc
++++ b/cups_drv.inc
+@@ -411,6 +411,7 @@ cups_ppd_printers = \
+    ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
+    ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
+    ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
++   ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
+    ppd/hpcups/hp-laserjet_m1005.ppd.gz \
+    ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
+    ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
+@@ -527,6 +528,7 @@ cups_ppd_printers = \
+    ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
+    ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
+    ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
++   ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
+    ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
+    ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
+    ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
+diff --git a/data/models/models.dat b/data/models/models.dat
+index 12e9a08..7d9650b 100644
+--- a/data/models/models.dat
++++ b/data/models/models.dat
+@@ -2104,7 +2104,7 @@ usb-pid=411
+ usb-vid=3f0
+ wifi-config=0
+ 
+-[hp_laserjet_100_colormfp_m175]
++[hp_laserjet_100_colormfp_m175nw]
+ align-type=0
+ clean-type=0
+ color-cal-type=0
+@@ -2119,14 +2119,6 @@ io-support=14
+ job-storage=0
+ linefeed-cal-type=0
+ model1=HP LaserJet 100 Color MFP M175
+-model2=HP LaserJet 100 Color MFP M175a
+-model3=HP LaserJet 100 Color MFP M175b
+-model4=HP LaserJet 100 Color MFP M175c
+-model5=HP LaserJet 100 Color MFP M175e
+-model6=HP LaserJet 100 Color MFP M175nw
+-model7=HP LaserJet 100 Color MFP M175p
+-model8=HP LaserJet 100 Color MFP M175q
+-model9=HP LaserJet 100 Color MFP M175r
+ ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
+ monitor-type=0
+ panel-check-type=0
+@@ -2165,6 +2157,378 @@ usb-pid=62a
+ usb-vid=3f0
+ wifi-config=3
+ 
++[hp_laserjet_100_colormfp_m175r]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=3
++io-mode=1
++io-support=14
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet 100 Color MFP M175
++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.11.7
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=62a
++usb-vid=3f0
++wifi-config=3
++
++[hp_laserjet_100_colormfp_m175q]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=3
++io-mode=1
++io-support=14
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet 100 Color MFP M175
++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.11.7
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=62a
++usb-vid=3f0
++wifi-config=3
++
++[hp_laserjet_100_colormfp_m175p]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=3
++io-mode=1
++io-support=14
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet 100 Color MFP M175
++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.11.7
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=62a
++usb-vid=3f0
++wifi-config=3
++
++[hp_laserjet_100_colormfp_m175e]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=3
++io-mode=1
++io-support=2
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet 100 Color MFP M175
++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.11.7
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=62a
++usb-vid=3f0
++wifi-config=-1
++
++[hp_laserjet_100_colormfp_m175a]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
++family-ppd=hp-postscript-laserjet-pro.ppd
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=3
++io-mode=1
++io-support=2
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet 100 Color MFP M175
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.11.7
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=62a
++usb-vid=3f0
++wifi-config=-1
++
++[hp_laserjet_100_colormfp_m175c]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=3
++io-mode=1
++io-support=2
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet 100 Color MFP M175
++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.11.7
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=62a
++usb-vid=3f0
++wifi-config=-1
++
++[hp_laserjet_100_colormfp_m175b]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=3
++io-mode=1
++io-support=2
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet 100 Color MFP M175
++ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.11.7
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=62a
++usb-vid=3f0
++wifi-config=-1
++
+ [officejet_100_mobile_l411]
+ align-type=-1
+ clean-type=1
+@@ -17867,6 +18231,58 @@ usb-pid=2c17
+ usb-vid=3f0
+ wifi-config=0
+ 
++[hp_laserjet_cp_1025nw]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=0
++fw-download=False
++icon=hp_color_laserjet_cp2025.png
++io-mfp-mode=1
++io-mode=1
++io-support=14
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet Pro CP 1025nw Color Printer Series
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=1
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CE310A
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CE311A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CE313A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CE312A
++r0-agent4-type=6
++scan-src=0
++scan-type=0
++status-battery-check=0
++status-dynamic-counters=0
++status-type=8
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.12.4
++tech-class=LJZjsColor
++family-class=LJ-Class4
++tech-subclass=Advanced
++tech-type=4
++usb-pid=112a
++usb-vid=3f0
++wifi-config=3
++
+ [hp_laserjet_cp1025nw]
+ align-type=0
+ clean-type=0
+@@ -18468,6 +18884,49 @@ usb-pid=3011
+ usb-vid=3f0
+ wifi-config=0
+ 
++[hp_laserjet_professional_p1102w]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=0
++fax-type=0
++fw-download=False
++icon=HP_LaserJet_1012.png
++io-mfp-mode=6
++io-mode=1
++io-support=10
++job-storage=0
++linefeed-cal-type=0
++model1=HP LaserJet Professional P1102w Printer
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=1
++power-settings=0
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=85A
++r0-agent1-type=1
++scan-src=0
++scan-type=0
++status-battery-check=0
++status-dynamic-counters=0
++status-type=8
++support-released=True
++support-subtype=219b2b
++support-type=2
++support-ver=3.10.4
++tech-class=LJZjsMono
++family-class=LJ-Class4
++tech-subclass=NoAutoDuplex
++tech-type=3
++usb-pid=32a
++usb-vid=3f0
++wifi-config=3
++
+ [hp_laserjet_professional_p1102]
+ align-type=0
+ clean-type=0
+diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in
+index 494758d..af65389 100644
+--- a/prnt/drv/hpcups.drv.in
++++ b/prnt/drv/hpcups.drv.in
+@@ -22688,6 +22688,14 @@ Group "RLT/HP Real Life Technologies"
+       Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)"
+       Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)"
+     }
++    {
++      ModelName "HP LaserJet Professional p1102w"
++      Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin"
++      Attribute "ShortNickName" "" "HP LaserJet Professional p1102w hpijs"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;"
++      PCFileName "hp-laserjet_professional_p1102w.ppd"
++      Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"
++    }
+     {
+       ModelName "HP LaserJet Professional p1106"
+       Attribute "NickName" "" "HP LaserJet Professional p1106, hpcups $Version"
+@@ -23122,6 +23130,14 @@ Group "RLT/HP Real Life Technologies"
+       PCFileName "hp-laserjet_cp1025nw.ppd"
+       Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)"
+     }
++    {
++      ModelName "HP LaserJet Cp 1025nw"
++      Attribute "NickName" "" "HP LaserJet Cp 1025nw, hpcups $Version, requires proprietary plugin"
++      Attribute "ShortNickName" "" "HP LaserJet Cp 1025nw hpijs"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp 1025nw;DES:hp laserjet cp 1025nw;"
++      PCFileName "hp-laserjet_cp_1025nw.ppd"
++      Attribute "Product" "" "(HP LaserJet Pro Cp 1025nw Color Printer Series)"
++    }
+   }
+ } // End LJZjsColor (for proprietary plugin)
+ 
diff --git a/libre/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch b/libre/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
deleted file mode 100644
index 8d3b4d7bf..000000000
--- a/libre/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Tue, 21 Aug 2018 18:18:10 +0200
-Subject: Remove all ImageProcessor functionality, which is closed-source
-
----
- Makefile.am                  | 14 ++------------
- prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
- 2 files changed, 2 insertions(+), 33 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1b097c4f9..8d5d78c9f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
- dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
- endif #HPLIP_CLASS_DRIVER
- 
--dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
-+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
- dist_noinst_SCRIPTS += dat2drv.py install.py  hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
- 
- if !HPLIP_CLASS_DRIVER
-@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
- 	prnt/hpcups/ImageProcessor.h
- 
- hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
--hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
-+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
- #else
- #hpcupsdir = $(cupsfilterdir)
- #hpcups_PROGRAMS = hpcups
-@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER
- 
- install-data-hook:
- if HPLIP_BUILD
--	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
--		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
--		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
--		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
--	fi; \
--	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
--		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
--		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
--		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
--	fi
- if !HPLIP_CLASS_DRIVER
- #	   If scanner build, add hpaio entry to sane dll.conf.
- 	if [ "$(scan_build)" = "yes" ]; then \
-diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
-index 5b282d83f..0bacfafac 100644
---- a/prnt/hpcups/HPCupsFilter.cpp
-+++ b/prnt/hpcups/HPCupsFilter.cpp
-@@ -31,7 +31,6 @@
- \*****************************************************************************/
- 
- #include "HPCupsFilter.h"
--#include "ImageProcessor.h"
- 
- #include <signal.h>
- #include <sys/wait.h>
-@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
- 
- 
-     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
--    image_processor_t* imageProcessor = imageProcessorCreate();
- 
-     while (cupsRasterReadHeader2(cups_raster, &cups_header))
-     {
- 
--        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
--        if (result != IPE_SUCCESS){
--            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
--        }
--
-         current_page_number++;
- 
-         if (current_page_number == 1) {
-@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
-             color_raster = rgbRaster;
-             black_raster = kRaster;
- 
--            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
--            if (result != IPE_SUCCESS){
--                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
--            }
--
--
-             if ((y == 0) && !is_ljmono) {
-                 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
-                 //may not skip blank lines before actual data
-@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
-             }
-         }  // for() loop end
- 
--        result = imageProcessorEndPage(imageProcessor);
--        if (result != IPE_SUCCESS){
--                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
--        }
--
--
-         m_Job.NewPage();
-         if (err != NO_ERROR) {
-             break;
-@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
-         rgbRaster = NULL;
-     }
- 
--    imageProcessorDestroy(imageProcessor);
--
-     unlink(hpPreProcessedRasterFile);
-     return ret_status;
- }
diff --git a/libre/hplip/0025_fix-Werror-format-security.patch b/libre/hplip/0025_fix-Werror-format-security.patch
new file mode 100644
index 000000000..86154afcd
--- /dev/null
+++ b/libre/hplip/0025_fix-Werror-format-security.patch
@@ -0,0 +1,47 @@
+--- hplip-3.22.6/protocol/hp_ipp.c	2022-06-28 20:44:38.000000000 +0200
++++ hplip-3.22.6/protocol/hp_ipp.c.new	2022-06-28 20:56:14.336097721 +0200
+@@ -110,7 +110,7 @@
+      }
+ 
+      if ( info == NULL )
+-        snprintf( info,sizeof(info), name );
++        snprintf( info, sizeof(info), "%s", name );
+ 
+      sprintf( printer_uri, "ipp://localhost/printers/%s", name );
+ 
+--- hplip-3.22.6/protocol/hp_ipp.c	2022-06-28 21:08:10.000000000 +0200
++++ hplip-3.22.6/protocol/hp_ipp.c.new	2022-06-28 21:14:15.921484059 +0200
+@@ -511,27 +511,27 @@
+ 
+              if ( strcmp(attr_name, "printer-name") == 0 &&
+                                         val_tag == IPP_TAG_NAME ) {
+-                  snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) );
++                  snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) );
+              }
+              else if ( strcmp(attr_name, "device-uri") == 0 &&
+                                          val_tag == IPP_TAG_URI ) {
+-                  snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) );
++                  snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) );
+              }
+              else if ( strcmp(attr_name, "printer-uri-supported") == 0 &&
+                                                  val_tag == IPP_TAG_URI ) {
+-                  snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) );
++                  snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) );
+              }
+              else if ( strcmp(attr_name, "printer-info") == 0 &&
+                                         val_tag == IPP_TAG_TEXT ) {
+-                  snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) );
++                  snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) );
+              }
+              else if ( strcmp(attr_name, "printer-location") == 0 &&
+                                            val_tag == IPP_TAG_TEXT ) {
+-                  snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) );
++                  snprintf(t_printer->location,sizeof(t_printer->location),"%s", ippGetString(attr, 0, NULL) );
+              }
+              else if ( strcmp(attr_name, "printer-make-and-model") == 0 &&
+                                                   val_tag == IPP_TAG_TEXT ) {
+-                  snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) );
++                  snprintf(t_printer->make_model,sizeof(t_printer->make_model),"%s", ippGetString(attr, 0, NULL) );
+              } 
+              else if ( strcmp(attr_name, "printer-state") == 0 &&
+                                              val_tag == IPP_TAG_ENUM ) {
diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD
index 30e24b6af..3b759d52f 100644
--- a/libre/hplip/PKGBUILD
+++ b/libre/hplip/PKGBUILD
@@ -9,8 +9,8 @@
 # Maintainer: David P. <megver83@parabola.nu>
 
 pkgname=hplip
-pkgver=3.20.6
-pkgrel=3
+pkgver=3.22.6
+pkgrel=1
 pkgrel+=.par1
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
@@ -35,31 +35,52 @@ conflicts=(${pkgname}-libre)
 backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')
 source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
         disable_upgrade.patch
+        0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch
         0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
         0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
-        0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
-        https://launchpadlibrarian.net/480406888/hplip-configure-python.patch
+        0025_fix-Werror-format-security.patch
+        # use the one from Fedora
+        hplip-configure-python.patch
         python3.diff
-        reproducible-gzip.patch
-        hplip-revert-plugins.patch)
-sha512sums=('ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96'
+        reproducible-gzip.patch)
+sha512sums=('cb25c07c767d3d8921468429ef154401a4df9d2fdf87ead3ab18f0d06e1bd3de610843b8131641a1af8d920c7e15e290a0923405bf609cdc0a3fba9df93ddb5e'
             'SKIP'
-            'f0cf2774e53070406e89614b748e3c45079be889b83d5854340b92093643f6f8b332d6b6e617884d2bdcbef667a84ee5741b07c5fb080bb04925bb454af448d1'
+            'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
+            'f79b3f09d022178099f38b9eae1792396e730eb5352a03d088e6610d92b3895f3f65bb92089ce7f5b21d794f9716ceb176d29ca7283e8a48bb04cf6aba305a2f'
             '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
             '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
-            '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
-            'c41d5812ab9b5994e06f82acb0299c69edeaed548f5df2a3578c6c6428223e9cf7ec3b746f6e3071b6c858e2b0552417ba4695e1032ea41657bf852eb3ffc3fe'
-            '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82'
-            '7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b'
-            '0dda7afaa96746a45c4720304338aea2315c983edeb8cdde4fbb98ea18421e64209947f87a374c6333ce777ea0e9565e7c5ad4c8f4c987f17d308466d02f475b')
+            'b7e67bccb2516f4d98e4c5ea55f7d2299d95bfdc341dbc0149af1423169bedcd8bcfdb125c92f373e9e7be57ea284fef80a8343035fb42572b9cb927929cd257'
+            '089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8'
+            'b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14'
+            '379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com>
 
 prepare() {
  cd "$pkgname"-$pkgver
 
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i "${srcdir}"/disable_upgrade.patch
+ # add missing 'include <cups/ppd.h>' at various places
+ patch -Np1 -i "${srcdir}"/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
+ # fix some handling unicode file names FS#58412
+ patch -Np1 -i "${srcdir}"/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
+ # Workaround patch for missing Python3 transition of the old
+ # (pre-USB-storage) photo memory card support (pcardext) - Debian patch
+ patch -Np1 -i "${srcdir}"/python3.diff
+ # fix model support / Debian patch / FS#74942
+ patch -Np1 -i "${srcdir}"/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch
+ # fix -Werror=format-security build error with gcc 12
+ patch -Np1 -i "${srcdir}"/0025_fix-Werror-format-security.patch
+ # https://bugs.launchpad.net/hplip/+bug/1879445
+ # broken scanning - https://bugs.archlinux.org/task/66704
+ patch -Np1 -i ../hplip-configure-python.patch
+
+ # make gzip creation reproducible by removing the timestamp
+ patch -Np1 -i ../reproducible-gzip.patch
+
  echo "Removing printers not supported with free drivers from the database"
 
- # based on https://devel.trisquel.info/trisquel/package-helpers/raw/master/helpers/make-hplip
+ # based on https://gitlab.trisquel.org/trisquel/package-helpers/raw/nabia/helpers/make-hplip
  # keep header license
  sed '/\[/,99999d' data/models/models.dat > mktemp
 
@@ -80,44 +101,20 @@ prepare() {
  # remove nonfree software recommendation - https://labs.parabola.nu/issues/893
  sed -i 's/\, requires proprietary plugin//' $(grep -rlI '[,] requires proprietary plugin')
 
- echo "Preparing source"
-
- # disable insecure update - https://bugs.archlinux.org/task/38083
- patch -Np0 -i "${srcdir}"/disable_upgrade.patch
-
- # add missing 'include <cups/ppd.h>' at various places
- patch -Np1 -i "${srcdir}"/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
- # fix some handling unicode file names FS#58412
- patch -Np1 -i "${srcdir}"/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
- # remove binary blob libImageProcessor and all linking - FS#59681
- patch -Np1 -i "${srcdir}"/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
- # Workaround patch for missing Python3 transition of the old
- # (pre-USB-storage) photo memory card support (pcardext) - Debian patch
- patch -Np1 -i "${srcdir}"/python3.diff
-
- # https://bugs.launchpad.net/hplip/+bug/1879445
- # broken scanning - https://bugs.archlinux.org/task/66704
- patch -Np1 -i ../hplip-configure-python.patch
-
- # make gzip creation reproducible by removing the timestamp
- patch -Np1 -i ../reproducible-gzip.patch
-
- # why do they disable the plugins for almost all printers??? - FS#67119
- patch -Np1 -i ../hplip-revert-plugins.patch
-
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 }
 
 build() {
  cd "$pkgname"-$pkgver
- #export CFLAGS+=" $(python3-config --includes)" # Fix build with python 3.8
  ./configure --prefix=/usr \
              --enable-qt5 \
              --disable-qt4 \
              --enable-hpcups-install \
              --enable-cups-drv-install \
+             --disable-imageProcessor-build \
              --enable-pp-build #--help
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
  make
 }
 
diff --git a/libre/hplip/disable_upgrade.patch b/libre/hplip/disable_upgrade.patch
index 600d6ccc7..f7d8fb322 100644
--- a/libre/hplip/disable_upgrade.patch
+++ b/libre/hplip/disable_upgrade.patch
@@ -5,7 +5,7 @@
      log.set_level('debug')
  
 +
-+log.error("HPLIP upgrade is disabled by Parabola for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Parabola software package manager pacman.")
++log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Archlinux software package manager pacman.")
 +clean_exit(1)
 +
 +
diff --git a/libre/hplip/hplip-configure-python.patch b/libre/hplip/hplip-configure-python.patch
new file mode 100644
index 000000000..9dc78cdaf
--- /dev/null
+++ b/libre/hplip/hplip-configure-python.patch
@@ -0,0 +1,52 @@
+diff -up hplip-3.20.9/configure.in.configure-python hplip-3.20.9/configure.in
+--- hplip-3.20.9/configure.in.configure-python	2020-09-23 07:24:27.000000000 +0200
++++ hplip-3.20.9/configure.in	2020-10-02 07:27:09.082331431 +0200
+@@ -604,17 +604,29 @@ if test "$class_driver" = "no" && test "
+    fi
+ fi
+ 
+-SAVE_CPPFLAGS="$CPPFLAGS"
+-CFLAGS=`python-config --includes`
+-if [ $? -eq 0 ] 
+-then
+-   echo $FLAGS
+-else
+-CFLAGS=`python3-config --includes`
+-   if [ $? -eq 0 ]
+-   then
+-   echo $FLAGS
+-   fi
++AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)])
++
++PYTHON_INCLUDES=`$python3_config_path --includes`
++if test "X$PYTHON_INCLUDES" = "X" ; then
++  AC_MSG_ERROR([Cannot get Python includes via python3-config], 6)
++fi
++
++PYTHON_LIBS=`$python3_config_path --libs`
++if test "X$PYTHON_LIBS" = "X" ; then
++  AC_MSG_ERROR([Cannot get Python libs via python3-config], 6)
++fi
++
++SAVE_CFLAGS=$CFLAGS
++SAVE_LIBS=$LIBS
++
++CFLAGS="$CFLAGS $PYTHON_INCLUDES"
++LIBS="$LIBS $PYTHON_LIBS"
++
++AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6))
++
++if test "X$python_includes" != "Xok" ; then
++  CFLAGS="$SAVE_CFLAGS"
++  LIBS="$SAVE_LIBS"
+ fi
+ 
+ #CFLAGS=`(python-config --includes)`
+@@ -631,7 +643,6 @@ if test "$class_driver" = "no" && test "
+    AS_IF([test "x$FOUND_HEADER" != "xyes"],
+           [AC_MSG_ERROR([cannot find python-devel support], 6)])
+ fi
+-CFLAGS="$save_CFLAGS"
+ 
+ if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
+    AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)])
diff --git a/libre/hplip/hplip-revert-plugins.patch b/libre/hplip/hplip-revert-plugins.patch
deleted file mode 100644
index bc54c15d8..000000000
--- a/libre/hplip/hplip-revert-plugins.patch
+++ /dev/null
@@ -1,1312 +0,0 @@
-diff --git a/data/models/models.dat b/data/models/models.dat
-index 85485636e..3a430e250 100644
---- a/data/models/models.dat
-+++ b/data/models/models.dat
-@@ -2131,7 +2131,7 @@ ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=64
- power-settings=0
- pq-diag-type=0
-@@ -3913,8 +3913,8 @@ model1=HP LaserJet Pro 200 color MFP M276nw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -3967,8 +3967,8 @@ model1=HP LaserJet 200 Color MFP M275s
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4021,8 +4021,8 @@ model1=HP LaserJet 200 Color MFP M275u
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4075,8 +4075,8 @@ model1=HP LaserJet 200 Color MFP M275t
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4128,8 +4128,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4181,8 +4181,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4234,8 +4234,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4288,8 +4288,8 @@ model1=HP LaserJet Pro 200 color MFP M276n
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4341,8 +4341,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4394,8 +4394,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4447,8 +4447,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4500,8 +4500,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4553,8 +4553,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4606,8 +4606,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4659,8 +4659,8 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -4713,8 +4713,8 @@ model1=HP LaserJet 200 Color MFP M275nw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -5850,7 +5850,7 @@ model1=HP LaserJet Pro MFP M225rdn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=2112
- power-settings=0
- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -5893,7 +5893,7 @@ model1=HP LaserJet Pro MFP M225dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=2112
- power-settings=0
- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -5934,7 +5934,7 @@ model1=HP LaserJet Pro MFP M225dn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=2112
- power-settings=0
- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -5975,7 +5975,7 @@ model1=HP LaserJet Pro MFP M226dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=2112
- power-settings=0
- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -6017,7 +6017,7 @@ model1=HP LaserJet Pro MFP M226dn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=2112
- power-settings=0
- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd
-@@ -6466,8 +6466,8 @@ model1=HP LaserJet 300 Color MFP M375nw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -7863,8 +7863,8 @@ model1=HP LaserJet 400 Color MFP M475dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8007,8 +8007,8 @@ model1=HP LaserJet 400 MFP M425dw
- monitor-type=1
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_400_mfp_m425-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8052,8 +8052,8 @@ model1=HP Laserjet 400 MFP M425dn
- monitor-type=1
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_400_mfp_m425-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8440,8 +8440,8 @@ model1=HP LaserJet 400 Color MFP M475dn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -8751,8 +8751,8 @@ model1=HP LaserJet Pro MFP M435nw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -9374,8 +9374,8 @@ model1=HP Color Laserjet Pro MFP M476dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9416,8 +9416,8 @@ model1=HP Color Laserjet Pro MFP M476nw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9458,8 +9458,8 @@ model1=HP Color Laserjet Pro MFP M476dn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9754,8 +9754,8 @@ model1=HP LaserJet Pro 500 color MFP M570dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_500_color_mfp_m570-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -9808,8 +9808,8 @@ model1=HP LaserJet Pro 500 color MFP M570dn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_500_color_mfp_m570-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -10383,8 +10383,8 @@ model1=HP LaserJet Pro M521dn Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_mfp_m521-ps.ppd
- family-ppd=hp-postscript-laserjet.ppd
-@@ -10428,8 +10428,8 @@ model1=HP LaserJet Pro M521dw Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_mfp_m521-ps.ppd
- family-ppd=hp-postscript-laserjet.ppd
-@@ -16911,7 +16911,7 @@ model1=HP LaserJet 1000 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17091,7 +17091,7 @@ model1=HP LaserJet 1005 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17131,7 +17131,7 @@ model1=HP LaserJet P1005 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17174,7 +17174,7 @@ model1=HP LaserJet M1005 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -17217,7 +17217,7 @@ model1=HP LaserJet P1006 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17260,7 +17260,7 @@ model1=HP LaserJet P1007 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17303,7 +17303,7 @@ model1=HP LaserJet P1008 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17346,7 +17346,7 @@ model1=HP LaserJet P1009 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17563,8 +17563,8 @@ model1=HP Color LaserJet CM1015 Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=2
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -17615,8 +17615,8 @@ model1=HP Color LaserJet CM1017 Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=2
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -17668,7 +17668,7 @@ model2=HP LaserJet 1018s Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17712,7 +17712,7 @@ model2=HP LaserJet 1020 Plus Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17885,7 +17885,7 @@ model1=HP LaserJet Pro CP1025nw Color Printer Series
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -17937,7 +17937,7 @@ model1=HP LaserJet Pro CP1025 Color Printer Series
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18487,7 +18487,7 @@ model2=HP Laserjet Professional P1102s Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18530,7 +18530,7 @@ model1=HP LaserJet Professional P 1102w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18573,7 +18573,7 @@ model1=HP Laserjet Professional P1106w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18616,7 +18616,7 @@ model1=HP Laserjet Professional P1106 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18659,7 +18659,7 @@ model1=HP LaserJet Professional P1107 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18702,7 +18702,7 @@ model1=HP LaserJet Professional P1107w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18745,7 +18745,7 @@ model1=HP Laserjet Professional P1108w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18788,7 +18788,7 @@ model1=HP Laserjet Professional P1108 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18831,7 +18831,7 @@ model1=HP LaserJet Professional P1109w Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -18874,7 +18874,7 @@ model1=HP LaserJet Professional P1109 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -19091,7 +19091,7 @@ model1=HP LaserJet M1120 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19134,7 +19134,7 @@ model1=HP LaserJet M1120n Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19224,7 +19224,7 @@ model2=HP LaserJet Professional M1132s Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19267,7 +19267,7 @@ model1=HP Laserjet Professional M1136 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19310,7 +19310,7 @@ model1=HP LaserJet Professional M1137 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19353,7 +19353,7 @@ model1=HP LaserJet Professional M1138 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19396,7 +19396,7 @@ model1=HP LaserJet Professional M1139 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -19988,7 +19988,7 @@ model1=HP LaserJet Professional M1212nf Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20031,7 +20031,7 @@ model1=HP LaserJet Professional M1213nf Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20074,7 +20074,7 @@ model1=HP LaserJet Professional M1214nfh Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20117,7 +20117,7 @@ model1=HP Color LaserJet CP1215 Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -20216,7 +20216,7 @@ model1=HP LaserJet Professional M1216nfh MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20259,7 +20259,7 @@ model1=HP Color LaserJet CP1217 Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -20311,7 +20311,7 @@ model1=HP LaserJet Professional M1217nfW Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20354,7 +20354,7 @@ model1=HP Laserjet M1210 MFP Series
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20444,7 +20444,7 @@ model1=HP HotSpot LaserJet Pro M1218nfs MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20486,7 +20486,7 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20528,7 +20528,7 @@ linefeed-cal-type=0
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -20571,7 +20571,7 @@ model1=HP LaserJet Professional M1219nf MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -21235,8 +21235,8 @@ model1=HP Color LaserJet CM1312nfi Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=2
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -21287,8 +21287,8 @@ model1=HP Color LaserJet CM1312 Multifunction Printer
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -21385,7 +21385,7 @@ model1=HP LaserJet M1319f Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=65
- power-settings=0
- pq-diag-type=0
-@@ -21861,8 +21861,8 @@ model1=HP LaserJet Professional CM1411fn
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -21914,8 +21914,8 @@ model1=HP LaserJet Professional CM1412fn
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -21967,8 +21967,8 @@ model1=HP LaserJet Professional CM1413fn
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -22020,8 +22020,8 @@ model1=HP LaserJet Professional CM1415fn
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -22073,8 +22073,8 @@ model1=HP LaserJet Professional CM1415fnw
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -22126,8 +22126,8 @@ model1=HP LaserJet Professional CM1416fnw
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -22179,8 +22179,8 @@ model1=HP LaserJet Professional CM1417fnw
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -22232,8 +22232,8 @@ model1=HP LaserJet Professional CM1418fnw
- monitor-type=0
- panel-check-type=1
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_cm1410_series-ps.ppd
- pq-diag-type=0
-@@ -22619,7 +22619,7 @@ model1=HP LaserJet P1505 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -22921,8 +22921,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -23019,8 +23019,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -23063,8 +23063,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -23430,8 +23430,8 @@ model1=HP LaserJet M1536dnf MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
- family-ppd=hp-postscript-laserjet.ppd
-@@ -23475,8 +23475,8 @@ model1=HP LaserJet M1537dnf MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
- pq-diag-type=0
-@@ -23519,8 +23519,8 @@ model1=HP LaserJet M1538dnf MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
- pq-diag-type=0
-@@ -23563,8 +23563,8 @@ model1=HP LaserJet M1539dnf MFP
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd
- pq-diag-type=0
-@@ -23607,7 +23607,7 @@ model1=HP LaserJet Professional P1566
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -23650,7 +23650,7 @@ model1=HP LaserJet Professional P1567
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -23693,7 +23693,7 @@ model1=HP LaserJet Professional P1568
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -23736,7 +23736,7 @@ model1=HP LaserJet Professional P1569
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -24132,7 +24132,7 @@ model1=HP Color LaserJet 1600 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -24172,7 +24172,7 @@ model1=HP LaserJet Professional P1606dn Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -24215,7 +24215,7 @@ model1=HP LaserJet Professional P1607dn Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -24258,7 +24258,7 @@ model1=HP LaserJet Professional P1608dn Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -24301,7 +24301,7 @@ model1=HP LaserJet Professional P1609dn Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -25254,7 +25254,7 @@ model1=HP LaserJet P2035n Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -25297,7 +25297,7 @@ model1=HP LaserJet P2035 Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -26939,8 +26939,8 @@ model1=HP Color LaserJet CM2320 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -26991,8 +26991,8 @@ model1=HP Color LaserJet CM2320nf Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -27043,8 +27043,8 @@ model1=HP Color LaserJet CM2320fxi Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -27095,8 +27095,8 @@ model1=HP Color LaserJet CM2320n Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- pq-diag-type=0
- r-type=0
-@@ -28453,7 +28453,7 @@ model1=HP Color LaserJet 2600n Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
-+plugin=1
- plugin-reason=1
- power-settings=0
- pq-diag-type=0
-@@ -29353,8 +29353,8 @@ model1=HP LaserJet M2727 Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd
- pq-diag-type=0
-@@ -29397,8 +29397,8 @@ model1=HP LaserJet M2727nfs Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd
- pq-diag-type=0
-@@ -29441,8 +29441,8 @@ model1=HP LaserJet M2727nf Multifunction Printer
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd
- family-ppd=hp-postscript-laserjet.ppd
-@@ -52679,8 +52679,8 @@ model1=HP Color LaserJet MFP M277n
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_mfp_m277
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -52733,8 +52733,8 @@ model1=HP Color LaserJet MFP M277dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m277
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -53474,8 +53474,8 @@ model1=HP Color LaserJet Pro MFP M274n
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_mfp_m274-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54257,8 +54257,8 @@ model1=HP Laserjet Pro MFP M426fdn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54302,8 +54302,8 @@ model1=HP Laserjet Pro MFP M426fdw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54347,8 +54347,8 @@ model1=HP Laserjet Pro MFP M427dn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54392,8 +54392,8 @@ model1=HP Laserjet Pro MFP M427fdw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54437,8 +54437,8 @@ model1=HP Laserjet Pro MFP M426dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=laserjet_mfp_m426_m427
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54482,8 +54482,8 @@ model1=HP Laserjet Pro MFP M427dw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-laserjet_mfp_m426_m427-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54812,8 +54812,8 @@ model1=HP Color Laserjet Pro MFP M477 fnw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m477-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54854,8 +54854,8 @@ model1=HP Color Laserjet Pro MFP M477 fdn
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=color_laserjet_pro_mfp_m477d
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -54896,8 +54896,8 @@ model1=HP Color Laserjet Pro MFP M477 fdw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m477d-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -56054,8 +56054,8 @@ model1=HP Color Laserjet MFP M377 fnw
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m377-ps.ppd
- family-ppd=hp-postscript-laserjet-pro.ppd
-@@ -57016,8 +57016,8 @@ model1=HP Color LaserJet MFP M277c6
- monitor-type=0
- panel-check-type=0
- pcard-type=0
--plugin=0
--plugin-reason=0
-+plugin=1
-+plugin-reason=64
- power-settings=0
- ppd-name=hp-color_laserjet_pro_mfp_m277-ps.ppd
- pq-diag-type=0
diff --git a/libre/hplip/python3.diff b/libre/hplip/python3.diff
index b79f0c017..636d165c1 100644
--- a/libre/hplip/python3.diff
+++ b/libre/hplip/python3.diff
@@ -116,19 +116,6 @@ index c1a8273..37d979b 100644
  }
  
  
-diff --git a/pcard/photocard.py b/pcard/photocard.py
-index 913dc4e..2c73158 100644
---- a/pcard/photocard.py
-+++ b/pcard/photocard.py
-@@ -30,7 +30,7 @@ from base.codes import *
- from base import device, utils, exif
- 
- try:
--    from . import pcardext
-+    import pcardext
- except ImportError:
-     if not os.getenv("HPLIP_BUILD"):
-         log.error("PCARDEXT could not be loaded. Please check HPLIP installation.")
 diff --git a/unload.py b/unload.py
 index 3fdd5a3..ce8b069 100755
 --- a/unload.py
diff --git a/libre/hplip/reproducible-gzip.patch b/libre/hplip/reproducible-gzip.patch
index 7eeb9941b..5a25d2689 100644
--- a/libre/hplip/reproducible-gzip.patch
+++ b/libre/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