diff --git a/files/hplip-missing-drivers.patch b/files/hplip-missing-drivers.patch --- a/files/hplip-missing-drivers.patch +++ b/files/hplip-missing-drivers.patch @@ -1,25 +1,75 @@ -diff -up hplip-3.20.6/cups_drv.inc.missing-drivers hplip-3.20.6/cups_drv.inc ---- hplip-3.20.6/cups_drv.inc.missing-drivers 2020-06-09 13:23:14.000000000 +0200 -+++ hplip-3.20.6/cups_drv.inc 2020-06-17 13:49:39.110952720 +0200 -@@ -407,6 +407,7 @@ cups_ppd_printers = \ +From 29a8d5bb5620a2aaad5da56e3186fbcedd13855e Mon Sep 17 00:00:00 2001 +From: Thomas Staudinger +Date: Sat, 2 Apr 2022 22:26:37 +0200 +Subject: [PATCH] hplip-missing-drivers + +--- + 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 dbee0c3..3e70a4a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1613,6 +1613,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 \ +@@ -1730,6 +1731,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 \ +@@ -4090,6 +4092,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 \ +@@ -4206,6 +4209,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_m1120_mfp.ppd.gz \ -@@ -520,6 +521,7 @@ cups_ppd_printers = \ + 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-mopier_240-pcl3.ppd.gz \ - ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ -diff -up hplip-3.20.6/data/models/models.dat.missing-drivers hplip-3.20.6/data/models/models.dat ---- hplip-3.20.6/data/models/models.dat.missing-drivers 2020-06-17 13:49:39.080953000 +0200 -+++ hplip-3.20.6/data/models/models.dat 2020-06-17 13:49:39.120952626 +0200 + 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 1af0f1e..476b3c4 100644 +--- a/data/models/models.dat ++++ b/data/models/models.dat @@ -2104,7 +2104,7 @@ usb-pid=411 usb-vid=3f0 wifi-config=0 @@ -532,48 +582,15 @@ [hp_laserjet_professional_p1102] align-type=0 clean-type=0 -diff -up hplip-3.20.6/Makefile.in.missing-drivers hplip-3.20.6/Makefile.in ---- hplip-3.20.6/Makefile.in.missing-drivers 2020-06-09 13:23:20.000000000 +0200 -+++ hplip-3.20.6/Makefile.in 2020-06-17 13:49:39.110952720 +0200 -@@ -1571,6 +1571,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase - 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_m1120_mfp.ppd.gz \ -@@ -1685,6 +1686,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase - 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-mopier_240-pcl3.ppd.gz \ - ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ - ppd/hpcups/hp-neverstop_laser_100x.ppd.gz \ -@@ -3961,6 +3963,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_m1120_mfp.ppd.gz \ -@@ -4074,6 +4077,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-mopier_240-pcl3.ppd.gz \ - @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ -diff -up hplip-3.20.6/prnt/drv/hpcups.drv.in.missing-drivers hplip-3.20.6/prnt/drv/hpcups.drv.in ---- hplip-3.20.6/prnt/drv/hpcups.drv.in.missing-drivers 2020-06-17 13:49:39.009953663 +0200 -+++ hplip-3.20.6/prnt/drv/hpcups.drv.in 2020-06-17 13:51:49.576733820 +0200 -@@ -22319,6 +22319,14 @@ Group "RLT/HP Real Life Technologies" +diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in +index a6e37db..c59576c 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" @@ -581,11 +598,10 @@ + 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" - Attribute "ShortNickName" "" "HP LJ Pro p1106 hpijs" -@@ -22752,6 +22760,14 @@ Group "RLT/HP Real Life Technologies" +@@ -23122,6 +23130,14 @@ Group "RLT/HP Real Life Technologies" PCFileName "hp-laserjet_cp1025nw.ppd" Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)" } @@ -600,3 +616,5 @@ } } // End LJZjsColor (for proprietary plugin) +-- +2.35.1 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : hplip -version : 3.21.12 -release : 48 +version : 3.22.2 +release : 49 source : - - https://downloads.sourceforge.net/project/hplip/hplip/3.21.12/hplip-3.21.12.tar.gz : 7ef4523ef81bced71515e1c8840ef6c68c602638c159e6dd9a92691ceec64f9c + - https://downloads.sourceforge.net/project/hplip/hplip/3.22.2/hplip-3.22.2.tar.gz : 13c29020be3ab096ee7dfbe6cf569b9b96a4ab6f725d9c0d5d0e8c2b2ac28958 license : - GPL-2.0-or-later - MIT diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ hplip - Thomas Staudinger - Staudi.Kaos@gmail.com + Tracey Clark + traceyc.dev@tlcnet.info GPL-2.0-or-later MIT @@ -21,7 +21,7 @@ desktop.core - hplip-drivers + hplip-drivers /etc/hp/hplip.conf @@ -70,40 +70,40 @@ /usr/lib/systemd/system/hplip-printer@.service /usr/share/applications/hp-uiscan.desktop /usr/share/applications/hplip.desktop - /usr/share/doc/hplip-3.21.12/COPYING - /usr/share/doc/hplip-3.21.12/README_LIBJPG - /usr/share/doc/hplip-3.21.12/commandline.html - /usr/share/doc/hplip-3.21.12/copying.html - /usr/share/doc/hplip-3.21.12/copyright - /usr/share/doc/hplip-3.21.12/devicemanager.html - /usr/share/doc/hplip-3.21.12/faxtrouble.html - /usr/share/doc/hplip-3.21.12/gettinghelp.html - /usr/share/doc/hplip-3.21.12/hpscan.html - /usr/share/doc/hplip-3.21.12/images/favicon.ico - /usr/share/doc/hplip-3.21.12/images/print.png - /usr/share/doc/hplip-3.21.12/images/toolbox_actions.png - /usr/share/doc/hplip-3.21.12/images/toolbox_fax.png - /usr/share/doc/hplip-3.21.12/images/toolbox_print_control.png - /usr/share/doc/hplip-3.21.12/images/toolbox_print_settings.png - /usr/share/doc/hplip-3.21.12/images/toolbox_status.png - /usr/share/doc/hplip-3.21.12/images/toolbox_supplies.png - /usr/share/doc/hplip-3.21.12/images/xsane.png - /usr/share/doc/hplip-3.21.12/index.html - /usr/share/doc/hplip-3.21.12/mainttask.html - /usr/share/doc/hplip-3.21.12/plugins.html - /usr/share/doc/hplip-3.21.12/print.html - /usr/share/doc/hplip-3.21.12/printing.html - /usr/share/doc/hplip-3.21.12/printoptions.html - /usr/share/doc/hplip-3.21.12/printtroubleshooting.html - /usr/share/doc/hplip-3.21.12/scanning.html - /usr/share/doc/hplip-3.21.12/scantrouble.html - /usr/share/doc/hplip-3.21.12/sendfax.html - /usr/share/doc/hplip-3.21.12/setup.html - /usr/share/doc/hplip-3.21.12/styles/css.css - /usr/share/doc/hplip-3.21.12/systray.html - /usr/share/doc/hplip-3.21.12/troubleshooting.html - /usr/share/doc/hplip-3.21.12/uninstalling.html - /usr/share/doc/hplip-3.21.12/upgrading.html + /usr/share/doc/hplip-3.22.2/COPYING + /usr/share/doc/hplip-3.22.2/README_LIBJPG + /usr/share/doc/hplip-3.22.2/commandline.html + /usr/share/doc/hplip-3.22.2/copying.html + /usr/share/doc/hplip-3.22.2/copyright + /usr/share/doc/hplip-3.22.2/devicemanager.html + /usr/share/doc/hplip-3.22.2/faxtrouble.html + /usr/share/doc/hplip-3.22.2/gettinghelp.html + /usr/share/doc/hplip-3.22.2/hpscan.html + /usr/share/doc/hplip-3.22.2/images/favicon.ico + /usr/share/doc/hplip-3.22.2/images/print.png + /usr/share/doc/hplip-3.22.2/images/toolbox_actions.png + /usr/share/doc/hplip-3.22.2/images/toolbox_fax.png + /usr/share/doc/hplip-3.22.2/images/toolbox_print_control.png + /usr/share/doc/hplip-3.22.2/images/toolbox_print_settings.png + /usr/share/doc/hplip-3.22.2/images/toolbox_status.png + /usr/share/doc/hplip-3.22.2/images/toolbox_supplies.png + /usr/share/doc/hplip-3.22.2/images/xsane.png + /usr/share/doc/hplip-3.22.2/index.html + /usr/share/doc/hplip-3.22.2/mainttask.html + /usr/share/doc/hplip-3.22.2/plugins.html + /usr/share/doc/hplip-3.22.2/print.html + /usr/share/doc/hplip-3.22.2/printing.html + /usr/share/doc/hplip-3.22.2/printoptions.html + /usr/share/doc/hplip-3.22.2/printtroubleshooting.html + /usr/share/doc/hplip-3.22.2/scanning.html + /usr/share/doc/hplip-3.22.2/scantrouble.html + /usr/share/doc/hplip-3.22.2/sendfax.html + /usr/share/doc/hplip-3.22.2/setup.html + /usr/share/doc/hplip-3.22.2/styles/css.css + /usr/share/doc/hplip-3.22.2/systray.html + /usr/share/doc/hplip-3.22.2/troubleshooting.html + /usr/share/doc/hplip-3.22.2/uninstalling.html + /usr/share/doc/hplip-3.22.2/upgrading.html /usr/share/hplip/__init__.py /usr/share/hplip/align.py /usr/share/hplip/base/LedmWifi.py @@ -1565,6 +1565,12 @@ /usr/share/ppd/HP/hp-laserjet_professional_p1608dn.ppd.gz /usr/share/ppd/HP/hp-laserjet_professional_p1609dn.ppd.gz /usr/share/ppd/HP/hp-laserjet_professional_p_1102w.ppd.gz + /usr/share/ppd/HP/hp-laserjet_tank_1020.ppd.gz + /usr/share/ppd/HP/hp-laserjet_tank_150x.ppd.gz + /usr/share/ppd/HP/hp-laserjet_tank_250x.ppd.gz + /usr/share/ppd/HP/hp-laserjet_tank_mfp_1005.ppd.gz + /usr/share/ppd/HP/hp-laserjet_tank_mfp_160x.ppd.gz + /usr/share/ppd/HP/hp-laserjet_tank_mfp_260x.ppd.gz /usr/share/ppd/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz /usr/share/ppd/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz /usr/share/ppd/HP/hp-mopier_240-pcl3.ppd.gz @@ -1943,12 +1949,12 @@ - - 2022-03-26 - 3.21.12 + + 2022-04-02 + 3.22.2 Packaging update - Thomas Staudinger - Staudi.Kaos@gmail.com + Tracey Clark + traceyc.dev@tlcnet.info \ No newline at end of file