Date: Sunday, August 23, 2020 @ 09:42:21 Author: andyrtr Revision: 394593
archrelease: copy trunk to extra-x86_64 Added: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 394592, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 394592, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch) hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (from rev 394592, hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) hplip/repos/extra-x86_64/PKGBUILD (from rev 394592, hplip/trunk/PKGBUILD) hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 394592, hplip/trunk/disable_upgrade.patch) hplip/repos/extra-x86_64/hplip-revert-plugins.patch (from rev 394592, hplip/trunk/hplip-revert-plugins.patch) hplip/repos/extra-x86_64/python3.diff (from rev 394592, hplip/trunk/python3.diff) hplip/repos/extra-x86_64/reproducible-gzip.patch (from rev 394592, hplip/trunk/reproducible-gzip.patch) Deleted: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch hplip/repos/extra-x86_64/PKGBUILD hplip/repos/extra-x86_64/disable_upgrade.patch hplip/repos/extra-x86_64/hplip-revert-plugins.patch hplip/repos/extra-x86_64/python3.diff hplip/repos/extra-x86_64/reproducible-gzip.patch -----------------------------------------------------------------+ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch | 100 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch | 58 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 226 PKGBUILD | 222 disable_upgrade.patch | 28 hplip-revert-plugins.patch | 2624 +++++----- python3.diff | 294 - reproducible-gzip.patch | 76 8 files changed, 1814 insertions(+), 1814 deletions(-) Deleted: 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch =================================================================== --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2020-08-23 09:42:08 UTC (rev 394592) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -1,50 +0,0 @@ -From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppe...@canonical.com> -Date: Sat, 24 Sep 2016 10:37:20 +0200 -Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some - definitions to ppd.h - ---- - configure.in | 2 +- - prnt/hpcups/HPCupsFilter.h | 2 ++ - prnt/hpijs/hpcupsfax.cpp | 1 + - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index d3a1ddb..eabe14a 100755 ---- a/configure.in -+++ b/configure.in -@@ -554,7 +554,7 @@ fi - - if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then - AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) -- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) -+ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) - if test "$libusb01_build" = "yes"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) -diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h -index ff5548e..c517989 100644 ---- a/prnt/hpcups/HPCupsFilter.h -+++ b/prnt/hpcups/HPCupsFilter.h -@@ -38,6 +38,8 @@ - - #include "dbuscomm.h" - -+#include <cups/ppd.h> -+ - #define DBITMAPFILEHEADER 14 - #define DBITMAPINFOHEADER 40 - -diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp -index 8514775..994e50f 100644 ---- a/prnt/hpijs/hpcupsfax.cpp -+++ b/prnt/hpijs/hpcupsfax.cpp -@@ -43,6 +43,7 @@ - #include <arpa/inet.h> - #include <math.h> - #include <cups/cups.h> -+#include <cups/ppd.h> - #include <cups/raster.h> - #include <string> - #ifdef FALSE Copied: hplip/repos/extra-x86_64/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (from rev 394592, hplip/trunk/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch) =================================================================== --- 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch (rev 0) +++ 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,50 @@ +From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001 +From: Till Kamppeter <till.kamppe...@canonical.com> +Date: Sat, 24 Sep 2016 10:37:20 +0200 +Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some + definitions to ppd.h + +--- + configure.in | 2 +- + prnt/hpcups/HPCupsFilter.h | 2 ++ + prnt/hpijs/hpcupsfax.cpp | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d3a1ddb..eabe14a 100755 +--- a/configure.in ++++ b/configure.in +@@ -554,7 +554,7 @@ fi + + if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then + AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)]) +- AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) ++ AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)]) + if test "$libusb01_build" = "yes"; then + AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) + AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) +diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h +index ff5548e..c517989 100644 +--- a/prnt/hpcups/HPCupsFilter.h ++++ b/prnt/hpcups/HPCupsFilter.h +@@ -38,6 +38,8 @@ + + #include "dbuscomm.h" + ++#include <cups/ppd.h> ++ + #define DBITMAPFILEHEADER 14 + #define DBITMAPINFOHEADER 40 + +diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp +index 8514775..994e50f 100644 +--- a/prnt/hpijs/hpcupsfax.cpp ++++ b/prnt/hpijs/hpcupsfax.cpp +@@ -43,6 +43,7 @@ + #include <arpa/inet.h> + #include <math.h> + #include <cups/cups.h> ++#include <cups/ppd.h> + #include <cups/raster.h> + #include <string> + #ifdef FALSE Deleted: 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch =================================================================== --- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch 2020-08-23 09:42:08 UTC (rev 394592) +++ 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -1,29 +0,0 @@ -From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001 -From: Gaurav Sood <gaurav-s...@invalid-email.launchpad.net> -Date: Thu, 4 May 2017 18:32:08 +0200 -Subject: Fix handling of unicode filenames in sixext.py - -LP: #1480152 -Closes: #861731 ---- - base/sixext.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/sixext.py b/base/sixext.py -index 0bf4fc4f4..311bf72c6 100644 ---- a/base/sixext.py -+++ b/base/sixext.py -@@ -110,11 +110,11 @@ if PY3: - - - def to_string_utf8(s): -- return s.decode("utf-8") -+ return s.decode("utf-8", 'ignore') - - - def to_string_latin(s): -- return s.decode("latin-1") -+ return s.decode("latin-1", 'ignore') - - - def to_unicode(s, enc=None): Copied: hplip/repos/extra-x86_64/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (from rev 394592, hplip/trunk/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch) =================================================================== --- 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch (rev 0) +++ 0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,29 @@ +From 04b5a1ddac1dd90c5a392f23aaf7df42eae32918 Mon Sep 17 00:00:00 2001 +From: Gaurav Sood <gaurav-s...@invalid-email.launchpad.net> +Date: Thu, 4 May 2017 18:32:08 +0200 +Subject: Fix handling of unicode filenames in sixext.py + +LP: #1480152 +Closes: #861731 +--- + base/sixext.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/base/sixext.py b/base/sixext.py +index 0bf4fc4f4..311bf72c6 100644 +--- a/base/sixext.py ++++ b/base/sixext.py +@@ -110,11 +110,11 @@ if PY3: + + + def to_string_utf8(s): +- return s.decode("utf-8") ++ return s.decode("utf-8", 'ignore') + + + def to_string_latin(s): +- return s.decode("latin-1") ++ return s.decode("latin-1", 'ignore') + + + def to_unicode(s, enc=None): Deleted: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch =================================================================== --- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch 2020-08-23 09:42:08 UTC (rev 394592) +++ 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -1,113 +0,0 @@ -From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 -From: Didier Raboud <o...@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; - } Copied: hplip/repos/extra-x86_64/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (from rev 394592, hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch) =================================================================== --- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch (rev 0) +++ 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,113 @@ +From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 +From: Didier Raboud <o...@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; + } Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-08-23 09:42:08 UTC (rev 394592) +++ PKGBUILD 2020-08-23 09:42:21 UTC (rev 394593) @@ -1,111 +0,0 @@ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor : Rémy Oudompheng <r...@archlinux.org> -# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org> - -pkgname=hplip -pkgver=3.20.6 -pkgrel=2 -epoch=1 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" -arch=('x86_64') -url="https://hplipopensource.com" -license=('GPL2' 'custom') -depends=('python-dbus' 'python-distro' 'ghostscript' 'net-snmp' 'foomatic-db-engine' 'python-gobject') -makedepends=('python-pyqt5' 'sane' 'rpcbind' 'cups' 'libusb') -optdepends=('cups: for printing support' - 'sane: for scanner support' - 'xsane: sane scanner frontend' - 'python-pillow: for commandline scanning support' - 'python-reportlab: for pdf output in hp-scan' - 'rpcbind: for network support' - 'python-pyqt5: for running GUI and hp-toolbox' - 'libusb: for advanced usb support' - 'wget: for network support') -# 'hplip-plugin: binary blobs for specific devices (AUR) or run hp-setup to download the plugin' -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 - 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 - python3.diff - reproducible-gzip.patch - hplip-revert-plugins.patch) -sha512sums=('ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96' - 'SKIP' - 'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525' - '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67' - '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff' - '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b' - 'c41d5812ab9b5994e06f82acb0299c69edeaed548f5df2a3578c6c6428223e9cf7ec3b746f6e3071b6c858e2b0552417ba4695e1032ea41657bf852eb3ffc3fe' - '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82' - '7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b' - '0dda7afaa96746a45c4720304338aea2315c983edeb8cdde4fbb98ea18421e64209947f87a374c6333ce777ea0e9565e7c5ad4c8f4c987f17d308466d02f475b') -validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hp...@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 - # 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 \ - --enable-pp-build #--help - make -} - -package() { - cd "$pkgname"-$pkgver - make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install - - # remove config provided by sane and autostart of hp-daemon - rm -rf "$pkgdir"/etc/{sane.d,xdg} - install -dm755 "${pkgdir}"/etc/sane.d/dll.d - echo hpaio > "${pkgdir}"/etc/sane.d/dll.d/hpaio - - # remove HAL .fdi file because HAL is no longer used - rm -vrf "$pkgdir"/usr/share/hal - - # remove rc script - rm -vrf "$pkgdir"/etc/init.d - - # add mixed license file - install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 COPYING - - # Compile Python bytecode: - python -m compileall -d /usr/share "$pkgdir/usr/share" - python -O -m compileall -d /usr/share "$pkgdir/usr/share" -} Copied: hplip/repos/extra-x86_64/PKGBUILD (from rev 394592, hplip/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,111 @@ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor : Rémy Oudompheng <r...@archlinux.org> +# Contributor: Morgan LEFIEUX <com...@archlinuxfr.org> + +pkgname=hplip +pkgver=3.20.6 +pkgrel=3 +epoch=1 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +arch=('x86_64') +url="https://hplipopensource.com" +license=('GPL2' 'custom') +depends=('python-dbus' 'python-distro' 'ghostscript' 'net-snmp' 'foomatic-db-engine' 'python-gobject' 'libxcrypt') +makedepends=('python-pyqt5' 'sane' 'rpcbind' 'cups' 'libusb') +optdepends=('cups: for printing support' + 'sane: for scanner support' + 'xsane: sane scanner frontend' + 'python-pillow: for commandline scanning support' + 'python-reportlab: for pdf output in hp-scan' + 'rpcbind: for network support' + 'python-pyqt5: for running GUI and hp-toolbox' + 'libusb: for advanced usb support' + 'wget: for network support') +# 'hplip-plugin: binary blobs for specific devices (AUR) or run hp-setup to download the plugin' +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 + 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 + python3.diff + reproducible-gzip.patch + hplip-revert-plugins.patch) +sha512sums=('ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96' + 'SKIP' + 'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525' + '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67' + '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff' + '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b' + 'c41d5812ab9b5994e06f82acb0299c69edeaed548f5df2a3578c6c6428223e9cf7ec3b746f6e3071b6c858e2b0552417ba4695e1032ea41657bf852eb3ffc3fe' + '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82' + '7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b' + '0dda7afaa96746a45c4720304338aea2315c983edeb8cdde4fbb98ea18421e64209947f87a374c6333ce777ea0e9565e7c5ad4c8f4c987f17d308466d02f475b') +validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hp...@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 + # 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 \ + --enable-pp-build #--help + make +} + +package() { + cd "$pkgname"-$pkgver + make -j1 rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install + + # remove config provided by sane and autostart of hp-daemon + rm -rf "$pkgdir"/etc/{sane.d,xdg} + install -dm755 "${pkgdir}"/etc/sane.d/dll.d + echo hpaio > "${pkgdir}"/etc/sane.d/dll.d/hpaio + + # remove HAL .fdi file because HAL is no longer used + rm -vrf "$pkgdir"/usr/share/hal + + # remove rc script + rm -vrf "$pkgdir"/etc/init.d + + # add mixed license file + install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 COPYING + + # Compile Python bytecode: + python -m compileall -d /usr/share "$pkgdir/usr/share" + python -O -m compileall -d /usr/share "$pkgdir/usr/share" +} Deleted: disable_upgrade.patch =================================================================== --- disable_upgrade.patch 2020-08-23 09:42:08 UTC (rev 394592) +++ disable_upgrade.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -1,14 +0,0 @@ ---- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100 -+++ upgrade.py 2013-12-04 14:58:03.000000000 +0100 -@@ -134,6 +134,11 @@ except getopt.GetoptError, e: - if os.getenv("HPLIP_DEBUG"): - log.set_level('debug') - -+ -+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) -+ -+ - for o, a in opts: - if o in ('-h', '--help'): - usage() Copied: hplip/repos/extra-x86_64/disable_upgrade.patch (from rev 394592, hplip/trunk/disable_upgrade.patch) =================================================================== --- disable_upgrade.patch (rev 0) +++ disable_upgrade.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,14 @@ +--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100 ++++ upgrade.py 2013-12-04 14:58:03.000000000 +0100 +@@ -134,6 +134,11 @@ except getopt.GetoptError, e: + if os.getenv("HPLIP_DEBUG"): + log.set_level('debug') + ++ ++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) ++ ++ + for o, a in opts: + if o in ('-h', '--help'): + usage() Deleted: hplip-revert-plugins.patch =================================================================== --- hplip-revert-plugins.patch 2020-08-23 09:42:08 UTC (rev 394592) +++ hplip-revert-plugins.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -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 Copied: hplip/repos/extra-x86_64/hplip-revert-plugins.patch (from rev 394592, hplip/trunk/hplip-revert-plugins.patch) =================================================================== --- hplip-revert-plugins.patch (rev 0) +++ hplip-revert-plugins.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,1312 @@ +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 Deleted: python3.diff =================================================================== --- python3.diff 2020-08-23 09:42:08 UTC (rev 394592) +++ python3.diff 2020-08-23 09:42:21 UTC (rev 394593) @@ -1,147 +0,0 @@ -From: Till Kamppeter <till.kamppe...@gmail.com> -Date: Fri, 22 Jul 2016 09:33:04 +0200 -Subject: Workaround patch for missing Python3 transition of the old - (pre-USB-storage) photo memory card support (pcardext) as this part builds - in Python3 environments but with pointer-related warnings which are fatal - errors for Ubuntu's build servers. The patch silences the warnings but the - memory card support is dropped in Python3 environments. This patch is - supplied by the HPLIP upstream developers and will be replaced by a more - proper solution in the next upstream release of HPLIP (see LP: #1275353) - ---- - pcard/pcardext/pcardext.c | 59 +++++++++++++++++++++++++++++++++++++---------- - pcard/photocard.py | 2 +- - unload.py | 5 ++++ - 3 files changed, 53 insertions(+), 13 deletions(-) - -diff --git a/pcard/pcardext/pcardext.c b/pcard/pcardext/pcardext.c -index c1a8273..37d979b 100644 ---- a/pcard/pcardext/pcardext.c -+++ b/pcard/pcardext/pcardext.c -@@ -20,7 +20,7 @@ pcardext - Python extension for HP photocard services - Requires: - Python 2.2+ - --Author: Don Welch -+Author: Don Welch - - \*****************************************************************************/ - -@@ -38,9 +38,37 @@ typedef int Py_ssize_t; - - int verbose=0; - -+#if PY_MAJOR_VERSION >= 3 -+ #define MOD_ERROR_VAL NULL -+ #define MOD_SUCCESS_VAL(val) val -+ #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void) -+ #define PyInt_AS_LONG PyLong_AS_LONG -+ #define MOD_DEF(ob, name, doc, methods) \ -+ static struct PyModuleDef moduledef = { \ -+ PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \ -+ ob = PyModule_Create(&moduledef); -+ -+ -+ #define PY_String_Bytes PyBytes_FromStringAndSize -+ #define PY_AsString_Bytes PyBytes_AsStringAndSize -+ -+#else -+ #define MOD_ERROR_VAL -+ #define MOD_SUCCESS_VAL(val) -+ #define MOD_INIT(name) void init##name(void) -+ #define MOD_DEF(ob, name, doc, methods) \ -+ ob = Py_InitModule3(name, methods, doc); -+ -+ #define PY_String_Bytes PyString_FromStringAndSize -+ #define PY_AsString_Bytes PyString_AsStringAndSize -+ -+#endif -+ - PyObject * readsectorFunc = NULL; - PyObject * writesectorFunc = NULL; - -+ -+ - int ReadSector(int sector, int nsector, void *buf, int size) - { - PyObject * result; -@@ -56,9 +84,13 @@ int ReadSector(int sector, int nsector, void *buf, int size) - if( result ) - { - Py_ssize_t len = 0; -- PyString_AsStringAndSize( result, &result_str, &len ); -+ -+ //PyString_AsStringAndSize( result, &result_str, &len ); -+ //PyBytes_AsStringAndSize( result, &result_str, &len ); -+ PY_AsString_Bytes( result, &result_str, &len ); - -- if( len < nsector*FAT_HARDSECT ) -+ -+ if( len < nsector*FAT_HARDSECT ) - { - goto abort; - } -@@ -205,7 +237,9 @@ PyObject * pcardext_read( PyObject * self, PyObject * args ) - - if( FatReadFileExt( name, offset, len, buffer ) == len ) - { -- return PyString_FromStringAndSize( (char *)buffer, len ); -+ // return PyString_FromStringAndSize( (char *)buffer, len ); -+ return PY_String_Bytes( (char *)buffer, len ); -+ // return PyBytes_FromStringAndSize( (char *)buffer, len ); - } - else - { -@@ -233,14 +267,15 @@ static PyMethodDef pcardext_methods[] = - - static char pcardext_documentation[] = "Python extension for HP photocard services"; - --void initpcardext( void ) --{ -- PyObject * mod = Py_InitModule4( "pcardext", pcardext_methods, -- pcardext_documentation, (PyObject*)NULL, -- PYTHON_API_VERSION ); -- -- if (mod == NULL) -- return; -+MOD_INIT(pcardext) { -+ -+ PyObject* mod ; -+ MOD_DEF(mod, "pcardext", pcardext_documentation, pcardext_methods); -+ if (mod == NULL) -+ return MOD_ERROR_VAL; -+ -+ return MOD_SUCCESS_VAL(mod); -+ - } - - -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 -+++ b/unload.py -@@ -44,6 +44,11 @@ except ImportError: - - # Local - from base.g import * -+from base.sixext import PY3 -+if PY3: -+ log.error("This functionality is not spported in python3 environment.") -+ sys.exit(1) -+ - from base import device, utils, tui, module - from prnt import cups - Copied: hplip/repos/extra-x86_64/python3.diff (from rev 394592, hplip/trunk/python3.diff) =================================================================== --- python3.diff (rev 0) +++ python3.diff 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,147 @@ +From: Till Kamppeter <till.kamppe...@gmail.com> +Date: Fri, 22 Jul 2016 09:33:04 +0200 +Subject: Workaround patch for missing Python3 transition of the old + (pre-USB-storage) photo memory card support (pcardext) as this part builds + in Python3 environments but with pointer-related warnings which are fatal + errors for Ubuntu's build servers. The patch silences the warnings but the + memory card support is dropped in Python3 environments. This patch is + supplied by the HPLIP upstream developers and will be replaced by a more + proper solution in the next upstream release of HPLIP (see LP: #1275353) + +--- + pcard/pcardext/pcardext.c | 59 +++++++++++++++++++++++++++++++++++++---------- + pcard/photocard.py | 2 +- + unload.py | 5 ++++ + 3 files changed, 53 insertions(+), 13 deletions(-) + +diff --git a/pcard/pcardext/pcardext.c b/pcard/pcardext/pcardext.c +index c1a8273..37d979b 100644 +--- a/pcard/pcardext/pcardext.c ++++ b/pcard/pcardext/pcardext.c +@@ -20,7 +20,7 @@ pcardext - Python extension for HP photocard services + Requires: + Python 2.2+ + +-Author: Don Welch ++Author: Don Welch + + \*****************************************************************************/ + +@@ -38,9 +38,37 @@ typedef int Py_ssize_t; + + int verbose=0; + ++#if PY_MAJOR_VERSION >= 3 ++ #define MOD_ERROR_VAL NULL ++ #define MOD_SUCCESS_VAL(val) val ++ #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void) ++ #define PyInt_AS_LONG PyLong_AS_LONG ++ #define MOD_DEF(ob, name, doc, methods) \ ++ static struct PyModuleDef moduledef = { \ ++ PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \ ++ ob = PyModule_Create(&moduledef); ++ ++ ++ #define PY_String_Bytes PyBytes_FromStringAndSize ++ #define PY_AsString_Bytes PyBytes_AsStringAndSize ++ ++#else ++ #define MOD_ERROR_VAL ++ #define MOD_SUCCESS_VAL(val) ++ #define MOD_INIT(name) void init##name(void) ++ #define MOD_DEF(ob, name, doc, methods) \ ++ ob = Py_InitModule3(name, methods, doc); ++ ++ #define PY_String_Bytes PyString_FromStringAndSize ++ #define PY_AsString_Bytes PyString_AsStringAndSize ++ ++#endif ++ + PyObject * readsectorFunc = NULL; + PyObject * writesectorFunc = NULL; + ++ ++ + int ReadSector(int sector, int nsector, void *buf, int size) + { + PyObject * result; +@@ -56,9 +84,13 @@ int ReadSector(int sector, int nsector, void *buf, int size) + if( result ) + { + Py_ssize_t len = 0; +- PyString_AsStringAndSize( result, &result_str, &len ); ++ ++ //PyString_AsStringAndSize( result, &result_str, &len ); ++ //PyBytes_AsStringAndSize( result, &result_str, &len ); ++ PY_AsString_Bytes( result, &result_str, &len ); + +- if( len < nsector*FAT_HARDSECT ) ++ ++ if( len < nsector*FAT_HARDSECT ) + { + goto abort; + } +@@ -205,7 +237,9 @@ PyObject * pcardext_read( PyObject * self, PyObject * args ) + + if( FatReadFileExt( name, offset, len, buffer ) == len ) + { +- return PyString_FromStringAndSize( (char *)buffer, len ); ++ // return PyString_FromStringAndSize( (char *)buffer, len ); ++ return PY_String_Bytes( (char *)buffer, len ); ++ // return PyBytes_FromStringAndSize( (char *)buffer, len ); + } + else + { +@@ -233,14 +267,15 @@ static PyMethodDef pcardext_methods[] = + + static char pcardext_documentation[] = "Python extension for HP photocard services"; + +-void initpcardext( void ) +-{ +- PyObject * mod = Py_InitModule4( "pcardext", pcardext_methods, +- pcardext_documentation, (PyObject*)NULL, +- PYTHON_API_VERSION ); +- +- if (mod == NULL) +- return; ++MOD_INIT(pcardext) { ++ ++ PyObject* mod ; ++ MOD_DEF(mod, "pcardext", pcardext_documentation, pcardext_methods); ++ if (mod == NULL) ++ return MOD_ERROR_VAL; ++ ++ return MOD_SUCCESS_VAL(mod); ++ + } + + +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 ++++ b/unload.py +@@ -44,6 +44,11 @@ except ImportError: + + # Local + from base.g import * ++from base.sixext import PY3 ++if PY3: ++ log.error("This functionality is not spported in python3 environment.") ++ sys.exit(1) ++ + from base import device, utils, tui, module + from prnt import cups + Deleted: reproducible-gzip.patch =================================================================== --- reproducible-gzip.patch 2020-08-23 09:42:08 UTC (rev 394592) +++ reproducible-gzip.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -1,38 +0,0 @@ ---- 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 @@ - else - cp prnt/ps/hp-postscript*.ppd ppd/classppd/ps - for i in ppd/classppd/ps/*.ppd; do -- gzip -c "$i" > "$i.gz" -+ gzip -nc "$i" > "$i.gz" - done - fi - #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" - done - #for i in ppd/classppd/ps/*.ppd; do -- # gzip -c "$i" > "$i.gz" -+ # gzip -nc "$i" > "$i.gz" - #done - - cat > class_cups_drv.inc <<EOF -@@ -81,14 +81,14 @@ - install -d ppd/hpcups - ppdc -d ppd/hpcups prnt/drv/hpcups.drv - for i in ppd/hpcups/*.ppd; do -- gzip -c "$i" > "$i.gz" -+ gzip -nc "$i" > "$i.gz" - done - - install -d ppd/hpijs - ppdc -d ppd/hpijs prnt/drv/hpijs.drv - echo "gzip ppd files..." - for i in ppd/hpijs/*.ppd; do -- gzip -c "$i" > "$i.gz" -+ gzip -nc "$i" > "$i.gz" - done - echo "building foomatic_drv.inc..." - ./hpijs-drv > foomatic_drv.inc $shadow Copied: hplip/repos/extra-x86_64/reproducible-gzip.patch (from rev 394592, hplip/trunk/reproducible-gzip.patch) =================================================================== --- reproducible-gzip.patch (rev 0) +++ reproducible-gzip.patch 2020-08-23 09:42:21 UTC (rev 394593) @@ -0,0 +1,38 @@ +--- 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 @@ + else + cp prnt/ps/hp-postscript*.ppd ppd/classppd/ps + for i in ppd/classppd/ps/*.ppd; do +- gzip -c "$i" > "$i.gz" ++ gzip -nc "$i" > "$i.gz" + done + fi + #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" + done + #for i in ppd/classppd/ps/*.ppd; do +- # gzip -c "$i" > "$i.gz" ++ # gzip -nc "$i" > "$i.gz" + #done + + cat > class_cups_drv.inc <<EOF +@@ -81,14 +81,14 @@ + install -d ppd/hpcups + ppdc -d ppd/hpcups prnt/drv/hpcups.drv + for i in ppd/hpcups/*.ppd; do +- gzip -c "$i" > "$i.gz" ++ gzip -nc "$i" > "$i.gz" + done + + install -d ppd/hpijs + ppdc -d ppd/hpijs prnt/drv/hpijs.drv + echo "gzip ppd files..." + for i in ppd/hpijs/*.ppd; do +- gzip -c "$i" > "$i.gz" ++ gzip -nc "$i" > "$i.gz" + done + echo "building foomatic_drv.inc..." + ./hpijs-drv > foomatic_drv.inc $shadow