Merge branch 'f29' into f28

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -90,29 +90,3 @@ hplip-3.10.6.tar.gz
 /hplip-3.18.5.tar.gz
 /hplip-3.18.6.tar.gz
 /hplip-3.18.12.tar.gz
-/hplip-3.19.6.tar.gz
-/hplip-3.19.8.tar.gz
-/hplip-3.19.10.tar.gz
-/hplip-3.19.11.tar.gz
-/hplip-3.19.12.tar.gz
-/hplip-3.20.2.tar.gz
-/hplip-3.20.3.tar.gz
-/hplip-3.20.5.tar.gz
-/hplip-3.20.6.tar.gz
-/hplip-3.20.9.tar.gz
-/hplip-3.20.11.tar.gz
-/hplip-3.21.2.tar.gz
-/hplip-3.21.2-repack.tar.gz
-/hplip-3.21.12-repack.tar.gz
-/hplip-3.22.2-repack.tar.gz
-/hplip-3.22.4-repack.tar.gz
-/hplip-3.22.6-repack.tar.gz
-/hplip-3.22.10-repack.tar.gz
-/hplip-3.23.3-repack.tar.gz
-/hplip-3.23.5-repack.tar.gz
-/hplip-3.23.8-repack.tar.gz
-/hplip-3.23.12-repack.tar.gz
-/hplip-3.24.4-repack.tar.gz
-/hplip-3.25.2-repack.tar.gz
-/hplip-3.25.6-repack.tar.gz
-/hplip-3.25.8-repack.tar.gz

0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch

@@ -1,17 +1,16 @@
-diff --git a/Makefile.am b/Makefile.am
-index f65afea..12317dc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -167,7 +167,7 @@ if !HPLIP_CLASS_DRIVER
+diff -up hplip-3.18.12/Makefile.am.libimageprocessor-removal hplip-3.18.12/Makefile.am
+--- hplip-3.18.12/Makefile.am.libimageprocessor-removal	2019-01-08 12:51:08.629447883 +0100
++++ hplip-3.18.12/Makefile.am	2019-01-08 12:51:08.710447208 +0100
+@@ -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_DATA += prnt/ipp-usb/HPLIP.conf
  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
-@@ -597,7 +597,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
+ 
+ if !HPLIP_CLASS_DRIVER
+@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
  	prnt/hpcups/ImageProcessor.h
  
  hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@@ -20,7 +19,7 @@ index f65afea..12317dc 100644
  #else
  #hpcupsdir = $(cupsfilterdir)
  #hpcups_PROGRAMS = hpcups
-@@ -687,16 +687,6 @@ endif #HPLIP_CLASS_DRIVER
+@@ -684,16 +684,6 @@ endif #HPLIP_CLASS_DRIVER
  
  install-data-hook:
  if HPLIP_BUILD
@@ -34,6 +33,69 @@ index f65afea..12317dc 100644
 -		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
 -		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
 -	fi
- 	if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
- 		echo "ipp-usb directory exists"; \
- 		cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \
+ if !HPLIP_CLASS_DRIVER
+ #	   If scanner build, add hpaio entry to sane dll.conf.
+ 	if [ "$(scan_build)" = "yes" ]; then \
+diff -up hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp.libimageprocessor-removal hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp.libimageprocessor-removal	2019-01-08 12:51:08.619447966 +0100
++++ hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp	2019-01-08 12:52:39.321686854 +0100
+@@ -31,7 +31,6 @@
+ \*****************************************************************************/
+ 
+ #include "HPCupsFilter.h"
+-#include "ImageProcessor.h"
+ 
+ #include <signal.h>
+ #include <sys/wait.h>
+@@ -645,16 +644,10 @@ int HPCupsFilter::processRasterData(cups
+ 
+ 
+     snprintf(hpPreProcessedRasterFile, sizeof (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) {
+@@ -753,12 +746,6 @@ int HPCupsFilter::processRasterData(cups
+             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
+@@ -788,12 +775,6 @@ int HPCupsFilter::processRasterData(cups
+             }
+         }  // 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;
+@@ -808,8 +789,6 @@ int HPCupsFilter::processRasterData(cups
+         rgbRaster = NULL;
+     }
+ 
+-    imageProcessorDestroy(imageProcessor);
+-
+     unlink(hpPreProcessedRasterFile);
+     return ret_status;
+ }

0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch

@@ -1,108 +1,45 @@
-diff -up hplip-3.23.3/ui5/devmgr5.py.qmsgbox-typos-fix hplip-3.23.3/ui5/devmgr5.py
---- hplip-3.23.3/ui5/devmgr5.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui5/devmgr5.py	2023-05-29 13:48:48.429731297 +0200
-@@ -144,8 +144,7 @@ class PluginInstall(QObject):
-             install_plugin = QMessageBox.warning(self.parent,
-                                 self.parent.windowTitle(),
-                                 self.__tr("<b>The HPLIP plugin is already installed.</b><p>Do you want to continue and re-install it?"),
--                                QMessageBox.Yes,
--                                QMessageBox.No,
-+                                QMessageBox.Yes | QMessageBox.No,
-                                 QMessageBox.NoButton) == QMessageBox.Yes
- 
-         if install_plugin:
-@@ -154,8 +153,7 @@ class PluginInstall(QObject):
-                 QMessageBox.critical(self.parent,
-                     self.parent.windowTitle(),
-                     self.__tr("<b>Unable to find an appropriate su/sudo utility to run hp-plugin.</b><p>Install kdesu, gnomesu, or gksu.</p>"),
--                    QMessageBox.Ok,
--                    QMessageBox.NoButton,
-+                    QMessageBox.Ok | QMessageBox.NoButton,
-                     QMessageBox.NoButton)
- 
- 
-diff -up hplip-3.23.3/ui5/fabwindow.py.qmsgbox-typos-fix hplip-3.23.3/ui5/fabwindow.py
---- hplip-3.23.3/ui5/fabwindow.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui5/fabwindow.py	2023-05-29 13:48:48.429731297 +0200
-@@ -344,7 +344,7 @@ class FABWindow(QMainWindow,  Ui_MainWin
-             new_name = to_unicode(self.NameLineEdit.text())
-             if new_name != self.name:
-                 if QMessageBox.question(self, self.__tr("Rename?"), "Rename '%s' to '%s'?"%(self.name,new_name), \
--                                        QMessageBox.Yes | QMessageBox.No) == QMessageBox.Yes:
-+                                        QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.Yes:
- 
-                     self.db.rename(self.name, new_name)
-                     log.debug("Rename %s to %s" % (self.name, new_name))
-diff -up hplip-3.23.3/ui5/nodevicesdialog.py.qmsgbox-typos-fix hplip-3.23.3/ui5/nodevicesdialog.py
---- hplip-3.23.3/ui5/nodevicesdialog.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui5/nodevicesdialog.py	2023-05-29 13:48:48.429731297 +0200
-@@ -64,8 +64,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevi
-             QMessageBox.critical(self,
-                                     self.windowTitle(),
-                                     self.__tr("<b>An error occurred.</b><p>Please re-start the Device Manager and try again."),
--                                    QMessageBox.Ok,
--                                    QMessageBox.NoButton,
-+                                    QMessageBox.Ok | QMessageBox.NoButton,
-                                     QMessageBox.NoButton)
- 
- 
-diff -up hplip-3.23.3/ui5/plugindialog.py.qmsgbox-typos-fix hplip-3.23.3/ui5/plugindialog.py
---- hplip-3.23.3/ui5/plugindialog.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui5/plugindialog.py	2023-05-29 13:48:48.429731297 +0200
-@@ -252,7 +252,7 @@ class PluginDialog(QDialog, Ui_Dialog):
- 
-                 if QMessageBox.question(self, " ",
-                         self.__tr("<b>%s</b><p>Without this, it is not possible to authenticate and validate the plug-in prior to installation.</p>Do you still want to install the plug-in?" %error_str),
--                        QMessageBox.Yes | QMessageBox.No) != QMessageBox.Yes:
-+                                        QMessageBox.Yes | QMessageBox.No, QMessageBox.No) != QMessageBox.Yes:
- 
-                     self.pluginObj.deleteInstallationFiles(download_plugin_file)
-                     self.close()
-diff -up hplip-3.23.3/ui5/queuesconf.py.qmsgbox-typos-fix hplip-3.23.3/ui5/queuesconf.py
---- hplip-3.23.3/ui5/queuesconf.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui5/queuesconf.py	2023-05-29 13:48:48.430731291 +0200
-@@ -245,7 +245,7 @@ class QueuesDiagnose(QDialog, Ui_Dialog)
-                 
-                     if QMessageBox.question(self, " ",
-                         self.__tr("<b>%s</b><p>Without this, it is not possible to authenticate and validate this tool prior to installation.</p>Do you still want to run Smart Install disabler?" %error_str),
--                        QMessageBox.Yes | QMessageBox.No) == QMessageBox.Yes:
-+                                            QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.Yes:
-                         # Disabling without verification.
-                         sts, out = utils.run("sh %s"%smart_install_run)
- 
-diff -up hplip-3.23.3/ui5/setupdialog.py.qmsgbox-typos-fix hplip-3.23.3/ui5/setupdialog.py
---- hplip-3.23.3/ui5/setupdialog.py.qmsgbox-typos-fix	2023-05-29 13:48:48.430731291 +0200
-+++ hplip-3.23.3/ui5/setupdialog.py	2023-05-29 13:54:03.236851925 +0200
-@@ -886,7 +886,7 @@ class SetupDialog(QDialog, Ui_Dialog):
-                                     self.windowTitle(),
-                                     warn_text,
-                                     QMessageBox.Yes |
--                                    QMessageBox.No |
-+                                    QMessageBox.No,
-                                     QMessageBox.NoButton) == QMessageBox.Yes):
-                 i = 2
-                 while True:
-@@ -1171,7 +1171,7 @@ class SetupDialog(QDialog, Ui_Dialog):
-                     if QMessageBox.critical(self,
-                                             self.windowTitle(),
-                                             error_text,
--                                            QMessageBox.Retry | QMessageBox.Default,
-+                                            QMessageBox.Retry | QMessageBox.Default |\
-                                             QMessageBox.Cancel | QMessageBox.Escape,
-                                             QMessageBox.NoButton) == QMessageBox.Cancel:
-                         break
-@@ -1223,7 +1223,7 @@ class SetupDialog(QDialog, Ui_Dialog):
-                                 if QMessageBox.critical(self,
-                                                         self.windowTitle(),
-                                                         error_text,
--                                                        QMessageBox.Retry | QMessageBox.Default,
-+                                                        QMessageBox.Retry | QMessageBox.Default |\
-                                                         QMessageBox.Cancel | QMessageBox.Escape,
-                                                         QMessageBox.NoButton) == QMessageBox.Cancel:
-                                     break
-diff -up hplip-3.23.3/ui/devmgr4.py.qmsgbox-typos-fix hplip-3.23.3/ui/devmgr4.py
---- hplip-3.23.3/ui/devmgr4.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/devmgr4.py	2023-05-29 13:48:48.424731328 +0200
+From 95a73bbc9bd65602a0f9411469ab511bc80a01d0 Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Wed, 3 Oct 2018 15:13:00 +0200
+Subject: Call QMessageBox constructors of PyQT5 with the correct parameters
+
+The whole Python source code of HPLIP contains 40 incorrect calls of
+the QMessageBox constructurs, mostly the list of buttons was given as
+separate arguments instead of a bitwise OR of each button's
+representation value.  If the flow of the code hits one of these
+calls (usually when some error or warnings message should be
+displayed or an "Are you sure?" question asked) the GUI app crashes.
+See https://pythonspot.com/pyqt5-messagebox/ for QMessageBox
+documentation.
+This patch corrects all these calls.
+
+Bug-Debian: https://bugs.debian.org/912768
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1745383
+---
+ ui/devmgr4.py          | 16 ++++++++--------
+ ui/faxaddrbookform.py  |  6 +++---
+ ui/faxsendjobform.py   |  6 +++---
+ ui/firmwaredialog.py   |  2 +-
+ ui/makecopiesform.py   |  4 ++--
+ ui/nodevicesform.py    |  2 +-
+ ui/pluginform2.py      |  4 ++--
+ ui/printerform.py      |  2 +-
+ ui/settingsdialog.py   |  4 ++--
+ ui/setupform.py        | 10 +++++-----
+ ui/unloadform.py       |  2 +-
+ ui/upgradeform.py      |  4 ++--
+ ui5/devmgr5.py         |  6 ++----
+ ui5/fabwindow.py       |  2 +-
+ ui5/nodevicesdialog.py |  3 +--
+ ui5/plugindialog.py    |  2 +-
+ ui5/queuesconf.py      |  2 +-
+ ui5/setupdialog.py     |  6 +++---
+ 18 files changed, 40 insertions(+), 43 deletions(-)
+
+diff --git a/ui/devmgr4.py b/ui/devmgr4.py
+index cc2552f91..a868ccac0 100644
+--- a/ui/devmgr4.py
++++ b/ui/devmgr4.py
 @@ -1422,7 +1422,7 @@ class DevMgr4(DevMgr4_base):
              QMessageBox.critical(self,
                  self.caption(),
@@ -175,10 +112,11 @@ diff -up hplip-3.23.3/ui/devmgr4.py.qmsgbox-typos-fix hplip-3.23.3/ui/devmgr4.py
              QMessageBox.NoButton,
              QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/faxaddrbookform.py.qmsgbox-typos-fix hplip-3.23.3/ui/faxaddrbookform.py
---- hplip-3.23.3/ui/faxaddrbookform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/faxaddrbookform.py	2023-05-29 13:48:48.424731328 +0200
-@@ -228,7 +228,7 @@ class FaxAddrBookGroupsForm(FaxAddrBookG
+diff --git a/ui/faxaddrbookform.py b/ui/faxaddrbookform.py
+index 109462207..b23364410 100644
+--- a/ui/faxaddrbookform.py
++++ b/ui/faxaddrbookform.py
+@@ -228,7 +228,7 @@ class FaxAddrBookGroupsForm(FaxAddrBookGroupsForm_base):
          x = QMessageBox.critical(self,
                                   self.caption(),
                                   self.__tr("<b>Annoying Confirmation: Are you sure you want to delete this group?</b>"),
@@ -187,7 +125,7 @@ diff -up hplip-3.23.3/ui/faxaddrbookform.py.qmsgbox-typos-fix hplip-3.23.3/ui/fa
                                    QMessageBox.No | QMessageBox.Default,
                                    QMessageBox.NoButton)
          if x == QMessageBox.Yes:
-@@ -421,7 +421,7 @@ class FaxAddrBookForm(FaxAddrBookForm_ba
+@@ -421,7 +421,7 @@ class FaxAddrBookForm(FaxAddrBookForm_base):
          if QMessageBox.critical(self,
               self.caption(),
               self.__tr("<b>Annoying Confirmation: Are you sure you want to delete this address book entry?</b>"),
@@ -196,7 +134,7 @@ diff -up hplip-3.23.3/ui/faxaddrbookform.py.qmsgbox-typos-fix hplip-3.23.3/ui/fa
                QMessageBox.No | QMessageBox.Default,
                QMessageBox.NoButton) == QMessageBox.Yes:
              db.delete(self.current.entry['name'])
-@@ -451,7 +451,7 @@ class FaxAddrBookForm(FaxAddrBookForm_ba
+@@ -451,7 +451,7 @@ class FaxAddrBookForm(FaxAddrBookForm_base):
          QMessageBox.critical(self,
                               self.caption(),
                               QString(error_text),
@@ -205,9 +143,10 @@ diff -up hplip-3.23.3/ui/faxaddrbookform.py.qmsgbox-typos-fix hplip-3.23.3/ui/fa
                                QMessageBox.NoButton,
                                QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/faxsendjobform.py.qmsgbox-typos-fix hplip-3.23.3/ui/faxsendjobform.py
---- hplip-3.23.3/ui/faxsendjobform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/faxsendjobform.py	2023-05-29 13:48:48.424731328 +0200
+diff --git a/ui/faxsendjobform.py b/ui/faxsendjobform.py
+index 106215c5e..69f424c42 100644
+--- a/ui/faxsendjobform.py
++++ b/ui/faxsendjobform.py
 @@ -210,7 +210,7 @@ class FaxSendJobForm(QMainWindow):
          QMessageBox.information(self,
                               self.caption(),
@@ -235,10 +174,11 @@ diff -up hplip-3.23.3/ui/faxsendjobform.py.qmsgbox-typos-fix hplip-3.23.3/ui/fax
                               QMessageBox.NoButton,
                               QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/firmwaredialog.py.qmsgbox-typos-fix hplip-3.23.3/ui/firmwaredialog.py
---- hplip-3.23.3/ui/firmwaredialog.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/firmwaredialog.py	2023-05-29 13:48:48.424731328 +0200
-@@ -109,7 +109,7 @@ class FirmwareDialog(QDialog, FirmwareDi
+diff --git a/ui/firmwaredialog.py b/ui/firmwaredialog.py
+index 16b313374..0bcee1164 100644
+--- a/ui/firmwaredialog.py
++++ b/ui/firmwaredialog.py
+@@ -109,7 +109,7 @@ class FirmwareDialog(QDialog, FirmwareDialog_Base):
          QMessageBox.critical(self,
                  self.caption(),
                  error_text,
@@ -247,9 +187,10 @@ diff -up hplip-3.23.3/ui/firmwaredialog.py.qmsgbox-typos-fix hplip-3.23.3/ui/fir
                  QMessageBox.NoButton,
                  QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/makecopiesform.py.qmsgbox-typos-fix hplip-3.23.3/ui/makecopiesform.py
---- hplip-3.23.3/ui/makecopiesform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/makecopiesform.py	2023-05-29 13:48:48.424731328 +0200
+diff --git a/ui/makecopiesform.py b/ui/makecopiesform.py
+index 27f144b36..0fbb573e3 100644
+--- a/ui/makecopiesform.py
++++ b/ui/makecopiesform.py
 @@ -156,7 +156,7 @@ class MakeCopiesForm(QMainWindow):
          QMessageBox.critical(self,
                               self.caption(),
@@ -268,9 +209,10 @@ diff -up hplip-3.23.3/ui/makecopiesform.py.qmsgbox-typos-fix hplip-3.23.3/ui/mak
                                QMessageBox.NoButton,
                                QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/nodevicesform.py.qmsgbox-typos-fix hplip-3.23.3/ui/nodevicesform.py
---- hplip-3.23.3/ui/nodevicesform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/nodevicesform.py	2023-05-29 13:48:48.424731328 +0200
+diff --git a/ui/nodevicesform.py b/ui/nodevicesform.py
+index 01f6ae53b..57a696375 100644
+--- a/ui/nodevicesform.py
++++ b/ui/nodevicesform.py
 @@ -67,7 +67,7 @@ class NoDevicesForm(NoDevicesForm_base):
              QMessageBox.critical(self,
                                      self.caption(),
@@ -280,9 +222,10 @@ diff -up hplip-3.23.3/ui/nodevicesform.py.qmsgbox-typos-fix hplip-3.23.3/ui/node
                                      QMessageBox.NoButton,
                                      QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/pluginform2.py.qmsgbox-typos-fix hplip-3.23.3/ui/pluginform2.py
---- hplip-3.23.3/ui/pluginform2.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/pluginform2.py	2023-05-29 13:48:48.424731328 +0200
+diff --git a/ui/pluginform2.py b/ui/pluginform2.py
+index 64e64aa77..76cb0238b 100644
+--- a/ui/pluginform2.py
++++ b/ui/pluginform2.py
 @@ -173,7 +173,7 @@ class PluginForm2(PluginForm2_base):
          QMessageBox.critical(self,
              self.caption(),
@@ -301,9 +244,10 @@ diff -up hplip-3.23.3/ui/pluginform2.py.qmsgbox-typos-fix hplip-3.23.3/ui/plugin
                                QMessageBox.NoButton,
                                QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/printerform.py.qmsgbox-typos-fix hplip-3.23.3/ui/printerform.py
---- hplip-3.23.3/ui/printerform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/printerform.py	2023-05-29 13:48:48.425731321 +0200
+diff --git a/ui/printerform.py b/ui/printerform.py
+index 0c6c4f39e..7c10ab07b 100644
+--- a/ui/printerform.py
++++ b/ui/printerform.py
 @@ -154,7 +154,7 @@ class PrinterForm(QMainWindow):
          QMessageBox.critical(self,
                               self.caption(),
@@ -313,10 +257,11 @@ diff -up hplip-3.23.3/ui/printerform.py.qmsgbox-typos-fix hplip-3.23.3/ui/printe
                                QMessageBox.NoButton,
                                QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/settingsdialog.py.qmsgbox-typos-fix hplip-3.23.3/ui/settingsdialog.py
---- hplip-3.23.3/ui/settingsdialog.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/settingsdialog.py	2023-05-29 13:48:48.425731321 +0200
-@@ -146,7 +146,7 @@ class SettingsDialog(SettingsDialog_base
+diff --git a/ui/settingsdialog.py b/ui/settingsdialog.py
+index 92da22546..24f02fd84 100644
+--- a/ui/settingsdialog.py
++++ b/ui/settingsdialog.py
+@@ -146,7 +146,7 @@ class SettingsDialog(SettingsDialog_base):
  ##            QMessageBox.warning(self,
  ##                                 self.caption(),
  ##                                 self.__tr("<b>One or more email addresses are missing.</b><p>Please enter this information and try again."),
@@ -325,7 +270,7 @@ diff -up hplip-3.23.3/ui/settingsdialog.py.qmsgbox-typos-fix hplip-3.23.3/ui/set
  ##                                  QMessageBox.NoButton,
  ##                                  QMessageBox.NoButton)
  ##            return
-@@ -163,7 +163,7 @@ class SettingsDialog(SettingsDialog_base
+@@ -163,7 +163,7 @@ class SettingsDialog(SettingsDialog_base):
  ##        QMessageBox.information(self,
  ##                     self.caption(),
  ##                     self.__tr("<p><b>Please check your email for a test message.</b><p>If the message doesn't arrive, please check your settings and try again."),
@@ -334,9 +279,10 @@ diff -up hplip-3.23.3/ui/settingsdialog.py.qmsgbox-typos-fix hplip-3.23.3/ui/set
  ##                      QMessageBox.NoButton,
  ##                      QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/setupform.py.qmsgbox-typos-fix hplip-3.23.3/ui/setupform.py
---- hplip-3.23.3/ui/setupform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/setupform.py	2023-05-29 13:48:48.425731321 +0200
+diff --git a/ui/setupform.py b/ui/setupform.py
+index 307917b02..78863fdd8 100644
+--- a/ui/setupform.py
++++ b/ui/setupform.py
 @@ -602,7 +602,7 @@ class SetupForm(SetupForm_base):
              if ( QMessageBox.warning(self,
                                  self.caption(),
@@ -382,9 +328,10 @@ diff -up hplip-3.23.3/ui/setupform.py.qmsgbox-typos-fix hplip-3.23.3/ui/setupfor
                                QMessageBox.NoButton,
                                QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/unloadform.py.qmsgbox-typos-fix hplip-3.23.3/ui/unloadform.py
---- hplip-3.23.3/ui/unloadform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/unloadform.py	2023-05-29 13:48:48.425731321 +0200
+diff --git a/ui/unloadform.py b/ui/unloadform.py
+index 8397a689c..ae363e01e 100644
+--- a/ui/unloadform.py
++++ b/ui/unloadform.py
 @@ -135,7 +135,7 @@ class UnloadForm(QMainWindow):
          QMessageBox.critical(self,
                               self.caption(),
@@ -394,9 +341,10 @@ diff -up hplip-3.23.3/ui/unloadform.py.qmsgbox-typos-fix hplip-3.23.3/ui/unloadf
                                QMessageBox.NoButton,
                                QMessageBox.NoButton)
  
-diff -up hplip-3.23.3/ui/upgradeform.py.qmsgbox-typos-fix hplip-3.23.3/ui/upgradeform.py
---- hplip-3.23.3/ui/upgradeform.py.qmsgbox-typos-fix	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/ui/upgradeform.py	2023-05-29 13:48:48.425731321 +0200
+diff --git a/ui/upgradeform.py b/ui/upgradeform.py
+index 6b9acf5cc..d0b418419 100644
+--- a/ui/upgradeform.py
++++ b/ui/upgradeform.py
 @@ -118,7 +118,7 @@ class UpgradeForm(UpgradeForm_base):
          QMessageBox.critical(self,
              self.caption(),
@@ -415,3 +363,111 @@ diff -up hplip-3.23.3/ui/upgradeform.py.qmsgbox-typos-fix hplip-3.23.3/ui/upgrad
                                QMessageBox.NoButton,
                                QMessageBox.NoButton)
  
+diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
+index 495883f72..0ca016820 100644
+--- a/ui5/devmgr5.py
++++ b/ui5/devmgr5.py
+@@ -139,8 +139,7 @@ class PluginInstall(QObject):
+             install_plugin = QMessageBox.warning(self.parent,
+                                 self.parent.windowTitle(),
+                                 self.__tr("<b>The HPLIP plugin is already installed.</b><p>Do you want to continue and re-install it?"),
+-                                QMessageBox.Yes,
+-                                QMessageBox.No,
++                                QMessageBox.Yes | QMessageBox.No,
+                                 QMessageBox.NoButton) == QMessageBox.Yes
+ 
+         if install_plugin:
+@@ -149,8 +148,7 @@ class PluginInstall(QObject):
+                 QMessageBox.critical(self.parent,
+                     self.parent.windowTitle(),
+                     self.__tr("<b>Unable to find an appropriate su/sudo utility to run hp-plugin.</b><p>Install kdesu, gnomesu, or gksu.</p>"),
+-                    QMessageBox.Ok,
+-                    QMessageBox.NoButton,
++                    QMessageBox.Ok | QMessageBox.NoButton,
+                     QMessageBox.NoButton)
+ 
+ 
+diff --git a/ui5/fabwindow.py b/ui5/fabwindow.py
+index 488b6bbd5..0b95c94f1 100644
+--- a/ui5/fabwindow.py
++++ b/ui5/fabwindow.py
+@@ -344,7 +344,7 @@ class FABWindow(QMainWindow,  Ui_MainWindow):
+             new_name = to_unicode(self.NameLineEdit.text())
+             if new_name != self.name:
+                 if QMessageBox.question(self, self.__tr("Rename?"), "Rename '%s' to '%s'?"%(self.name,new_name), \
+-                                        QMessageBox.Yes | QMessageBox.No) == QMessageBox.Yes:
++                                        QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.Yes:
+ 
+                     self.db.rename(self.name, new_name)
+                     log.debug("Rename %s to %s" % (self.name, new_name))
+diff --git a/ui5/nodevicesdialog.py b/ui5/nodevicesdialog.py
+index 6083f6d4b..ca86bfcda 100644
+--- a/ui5/nodevicesdialog.py
++++ b/ui5/nodevicesdialog.py
+@@ -64,8 +64,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base):
+             QMessageBox.critical(self,
+                                     self.windowTitle(),
+                                     self.__tr("<b>An error occurred.</b><p>Please re-start the Device Manager and try again."),
+-                                    QMessageBox.Ok,
+-                                    QMessageBox.NoButton,
++                                    QMessageBox.Ok | QMessageBox.NoButton,
+                                     QMessageBox.NoButton)
+ 
+ 
+diff --git a/ui5/plugindialog.py b/ui5/plugindialog.py
+index e3007f911..1c6b33868 100644
+--- a/ui5/plugindialog.py
++++ b/ui5/plugindialog.py
+@@ -252,7 +252,7 @@ class PluginDialog(QDialog, Ui_Dialog):
+ 
+                 if QMessageBox.question(self, " ",
+                         self.__tr("<b>%s</b><p>Without this, it is not possible to authenticate and validate the plug-in prior to installation.</p>Do you still want to install the plug-in?" %error_str),
+-                        QMessageBox.Yes | QMessageBox.No) != QMessageBox.Yes:
++                                        QMessageBox.Yes | QMessageBox.No, QMessageBox.No) != QMessageBox.Yes:
+ 
+                     self.pluginObj.deleteInstallationFiles(download_plugin_file)
+                     self.close()
+diff --git a/ui5/queuesconf.py b/ui5/queuesconf.py
+index cf2206490..e3c2a0278 100644
+--- a/ui5/queuesconf.py
++++ b/ui5/queuesconf.py
+@@ -245,7 +245,7 @@ class QueuesDiagnose(QDialog, Ui_Dialog):
+                 
+                     if QMessageBox.question(self, " ",
+                         self.__tr("<b>%s</b><p>Without this, it is not possible to authenticate and validate this tool prior to installation.</p>Do you still want to run Smart Install disabler?" %error_str),
+-                        QMessageBox.Yes | QMessageBox.No) == QMessageBox.Yes:
++                                            QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.Yes:
+                         # Disabling without verification.
+                         sts, out = utils.run("sh %s"%smart_install_run)
+ 
+diff --git a/ui5/setupdialog.py b/ui5/setupdialog.py
+index fbfe5ac9b..120ee1587 100644
+--- a/ui5/setupdialog.py
++++ b/ui5/setupdialog.py
+@@ -873,7 +873,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+                                  self.windowTitle(),
+                                  warn_text,
+                                  QMessageBox.Yes|\
+-                                 QMessageBox.No|\
++                                 QMessageBox.No,
+                                  QMessageBox.NoButton) == QMessageBox.Yes ):
+                 i = 2
+                 while True:
+@@ -1108,7 +1108,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+                     if QMessageBox.critical(self,
+                                            self.windowTitle(),
+                                            error_text,
+-                                           QMessageBox.Retry | QMessageBox.Default,
++                                           QMessageBox.Retry | QMessageBox.Default |\
+                                            QMessageBox.Cancel | QMessageBox.Escape,
+                                            QMessageBox.NoButton) == QMessageBox.Cancel:
+                         break
+@@ -1138,7 +1138,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+                                 if QMessageBox.critical(self,
+                                                        self.windowTitle(),
+                                                        error_text,
+-                                                       QMessageBox.Retry | QMessageBox.Default,
++                                                       QMessageBox.Retry | QMessageBox.Default |\
+                                                        QMessageBox.Cancel | QMessageBox.Escape,
+                                                        QMessageBox.NoButton) == QMessageBox.Cancel:
+                                     break

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,25 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-
-#Rawhide
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-
-#gating rhel
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

hp-plugin.in

@@ -1,62 +0,0 @@
-#!/usr/bin/bash
-
-# get version from base hplip rpm
-VER=$(@bindir@/rpm -q hplip --queryformat='%{version}')
-
-if test "x$VER" = "x"
-then
-  @bindir@/echo "Version was not acquired - exiting..."
-  exit 1
-fi
-
-# plugin name
-PLUGIN_FILE="hplip-${VER}-plugin.run"
-
-download()
-{
-  SOURCE="$1"
-
-  @bindir@/curl --create-dirs -O  --output-dir ~/.hplip --location ${SOURCE}
-}
-
-# link to the plugin
-PLUGIN_SOURCE="https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${PLUGIN_FILE}"
-FALLBACK_SOURCE="https://developers.hp.com/sites/default/files/${PLUGIN_FILE}"
-
-# create a hidden hplip dir to store a file indicating the plugin version after successful install
-# the directory can be used by other hplip tools, so we don't have to remove it if the failure happens
-if [ ! -d ~/.hplip ]
-then
-  @bindir@/mkdir ~/.hplip || (@bindir@/echo "Cannot create the ~/.hplip dir, exiting" && exit 1)
-fi
-
-for link in ${PLUGIN_SOURCE} ${FALLBACK_SOURCE}
-do
-  download ${link}
-
-  if test "x$(file --mime ~/.hplip/${PLUGIN_FILE} | grep -o 'text/x-shellscript')" = "xtext/x-shellscript"
-  then
-    break
-  fi
-done
-
-if test "x$(file --mime ~/.hplip/${PLUGIN_FILE} | grep -o 'text/x-shellscript')" = "x"
-then
-  @bindir@/echo "The downloaded file does not exist or is not a shell script - error during downloading, exiting..."
-  exit 1
-fi
-
-@bindir@/bash ~/.hplip/${PLUGIN_FILE}
-
-if [ $? -ne 0 ]
-then
-  @bindir@/echo "Plugin installation failed, exiting..."
-  @bindir@/rm -f ~/.hplip/${PLUGIN_FILE} &> /dev/null
-  exit 1
-fi
-
-@bindir@/rm -f ~/.hplip/${PLUGIN_FILE} &> /dev/null
-@bindir@/rm -f ~/.hplip/plugin-installed-* &> /dev/null
-@bindir@/touch ~/.hplip/plugin-installed-$VER
-
-exit 0

hplip-3.18.6.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlsYzCYACgkQc9dwzaWQR7k3kQCgpUG6Okb3nGf7qodmI9zTBf3A
+a8AAoLD0LiwifYlnEBlHS5Eaw/ylB9A8
+=H/1x
+-----END PGP SIGNATURE-----

hplip-add-ppd-crash.patch

@@ -1,17 +1,14 @@
-diff -up hplip-3.23.3/ui5/setupdialog.py.add-ppd-crash hplip-3.23.3/ui5/setupdialog.py
---- hplip-3.23.3/ui5/setupdialog.py.add-ppd-crash	2023-05-29 13:55:03.443497903 +0200
-+++ hplip-3.23.3/ui5/setupdialog.py	2023-05-29 13:57:19.014700721 +0200
-@@ -765,10 +765,9 @@ class SetupDialog(QDialog, Ui_Dialog):
-                 pass
+diff --git a/setup.py b/setup.py
+index ba1b519..4f64eed 100755
+--- a/setup.py
++++ b/setup.py
+@@ -556,6 +556,9 @@ else: # INTERACTIVE_MODE
+                             else:
+                                 nickname = open(file_path, 'r').read(4096)
  
-     def OtherPPDButton_clicked(self, b):
--        ppd_file = to_unicode(QFileDialog.getOpenFileName(self, self.__tr("Select PPD File"),
--                                                          sys_conf.get(
--            'dirs', 'ppd'),
--            self.__tr("PPD Files (*.ppd *.ppd.gz);;All Files (*)")))
-+        ppd_file = QFileDialog.getOpenFileName(self, self.__tr("Select PPD File"),
-+                                                sys_conf.get('dirs', 'ppd'),
-+                                                self.__tr("PPD Files (*.ppd *.ppd.gz);;All Files (*)"))[0]
- 
-         if ppd_file and os.path.exists(ppd_file):
-             self.print_ppd = (ppd_file, cups.getPPDDescription(ppd_file))
++                            if sys.version_info[0] > 2:
++                                nickname = nickname.decode('utf-8')
++
+                             try:
+                                 desc = nickname_pat.search(nickname).group(1)
+                             except AttributeError:

hplip-check-cups.patch

@@ -1,17 +1,16 @@
-diff --git a/installer/core_install.py b/installer/core_install.py
-index a6654e2..0bd1e9c 100644
---- a/installer/core_install.py
-+++ b/installer/core_install.py
-@@ -362,9 +362,9 @@ class CoreInstall(object):
+diff -up hplip-3.17.11/installer/core_install.py.check-cups hplip-3.17.11/installer/core_install.py
+--- hplip-3.17.11/installer/core_install.py.check-cups	2017-12-07 15:34:24.855761874 +0100
++++ hplip-3.17.11/installer/core_install.py	2017-12-07 15:38:44.749568860 +0100
+@@ -349,9 +349,9 @@ class CoreInstall(object):
              'automake':         (True, ['prnt'], AUTOMAKE_STR, self.check_automake, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP),
              'libjpeg':          (True,  ['base', 'prnt'], JPEG_STR, self.check_libjpeg, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP),
              'libtool':          (True,  ['base', 'prnt'], LIBTOOL_STR, self.check_libtool, DEPENDENCY_COMPILE_TIME, '-', 'libtool --version', COMPILEDEP),
 -            'cups':            (True,  ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'cups-config --version', EXTERNALDEP),
 -            'cups-devel':       (True,  ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
 -            'cups-image':       (True,  ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
-+            'cups':            (True,  ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '-', None, EXTERNALDEP),
-+            'cups-devel':       (True,  ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '1.1', 'pkgconf --modversion cups', GENERALDEP),
-+            'cups-image':       (True,  ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '1.1', 'pkgconf --modversion cups', GENERALDEP),
++            'cups':            (True,  ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'lpstat -r', EXTERNALDEP),
++            'cups-devel':       (True,  ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP),
++            'cups-image':       (True,  ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP),
              'gcc':             (True,  ['base', 'prnt'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-', 'gcc --version', COMPILEDEP),
              'make':            (True,  ['base', 'prnt'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME, '3.0', 'make --version', COMPILEDEP),
              'libpthread':      (True,  ['base', 'prnt'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libpthread_version', GENERALDEP),

hplip-clean-ldl.patch

@@ -1,44 +0,0 @@
-diff --git a/base/device.py b/base/device.py
-index 6d7add9..bf27307 100644
---- a/base/device.py
-+++ b/base/device.py
-@@ -2264,7 +2264,8 @@ class Device(object):
-                 self.callback()
- 
-         if total_bytes_to_write != bytes_out:
--            raise Error(ERROR_DEVICE_IO_ERROR)
-+            raise Error(ERROR_DEVICE_IO_ERROR, 'Number of written '
-+                        'bytes by hpmudext mismatch with expected amount.')
- 
-         return bytes_out
- 
-diff --git a/base/g.py b/base/g.py
-index 9856662..0aa0e2e 100644
---- a/base/g.py
-+++ b/base/g.py
-@@ -398,9 +398,11 @@ ERROR_STRINGS = {
- 
- 
- class Error(Exception):
--    def __init__(self, opt=ERROR_INTERNAL):
-+    def __init__(self, opt=ERROR_INTERNAL, msg=None):
-         self.opt = opt
-         self.msg = ERROR_STRINGS.get(opt, ERROR_STRINGS[ERROR_INTERNAL])
-+        if msg:
-+            self.msg = '{} - {}'.format(self.msg, msg)
-         log.debug("Exception: %d (%s)" % (opt, self.msg))
-         Exception.__init__(self, self.msg, opt)
- 
-diff --git a/prnt/ldl.py b/prnt/ldl.py
-index e3f77f7..8b28e7f 100644
---- a/prnt/ldl.py
-+++ b/prnt/ldl.py
-@@ -145,7 +145,7 @@ def buildLIDILPacket(packet_type, command=0, operation=0, other={}):
-         p = '$\x00\x10\x00\x08\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff$'
- 
-     elif packet_type == PACKET_TYPE_RESET_LIDIL:
--        p = '$\x00\x10\x00\x06\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff$'
-+        p = b'$\x00\x10\x00\x06\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff$'
- 
-     elif packet_type == PACKET_TYPE_COMMAND:
- 

hplip-colorlaserjet-mfp-m278-m281.patch

@@ -0,0 +1,63 @@
+diff -up hplip-3.17.11/data/models/models.dat.colorlaserjet-mfp-m278-m281 hplip-3.17.11/data/models/models.dat
+--- hplip-3.17.11/data/models/models.dat.colorlaserjet-mfp-m278-m281	2017-11-23 13:10:17.000000000 +0100
++++ hplip-3.17.11/data/models/models.dat	2018-01-19 08:24:21.554788787 +0100
+@@ -58516,6 +58516,59 @@ usb-pid=3c2a
+ usb-vid=3f0
+ wifi-config=3
+ 
++[hp_colorlaserjet_mfp_m278-m281]
++align-type=0
++clean-type=0
++color-cal-type=0
++copy-type=0
++embedded-server-type=1
++fax-type=7
++fw-download=False
++icon=hp_color_laserjet_cm1312_mfp.png
++io-mfp-mode=1
++io-mode=1
++io-support=14
++job-storage=0
++linefeed-cal-type=0
++model1=HP Color LaserJet MFP M278-281
++monitor-type=0
++panel-check-type=0
++pcard-type=0
++plugin=1
++plugin-reason=64
++power-settings=0
++ppd-name=hp-color_laserjet_pro_mfp_m277
++pq-diag-type=0
++r-type=0
++r0-agent1-kind=4
++r0-agent1-sku=CF400A/CF400X
++r0-agent1-type=1
++r0-agent2-kind=4
++r0-agent2-sku=CF401A
++r0-agent2-type=4
++r0-agent3-kind=4
++r0-agent3-sku=CF403A
++r0-agent3-type=5
++r0-agent4-kind=4
++r0-agent4-sku=CF402A
++r0-agent4-type=6
++scan-src=3
++scan-type=5
++status-battery-check=0
++status-dynamic-counters=0
++status-type=10
++support-released=True
++support-subtype=48c3
++support-type=2
++support-ver=3.15.4
++tech-class=Postscript
++family-class=Undefined
++tech-subclass=Normal
++tech-type=4
++usb-pid=3c2a
++usb-vid=3f0
++wifi-config=3
++
+ [hp_color_laserjet_m553]
+ align-type=0
+ clean-type=0

hplip-configure-python.patch

@@ -1,52 +0,0 @@
-diff -up hplip-3.20.9/configure.in.configure-python hplip-3.20.9/configure.in
---- hplip-3.20.9/configure.in.configure-python	2020-09-23 07:24:27.000000000 +0200
-+++ hplip-3.20.9/configure.in	2020-10-02 07:27:09.082331431 +0200
-@@ -604,17 +604,29 @@ if test "$class_driver" = "no" && test "
-    fi
- fi
- 
--SAVE_CPPFLAGS="$CPPFLAGS"
--CFLAGS=`python-config --includes`
--if [ $? -eq 0 ] 
--then
--   echo $FLAGS
--else
--CFLAGS=`python3-config --includes`
--   if [ $? -eq 0 ]
--   then
--   echo $FLAGS
--   fi
-+AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)])
-+
-+PYTHON_INCLUDES=`$python3_config_path --includes`
-+if test "X$PYTHON_INCLUDES" = "X" ; then
-+  AC_MSG_ERROR([Cannot get Python includes via python3-config], 6)
-+fi
-+
-+PYTHON_LIBS=`$python3_config_path --libs`
-+if test "X$PYTHON_LIBS" = "X" ; then
-+  AC_MSG_ERROR([Cannot get Python libs via python3-config], 6)
-+fi
-+
-+SAVE_CFLAGS="$CFLAGS"
-+SAVE_LIBS="$LIBS"
-+
-+CFLAGS="$CFLAGS $PYTHON_INCLUDES"
-+LIBS="$LIBS $PYTHON_LIBS"
-+
-+AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6))
-+
-+if test "X$python_includes" != "Xok" ; then
-+  CFLAGS="$SAVE_CFLAGS"
-+  LIBS="$SAVE_LIBS"
- fi
- 
- #CFLAGS=`(python-config --includes)`
-@@ -631,7 +643,6 @@ if test "$class_driver" = "no" && test "
-    AS_IF([test "x$FOUND_HEADER" != "xyes"],
-           [AC_MSG_ERROR([cannot find python-devel support], 6)])
- fi
--CFLAGS="$save_CFLAGS"
- 
- if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
-    AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)])

hplip-covscan.patch

@@ -1,615 +0,0 @@
-diff -up hplip-3.25.2/common/utils.c.covscan hplip-3.25.2/common/utils.c
---- hplip-3.25.2/common/utils.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/common/utils.c	2025-04-11 10:21:58.034950818 +0200
-@@ -1,5 +1,9 @@
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+
- #include "utils.h"
--#include "string.h"
-+#include <string.h>
- #include <dlfcn.h>
- #include <sys/stat.h>
- #include <errno.h>
-diff -up hplip-3.25.2/io/hpmud/hpmud.c.covscan hplip-3.25.2/io/hpmud/hpmud.c
---- hplip-3.25.2/io/hpmud/hpmud.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/io/hpmud/hpmud.c	2025-04-11 10:21:58.035151792 +0200
-@@ -769,6 +769,7 @@ enum HPMUD_RESULT hpmud_get_dstat(HPMUD_
-    }
- 
-    strncpy(ds->uri, msp->device[dd].uri, sizeof(ds->uri));
-+   ds->uri[sizeof(ds->uri)-1] = '\0';
-    ds->io_mode = msp->device[dd].io_mode;
-    ds->channel_cnt = msp->device[dd].channel_cnt;
-    ds->mlc_up = msp->device[dd].mlc_up;
-diff -up hplip-3.25.2/io/hpmud/jd.c.covscan hplip-3.25.2/io/hpmud/jd.c
---- hplip-3.25.2/io/hpmud/jd.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/io/hpmud/jd.c	2025-04-11 10:21:58.035328288 +0200
-@@ -31,6 +31,7 @@
- #endif
- 
- #include <signal.h>
-+#include <stdlib.h>
- #include "hpmud.h"
- #include "hpmudi.h"
- 
-diff -up hplip-3.25.2/io/hpmud/model.c.covscan hplip-3.25.2/io/hpmud/model.c
---- hplip-3.25.2/io/hpmud/model.c.covscan	2025-04-11 10:21:58.023885145 +0200
-+++ hplip-3.25.2/io/hpmud/model.c	2025-04-11 10:21:58.035487541 +0200
-@@ -117,6 +117,7 @@ static int ReadConfig()
-       if (rcbuf[0] == '[')
-       {
-          strncpy(section, rcbuf, sizeof(section)); /* found new section */
-+         section[sizeof(section)-1] = '\0';
-          continue;
-       }
- 
-@@ -125,6 +126,7 @@ static int ReadConfig()
-       if ((strncasecmp(section, "[dirs]", 6) == 0) && (strcasecmp(key, "home") == 0))
-       {
-          strncpy(homedir, value, sizeof(homedir));
-+         homedir[sizeof(homedir)-1] = '\0';
-          break;  /* done */
-       }
-    }
-diff -up hplip-3.25.2/io/hpmud/musb.c.covscan hplip-3.25.2/io/hpmud/musb.c
---- hplip-3.25.2/io/hpmud/musb.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/io/hpmud/musb.c	2025-04-11 10:21:58.035717762 +0200
-@@ -776,7 +776,7 @@ static int device_id(int fd, unsigned ch
-         len = size-1;   /* leave byte for zero termination */
-     if (len > 2)
-         len -= 2;
--    memcpy(buffer, buffer+2, len);    /* remove length */
-+    memmove(buffer, buffer+2, len);    /* remove length */
-     buffer[len]=0;
-     DBG("read actual device_id successfully fd=%d len=%d\n", fd, len);
- 
-diff -up hplip-3.25.2/io/hpmud/pp.c.covscan hplip-3.25.2/io/hpmud/pp.c
---- hplip-3.25.2/io/hpmud/pp.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/io/hpmud/pp.c	2025-04-11 10:21:58.035977040 +0200
-@@ -632,7 +632,7 @@ static int device_id(int fd, char *buffe
-       len = size-1;   /* leave byte for zero termination */
-    if (len > 2)
-       len -= 2;
--   memcpy(buffer, buffer+2, len);    /* remove length */
-+   memmove(buffer, buffer+2, len);    /* remove length */
-    buffer[len]=0;
- 
-    DBG("read actual device_id successfully fd=%d len=%d\n", fd, len);
-diff -up hplip-3.25.2/Makefile.am.covscan hplip-3.25.2/Makefile.am
---- hplip-3.25.2/Makefile.am.covscan	2025-04-11 10:21:58.010155532 +0200
-+++ hplip-3.25.2/Makefile.am	2025-04-11 10:22:52.826357214 +0200
-@@ -3,7 +3,7 @@
- #
- #  (c) 2004-2015 Copyright HP Development Company, LP
- #  Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher
--INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/
-+INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/ -Iprotocol
- CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
- CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
- 
-@@ -310,7 +310,7 @@ dist_pcard_DATA = pcard/__init__.py pcar
- pcardextdir = $(PYTHONEXECDIR)
- pcardext_LTLIBRARIES = pcardext.la
- pcardext_la_LDFLAGS = -module -avoid-version
--pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c
-+pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c pcard/pcardext/pcardext.h
- pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
- 
- # prnt
-@@ -322,7 +322,7 @@ lib_LTLIBRARIES += libhpipp.la
- #hpipp_LTLIBRARIES = hpipp.la
- #hpipp_la_LDFLAGS = -module -avoid-version
- libhpipp_la_SOURCES = protocol/hp_ipp.c protocol/hp_ipp.h protocol/hp_ipp_i.h
--libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
-+libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -D_GNU_SOURCE
- libhpipp_la_LDFLAGS = -version-info 0:1:0
- libhpipp_la_LIBADD = libhpmud.la
- 
-diff -up hplip-3.25.2/pcard/fat.c.covscan hplip-3.25.2/pcard/fat.c
---- hplip-3.25.2/pcard/fat.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/pcard/fat.c	2025-04-11 10:21:58.036450105 +0200
-@@ -519,14 +519,17 @@ int FatFreeSpace(void)
- 
- int FatDiskAttributes( PHOTO_CARD_ATTRIBUTES * pa )
- {
--    strncpy( pa->OEMID, bpb.OEMID, 8 );
-+    strncpy(pa->OEMID, bpb.OEMID, sizeof(pa->OEMID));
-+    pa->OEMID[sizeof(pa->OEMID)-1] = '\0';
-     pa->BytesPerSector = bpb.BytesPerSector;
-     pa->SectorsPerCluster = bpb.SectorsPerCluster;
-     pa->ReservedSectors = bpb.ReservedSectors;
-     pa->SectorsPerFat = bpb.SectorsPerFat;
-     pa->RootEntries = bpb.RootEntries;
--    strncpy( pa->SystemID, (char *)bpb.SystemID, 8 );
--    strncpy( pa->VolumeLabel, (char *)bpb.VolumeLabel, 11 );
-+    strncpy(pa->SystemID, (char *)bpb.SystemID, sizeof(pa->SystemID));
-+    pa->SystemID[sizeof(pa->SystemID)-1] = '\0';
-+    strncpy(pa->VolumeLabel, (char *)bpb.VolumeLabel, sizeof(pa->VolumeLabel));
-+    pa->VolumeLabel[sizeof(pa->VolumeLabel)-1] = '\0';
-     pa->WriteProtect = da.WriteProtect;
-     
-     return 0;
-@@ -741,6 +744,7 @@ int FatSetCWD(char *dir)
-       return 1;
- 
-    strncpy(cwd.Name, fa.Name, sizeof(cwd.Name));
-+   cwd.Name[sizeof(cwd.Name)-1] = '\0';
-    cwd.StartSector = ConvertClusterToSector(fa.StartCluster);
-    cwd.CurrSector = cwd.StartSector;
-    cwd.StartCluster = fa.StartCluster;
-diff -up hplip-3.25.2/prnt/hpijs/context2.cpp.covscan hplip-3.25.2/prnt/hpijs/context2.cpp
---- hplip-3.25.2/prnt/hpijs/context2.cpp.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/prnt/hpijs/context2.cpp	2025-04-11 10:21:58.036656862 +0200
-@@ -1302,6 +1302,7 @@ DRIVER_ERROR PrintContext::SelectDevice
- 	if(0 == strnlen((const char *)pSS->strDevID, DevIDBuffSize))
- 	{
- 		strncpy((char *)pSS->strDevID,szDeviceId,DevIDBuffSize);
-+		pSS->strDevID[sizeof(pSS->strDevID)-1] = '\0';
- 	}
-     thePrinter = pPFI->CreatePrinter (pSS, familyHandle);
-     if (thePrinter->constructor_error != NO_ERROR)
-diff -up hplip-3.25.2/prnt/hpijs/systemservices.cpp.covscan hplip-3.25.2/prnt/hpijs/systemservices.cpp
---- hplip-3.25.2/prnt/hpijs/systemservices.cpp.covscan	2025-02-27 13:12:44.000000000 +0100
-+++ hplip-3.25.2/prnt/hpijs/systemservices.cpp	2025-04-11 10:21:58.036891582 +0200
-@@ -396,7 +396,10 @@ void SystemServices::AdjustIO(IO_MODE IM
-     IOMode.bDevID =IM.bDevID  && IOMode.bDevID;
- 
-     if (model)
-+    {
-         strncpy(strModel,model, sizeof(strModel));
-+        strModel[sizeof(strModel)-1] = '\0';
-+    }
- }
- 
- APDK_END_NAMESPACE
-diff -up hplip-3.25.2/prnt/hpps/hppsfilter.c.covscan hplip-3.25.2/prnt/hpps/hppsfilter.c
---- hplip-3.25.2/prnt/hpps/hppsfilter.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/prnt/hpps/hppsfilter.c	2025-04-11 10:21:58.037072084 +0200
-@@ -329,13 +329,13 @@ static void WriteHeader(char **argument)
-     /*		Writing Header Information
-     argument[1] = JOB ID , argument[2]= USERNAME,  argument[3] = TITLE		*/
-     hpwrite("\x1b%-12345X@PJL JOBNAME=", strlen("\x1b%-12345X@PJL JOBNAME="));
--    sprintf(buffer, "hplip_%s_%s\x0a", argument[2], argument[1]);
-+    snprintf(buffer, MAX_BUFFER-1, "hplip_%s_%s\x0a", argument[2], argument[1]);
-     hpwrite(buffer, strlen(buffer));
-     memset(buffer, 0, sizeof(buffer));
--    sprintf(buffer, "@PJL SET USERNAME=\"%s\"\x0a", argument[2]);
-+    snprintf(buffer, MAX_BUFFER-1, "@PJL SET USERNAME=\"%s\"\x0a", argument[2]);
-     hpwrite(buffer, strlen(buffer));
-     memset(buffer, 0, sizeof(buffer));
--    sprintf(buffer, "@PJL SET JOBNAME=\"%s\"\x0a", argument[3]);
-+    snprintf(buffer, MAX_BUFFER-1, "@PJL SET JOBNAME=\"%s\"\x0a", argument[3]);
-     hpwrite(buffer, strlen(buffer));
-     fprintf(stderr, "HP PS filter func = WriteHeader           : WRITING PJL HEADER INFO\n");
-     return;
-diff -up hplip-3.25.2/protocol/hp_ipp.h.covscan hplip-3.25.2/protocol/hp_ipp.h
---- hplip-3.25.2/protocol/hp_ipp.h.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/protocol/hp_ipp.h	2025-04-11 10:21:58.037239020 +0200
-@@ -168,6 +168,11 @@ HPIPP_RESULT parseResponseHeader(char* h
- HPIPP_RESULT prepend_http_header(raw_ipp *raw_request,const char *resource);
- enum HPMUD_RESULT sendUSBRequest(char *buf, int size, raw_ipp *responseptr, char * device_uri);
- enum HPMUD_RESULT sendUSBFileRequest(char *buf, int size, int fileHandle,raw_ipp *responseptr, char *device_uri);
-+void _releaseCupsInstance();
-+int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, char *model, char *info);
-+int delCupsPrinter(char *pr_name);
-+int setDefaultCupsPrinter(char *pr_name);
-+int controlCupsPrinter(char *pr_name, int op);
- 
- ipp_t * createFaxDetailRequest(const char *printer_name);
- ipp_t * getDeviceFaxModemAttributes(char* device_uri,char* printer_name, int *count);
-diff -up hplip-3.25.2/scan/sane/bb_ledm.c.covscan hplip-3.25.2/scan/sane/bb_ledm.c
---- hplip-3.25.2/scan/sane/bb_ledm.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/bb_ledm.c	2025-04-11 10:21:58.037378913 +0200
-@@ -26,6 +26,7 @@
- # include "http.h"
- # include "xml.h"
- # include <stdlib.h>
-+# include <unistd.h>
- 
- # include <stdint.h>
- 
-diff -up hplip-3.25.2/scan/sane/common.h.covscan hplip-3.25.2/scan/sane/common.h
---- hplip-3.25.2/scan/sane/common.h.covscan	2025-04-11 10:21:57.806326475 +0200
-+++ hplip-3.25.2/scan/sane/common.h	2025-04-11 10:21:58.037532413 +0200
-@@ -36,7 +36,7 @@
- #define _STRINGIZE(x) #x
- #define STRINGIZE(x) _STRINGIZE(x)
- 
--#define BUG(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); DBG(2, __FILE__ " " STRINGIZE(__LINE__) ": " args);}
-+#define BUG_SCAN(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); DBG(2, __FILE__ " " STRINGIZE(__LINE__) ": " args);}
- #define BUG_DUMP(data, size) bugdump((data), (size))
- #define BUG_SZ(args...) {syslog(LOG_ERR, args); DBG(2, args);}
- 
-diff -up hplip-3.25.2/scan/sane/escl.c.covscan hplip-3.25.2/scan/sane/escl.c
---- hplip-3.25.2/scan/sane/escl.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/escl.c	2025-04-11 10:21:58.037677793 +0200
-@@ -849,7 +849,7 @@ SANE_Status escl_control_option(SANE_Han
-   //DBG8("escl_control_option (option=%s) action=%d\n", ps->option[option].name, action);
-   if (stat != SANE_STATUS_GOOD)
-   {
--     BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
-+     BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
-   }
- 
-    return stat;
-@@ -1159,7 +1159,7 @@ void escl_close(SANE_Handle handle)
- 
-   if (ps == NULL || ps != session)
-   {
--    BUG("invalid sane_close\n");
-+    BUG_SCAN("invalid sane_close\n");
-     return;
-   }
- 
-diff -up hplip-3.25.2/scan/sane/http.c.covscan hplip-3.25.2/scan/sane/http.c
---- hplip-3.25.2/scan/sane/http.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/http.c	2025-04-11 10:21:58.037859247 +0200
-@@ -36,6 +36,7 @@
- #include <string.h>
- #include <syslog.h>
- #include <ctype.h>
-+#include <unistd.h>
- #include "hpmud.h"
- #include "http.h"
- 
-diff -up hplip-3.25.2/scan/sane/io.c.covscan hplip-3.25.2/scan/sane/io.c
---- hplip-3.25.2/scan/sane/io.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/io.c	2025-04-11 10:21:58.037998005 +0200
-@@ -50,7 +50,7 @@ int __attribute__ ((visibility ("hidden"
-     
-    if (dbus_error_is_set(&dbus_err))
-    { 
--      BUG("dBus Connection Error (%s)!\n", dbus_err.message); 
-+      BUG_SCAN("dBus Connection Error (%s)!\n", dbus_err.message); 
-       dbus_error_free(&dbus_err); 
-    }
- 
-@@ -79,7 +79,7 @@ int __attribute__ ((visibility ("hidden"
- 
-     if (NULL == msg)
-     {
--        BUG("dbus message is NULL!\n");
-+        BUG_SCAN("dbus message is NULL!\n");
-         return 0;
-     }
- 
-@@ -94,7 +94,7 @@ int __attribute__ ((visibility ("hidden"
- 
-     if (!dbus_connection_send(dbus_conn, msg, NULL))
-     {
--        BUG("dbus message send failed!\n");
-+        BUG_SCAN("dbus message send failed!\n");
-         return 0;
-     }
- 
-diff -up hplip-3.25.2/scan/sane/ledm.c.covscan hplip-3.25.2/scan/sane/ledm.c
---- hplip-3.25.2/scan/sane/ledm.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/ledm.c	2025-04-11 10:21:58.038131991 +0200
-@@ -813,7 +813,7 @@ SANE_Status ledm_control_option(SANE_Han
- 
-   if (stat != SANE_STATUS_GOOD)
-   {
--     BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
-+     BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
-   }
- 
-    return stat;
-@@ -1078,7 +1078,7 @@ void ledm_close(SANE_Handle handle)
- 
-   if (ps == NULL || ps != session)
-   {
--    BUG("invalid sane_close\n");
-+    BUG_SCAN("invalid sane_close\n");
-     return;
-   }
- 
-diff -up hplip-3.25.2/scan/sane/marvell.c.covscan hplip-3.25.2/scan/sane/marvell.c
---- hplip-3.25.2/scan/sane/marvell.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/marvell.c	2025-04-11 10:21:58.038309394 +0200
-@@ -134,7 +134,7 @@ static int get_ip_data(struct marvell_se
- 
-    if (!ps->ip_handle)
-    {
--      BUG("invalid ipconvert state\n");
-+      BUG_SCAN("invalid ipconvert state\n");
-       goto bugout;
-    }
-    
-@@ -335,7 +335,7 @@ static struct marvell_session *create_se
- 
-    if ((ps = malloc(sizeof(struct marvell_session))) == NULL)
-    {
--      BUG("malloc failed: %m\n");
-+      BUG_SCAN("malloc failed: %m\n");
-       return NULL;
-    }
-    memset(ps, 0, sizeof(struct marvell_session));
-@@ -402,7 +402,7 @@ SANE_Status marvell_open(SANE_String_Con
- 
-    if (session)
-    {
--      BUG("session in use\n");
-+      BUG_SCAN("session in use\n");
-       return SANE_STATUS_DEVICE_BUSY;
-    }
-       
-@@ -431,7 +431,7 @@ SANE_Status marvell_open(SANE_String_Con
- 
-    if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK)
-    {
--      BUG("unable to open device %s\n", session->uri);
-+      BUG_SCAN("unable to open device %s\n", session->uri);
-       goto bugout;
- 
-       free(session);
-@@ -441,7 +441,7 @@ SANE_Status marvell_open(SANE_String_Con
- 
-    if (hpmud_open_channel(session->dd, HPMUD_S_MARVELL_SCAN_CHANNEL, &session->cd) != HPMUD_R_OK)
-    {
--      BUG("unable to open %s channel %s\n", HPMUD_S_MARVELL_SCAN_CHANNEL, session->uri);
-+      BUG_SCAN("unable to open %s channel %s\n", HPMUD_S_MARVELL_SCAN_CHANNEL, session->uri);
-       stat = SANE_STATUS_DEVICE_BUSY;
-       goto bugout;
-    }
-@@ -554,7 +554,7 @@ void marvell_close(SANE_Handle handle)
- 
-    if (ps == NULL || ps != session)
-    {
--      BUG("invalid sane_close\n");
-+      BUG_SCAN("invalid sane_close\n");
-       return;
-    }
- 
-@@ -849,7 +849,7 @@ SANE_Status marvell_control_option(SANE_
-                stat = SANE_STATUS_GOOD;
-                break;
-             }
--            BUG("value=%d brymin=%d brymax=%d\n", *int_value, ps->bryRange.min, ps->bryRange.max);
-+            BUG_SCAN("value=%d brymin=%d brymax=%d\n", *int_value, ps->bryRange.min, ps->bryRange.max);
-          }
-          else
-          {  /* Set default. */
-@@ -866,7 +866,7 @@ SANE_Status marvell_control_option(SANE_
- 
-    if (stat != SANE_STATUS_GOOD)
-    {
--      BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, 
-+      BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, 
-                   action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
-    }
- 
-@@ -905,7 +905,7 @@ SANE_Status marvell_start(SANE_Handle ha
-    
-    if (set_extents(ps))
-    {
--      BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
-+      BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
-          ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max);
-       stat = SANE_STATUS_INVAL;
-       goto bugout;
-@@ -963,7 +963,7 @@ SANE_Status marvell_start(SANE_Handle ha
-    /* Open image processor. */
-    if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE)
-    {
--      BUG("unable open image processor: err=%d\n", ret);
-+      BUG_SCAN("unable open image processor: err=%d\n", ret);
-       stat = SANE_STATUS_INVAL;
-       goto bugout;
-    }
-@@ -1023,7 +1023,7 @@ SANE_Status marvell_read(SANE_Handle han
- 
-    if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR))
-    {
--      BUG("ipConvert error=%x\n", ret);
-+      BUG_SCAN("ipConvert error=%x\n", ret);
-       goto bugout;
-    }
- 
-diff -up hplip-3.25.2/scan/sane/sclpml.c.covscan hplip-3.25.2/scan/sane/sclpml.c
---- hplip-3.25.2/scan/sane/sclpml.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/sclpml.c	2025-04-11 10:21:58.038605168 +0200
-@@ -30,6 +30,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
-+#include <sys/time.h>
- #include "sane.h"
- #include "saneopts.h"
- #include "common.h"
-@@ -2090,7 +2091,7 @@ void sclpml_close(SANE_Handle handle)
-     DBG(8, "sane_hpaio_close(): %s %d\n", __FILE__, __LINE__); 
-     if (hpaio == NULL || hpaio != session)
-     {
--      BUG("invalid sane_close\n");
-+      BUG_SCAN("invalid sane_close\n");
-       return;
-      }
- 
-diff -up hplip-3.25.2/scan/sane/soap.c.covscan hplip-3.25.2/scan/sane/soap.c
---- hplip-3.25.2/scan/sane/soap.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/soap.c	2025-04-11 10:21:58.038894758 +0200
-@@ -142,7 +142,7 @@ static int get_ip_data(struct soap_sessi
- 
-    if (!ps->ip_handle)
-    {
--      BUG("invalid ipconvert state\n");
-+      BUG_SCAN("invalid ipconvert state\n");
-       goto bugout;
-    }      
- 
-@@ -219,7 +219,7 @@ static struct soap_session *create_sessi
- 
-    if ((ps = malloc(sizeof(struct soap_session))) == NULL)
-    {
--      BUG("malloc failed: %m\n");
-+      BUG_SCAN("malloc failed: %m\n");
-       return NULL;
-    }
-    memset(ps, 0, sizeof(struct soap_session));
-@@ -418,7 +418,7 @@ SANE_Status soap_open(SANE_String_Const
- 
-    if (session)
-    {
--      BUG("session in use\n");
-+      BUG_SCAN("session in use\n");
-       return SANE_STATUS_DEVICE_BUSY;
-    }
- 
-@@ -434,7 +434,7 @@ SANE_Status soap_open(SANE_String_Const
- 
-    if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK)
-    {
--      BUG("unable to open device %s\n", session->uri);
-+      BUG_SCAN("unable to open device %s\n", session->uri);
-       goto bugout;
- 
-       free(session);
-@@ -519,7 +519,7 @@ void soap_close(SANE_Handle handle)
- 
-    if (ps == NULL || ps != session)
-    {
--      BUG("invalid sane_close\n");
-+      BUG_SCAN("invalid sane_close\n");
-       return;
-    }
- 
-@@ -824,7 +824,7 @@ SANE_Status soap_control_option(SANE_Han
- 
-    if (stat != SANE_STATUS_GOOD)
-    {
--      BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, 
-+      BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, 
-                   action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
-    }
- 
-@@ -862,7 +862,7 @@ SANE_Status soap_start(SANE_Handle handl
-    ps->user_cancel = 0;
-    if (set_extents(ps))
-    {
--      BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
-+      BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
-          ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max);
-       stat = SANE_STATUS_INVAL;
-       goto bugout;
-@@ -913,7 +913,7 @@ SANE_Status soap_start(SANE_Handle handl
-    /* Open image processor. */
-    if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE)
-    {
--      BUG("unable open image processor: err=%d\n", ret);
-+      BUG_SCAN("unable open image processor: err=%d\n", ret);
-       stat = SANE_STATUS_INVAL;
-       goto bugout;
-    }
-@@ -955,7 +955,7 @@ SANE_Status soap_start(SANE_Handle handl
- 
-          if (ret & (IP_INPUT_ERROR | IP_FATAL_ERROR | IP_DONE))
-          {
--            BUG("ipConvert error=%x\n", ret);
-+            BUG_SCAN("ipConvert error=%x\n", ret);
-             stat = SANE_STATUS_IO_ERROR;
-             goto bugout;
-          }
-@@ -1007,7 +1007,7 @@ SANE_Status soap_read(SANE_Handle handle
- 
-    if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR))
-    {
--      BUG("ipConvert error=%x\n", ret);
-+      BUG_SCAN("ipConvert error=%x\n", ret);
-       goto bugout;
-    }
- 
-diff -up hplip-3.25.2/scan/sane/soapht.c.covscan hplip-3.25.2/scan/sane/soapht.c
---- hplip-3.25.2/scan/sane/soapht.c.covscan	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/scan/sane/soapht.c	2025-04-11 10:21:58.039106018 +0200
-@@ -136,7 +136,7 @@ static int get_ip_data(struct soap_sessi
- 
-    if (!ps->ip_handle)
-    {
--      BUG("invalid ipconvert state\n");
-+      BUG_SCAN("invalid ipconvert state\n");
-       goto bugout;
-    }      
- 
-@@ -435,7 +435,7 @@ static struct soap_session *create_sessi
- 
-    if ((ps = malloc(sizeof(struct soap_session))) == NULL)
-    {
--      BUG("malloc failed: %m\n");
-+      BUG_SCAN("malloc failed: %m\n");
-       return NULL;
-    }
-    memset(ps, 0, sizeof(struct soap_session));
-@@ -459,7 +459,7 @@ SANE_Status soapht_open(SANE_String_Cons
- 
-    if (session)
-    {
--      BUG("session in use\n");
-+      BUG_SCAN("session in use\n");
-       return SANE_STATUS_DEVICE_BUSY;
-    }
- 
-@@ -475,7 +475,7 @@ SANE_Status soapht_open(SANE_String_Cons
- 
-    if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK)
-    {
--      BUG("unable to open device %s\n", session->uri);
-+      BUG_SCAN("unable to open device %s\n", session->uri);
-       goto bugout;
- 
-       free(session);
-@@ -554,7 +554,7 @@ void soapht_close(SANE_Handle handle)
- 
-    if (ps == NULL || ps != session)
-    {
--      BUG("invalid sane_close\n");
-+      BUG_SCAN("invalid sane_close\n");
-       return;
-    }
- 
-@@ -904,7 +904,7 @@ SANE_Status soapht_control_option(SANE_H
- 
-    if (stat != SANE_STATUS_GOOD)
-    {
--      BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, 
-+      BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, 
-                   action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
-    }
- 
-@@ -946,7 +946,7 @@ SANE_Status soapht_start(SANE_Handle han
-   
-    if (set_extents(ps))
-    {
--      BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
-+      BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
-          ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max);
-       stat = SANE_STATUS_INVAL;
-       goto bugout;
-@@ -1032,7 +1032,7 @@ SANE_Status soapht_start(SANE_Handle han
-    /* Open image processor. */
-    if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE)
-    {
--      BUG("unable open image processor: err=%d\n", ret);
-+      BUG_SCAN("unable open image processor: err=%d\n", ret);
-       stat = SANE_STATUS_INVAL;
-       goto bugout;
-    }
-@@ -1075,7 +1075,7 @@ SANE_Status soapht_start(SANE_Handle han
- 
-          if (ret & (IP_INPUT_ERROR | IP_FATAL_ERROR | IP_DONE))
-          {
--            BUG("ipConvert error=%x\n", ret);
-+            BUG_SCAN("ipConvert error=%x\n", ret);
-             stat = SANE_STATUS_IO_ERROR;
-             goto bugout;
-          }
-@@ -1124,7 +1124,7 @@ SANE_Status soapht_read(SANE_Handle hand
- 
-    if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR))
-    {
--      BUG("ipConvert error=%x\n", ret);
-+      BUG_SCAN("ipConvert error=%x\n", ret);
-       goto bugout;
-    }
- 

hplip-deviceIDs-drv.patch

@@ -1,6 +1,6 @@
-diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv/hpcups.drv.in
---- hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv	2019-06-26 15:09:17.000000000 +0200
-+++ hplip-3.19.6/prnt/drv/hpcups.drv.in	2019-07-12 08:34:02.789910485 +0200
+diff -up hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.18.12/prnt/drv/hpcups.drv.in
+--- hplip-3.18.12/prnt/drv/hpcups.drv.in.deviceIDs-drv	2018-12-03 08:13:47.000000000 +0100
++++ hplip-3.18.12/prnt/drv/hpcups.drv.in	2019-01-08 12:29:21.803213255 +0100
 @@ -487,7 +487,7 @@ Manufacturer "HP"
        ModelName "HP Deskjet 3820"
        Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version"
@@ -65,6 +65,24 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        Attribute "Product" "" "(HP Deskjet 970cxi Printer)"
        Attribute "Product" "" "(HP Deskjet 970cse Printer)"
 @@ -665,7 +665,7 @@ Manufacturer "HP"
+       ModelName "HP Officejet 5105"
+       Attribute "NickName" "" "HP Officejet 5105, hpcups $Version"
+       Attribute "ShortNickName" "" "HP Officejet 5105 hpijs"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;"
+       PCFileName "hp-officejet_5105.ppd"
+       Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)"
+     }
+@@ -682,7 +682,7 @@ Manufacturer "HP"
+       ModelName "HP Officejet 5110v"
+       Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version"
+       Attribute "ShortNickName" "" "HP Officejet 5110v hpijs"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;"
++      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;"
+       PCFileName "hp-officejet_5110v.ppd"
+       Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)"
+     }
+@@ -690,7 +690,7 @@ Manufacturer "HP"
        ModelName "HP Officejet g55"
        Attribute "NickName" "" "HP Officejet g55, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet g55 hpijs"
@@ -73,7 +91,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_g55.ppd"
        Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)"
      }
-@@ -681,7 +681,7 @@ Manufacturer "HP"
+@@ -706,7 +706,7 @@ Manufacturer "HP"
        ModelName "HP Officejet g85"
        Attribute "NickName" "" "HP Officejet g85, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet g85 hpijs"
@@ -82,7 +100,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_g85.ppd"
        Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)"
      }
-@@ -697,7 +697,7 @@ Manufacturer "HP"
+@@ -722,7 +722,7 @@ Manufacturer "HP"
        ModelName "HP Officejet g95"
        Attribute "NickName" "" "HP Officejet g95, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet g95 hpijs"
@@ -91,7 +109,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_g95.ppd"
        Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)"
      }
-@@ -745,7 +745,7 @@ Manufacturer "HP"
+@@ -770,7 +770,7 @@ Manufacturer "HP"
        ModelName "HP Officejet v40"
        Attribute "NickName" "" "HP Officejet v40, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet v40 hpijs"
@@ -100,7 +118,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_v40.ppd"
        Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)"
-@@ -754,7 +754,7 @@ Manufacturer "HP"
+@@ -779,7 +779,7 @@ Manufacturer "HP"
        ModelName "HP Officejet v40xi"
        Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet v40xi hpijs"
@@ -109,7 +127,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_v40xi.ppd"
        Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)"
      }
-@@ -770,7 +770,7 @@ Manufacturer "HP"
+@@ -795,7 +795,7 @@ Manufacturer "HP"
        ModelName "HP Photosmart p1000"
        Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version"
        Attribute "ShortNickName" "" "HP Photosmart p1000 hpijs"
@@ -118,7 +136,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-photosmart_p1000.ppd"
        Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)"
        Attribute "Product" "" "(HP Photosmart p1000xi Printer)"
-@@ -779,7 +779,7 @@ Manufacturer "HP"
+@@ -804,7 +804,7 @@ Manufacturer "HP"
        ModelName "HP Photosmart p1100"
        Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version"
        Attribute "ShortNickName" "" "HP Photosmart p1100 hpijs"
@@ -127,7 +145,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-photosmart_p1100.ppd"
        Attribute "Product" "" "(HP Photosmart p1100 Printer)"
        Attribute "Product" "" "(HP Photosmart p1100xi Printer)"
-@@ -796,7 +796,7 @@ Manufacturer "HP"
+@@ -821,7 +821,7 @@ Manufacturer "HP"
        ModelName "HP PSC 750"
        Attribute "NickName" "" "HP PSC 750, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 750 hpijs"
@@ -136,7 +154,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_750.ppd"
        Attribute "Product" "" "(HP PSC 750 All-in-one Printer)"
      }
-@@ -804,7 +804,7 @@ Manufacturer "HP"
+@@ -829,7 +829,7 @@ Manufacturer "HP"
        ModelName "HP PSC 750xi"
        Attribute "NickName" "" "HP PSC 750xi, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 750xi hpijs"
@@ -145,7 +163,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_750xi.ppd"
        Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)"
      }
-@@ -836,7 +836,7 @@ Manufacturer "HP"
+@@ -861,7 +861,7 @@ Manufacturer "HP"
        ModelName "HP PSC 900 Series"
        Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 900 Series hpijs"
@@ -154,7 +172,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_900_series.ppd"
        Attribute "Product" "" "(HP PSC 900 All-in-one Printer)"
      }
-@@ -910,7 +910,7 @@ Manufacturer "HP"
+@@ -935,7 +935,7 @@ Manufacturer "HP"
        ModelName "HP Deskjet 1220c"
        Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 1220c hpijs"
@@ -163,7 +181,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_1220c.ppd"
        Attribute "Product" "" "(HP Deskjet 1220c Printer)"
        Attribute "Product" "" "(HP Deskjet 1220cse Printer)"
-@@ -1100,7 +1100,7 @@ Manufacturer "HP"
+@@ -1125,7 +1125,7 @@ Manufacturer "HP"
        ModelName "HP 2000c"
        Attribute "NickName" "" "HP 2000c, hpcups $Version"
        Attribute "ShortNickName" "" "HP 2000c hpijs"
@@ -172,7 +190,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-2000c.ppd"
        Attribute "Product" "" "(HP 2000cse Printer)"
        Attribute "Product" "" "(HP 2000c Printer)"
-@@ -1564,7 +1564,7 @@ Manufacturer "HP"
+@@ -1589,7 +1589,7 @@ Manufacturer "HP"
        ModelName "HP Deskjet 960c"
        Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 960c hpijs"
@@ -181,7 +199,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_960c.ppd"
        Attribute "Product" "" "(HP Deskjet 960cse Printer)"
        Attribute "Product" "" "(HP Deskjet 960cxi Printer)"
-@@ -1574,7 +1574,7 @@ Manufacturer "HP"
+@@ -1599,7 +1599,7 @@ Manufacturer "HP"
        ModelName "HP Deskjet 980c"
        Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 980c hpijs"
@@ -190,7 +208,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_980c.ppd"
        Attribute "Product" "" "(HP Deskjet 980cxi Printer)"
        Attribute "Product" "" "(HP Deskjet 980c Printer)"
-@@ -1583,7 +1583,7 @@ Manufacturer "HP"
+@@ -1608,7 +1608,7 @@ Manufacturer "HP"
        ModelName "HP Deskjet 990c"
        Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 990c hpijs"
@@ -199,7 +217,16 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_990c.ppd"
        Attribute "Product" "" "(HP Deskjet 990cxi Printer)"
        Attribute "Product" "" "(HP Deskjet 990cse Printer)"
-@@ -1613,7 +1613,7 @@ Manufacturer "HP"
+@@ -1638,7 +1638,7 @@ Manufacturer "HP"
+       ModelName "HP Color Inkjet cp1700"
+       Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version"
+       Attribute "ShortNickName" "" "HP Color Inkjet cp1700 hpijs"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;"
++      Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;"
+       PCFileName "hp-color_inkjet_cp1700.ppd"
+       Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
+     }
+@@ -1646,7 +1646,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 7100 Series"
        Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 7100 Series hpijs"
@@ -208,7 +235,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_7100_series.ppd"
        Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)"
-@@ -1628,7 +1628,7 @@ Manufacturer "HP"
+@@ -1661,7 +1661,7 @@ Manufacturer "HP"
        ModelName "HP Officejet D Series"
        Attribute "NickName" "" "HP Officejet D Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet D Series hpijs"
@@ -217,7 +244,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_d_series.ppd"
        Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)"
-@@ -1675,7 +1675,7 @@ Manufacturer "HP"
+@@ -1708,7 +1708,7 @@ Manufacturer "HP"
        ModelName "HP PSC 2100 Series"
        Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 2100 Series hpijs"
@@ -226,7 +253,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_2100_series.ppd"
        Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)"
-@@ -1688,7 +1688,7 @@ Manufacturer "HP"
+@@ -1721,7 +1721,7 @@ Manufacturer "HP"
        ModelName "HP PSC 2150 Series"
        Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 2150 Series hpijs"
@@ -235,7 +262,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_2150_series.ppd"
        Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)"
      }
-@@ -1696,7 +1696,7 @@ Manufacturer "HP"
+@@ -1729,7 +1729,7 @@ Manufacturer "HP"
        ModelName "HP PSC 2170 Series"
        Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 2170 Series hpijs"
@@ -244,16 +271,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_2170_series.ppd"
        Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)"
-@@ -1743,7 +1743,7 @@ Manufacturer "HP"
-       ModelName "HP Color Inkjet Printer cp1700"
-       Attribute "NickName" "" "HP Color Inkjet Printer cp1700, hpcups $Version"
-       Attribute "ShortNickName" "" "HP CJ IJ Printer cp1700 hpijs"
--      Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet printer cp1700;DES:hp color inkjet printer cp1700;"
-+      Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;"
-       PCFileName "hp-color_inkjet_printer_cp1700.ppd"
-       Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
-       Attribute "Product" "" "(HP Color Inkjet cp1700ps Printer)"
-@@ -1918,7 +1918,7 @@ Manufacturer "HP"
+@@ -1951,7 +1951,7 @@ Manufacturer "HP"
        ModelName "HP Business Inkjet 2200"
        Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2200 hpijs"
@@ -262,7 +280,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-business_inkjet_2200.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2200 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2200se Printer)"
-@@ -1928,7 +1928,7 @@ Manufacturer "HP"
+@@ -1961,7 +1961,7 @@ Manufacturer "HP"
        ModelName "HP Business Inkjet 2230"
        Attribute "NickName" "" "HP Business Inkjet 2230, hpcups $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2230 hpijs"
@@ -271,7 +289,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-business_inkjet_2230.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2230 Printer)"
      }
-@@ -1936,7 +1936,7 @@ Manufacturer "HP"
+@@ -1969,7 +1969,7 @@ Manufacturer "HP"
        ModelName "HP Business Inkjet 2250"
        Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2250 hpijs"
@@ -280,7 +298,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-business_inkjet_2250-pcl3.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2250 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)"
-@@ -1945,7 +1945,7 @@ Manufacturer "HP"
+@@ -1978,7 +1978,7 @@ Manufacturer "HP"
        ModelName "HP Business Inkjet 2280"
        Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2280 hpijs"
@@ -289,7 +307,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-business_inkjet_2280-pcl3.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2280 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)"
-@@ -2689,7 +2689,7 @@ Manufacturer "HP"
+@@ -2740,7 +2740,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 7200 Series"
        Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 7200 Series hpijs"
@@ -298,7 +316,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_7200_series.ppd"
        Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)"
-@@ -2713,7 +2713,7 @@ Manufacturer "HP"
+@@ -2764,7 +2764,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 7400 Series"
        Attribute "NickName" "" "HP Officejet 7400 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 7400 Series hpijs"
@@ -307,7 +325,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_7400_series.ppd"
        Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)"
-@@ -2757,7 +2757,7 @@ Manufacturer "HP"
+@@ -2810,7 +2810,7 @@ Manufacturer "HP"
        ModelName "HP Officejet j5700 Series"
        Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet j5700 Series hpijs"
@@ -316,7 +334,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_j5700_series.ppd"
        Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet j5785 All-in-one Printer)"
-@@ -3391,7 +3391,7 @@ Manufacturer "HP"
+@@ -3461,7 +3461,7 @@ Manufacturer "HP"
        ModelName "HP PSC 2200 Series"
        Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 2200 Series hpijs"
@@ -325,7 +343,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_2200_series.ppd"
        Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)"
      }
-@@ -3409,7 +3409,7 @@ Manufacturer "HP"
+@@ -3479,7 +3479,7 @@ Manufacturer "HP"
        ModelName "HP PSC 2300 Series"
        Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 2300 Series hpijs"
@@ -334,7 +352,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_2300_series.ppd"
        Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)"
-@@ -3417,8 +3417,7 @@ Manufacturer "HP"
+@@ -3487,8 +3487,7 @@ Manufacturer "HP"
      {
        ModelName "HP PSC 2350 Series"
        Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version"
@@ -344,7 +362,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_2350_series.ppd"
        Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 2358 All-in-one Printer)"
-@@ -3448,7 +3447,7 @@ Manufacturer "HP"
+@@ -3518,7 +3517,7 @@ Manufacturer "HP"
        ModelName "HP PSC 2500 Series"
        Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 2500 Series hpijs"
@@ -353,7 +371,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_2500_series.ppd"
        Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)"
-@@ -7023,7 +7022,7 @@ Manufacturer "HP"
+@@ -7107,7 +7106,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 6100"
        Attribute "NickName" "" "HP Officejet 6100, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 6100 hpijs"
@@ -362,7 +380,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_6100.ppd"
        Attribute "Product" "" "(HP Officejet 6100 Eprinter h611a)"
      }
-@@ -16708,7 +16707,7 @@ Manufacturer "HP"
+@@ -17104,7 +17103,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        ModelName "HP Officejet 4100 Series"
        Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 4100 Series hpijs"
@@ -371,7 +389,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_4100_series.ppd"
        Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)"
-@@ -16735,7 +16734,7 @@ Manufacturer "HP"
+@@ -17131,7 +17130,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        ModelName "HP Officejet 4300 Series"
        Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 4300 Series hpijs"
@@ -380,7 +398,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_4300_series.ppd"
        Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4338 All-in-one Printer)"
-@@ -16767,7 +16766,7 @@ Manufacturer "HP"
+@@ -17163,7 +17162,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        ModelName "HP PSC 1100 Series"
        Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 1100 Series hpijs"
@@ -389,7 +407,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_1100_series.ppd"
        Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)"
-@@ -16777,7 +16776,7 @@ Manufacturer "HP"
+@@ -17173,7 +17172,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        ModelName "HP PSC 1200 Series"
        Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 1200 Series hpijs"
@@ -398,7 +416,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_1200_series.ppd"
        Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 1217 All-in-one Printer)"
-@@ -17077,7 +17076,7 @@ Manufacturer "HP"
+@@ -17476,7 +17475,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        ModelName "HP Officejet 4200 Series"
        Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 4200 Series hpijs"
@@ -407,7 +425,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_4200_series.ppd"
        Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)"
-@@ -17142,7 +17141,7 @@ Manufacturer "HP"
+@@ -17541,7 +17540,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        ModelName "HP Officejet j3600 Series"
        Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet j3600 Series hpijs"
@@ -416,7 +434,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_j3600_series.ppd"
        Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)"
-@@ -17639,6 +17638,7 @@ Manufacturer "HP"
+@@ -18044,6 +18043,7 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Photosmart 380 Series hpijs"
        Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;"
@@ -424,7 +442,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-photosmart_380_series.ppd"
        Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)"
        Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)"
-@@ -19378,7 +19378,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -19849,7 +19849,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Business Inkjet 2300"
            Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Business Inkjet 2300 hpijs"
@@ -433,7 +451,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
            PCFileName "hp-business_inkjet_2300-pcl3.ppd"
            Attribute "Product" "" "(HP Business Inkjet 2300 Printer)"
            Attribute "Product" "" "(HP Business Inkjet 2300n Printer)"
-@@ -19759,7 +19759,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20249,7 +20249,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Officejet 9100 Series"
            Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Officejet 9100 Series hpijs"
@@ -442,7 +460,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
            PCFileName "hp-officejet_9100_series-pcl3.ppd"
            Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)"
            Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)"
-@@ -19843,7 +19843,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20333,7 +20333,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Business Inkjet 2800"
        Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2800 hpijs"
@@ -451,7 +469,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-business_inkjet_2800-pcl3.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2800 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)"
-@@ -20379,7 +20379,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -20876,7 +20876,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Lx"
        Attribute "NickName" "" "HP Officejet Lx, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Lx hpijs"
@@ -460,7 +478,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_lx.ppd"
        Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)"
      }
-@@ -20516,7 +20516,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21013,7 +21013,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 540"
        Attribute "NickName" "" "HP Deskjet 540, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 540 hpijs"
@@ -469,7 +487,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_540.ppd"
        Attribute "Product" "" "(HP Deskjet 540 Printer)"
      }
-@@ -20524,7 +20524,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21021,7 +21021,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 400"
        Attribute "NickName" "" "HP Deskjet 400, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 400 hpijs"
@@ -478,7 +496,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_400.ppd"
        Attribute "Product" "" "(HP Deskjet 400 Printer)"
        Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
-@@ -20541,7 +20541,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21038,7 +21038,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Series 300"
        Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Series 300 hpijs"
@@ -487,7 +505,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_series_300.ppd"
        Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
      }
-@@ -20674,7 +20674,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21171,7 +21171,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 630c"
        Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 630c hpijs"
@@ -496,7 +514,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_630c.ppd"
        Attribute "Product" "" "(HP Deskjet 630c Printer)"
      }
-@@ -20690,7 +20690,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21187,7 +21187,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 656c"
        Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 656c hpijs"
@@ -505,7 +523,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_656c.ppd"
        Attribute "Product" "" "(HP Deskjet 656c Printer)"
        Attribute "Product" "" "(HP Deskjet 656cvr Printer)"
-@@ -20803,7 +20803,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21300,7 +21300,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 600"
          Attribute "NickName" "" "HP Deskjet 600, hpcups $Version"
          Attribute "ShortNickName" "" "HP Deskjet 600 hpijs"
@@ -514,7 +532,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
          PCFileName "hp-deskjet_600.ppd"
          Attribute "Product" "" "(HP Deskjet 600c Printer)"
          Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -20843,7 +20843,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21341,7 +21341,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 670c"
          Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version"
          Attribute "ShortNickName" "" "HP Deskjet 670c hpijs"
@@ -523,7 +541,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
          PCFileName "hp-deskjet_670c.ppd"
          Attribute "Product" "" "(HP Deskjet 670c Printer)"
        }
-@@ -20915,7 +20915,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21413,7 +21413,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Officejet Series 600"
          Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version"
          Attribute "ShortNickName" "" "HP Officejet Series 600 hpijs"
@@ -532,7 +550,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
          PCFileName "hp-officejet_series_600.ppd"
          Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)"
        }
-@@ -21060,7 +21060,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21558,7 +21558,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 610c"
        Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 610c hpijs"
@@ -541,7 +559,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_610c.ppd"
        Attribute "Product" "" "(HP Deskjet 610c Printer)"
      }
-@@ -21084,7 +21084,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21582,7 +21582,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 640c"
        Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 640c hpijs"
@@ -550,16 +568,16 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_640c.ppd"
        Attribute "Product" "" "(HP Deskjet 640c Lite Printer)"
        Attribute "Product" "" "(HP Deskjet 640c Printer)"
-@@ -21104,7 +21104,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21611,7 +21611,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 690c"
        Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 690c hpijs"
 -      Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;"
 +      Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;"
        PCFileName "hp-deskjet_690c.ppd"
-       Attribute "Product" "" "(HP Deskjet 690 Printer)"
        Attribute "Product" "" "(HP Deskjet 690c Plus Printer)"
-@@ -21156,7 +21156,7 @@ Group "RLT/HP Real Life Technologies"
+       Attribute "Product" "" "(HP Deskjet 690c Printer)"
+@@ -21662,7 +21662,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Series 700"
        Attribute "NickName" "" "HP Officejet Series 700, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Series 700 hpijs"
@@ -568,7 +586,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_series_700.ppd"
        Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)"
      }
-@@ -21307,7 +21307,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21813,7 +21813,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 812c"
        Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 812c hpijs"
@@ -577,7 +595,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_812c.ppd"
        Attribute "Product" "" "(HP Deskjet 812c Printer)"
      }
-@@ -21315,7 +21315,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21821,7 +21821,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 815c"
        Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 815c hpijs"
@@ -586,7 +604,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_815c.ppd"
        Attribute "Product" "" "(HP Deskjet 815c Printer)"
      }
-@@ -21347,7 +21347,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21853,7 +21853,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 840c"
        Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 840c hpijs"
@@ -595,7 +613,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_840c.ppd"
        Attribute "Product" "" "(HP Deskjet 840c Printer)"
      }
-@@ -21355,7 +21355,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21861,7 +21861,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 841c"
        Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 841c hpijs"
@@ -604,7 +622,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_841c.ppd"
        Attribute "Product" "" "(HP Deskjet 841c Printer)"
      }
-@@ -21371,7 +21371,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21877,7 +21877,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 843c"
        Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 843c hpijs"
@@ -613,7 +631,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_843c.ppd"
        Attribute "Product" "" "(HP Deskjet 843c Printer)"
        Attribute "Product" "" "(HP Deskjet 843cxe Printer)"
-@@ -21380,7 +21380,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21886,7 +21886,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 880c"
        Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 880c hpijs"
@@ -622,7 +640,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_880c.ppd"
        Attribute "Product" "" "(HP Deskjet 880c Printer)"
      }
-@@ -21396,7 +21396,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21902,7 +21902,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 895c"
        Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 895c hpijs"
@@ -631,7 +649,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_895c.ppd"
        Attribute "Product" "" "(HP Deskjet 895cse Printer)"
        Attribute "Product" "" "(HP Deskjet 895c Printer)"
-@@ -21406,7 +21406,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21912,7 +21912,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r40"
        Attribute "NickName" "" "HP Officejet r40, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r40 hpijs"
@@ -640,7 +658,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_r40.ppd"
        Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)"
      }
-@@ -21430,7 +21430,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21936,7 +21936,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r60"
        Attribute "NickName" "" "HP Officejet r60, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r60 hpijs"
@@ -649,7 +667,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_r60.ppd"
        Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)"
      }
-@@ -21438,7 +21438,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21944,7 +21944,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r65"
        Attribute "NickName" "" "HP Officejet r65, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r65 hpijs"
@@ -658,7 +676,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_r65.ppd"
        Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)"
      }
-@@ -21446,7 +21446,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21952,7 +21952,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r80"
        Attribute "NickName" "" "HP Officejet r80, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r80 hpijs"
@@ -667,7 +685,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_r80.ppd"
        Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)"
      }
-@@ -21462,7 +21462,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21968,7 +21968,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet T Series"
        Attribute "NickName" "" "HP Officejet T Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet T Series hpijs"
@@ -676,7 +694,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_t_series.ppd"
        Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)"
-@@ -21473,7 +21473,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -21979,7 +21979,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP PSC 500"
        Attribute "NickName" "" "HP PSC 500, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 500 hpijs"
@@ -685,7 +703,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-psc_500.ppd"
        Attribute "Product" "" "(HP PSC 500 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)"
-@@ -21589,7 +21589,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -22095,7 +22095,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 825c"
        Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 825c hpijs"
@@ -694,7 +712,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_825c.ppd"
        Attribute "Product" "" "(HP Deskjet 825cvr Printer)"
        Attribute "Product" "" "(HP Deskjet 825c Printer)"
-@@ -21598,7 +21598,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -22104,7 +22104,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 845c"
        Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 845c hpijs"
@@ -703,7 +721,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_845c.ppd"
        Attribute "Product" "" "(HP Deskjet 845c Printer)"
        Attribute "Product" "" "(HP Deskjet 845cvr Printer)"
-@@ -21709,7 +21709,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -22215,7 +22215,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 850c"
        Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 850c hpijs"
@@ -712,7 +730,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_850c.ppd"
        Attribute "Product" "" "(HP Deskjet 850k Printer)"
        Attribute "Product" "" "(HP Deskjet 850c Printer)"
-@@ -21728,7 +21728,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -22234,7 +22234,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 870c"
        Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 870c hpijs"
@@ -721,7 +739,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_870c.ppd"
        Attribute "Product" "" "(HP Deskjet 870k Printer)"
        Attribute "Product" "" "(HP Deskjet 870c Printer)"
-@@ -21739,7 +21739,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -22245,7 +22245,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Pro 1150c"
        Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Pro 1150c hpijs"
@@ -730,7 +748,7 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-officejet_pro_1150c.ppd"
        Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)"
-@@ -21853,7 +21853,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -22359,7 +22359,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 890c"
        Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 890c hpijs"
@@ -739,10 +757,10 @@ diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.19.6/prnt/drv
        PCFileName "hp-deskjet_890c.ppd"
        Attribute "Product" "" "(HP Deskjet 890cse Printer)"
        Attribute "Product" "" "(HP Deskjet 890c Printer)"
-@@ -21862,7 +21862,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -22368,7 +22368,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Pro 1170c Series"
        Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version"
-       Attribute "ShortNickName" "" "HP OJ Pro 1170c Series hpijs"
+       Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series hpijs"
 -      Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;"
 +      Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;"
        PCFileName "hp-officejet_pro_1170c_series.ppd"

hplip-dialog-infinite-loop.patch

@@ -1,25 +0,0 @@
-diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
-index c23957a..48b248f 100644
---- a/ui5/devmgr5.py
-+++ b/ui5/devmgr5.py
-@@ -2300,14 +2300,15 @@ class PasswordDialog(QDialog):
- # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- 
- def showPasswordUI(prompt):
-+    dlg = None
-+
-     try:
-         dlg = PasswordDialog(prompt, None)
-+    except Exception as e:
-+        log.error('Unable to open password dialog due following error:\n {}'.format(e))
- 
--        if dlg.exec_() == QDialog.Accepted:
--            return (dlg.getUsername(), dlg.getPassword())
--
--    finally:
--        pass
-+    if dlg and dlg.exec_() == QDialog.Accepted:
-+        return (dlg.getUsername(), dlg.getPassword())
- 
-     return ("", "")
- 

hplip-error-print.patch

@@ -32,3 +32,47 @@ index fdb48e8..345ed82 100644
                  self.cleanup(EVENT_PCARD_UNABLE_TO_MOUNT)
                  return False
  
+diff --git a/ui4/wifisetupdialog.py b/ui4/wifisetupdialog.py
+index 9fd1786..4d36f83 100644
+--- a/ui4/wifisetupdialog.py
++++ b/ui4/wifisetupdialog.py
+@@ -256,7 +256,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+             try:
+                 self.dev = device.Device(self.device_uri)
+             except Error as e:
+-                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, QString(e[0])))
++                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, QString(e.msg)))
+ 
+                 if self.dev is not None:
+                     self.dev.close()
+@@ -834,7 +834,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+ 
+ 
+     def showIOError(self, e):
+-        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % QString(e[0])))
++        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % QString(e.msg)))
+ 
+         if self.dev is not None:
+             self.dev.close()
+diff --git a/ui5/wifisetupdialog.py b/ui5/wifisetupdialog.py
+index e0c7aee..74cc0ef 100644
+--- a/ui5/wifisetupdialog.py
++++ b/ui5/wifisetupdialog.py
+@@ -259,7 +259,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+             try:
+                 self.dev = device.Device(self.device_uri)
+             except Error as e:
+-                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, str(e[0])))
++                FailureUI(self, self.__tr("<b>Error opening device:</b><p>%s</p><p>(%s)</p>") %(self.device_uri, str(e.msg)))
+ 
+                 if self.dev is not None:
+                     self.dev.close()
+@@ -840,7 +840,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+ 
+ 
+     def showIOError(self, e):
+-        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % str(e[0])))
++        FailureUI(self, self.__tr("<b>An I/O error occurred.</b><p>Please check the USB connection to your printer and try again.</p>(%s)" % str(e.msg)))
+ 
+         if self.dev is not None:
+             self.dev.close()

hplip-fedora-gui.patch

@@ -1,31 +0,0 @@
-diff --git a/base/utils.py b/base/utils.py
-index d493b54..401dc41 100644
---- a/base/utils.py
-+++ b/base/utils.py
-@@ -727,8 +727,8 @@ def canEnterGUIMode4(): # qt4
-         except ImportError:
-             try:
-                 import ui5.setupdialog
--            except ImportError as e:
--                log.warn(e)
-+            except ImportError:
-+                log.error("hplip-gui not installed. GUI not available.")
-                 return False
- 
-     return True
-@@ -746,6 +746,7 @@ def checkPyQtImport(): # qt3
-         try:
-             import ui
-         except ImportError:
-+            log.error("hplip-gui not installed. GUI not available.")
-             return False
- 
-         log.error("PyQt not installed. GUI not available. Exiting.")
-@@ -800,6 +801,7 @@ def checkPyQtImport4():
-             import ui5.setupdialog
-         except ImportError:
-             log.debug('GUI not available.')
-+            log.error('hplip-gui not installed. GUI not available.')
-             return False
- 
-     return True

hplip-find-driver.patch

@@ -1,163 +0,0 @@
-diff --git a/prnt/cups.py b/prnt/cups.py
-index a9f410a..3783a60 100644
---- a/prnt/cups.py
-+++ b/prnt/cups.py
-@@ -489,78 +489,77 @@ def getPPDFile2(mq,model, ppds): # New PPD find
-     #Check if common ppd name is already given in models.dat(This is needed because in case of devices having more than one derivatives
-     #will have diffrent model name strings in device ID, because of which we don't get the common ppd name for search)
-     family_check=isfamilydrv(ppds)
--    family_class=getFamilyClassName(model)
-+
-     model = models.normalizeModelName(model)
--    if family_check==0:
--       ppd_name = mq.get('ppd-name',0)
--    else:
--       ppd_name = mq.get('family-ppd',0)
- 
--    if ppd_name == 0:
--        stripped_model = stripModel2(model)
--    else:
--        stripped_model = stripModel2(ppd_name)
-+    ppd_name = mq.get('{}'.format('family-ppd' if family_check else 'ppd-name'), 0)
-+
-+    stripped_model = stripModel2(ppd_name) if ppd_name else stripModel2(model)
-+
-+    wanted_model = getFamilyClassName(model) if family_check else stripped_model
- 
-     log.debug("Matching PPD list to model  %s..." % stripped_model)
- 
-     matches = []
--    if family_check ==0 :
--        for f in ppds:
--            match = ppd_pat.match(f)
--            if match is not None:  
--                if match.group(1) == stripped_model:
--                    log.debug("Found match: %s" % f)
--                    try:
--                       pdls = match.group(2).split('-')
--                    except AttributeError:
--                         pdls = []
--                    if (prop.hpcups_build and 'hpijs' not in f) or \
--                        ((prop.hpijs_build and 'hpijs' in pdls) or (prop.hpcups_build and 'hpijs' not in pdls)) or \
--                         ('ps' in pdls) or ('pdf' in pdls):
--                          matches.append((f, [p for p in pdls if p and p != 'hpijs']))  
--    else:
--        for f in ppds:
--            match = ppd_pat1.match(f)
--            if match is not None: 
--                if match.group(1) == family_class:
--                    log.debug("Found match: %s" % f)
--                    try:
--                       pdls = match.group(2).split('-')
--                    except AttributeError:
--                         pdls = []
--                    if (prop.hpcups_build and 'hpijs' not in f) or \
--                        ((prop.hpijs_build and 'hpijs' in pdls) or (prop.hpcups_build and 'hpijs' not in pdls)) or \
--                         ('ps' in pdls) or ('pdf' in pdls):
--                          matches.append((f, [p for p in pdls if p and p != 'hpijs']))    
--    log.debug(matches)
--    num_matches = len(matches)
-+    for f in ppds:
-+        # ignore foomatic and gutenprint drivers
-+        if 'foomatic' in f or 'gutenprint' in f:
-+            continue
-+
-+        # see if driver type is in driver name
-+        driver_types = []
-+        if 'hpcups' in f:
-+            driver_types.append('hpcups')
-+        if 'hpijs' in f:
-+            driver_types.append('hpijs')
-+
-+
-+        ppd_filename = f.rsplit('/', 1)[1].split('.')[0].replace('hp-', '')
-+
-+        if not ppd_filename:
-+            continue
-+
-+        # we need to sanitize the end of filename - there can be a driver type (-hpijs, -hpcups),
-+        # pdl name (-zjstream, -pdf, -ps etc.) or the device can just have '-' in their name
-+        # (HP Photosmart Premium C309g-m).
-+        # So if we don't know the name after '-', take it as part of device name.
-+        # If we know them either like driver type of PDL, remove the string from ppd name
-+        # so we can compare it with stripped model
-+        pdl_candidates = []
-+        pdl_candidates = ppd_filename.split('-')[1:]
-+
-+        pdls = []
-+        ppd_model = ppd_filename
-+
-+        for pdl in pdl_candidates:
-+            if pdl in ['hpijs', 'hpcups']:
-+                ppd_model=ppd_model.replace('-{}'.format(pdl), '')
-+                continue
- 
--    if num_matches == 0:
--        log.debug("No PPD found for model %s using new algorithm. Trying old algorithm..." % stripped_model)
--        #Using Old algo, ignores the series keyword in ppd searching.
--        matches2 = list(getPPDFile(stripModel(stripped_model), ppds).items())
--        log.debug(matches2)
--        num_matches2 = len(matches2)
--        if num_matches2:
--            for f, d in matches2:
--                match = ppd_pat.match(f)
--                if match is not None:
--                    log.debug("Found match: %s" % f)
--                    try:
--                        pdls = match.group(2).split('-')
--                    except AttributeError:
--                        pdls = []
-+            if not models.PDL_TYPES.get(pdl):
-+                log.debug('Unknown PDL named \'{}\' - can be a new PDL or '
-+                          'just a part of device name. Assume it is '
-+                          'a part of device name.'.format(pdl))
-+            else:
-+                pdls.append(pdl)
-+                ppd_model=ppd_model.replace('-{}'.format(pdl), '')
-+
-+        if ppd_model != wanted_model and ppd_model != '{}_series'.format(wanted_model):
-+            continue
-+
-+        log.debug("Found match: %s" % f)
- 
--                    if (prop.hpcups_build and 'hpijs' not in f) or \
--                       ((prop.hpijs_build and 'hpijs' in pdls) or (prop.hpcups_build and 'hpijs' not in pdls)) or \
--                       ('ps' in pdls) or ('pdf' in pdls):
--                        matches.append((f, [p for p in pdls if p and p != 'hpijs']))
-+        if (prop.hpcups_build and 'hpijs' not in f) or \
-+            ((prop.hpijs_build and 'hpijs' in driver_types) or (prop.hpcups_build and 'hpijs' not in driver_types)) or \
-+            ('ps' in pdls) or ('pdf' in pdls):
-+            matches.append((f, pdls, [d for d in driver_types if d and d != 'hpijs']))
- 
--        log.debug(matches)
--        num_matches = len(matches)
-+
-+    log.debug(matches)
-+    num_matches = len(matches)
- 
-     if num_matches == 0:
--        log.error("No PPD found for model %s using old algorithm." % stripModel(stripped_model))
-+        log.error("No PPD found for model %s." % stripModel(stripped_model))
-         return None
- 
-     elif num_matches == 1:
-@@ -570,7 +569,7 @@ def getPPDFile2(mq,model, ppds): # New PPD find
-     # > 1
-     log.debug("%d matches found. Searching based on PDL: Host > PS,PDF > PCL/Other" % num_matches)
-     for p in [models.PDL_TYPE_HOST, models.PDL_TYPE_PS,models.PDL_TYPE_PDF, models.PDL_TYPE_PCL]:
--        for f, pdl_list in matches:
-+        for f, pdl_list, driver_list in matches:
-             for x in pdl_list:
-                 # default to HOST-based PDLs, as newly supported PDLs will most likely be of this type
-                 if models.PDL_TYPES.get(x, models.PDL_TYPE_HOST) == p:
-@@ -579,8 +578,8 @@ def getPPDFile2(mq,model, ppds): # New PPD find
- 
-     log.debug("%d matches found. Searching based on Filters: HPCUPS > HPIJS" % num_matches)
-     for p in ["hpcups","hpijs"]:
--        for f, pdl_list in matches:
--            if p in f:
-+        for f, pdl_list, driver_list in matches:
-+            if p in driver_list:
-                 log.debug("Selecting PPD: %s" % (f))
-                 return (f, '')
- 

hplip-fix-Wreturn-type-warning.patch

@@ -1,100 +0,0 @@
---- hplip-3.20.3/scan/sane/hpaio.c.orig	2020-03-25 01:24:15.558732638 +0000
-+++ hplip-3.20.3/scan/sane/hpaio.c	2020-03-25 02:48:36.097054366 +0000
-@@ -406,20 +406,34 @@ extern SANE_Status sane_hpaio_open(SANE_
- 
- extern void sane_hpaio_close(SANE_Handle handle)
- {
--    if (strcmp(*((char **)handle), "MARVELL") == 0)
--       return marvell_close(handle);
--    if (strcmp(*((char **)handle), "SOAP") == 0)
--       return soap_close(handle);
--    if (strcmp(*((char **)handle), "SOAPHT") == 0)
--       return soapht_close(handle);
--    if (strcmp(*((char **)handle), "LEDM") == 0)
--       return ledm_close(handle);
--    if (strcmp(*((char **)handle), "SCL-PML") == 0)
--       return sclpml_close(handle);
--    if (strcmp(*((char **)handle), "ESCL") == 0)
--       return escl_close(handle);
--    if (strcmp(*((char **)handle), "ORBLITE") == 0)
--       return orblite_close(handle);
-+    if (strcmp(*((char **)handle), "MARVELL") == 0) {
-+       marvell_close(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "SOAP") == 0) {
-+       soap_close(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "SOAPHT") == 0) {
-+       soapht_close(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "LEDM") == 0) {
-+       ledm_close(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "SCL-PML") == 0) {
-+       sclpml_close(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "ESCL") == 0) {
-+       escl_close(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "ORBLITE") == 0) {
-+       orblite_close(handle);
-+       return;
-+    }
- }  /* sane_hpaio_close() */
- 
- extern const SANE_Option_Descriptor * sane_hpaio_get_option_descriptor(SANE_Handle handle, SANE_Int option)
-@@ -539,20 +553,34 @@ extern SANE_Status sane_hpaio_read(SANE_
- /* Note, sane_cancel is called normally not just during IO abort situations. */
- extern void sane_hpaio_cancel( SANE_Handle handle )
- {
--    if (strcmp(*((char **)handle), "MARVELL") == 0)
--       return marvell_cancel(handle);
--    if (strcmp(*((char **)handle), "SOAP") == 0)
--       return soap_cancel(handle);
--    if (strcmp(*((char **)handle), "SOAPHT") == 0)
--       return soapht_cancel(handle);
--    if (strcmp(*((char **)handle), "LEDM") == 0)
--       return ledm_cancel(handle);
--    if (strcmp(*((char **)handle), "SCL-PML") == 0)
--       return sclpml_cancel(handle);
--    if (strcmp(*((char **)handle), "ESCL") == 0)
--       return escl_cancel(handle);
--    if (strcmp(*((char **)handle), "ORBLITE") == 0)
--       return orblite_cancel(handle);
-+    if (strcmp(*((char **)handle), "MARVELL") == 0) {
-+       marvell_cancel(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "SOAP") == 0) {
-+       soap_cancel(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "SOAPHT") == 0) {
-+       soapht_cancel(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "LEDM") == 0) {
-+       ledm_cancel(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "SCL-PML") == 0) {
-+       sclpml_cancel(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "ESCL") == 0) {
-+       escl_cancel(handle);
-+       return;
-+    }
-+    if (strcmp(*((char **)handle), "ORBLITE") == 0) {
-+       orblite_cancel(handle);
-+       return;
-+    }
- }  /* sane_hpaio_cancel() */
- 
- extern SANE_Status sane_hpaio_set_io_mode(SANE_Handle handle, SANE_Bool nonBlocking)

hplip-fix-parsing-lpstat.patch

@@ -1,13 +0,0 @@
-diff --git a/base/queues.py b/base/queues.py
-index 2f56c8a..0818574 100755
---- a/base/queues.py
-+++ b/base/queues.py
-@@ -101,7 +101,7 @@ def parseQueues(mode):
-             try:
-                 match = LPSTAT_PATTERN.search(p)
-                 printer_name = match.group(1)
--                device_uri = match.group(2)
-+                device_uri = match.group(3)
-                 cups_printers.append((printer_name, device_uri))
-             except AttributeError:
-                 pass

hplip-format-qdatetime.patch

@@ -1,53 +0,0 @@
-From 839a216f17ce17a5667eecd54de2a70b1383df2c Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Wed, 5 Jan 2022 21:57:06 -0500
-Subject: [PATCH 1/2] Info dlg: Use QDateTime.toString()
-
----
- ui5/infodialog.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui5/infodialog.py b/ui5/infodialog.py
-index 0de62fb..eaa846d 100644
---- a/ui5/infodialog.py
-+++ b/ui5/infodialog.py
-@@ -186,7 +186,7 @@ class InfoDialog(QDialog, Ui_Dialog):
-         for row, h in enumerate(history):
-             dt = QDateTime()
-             dt.setTime_t(int(h.timedate))
--            dt = value_str(dt)
-+            dt = value_str(dt.toString())
- 
-             ess = device.queryString(h.event_code, 0)
- 
--- 
-2.33.1
-
-From f6e7ab1542afe7fbcd2d29b6cb15b97484e3779c Mon Sep 17 00:00:00 2001
-From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
-Date: Wed, 5 Jan 2022 21:56:39 -0500
-Subject: [PATCH 2/2] value_str: Handle QDateTime correctly
-
----
- ui5/ui_utils.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/ui5/ui_utils.py b/ui5/ui_utils.py
-index caba339..225ca1c 100644
---- a/ui5/ui_utils.py
-+++ b/ui5/ui_utils.py
-@@ -105,7 +105,10 @@ def value_str(data):
-     if data is None:
-         return ""
-     try:
--        if not PY3:
-+        if PY3:
-+            if isinstance(data, QDateTime):
-+                data = data.toString()
-+        else:
-             try:
-                 data = data.toString()
-             except AttributeError as e:
--- 
-2.33.1
-

hplip-gcc15-stdc23.patch

@@ -1,13 +0,0 @@
-diff --git a/scan/sane/ledmi.h b/scan/sane/ledmi.h
-index a987c5d..f72847b 100644
---- a/scan/sane/ledmi.h
-+++ b/scan/sane/ledmi.h
-@@ -162,7 +162,7 @@ struct ledm_session
- int bb_open(struct ledm_session*);
- int bb_close(struct ledm_session*);
- int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int);
--int bb_is_paper_in_adf();         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
-+int bb_is_paper_in_adf(struct ledm_session*);         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
- SANE_Status bb_start_scan(struct ledm_session*);
- int bb_get_image_data(struct ledm_session*, int); 
- int bb_end_page(struct ledm_session*, int);

hplip-gpgdir-perms.patch

@@ -1,13 +0,0 @@
-diff --git a/base/validation.py b/base/validation.py
-index 96e65be..35f22eb 100644
---- a/base/validation.py
-+++ b/base/validation.py
-@@ -58,7 +58,7 @@ class GPG_Verification(DigiSign_Verification):
- 
-         if not os.path.exists(self.__gpg_dir):
-             try:
--                os.mkdir(self.__gpg_dir, 0o755)
-+                os.mkdir(self.__gpg_dir, 0o700)
-             except OSError:
-                 log.error("Failed to create %s" % self.__gpg_dir)
-         self.__change_owner()

hplip-gui-close-trace.patch

@@ -1,24 +0,0 @@
-diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
-index 79f8fa8..28a77b3 100644
---- a/ui5/devmgr5.py
-+++ b/ui5/devmgr5.py
-@@ -816,6 +816,9 @@ class DevMgr5(Ui_MainWindow_Derived, Ui_MainWindow, QMainWindow):
- 
- 
-     def updateWindowTitle(self):
-+        if self.cur_device is None or self.cur_device_uri is None:
-+            return
-+
-         if self.cur_device.device_type == DEVICE_TYPE_FAX:
-                 self.setWindowTitle(self.__tr("HP Device Manager - %s (Fax)"%self.cur_device.model_ui))
-         else:
-@@ -1876,6 +1879,9 @@ class DevMgr5(Ui_MainWindow_Derived, Ui_MainWindow, QMainWindow):
- 
- 
-     def updatePrintControlTab(self):
-+        if self.cur_device is None or self.cur_printer is None:
-+            return
-+
-         if self.cur_device.device_type == DEVICE_TYPE_PRINTER:
-             self.PrintControlPrinterNameLabel.setText(self.__tr("Printer Name:"))
-             self.groupBox.setTitle(QApplication.translate("MainWindow", "Printer Queue Control", None))

hplip-hpaio-gcc14.patch

@@ -1,114 +0,0 @@
-diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c
-index 57d1dde..3475929 100644
---- a/scan/sane/hpaio.c
-+++ b/scan/sane/hpaio.c
-@@ -379,7 +379,7 @@ extern SANE_Status sane_hpaio_get_devices(const SANE_Device ***deviceList, SANE_
-    ResetDeviceList(&DeviceList);
-    DevDiscovery(localOnly);
-    *deviceList = (const SANE_Device **)DeviceList;
--   SANE_Device*** devList;
-+   const SANE_Device*** devList;
-    orblite_get_devices(devList, localOnly);
- 
-    return SANE_STATUS_GOOD;
-diff --git a/scan/sane/orblite.c b/scan/sane/orblite.c
-index 2eb7aba..4eaa468 100644
---- a/scan/sane/orblite.c
-+++ b/scan/sane/orblite.c
-@@ -64,28 +64,28 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
- 		SANE_NAME_SCAN_TL_X, SANE_TITLE_SCAN_TL_X, SANE_DESC_SCAN_TL_X,  // name, title, desc
- 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeLeft  // constraint_type, constraint
-+		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeLeft  // constraint_type, constraint
- 	},
- 
- 	{
- 		SANE_NAME_SCAN_TL_Y, SANE_TITLE_SCAN_TL_Y, SANE_DESC_SCAN_TL_Y,  // name, title, desc
- 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeTop  // constraint_type, constraint
-+		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeTop  // constraint_type, constraint
- 	},
-   
- 	{
- 		SANE_NAME_SCAN_BR_X, SANE_TITLE_SCAN_BR_X, SANE_DESC_SCAN_BR_X,  // name, title, desc
- 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeRight  // constraint_type, constraint
-+		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeRight  // constraint_type, constraint
- 	},
- 
- 	{
- 		SANE_NAME_SCAN_BR_Y, SANE_TITLE_SCAN_BR_Y, SANE_DESC_SCAN_BR_Y,  // name, title, desc
- 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeBottom  // constraint_type, constraint
-+		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeBottom  // constraint_type, constraint
- 	},
-    
- 	// optResolution,                                       // resolution group  
-@@ -93,7 +93,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
- 		SANE_NAME_SCAN_RESOLUTION, SANE_TITLE_SCAN_RESOLUTION, SANE_DESC_SCAN_RESOLUTION, // name, title, desc
- 		SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word),  // type, unit, size,
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
-+		SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
- 	},
- 
- 	// optMode,                                            // color/depth group
-@@ -101,7 +101,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
- 		SANE_NAME_SCAN_MODE, SANE_TITLE_SCAN_MODE, SANE_DESC_SCAN_MODE, // name, title, desc
- 		SANE_TYPE_STRING, SANE_UNIT_NONE, 256,  // type, unit, size,
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_modes   // constraint type, constraint
-+		SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_modes   // constraint type, constraint
- 	},
-  
- 	// optSource, 
-@@ -109,7 +109,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
- 		SANE_NAME_SCAN_SOURCE, SANE_TITLE_SCAN_SOURCE, SANE_DESC_SCAN_SOURCE, // name, title, desc
- 		SANE_TYPE_STRING, SANE_UNIT_NONE, 256,  // type, unit, size,
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_sources   // constraint type, constraint
-+		SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_sources   // constraint type, constraint
- 	},
-  
- 	// optPaperSize, 
-@@ -117,7 +117,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
- 		SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
- 		SANE_TYPE_STRING, SANE_UNIT_NONE, 256,  // type, unit, size,
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_paper_sizes   // constraint type, constraint
-+		SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_paper_sizes   // constraint type, constraint
- 	},
-  
- 	// optPaperSize, 
-@@ -125,7 +125,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
- 		SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
- 		SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word),  // type, unit, size,
- 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
--		SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
-+		SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
- 	},
- #ifdef NOTDEF
- // default template
-@@ -274,6 +274,7 @@ orblite_open (SANE_String_Const devicename, SANE_Handle * handle)
- 	SANE_Auth_Callback authorize;
- 	const SANE_Device *** device_list;
- 	SANE_Bool local_only;
-+	void * temp_handle;
- 	
- 	
- 	// Allocate handle, set all handle values to zero
-@@ -305,7 +306,9 @@ orblite_open (SANE_String_Const devicename, SANE_Handle * handle)
- 	if (stat != SANE_STATUS_GOOD)
- 		return stat;
- 
--	stat = g_handle->bb_orblite_open(devicename, &g_handle);
-+	temp_handle = g_handle;
-+	stat = g_handle->bb_orblite_open(devicename, &temp_handle);
-+	g_handle = temp_handle;
- 	if (stat == SANE_STATUS_GOOD)
- 		*handle = g_handle;
- 

hplip-hpfax-importerror-print.patch

@@ -1,10 +1,16 @@
+commit cdf5cb36e5d5a86f6a690c5861666cdc2da70593
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Wed Sep 19 15:33:03 2018 +0200
+
+    Fix TypeError in hpfax
+
 diff --git a/fax/backend/hpfax.py b/fax/backend/hpfax.py
-index a63051d..3e187c9 100755
+index 9560e84..bc0912a 100755
 --- a/fax/backend/hpfax.py
 +++ b/fax/backend/hpfax.py
 @@ -89,7 +89,7 @@ try:
      from base import utils
-     #from prnt import cups
+     from prnt import cups
  except ImportError as e:
 -    bug("Error importing HPLIP modules: %s\n" % (pid, e))
 +    bug("Error importing HPLIP modules: %s\n" % (e))

hplip-hpfirmware-timeout.patch

@@ -1,24 +0,0 @@
-diff --git a/config_usb_printer.py b/config_usb_printer.py
-index 946a2d4..8db097e 100755
---- a/config_usb_printer.py
-+++ b/config_usb_printer.py
-@@ -28,6 +28,7 @@ __doc__ = "Udev invokes this tool. Tool detects the plugin, Smart Install (C/DVD
- # Std Lib
- import sys
- import os
-+import time
- 
- # Local
- from base.g import *
-@@ -181,9 +182,10 @@ try:
-        # ******************************* RUNNING FIRMWARE DOWNLOAD TO DEVICE FOR SUPPORTED PRINTER'S
-        fw_download_req = mq.get('fw-download', False)
-        if fw_download_req:
--           fw_cmd = "hp-firmware -y3 -s %s"%param
-+           fw_cmd = "hp-firmware -n -y3 -s %s"%param
-            log.info(fw_cmd)
-            fw_sts, fw_out = utils.run(fw_cmd)
-+           time.sleep(5)
-            if fw_sts == 0:
-                log.debug("Firmware downloaded to %s "%device_uri)
-            else:

hplip-hpsetup-noscanjets.patch

@@ -1,46 +0,0 @@
-diff -up hplip-3.23.3/setup.py.hpsetup-noscanjets hplip-3.23.3/setup.py
---- hplip-3.23.3/setup.py.hpsetup-noscanjets	2023-05-29 14:16:26.148133678 +0200
-+++ hplip-3.23.3/setup.py	2023-05-29 14:16:26.220133253 +0200
-@@ -399,9 +399,19 @@ else: # INTERACTIVE_MODE
-             #log.warning("Cannot setup fax - device does not have fax feature.")
-             setup_fax = False
- 
-+        norm_model = models.normalizeModelName(model).lower()
-+
-+        # get out if the found model is standalone scanner, hp-setup is printer/fax setup tool
-+        if 'scanjet' in norm_model:
-+            log.error('The device {} is a standalone scanner. '
-+                      'hp-setup is a printer/MFD setup tool, '
-+                      'not scanner installation tool. '.format(model))
-+            log.info(log.bold('Scanners do not need a installation, but they may '
-+                              'require a binary plugin (install by \'hp-plugin -i\').'))
-+            clean_exit(1)
-+
-         # ******************************* PLUGIN
- 
--        norm_model = models.normalizeModelName(model).lower()
-         plugin = mq.get('plugin', PLUGIN_NONE)
- 
-         if ignore_plugin_check is False and plugin > PLUGIN_NONE:
-diff -up hplip-3.23.3/ui5/setupdialog.py.hpsetup-noscanjets hplip-3.23.3/ui5/setupdialog.py
---- hplip-3.23.3/ui5/setupdialog.py.hpsetup-noscanjets	2023-05-29 14:16:26.220133253 +0200
-+++ hplip-3.23.3/ui5/setupdialog.py	2023-05-29 14:18:12.475041454 +0200
-@@ -1391,6 +1391,18 @@ class SetupDialog(QDialog, Ui_Dialog):
-             back_end, is_hp, bus, model, serial, dev_file, host, zc, port = device.parseDeviceURI(
-                 self.device_uri)
-             self.model = models.normalizeModelName(model).lower()
-+            if 'scanjet' in self.model:
-+                FailureUI(self,
-+                          self.__tr('<b>The device {} is a standalone '
-+                                    'scanner.</b> <p>\'hp-setup\' is a tool '
-+                                    'for installing printers and multifunction '
-+                                    'devices. Scanners supported by HPLIP '
-+                                    'work out-of-the-box after HPLIP installation, '
-+                                    'or they may require a binary plugin, which you '
-+                                    'can install by \'hp-plugin -i\'.</p>'.format(model)))
-+                self.displayPage(PAGE_DEVICES)
-+                return
-+
-             self.showAddPrinterPage()
- 
-         elif p == PAGE_ADD_PRINTER:

hplip-keyserver.patch

@@ -1,12 +1,12 @@
-diff --git a/base/tui.py b/base/tui.py
-index 99bda7b..0f90f92 100644
---- a/base/tui.py
-+++ b/base/tui.py
-@@ -241,6 +241,7 @@ class ProgressMeter(object):
-         sys.stdout.write(y)
+diff -up hplip-3.18.6/base/validation.py.keyserver hplip-3.18.6/base/validation.py
+--- hplip-3.18.6/base/validation.py.keyserver	2018-11-13 17:35:38.085322569 +0100
++++ hplip-3.18.6/base/validation.py	2018-11-13 17:36:18.026991983 +0100
+@@ -42,7 +42,7 @@ class DigiSign_Verification(object):
  
-         sys.stdout.flush()
-+        sys.stdout.write('\n')
-         self.prev_length = len(y)
-         self.spinner_pos = (self.spinner_pos + 1) % 8
  
+ class GPG_Verification(DigiSign_Verification):
+-    def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
++    def __init__(self, pgp_site = 'pool.sks-keyservers.net', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
+         self.__pgp_site = pgp_site
+         self.__key = key
+         self.__gpg = utils.which('gpg',True)

hplip-lineart.patch

@@ -0,0 +1,14 @@
+diff -up hplip-3.14.6/scan.py.lineart hplip-3.14.6/scan.py
+--- hplip-3.14.6/scan.py.lineart	2014-07-23 12:30:52.361517852 +0100
++++ hplip-3.14.6/scan.py	2014-07-23 12:32:17.052940000 +0100
+@@ -977,8 +977,8 @@ try:
+                         try:
+                             pixels_per_line = bytes_per_line * 8          # Calculation of pixels_per_line for Lineart must be 8 time of bytes_per_line
+                                                                           # Otherwise, scanned image will be corrupted (slanted)
+-                            im = Image.frombuffer('RGBA', (pixels_per_line, lines), buffer.read(),
+-                                'raw', 'RGBA', 0, 1).convert('L')
++                            im = Image.frombuffer('1', (pixels_per_line, lines), buffer.read(),
++                                'raw', '1', 0, 1).convert('L')
+                         except ValueError:
+                             log.error("Did not read enough data from scanner (I/O Error?)")
+                             sys.exit(1)

hplip-locale-format.patch

@@ -1,13 +0,0 @@
-diff --git a/base/utils.py b/base/utils.py
-index e2de550..55848b8 100644
---- a/base/utils.py
-+++ b/base/utils.py
-@@ -474,7 +474,7 @@ def sort_dict_by_value(d):
- 
- 
- def commafy(val):
--    return locale.format("%s", val, grouping=True)
-+    return locale.format_string("%s", val, grouping=True)
- 
- 
- def format_bytes(s, show_bytes=False):

hplip-logdir.patch

@@ -1,18 +1,18 @@
-diff -up hplip-3.21.12/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.21.12/prnt/hpcups/HPCupsFilter.cpp
---- hplip-3.21.12/prnt/hpcups/HPCupsFilter.cpp.logdir	2022-01-12 11:27:25.509348511 +0100
-+++ hplip-3.21.12/prnt/hpcups/HPCupsFilter.cpp	2022-01-12 11:29:11.507661838 +0100
-@@ -669,7 +669,7 @@ int HPCupsFilter::processRasterData(cups
+diff -up hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp.logdir	2019-01-08 12:31:15.346315031 +0100
++++ hplip-3.18.12/prnt/hpcups/HPCupsFilter.cpp	2019-01-08 12:47:42.314131260 +0100
+@@ -643,7 +643,7 @@ int HPCupsFilter::processRasterData(cups
      char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages.
  
  
 -    sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
 +    snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
-     #ifndef DISABLE_IMAGEPROCESSOR 
- 	    image_processor_t* imageProcessor=NULL;
- 	    IMAGE_PROCESSOR_ERROR result;
-diff -up hplip-3.21.12/prnt/hpcups/SystemServices.cpp.logdir hplip-3.21.12/prnt/hpcups/SystemServices.cpp
---- hplip-3.21.12/prnt/hpcups/SystemServices.cpp.logdir	2021-12-13 10:07:36.000000000 +0100
-+++ hplip-3.21.12/prnt/hpcups/SystemServices.cpp	2022-01-12 11:27:25.509348511 +0100
+     image_processor_t* imageProcessor = imageProcessorCreate();
+ 
+     while (cupsRasterReadHeader2(cups_raster, &cups_header))
+diff -up hplip-3.18.12/prnt/hpcups/SystemServices.cpp.logdir hplip-3.18.12/prnt/hpcups/SystemServices.cpp
+--- hplip-3.18.12/prnt/hpcups/SystemServices.cpp.logdir	2018-12-03 08:07:13.000000000 +0100
++++ hplip-3.18.12/prnt/hpcups/SystemServices.cpp	2019-01-08 12:31:15.346315031 +0100
 @@ -38,7 +38,7 @@ SystemServices::SystemServices(int iLogL
      if (iLogLevel & SAVE_OUT_FILE)
      {

hplip-logging-segfault.patch

@@ -1,13 +0,0 @@
-diff --git a/io/hpmud/musb.c b/io/hpmud/musb.c
-index 755493e..6d9c7fc 100644
---- a/io/hpmud/musb.c
-+++ b/io/hpmud/musb.c
-@@ -1454,7 +1454,7 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_write
-                     BUG("unable to write data %s: %d second io timeout\n", msp->device[pc->dindex].uri, sec_timeout);
-             }
-             else
--                BUG("unable to write data (len = %d) %s: %m\n", msp->device[pc->dindex].uri, len);
-+                BUG("unable to write data (len = %d) %s: %m\n", len, msp->device[pc->dindex].uri);
-             goto bugout;
-         }
- 		if(len == 0 && size > 0)

hplip-missing-drivers.patch

@@ -1,602 +0,0 @@
-diff -up hplip-3.22.2/cups_drv.inc.missing-drivers hplip-3.22.2/cups_drv.inc
---- hplip-3.22.2/cups_drv.inc.missing-drivers	2022-02-23 08:42:29.000000000 +0100
-+++ hplip-3.22.2/cups_drv.inc	2022-03-10 09:11:00.337315604 +0100
-@@ -411,6 +411,7 @@ cups_ppd_printers = \
-    ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
-    ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
-    ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
-+   ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
-    ppd/hpcups/hp-laserjet_m1005.ppd.gz \
-    ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
-    ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
-@@ -527,6 +528,7 @@ cups_ppd_printers = \
-    ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
-    ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
-    ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
-+   ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
-    ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
-    ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
-    ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
-diff -up hplip-3.22.2/data/models/models.dat.missing-drivers hplip-3.22.2/data/models/models.dat
---- hplip-3.22.2/data/models/models.dat.missing-drivers	2022-03-10 09:10:13.601066235 +0100
-+++ hplip-3.22.2/data/models/models.dat	2022-03-10 09:10:13.622066347 +0100
-@@ -2104,7 +2104,7 @@ usb-pid=411
- usb-vid=3f0
- wifi-config=0
- 
--[hp_laserjet_100_colormfp_m175]
-+[hp_laserjet_100_colormfp_m175nw]
- align-type=0
- clean-type=0
- color-cal-type=0
-@@ -2119,14 +2119,6 @@ io-support=14
- job-storage=0
- linefeed-cal-type=0
- model1=HP LaserJet 100 Color MFP M175
--model2=HP LaserJet 100 Color MFP M175a
--model3=HP LaserJet 100 Color MFP M175b
--model4=HP LaserJet 100 Color MFP M175c
--model5=HP LaserJet 100 Color MFP M175e
--model6=HP LaserJet 100 Color MFP M175nw
--model7=HP LaserJet 100 Color MFP M175p
--model8=HP LaserJet 100 Color MFP M175q
--model9=HP LaserJet 100 Color MFP M175r
- ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
- monitor-type=0
- panel-check-type=0
-@@ -2165,6 +2157,378 @@ usb-pid=62a
- usb-vid=3f0
- wifi-config=3
- 
-+[hp_laserjet_100_colormfp_m175r]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=3
-+io-mode=1
-+io-support=14
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet 100 Color MFP M175
-+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.11.7
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=62a
-+usb-vid=3f0
-+wifi-config=3
-+
-+[hp_laserjet_100_colormfp_m175q]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=3
-+io-mode=1
-+io-support=14
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet 100 Color MFP M175
-+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.11.7
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=62a
-+usb-vid=3f0
-+wifi-config=3
-+
-+[hp_laserjet_100_colormfp_m175p]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=3
-+io-mode=1
-+io-support=14
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet 100 Color MFP M175
-+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.11.7
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=62a
-+usb-vid=3f0
-+wifi-config=3
-+
-+[hp_laserjet_100_colormfp_m175e]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=3
-+io-mode=1
-+io-support=2
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet 100 Color MFP M175
-+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.11.7
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=62a
-+usb-vid=3f0
-+wifi-config=-1
-+
-+[hp_laserjet_100_colormfp_m175a]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
-+family-ppd=hp-postscript-laserjet-pro.ppd
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=3
-+io-mode=1
-+io-support=2
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet 100 Color MFP M175
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.11.7
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=62a
-+usb-vid=3f0
-+wifi-config=-1
-+
-+[hp_laserjet_100_colormfp_m175c]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=3
-+io-mode=1
-+io-support=2
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet 100 Color MFP M175
-+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.11.7
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=62a
-+usb-vid=3f0
-+wifi-config=-1
-+
-+[hp_laserjet_100_colormfp_m175b]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cm1312_mfp.png
-+io-mfp-mode=3
-+io-mode=1
-+io-support=2
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet 100 Color MFP M175
-+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=64
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=3
-+scan-type=5
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=10
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.11.7
-+tech-class=Postscript
-+family-class=Undefined
-+tech-subclass=Normal
-+tech-type=4
-+usb-pid=62a
-+usb-vid=3f0
-+wifi-config=-1
-+
- [officejet_100_mobile_l411]
- align-type=-1
- clean-type=1
-@@ -17867,6 +18231,58 @@ usb-pid=2c17
- usb-vid=3f0
- wifi-config=0
- 
-+[hp_laserjet_cp_1025nw]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=1
-+fax-type=0
-+fw-download=False
-+icon=hp_color_laserjet_cp2025.png
-+io-mfp-mode=1
-+io-mode=1
-+io-support=14
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet Pro CP 1025nw Color Printer Series
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=1
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=CE310A
-+r0-agent1-type=1
-+r0-agent2-kind=4
-+r0-agent2-sku=CE311A
-+r0-agent2-type=4
-+r0-agent3-kind=4
-+r0-agent3-sku=CE313A
-+r0-agent3-type=5
-+r0-agent4-kind=4
-+r0-agent4-sku=CE312A
-+r0-agent4-type=6
-+scan-src=0
-+scan-type=0
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=8
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.12.4
-+tech-class=LJZjsColor
-+family-class=LJ-Class4
-+tech-subclass=Advanced
-+tech-type=4
-+usb-pid=112a
-+usb-vid=3f0
-+wifi-config=3
-+
- [hp_laserjet_cp1025nw]
- align-type=0
- clean-type=0
-@@ -18468,6 +18884,49 @@ usb-pid=3011
- usb-vid=3f0
- wifi-config=0
- 
-+[hp_laserjet_professional_p1102w]
-+align-type=0
-+clean-type=0
-+color-cal-type=0
-+copy-type=0
-+embedded-server-type=0
-+fax-type=0
-+fw-download=False
-+icon=HP_LaserJet_1012.png
-+io-mfp-mode=6
-+io-mode=1
-+io-support=10
-+job-storage=0
-+linefeed-cal-type=0
-+model1=HP LaserJet Professional P1102w Printer
-+monitor-type=0
-+panel-check-type=0
-+pcard-type=0
-+plugin=1
-+plugin-reason=1
-+power-settings=0
-+pq-diag-type=0
-+r-type=0
-+r0-agent1-kind=4
-+r0-agent1-sku=85A
-+r0-agent1-type=1
-+scan-src=0
-+scan-type=0
-+status-battery-check=0
-+status-dynamic-counters=0
-+status-type=8
-+support-released=True
-+support-subtype=219b2b
-+support-type=2
-+support-ver=3.10.4
-+tech-class=LJZjsMono
-+family-class=LJ-Class4
-+tech-subclass=NoAutoDuplex
-+tech-type=3
-+usb-pid=32a
-+usb-vid=3f0
-+wifi-config=3
-+
- [hp_laserjet_professional_p1102]
- align-type=0
- clean-type=0
-diff -up hplip-3.22.2/Makefile.in.missing-drivers hplip-3.22.2/Makefile.in
---- hplip-3.22.2/Makefile.in.missing-drivers	2022-02-23 08:42:31.000000000 +0100
-+++ hplip-3.22.2/Makefile.in	2022-03-10 09:11:45.915558795 +0100
-@@ -1613,6 +1613,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase
- 	ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
- 	ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
- 	ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
-+	ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
- 	ppd/hpcups/hp-laserjet_m1005.ppd.gz \
- 	ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
- 	ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
-@@ -1729,6 +1730,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase
- 	ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
- 	ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
- 	ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
-+	ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
- 	ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
- 	ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
- 	ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
-@@ -4090,6 +4092,7 @@ dist_unrel_DATA =
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
-+@HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_m1005.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
-@@ -4206,6 +4209,7 @@ dist_unrel_DATA =
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
-+@HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
- @HPLIP_CLASS_DRIVER_FALSE@   ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
-diff -up hplip-3.22.2/prnt/drv/hpcups.drv.in.missing-drivers hplip-3.22.2/prnt/drv/hpcups.drv.in
---- hplip-3.22.2/prnt/drv/hpcups.drv.in.missing-drivers	2022-03-10 09:10:13.554065984 +0100
-+++ hplip-3.22.2/prnt/drv/hpcups.drv.in	2022-03-10 09:10:13.629066384 +0100
-@@ -22693,6 +22693,14 @@ Group "RLT/HP Real Life Technologies"
-       Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)"
-     }
-     {
-+      ModelName "HP LaserJet Professional p1102w"
-+      Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin"
-+      Attribute "ShortNickName" "" "HP LaserJet Professional p1102w hpijs"
-+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;"
-+      PCFileName "hp-laserjet_professional_p1102w.ppd"
-+      Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"
-+    }
-+    {
-       ModelName "HP LaserJet Professional p1106"
-       Attribute "NickName" "" "HP LaserJet Professional p1106, hpcups $Version"
-       Attribute "ShortNickName" "" "HP LJ Pro p1106 hpijs"
-@@ -23126,6 +23134,14 @@ Group "RLT/HP Real Life Technologies"
-       PCFileName "hp-laserjet_cp1025nw.ppd"
-       Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)"
-     }
-+    {
-+      ModelName "HP LaserJet Cp 1025nw"
-+      Attribute "NickName" "" "HP LaserJet Cp 1025nw, hpcups $Version, requires proprietary plugin"
-+      Attribute "ShortNickName" "" "HP LaserJet Cp 1025nw hpijs"
-+      Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp 1025nw;DES:hp laserjet cp 1025nw;"
-+      PCFileName "hp-laserjet_cp_1025nw.ppd"
-+      Attribute "Product" "" "(HP LaserJet Pro Cp 1025nw Color Printer Series)"
-+    }
-   }
- } // End LJZjsColor (for proprietary plugin)
- 

hplip-missing-links.patch

@@ -1,12 +1,22 @@
-diff -up hplip-3.21.12/installer/pluginhandler.py.missing-links hplip-3.21.12/installer/pluginhandler.py
---- hplip-3.21.12/installer/pluginhandler.py.missing-links	2022-01-12 16:55:39.761934879 +0100
-+++ hplip-3.21.12/installer/pluginhandler.py	2022-01-12 17:22:33.367435334 +0100
-@@ -167,7 +167,7 @@ class PluginHandle(object):
-                         continue
+diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py
+index 4d7c1b8..170cc1a 100755
+--- a/installer/pluginhandler.py
++++ b/installer/pluginhandler.py
+@@ -164,7 +164,16 @@ class PluginHandle(object):
+                 for src, trg, link in copies:
                      if link != "":
                          if not utils.check_library(link):
 -                            self.__plugin_state = PLUGIN_FILES_CORRUPTED
-+                            pass
++                            if (link != '/usr/lib/i386-linux-gnu/libjpeg.so.9' and
++                                link != '/usr/lib/x86_64-linux-gnu/libjpeg.so.9' and
++                                link != '/usr/lib64/x86_64-linux-gnu/libjpeg.so.9' and
++                                link != '/usr/lib/i386-linux-gnu/sane/libsane-hp2000S1.so' and
++                                link != '/usr/lib/i386-linux-gnu/sane/libsane-hp2000S1.so.1' and
++                                link != '/usr/lib/x86_64-linux-gnu/sane/libsane-hp2000S1.so' and
++                                link != '/usr/lib/x86_64-linux-gnu/sane/libsane-hp2000S1.so.1' and
++                                link != '/usr/lib64/x86_64-linux-gnu/sane/libsane-hp2000S1.so' and
++                                link != '/usr/lib64/x86_64-linux-gnu/sane/libsane-hp2000S1.so.1'):
++                                self.__plugin_state = PLUGIN_FILES_CORRUPTED
  
  
      def __getPluginInformation(self, callback=None):

hplip-model-mismatch.patch

@@ -1,64 +0,0 @@
-diff --git a/io/hpmud/jd.c b/io/hpmud/jd.c
-index 20df27a..7ed4918 100644
---- a/io/hpmud/jd.c
-+++ b/io/hpmud/jd.c
-@@ -208,7 +208,22 @@ enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_open(mud_device *pd
-    {
-        /* Make sure uri model matches device id model. */
-        hpmud_get_uri_model(pd->uri, uri_model, sizeof(uri_model));
-+
-+       /* remove possible hp_ string */
-+       if (strncasecmp(uri_model, "HP_", 3) == 0)
-+       {
-+         memmove(uri_model, uri_model + 3, 127);
-+         uri_model[127] = '\0';
-+       }
-+
-        hpmud_get_model(pd->id, model, sizeof(model));
-+       /* remove possible hp_ string */
-+       if (strncasecmp(model, "HP_", 3) == 0)
-+       {
-+         memmove(model, model + 3, 127);
-+         model[127] = '\0';
-+       }
-+
-        if (strcasecmp(uri_model, model) != 0)
-        {
-           stat = HPMUD_R_INVALID_URI;  /* different device plugged in */
-diff --git a/io/hpmud/model.c b/io/hpmud/model.c
-index d546ec1..adb3d87 100644
---- a/io/hpmud/model.c
-+++ b/io/hpmud/model.c
-@@ -407,7 +407,10 @@ static int ParseFile(char *datFile, char *model, char *attr, int attrSize, int *
-    char rcbuf[255];
-    char section[128];
-    char file[128];
--   int found=0, n;
-+   int found=0;
-+   size_t n;
-+
-+   size_t model_len = strlen(model);
- 
-    if ((fp = fopen(datFile, "r")) == NULL)
-       goto bugout;
-@@ -422,10 +425,17 @@ static int ParseFile(char *datFile, char *model, char *attr, int attrSize, int *
-          strncpy(section, rcbuf+1, sizeof(section)); /* found new section */
-          n = strlen(section);
-          section[n-2]=0; /* remove ']' and CR */
-+         n -= 2;
-          if (strcasecmp(model, section) == 0 ||
--            (section[0] == 'h' && section[1] == 'p' &&
--             section[2] == '_' &&
--             strcasecmp(model, section + 3) == 0))
-+             (section[0] == 'h' &&
-+              section[1] == 'p' &&
-+              section[2] == '_' &&
-+              strcasecmp(model, section + 3) == 0) ||
-+             (n > model_len &&
-+              strncasecmp(section, model, model_len) == 0 &&
-+              strncasecmp(section + model_len, "_series", strlen("_series")) == 0
-+             )
-+            )
-          {
-             /* Found model match. */
-             *bytes_read = ResolveAttributes(fp, attr, attrSize); 

hplip-no-libhpmud-libm-warnings.patch

@@ -1,108 +0,0 @@
-diff --git a/scan/sane/escl.c b/scan/sane/escl.c
-index 9fbbcaf..bc9e0b5 100644
---- a/scan/sane/escl.c
-+++ b/scan/sane/escl.c
-@@ -37,18 +37,12 @@ static int bb_load(struct escl_session *ps, const char *so)
-    int stat=1;
-    
-    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
--   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
--   {
--	   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
--           goto bugout;
--   }
-+	 if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
-+         goto bugout;
- 
-    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
--   if ((ps->math_handle = load_library("libm.so")) == NULL)
--   {
--      if ((ps->math_handle = load_library("libm.so.6")) == NULL)
--         goto bugout;
--   } 
-+   if ((ps->math_handle = load_library("libm.so.6")) == NULL)
-+      goto bugout;
-    if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL)
-    {
-       SendScanEvent(ps->uri, EVENT_PLUGIN_FAIL);
-diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c
-index 236f7c9..793104c 100644
---- a/scan/sane/marvell.c
-+++ b/scan/sane/marvell.c
-@@ -60,18 +60,12 @@ static int bb_load(struct marvell_session *ps, const char *so)
-    int stat=1;
- 
-    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
--   if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
--   {
--	   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
--           goto bugout;
--   }
-+	 if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
-+         goto bugout;
- 
-    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
--   if ((ps->math_handle = load_library("libm.so")) == NULL)
--   {
--      if ((ps->math_handle = load_library("libm.so.6")) == NULL)
--         goto bugout;
--   } 
-+   if ((ps->math_handle = load_library("libm.so.6")) == NULL)
-+      goto bugout;
- 
-    if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL)
-    {
-diff --git a/scan/sane/soap.c b/scan/sane/soap.c
-index 0d22e52..dcd8c7c 100644
---- a/scan/sane/soap.c
-+++ b/scan/sane/soap.c
-@@ -68,18 +68,12 @@ static int bb_load(struct soap_session *ps, const char *so)
-    int stat=1;
- 
-    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
--   if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
--   {
--	   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
--           goto bugout;
--   }
-+	 if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
-+         goto bugout;
- 
-    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
--   if ((ps->math_handle = load_library("libm.so")) == NULL)
--   {
--      if ((ps->math_handle = load_library("libm.so.6")) == NULL)
--         goto bugout;
--   } 
-+   if ((ps->math_handle = load_library("libm.so.6")) == NULL)
-+      goto bugout;
- 
-    if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL)
-    {
-diff --git a/scan/sane/soapht.c b/scan/sane/soapht.c
-index 139100d..74e8391 100644
---- a/scan/sane/soapht.c
-+++ b/scan/sane/soapht.c
-@@ -62,18 +62,12 @@ static int bb_load(struct soap_session *ps, const char *so)
-    int stat=1;
- 
-    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
--   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
--   {
--	   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
--           goto bugout;
--   }
-+	 if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
-+         goto bugout;
- 
-    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
--   if ((ps->math_handle = load_library("libm.so")) == NULL)
--   {
--      if ((ps->math_handle = load_library("libm.so.6")) == NULL)
--         goto bugout;
--   } 
-+   if ((ps->math_handle = load_library("libm.so.6")) == NULL)
-+      goto bugout;
- 
-    if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL)
-    {

hplip-no-urlopener.patch

@@ -1,79 +0,0 @@
-diff --git a/base/device.py b/base/device.py
-index 2fdb29c..ca0d97e 100644
---- a/base/device.py
-+++ b/base/device.py
-@@ -2526,9 +2526,9 @@ Content-length: %d\r
-                 data = None
- 
-             log.debug("Opening: %s" % url2)
--            opener = LocalOpener({})
-+            opener = LocalOpener()
-             try:
--                f = opener.open(url2, data)
-+                f = opener.open_hp(url2, data)
-                 
-             except Error:
-                 log.error("Status read failed: %s" % url2)
-@@ -2548,7 +2548,7 @@ Content-length: %d\r
-         try:
-             url2 = "%s&loc=%s" % (self.device_uri.replace('hpfax:', 'hp:'), url)
-             data = self
--            opener = LocalOpenerEWS_LEDM({})
-+            opener = LocalOpenerEWS_LEDM()
-             try:
-                 if footer:
-                     return opener.open_hp(url2, data, footer)
-@@ -2563,7 +2563,7 @@ Content-length: %d\r
-         try:
-             url2 = "%s&loc=%s" % (self.device_uri.replace('hpfax:', 'hp:'), url)
-             data = self
--            opener = LocalOpener_LEDM({})
-+            opener = LocalOpener_LEDM()
-             try:
-                 if footer:
-                     return opener.open_hp(url2, data, footer)
-@@ -2580,7 +2580,7 @@ Content-length: %d\r
-             url="/cdm/supply/v1/suppliesPublic"
-             url2 = "%s&loc=%s" % (self.device_uri.replace('hpfax:', 'hp:'), url)
-             data = self
--            opener = LocalOpener_CDM({})
-+            opener = LocalOpener_CDM()
-             try:
-                 if footer:
-                     return opener.open_hp(url2, data, footer)
-@@ -2688,7 +2688,7 @@ Content-length: %d\r
- 
- 
- # URLs: hp:/usb/HP_LaserJet_3050?serial=00XXXXXXXXXX&loc=/hp/device/info_device_status.xml
--class LocalOpener(urllib_request.URLopener):
-+class LocalOpener():
-     def open_hp(self, url, dev):
-         log.debug("open_hp(%s)" % url)
- 
-@@ -2718,7 +2718,7 @@ class LocalOpener(urllib_request.URLopener):
-             return response#.fp
- 
- # URLs: hp:/usb/HP_OfficeJet_7500?serial=00XXXXXXXXXX&loc=/hp/device/info_device_status.xml
--class LocalOpenerEWS_LEDM(urllib_request.URLopener):
-+class LocalOpenerEWS_LEDM():
-     def open_hp(self, url, dev, foot=""):
-         log.debug("open_hp(%s)" % url)
- 
-@@ -2744,7 +2744,7 @@ class LocalOpenerEWS_LEDM(urllib_request.URLopener):
- 
- 
- # URLs: hp:/usb/HP_OfficeJet_7500?serial=00XXXXXXXXXX&loc=/hp/device/info_device_status.xml
--class LocalOpener_LEDM(urllib_request.URLopener):
-+class LocalOpener_LEDM():
-     def open_hp(self, url, dev, foot=""):
-         log.debug("open_hp(%s)" % url)
- 
-@@ -2771,7 +2771,7 @@ class LocalOpener_LEDM(urllib_request.URLopener):
- 
- 
- # URLs: hp:/usb/HP_OfficeJet_7500?serial=00XXXXXXXXXX&loc=/hp/device/info_device_status.xml
--class LocalOpener_CDM(urllib_request.URLopener):
-+class LocalOpener_CDM():
-     def open_hp(self, url, dev, foot=""):
-         log.debug("open_hp(%s)" % url)
-         match_obj = http_pat_url.search(url)

hplip-noernie.patch

@@ -1,7 +1,7 @@
-diff -up hplip-3.23.3/Makefile.am.no-ernie hplip-3.23.3/Makefile.am
---- hplip-3.23.3/Makefile.am.no-ernie	2023-05-29 13:15:58.008610471 +0200
-+++ hplip-3.23.3/Makefile.am	2023-05-29 13:15:58.134609689 +0200
-@@ -562,7 +562,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
+diff -up hplip-3.17.4/Makefile.am.no-ernie hplip-3.17.4/Makefile.am
+--- hplip-3.17.4/Makefile.am.no-ernie	2017-04-26 16:28:35.398099978 +0200
++++ hplip-3.17.4/Makefile.am	2017-04-26 16:29:02.235879035 +0200
+@@ -519,7 +519,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
  	prnt/hpcups/Mode2.cpp prnt/hpcups/Mode2.h prnt/hpcups/Mode3.cpp prnt/hpcups/Mode3.h \
  	prnt/hpcups/Mode9.cpp prnt/hpcups/Mode9.h prnt/hpcups/Mode10.cpp prnt/hpcups/Mode10.h \
  	prnt/hpcups/ModeDeltaPlus.cpp prnt/hpcups/ModeDeltaPlus.h prnt/hpcups/ModeJbig.cpp prnt/hpcups/ModeJbig.h \
@@ -10,9 +10,9 @@ diff -up hplip-3.23.3/Makefile.am.no-ernie hplip-3.23.3/Makefile.am
  	prnt/hpcups/Encapsulator.cpp prnt/hpcups/Encapsulator.h prnt/hpcups/Pcl3.cpp prnt/hpcups/Pcl3.h \
  	prnt/hpcups/Pcl3Gui.cpp prnt/hpcups/Pcl3Gui.h prnt/hpcups/Pcl3Gui2.cpp prnt/hpcups/Pcl3Gui2.h \
  	prnt/hpcups/LJMono.cpp prnt/hpcups/LJMono.h prnt/hpcups/LJColor.cpp prnt/hpcups/LJColor.h \
-diff -up hplip-3.23.3/prnt/hpcups/Pcl3Gui2.cpp.no-ernie hplip-3.23.3/prnt/hpcups/Pcl3Gui2.cpp
---- hplip-3.23.3/prnt/hpcups/Pcl3Gui2.cpp.no-ernie	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/prnt/hpcups/Pcl3Gui2.cpp	2023-05-29 13:17:02.468210361 +0200
+diff -up hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp.no-ernie hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp
+--- hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp.no-ernie	2017-04-26 16:28:39.525066003 +0200
++++ hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp	2017-04-26 16:29:46.987510614 +0200
 @@ -30,7 +30,6 @@
  
  #include "CommonDefinitions.h"
@@ -26,7 +26,7 @@ diff -up hplip-3.23.3/prnt/hpcups/Pcl3Gui2.cpp.no-ernie hplip-3.23.3/prnt/hpcups
  {
      speed_mech_enabled = true;
 -    m_run_ernie_filter = true;
-     crd_type = eCrd_color_only;   // pcl3 printers support RGB only ref:hplip-1701
+     crd_type = eCrd_both;
      strcpy(m_szLanguage, "PCL3GUI");
  }
 @@ -59,21 +57,6 @@ DRIVER_ERROR Pcl3Gui2::Configure(Pipelin
@@ -51,9 +51,9 @@ diff -up hplip-3.23.3/prnt/hpcups/Pcl3Gui2.cpp.no-ernie hplip-3.23.3/prnt/hpcups
  
      if (crd_type != eCrd_black_only) {
          Mode10    *pMode10;
-diff -up hplip-3.23.3/prnt/hpcups/Pcl3Gui2.h.no-ernie hplip-3.23.3/prnt/hpcups/Pcl3Gui2.h
---- hplip-3.23.3/prnt/hpcups/Pcl3Gui2.h.no-ernie	2023-03-28 09:26:11.000000000 +0200
-+++ hplip-3.23.3/prnt/hpcups/Pcl3Gui2.h	2023-05-29 13:15:58.134609689 +0200
+diff -up hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h.no-ernie hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h
+--- hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h.no-ernie	2017-04-26 16:28:43.277035115 +0200
++++ hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h	2017-04-26 16:30:05.826355522 +0200
 @@ -60,7 +60,6 @@ private:
      DRIVER_ERROR encapsulateRaster(BYTE *input_raster, unsigned int num_bytes, COLORTYPE c_type);
      bool    speed_mech_enabled;

hplip-pcardext-disable.patch

@@ -1,18 +0,0 @@
-diff -up hplip-3.25.6/Makefile.am.pcardext-disable hplip-3.25.6/Makefile.am
---- hplip-3.25.6/Makefile.am.pcardext-disable	2025-08-11 12:52:35.359621088 +0200
-+++ hplip-3.25.6/Makefile.am	2025-08-11 12:54:58.654515582 +0200
-@@ -306,14 +306,6 @@ if !HPLIP_CLASS_DRIVER
- pcarddir = $(hplipdir)/pcard
- dist_pcard_DATA = pcard/__init__.py pcard/photocard.py
- 
--# pcardext
--pcardextdir = $(PYTHONEXECDIR)
--pcardextdir = $(PYTHONEXECDIR)
--pcardext_LTLIBRARIES = pcardext.la
--pcardext_la_LDFLAGS = -module -avoid-version
--pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c pcard/pcardext/pcardext.h
--pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
--
- # prnt
- prntdir = $(hplipdir)/prnt
- dist_prnt_DATA = prnt/cups.py prnt/__init__.py prnt/ldl.py prnt/pcl.py prnt/colorcal.py

hplip-plugin-curl.patch

@@ -1,58 +0,0 @@
-diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py
-index 56683fb..031ceec 100755
---- a/installer/pluginhandler.py
-+++ b/installer/pluginhandler.py
-@@ -185,14 +185,16 @@ class PluginHandle(object):
-                 if self.__plugin_conf_file.startswith('file://'):
-                     status, filename = utils.download_from_network(self.__plugin_conf_file, local_conf, True)
-                 else:
--                    wget = utils.which("wget", True)
--                    if wget:
--                        status, output = utils.run("%s --tries=3 --timeout=60 --output-document=%s %s --cache=off" %(wget, local_conf, self.__plugin_conf_file))
-+                    curl = utils.which("curl", True)
-+                    if curl:
-+                        cmd = "%s --retry 3 --max-time 10 --output %s --location %s" %(curl, local_conf, self.__plugin_conf_file)
-+                        log.debug(cmd)
-+                        status, output = utils.run(cmd)
-                         if status:
-                             log.error("Plugin download failed with error code = %d" %status)
-                             return status, url, check_sum
-                     else:
--                        log.error("Please install wget package to download the plugin.")
-+                        log.error("Please install curl package to download the plugin.")
-                         return status, url, check_sum
-             except IOError as e:
-                 log.error("I/O Error: %s" % e.strerror)
-@@ -284,18 +284,18 @@ class PluginHandle(object):
-             if src.startswith('file://'):
-                 status, filename = utils.download_from_network(src, plugin_file, True)
-             else:
--                wget = utils.which("wget", True)
--                if wget:
--                    cmd = "%s --cache=off -P %s %s" % (wget,self.__plugin_path,src)
-+                curl = utils.which("curl", True)
-+                if curl:
-+                    cmd = "%s --create-dirs -O --output-dir %s --location %s" % (curl,self.__plugin_path,src)
-                     log.debug(cmd)
-                     status, output = utils.run(cmd)
--                    log.debug("wget returned: %d" % status)
-+                    log.debug("curl returned: %d" % status)
- 
-                 #Check whether plugin is accessible in Openprinting.org website otherwise dowload plugin from alternate location.
-                 if status != 0 or os_utils.getFileSize(plugin_file) <= 0:
-                     src = os.path.join(PLUGIN_FALLBACK_LOCATION, self.__plugin_name)
-                     log.info("Plugin is not accessible. Trying to download it from fallback location: [%s]" % src)
--                    cmd = "%s --cache=off -P %s %s" % (wget,self.__plugin_path,src)
-+                    cmd = "%s --create-dirs -O --output-dir %s --location %s" % (curl,self.__plugin_path,src)
-                     log.debug(cmd)
-                     status, output = utils.run(cmd)
- 
-@@ -323,7 +323,7 @@ class PluginHandle(object):
-             if digsig_url.startswith('file://'):
-                 status, filename = utils.download_from_network(digsig_url, digsig_file, True)
-             else:
--                cmd = "%s --cache=off -P %s %s" % (wget,self.__plugin_path,digsig_url)
-+                cmd = "%s --create-dirs -O --output-dir %s --location %s" % (curl, self.__plugin_path,digsig_url)
-                 log.debug(cmd)
-                 status, output = utils.run(cmd)
-         except IOError as e:

hplip-plugin-script.patch

@@ -1,28 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index bb4195c..ddac16a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -680,6 +680,12 @@ if HPLIP_CLASS_DRIVER
- filterdir=$(cupsfilterdir)
- printpluginsdir=$(cupsfilterdir)
- 
-+#
-+# HP Plugin
-+#
-+
-+pkgplugindir=$(bindir)
-+pkgplugin_DATA=hp-plugin
- 
- dist_filter_DATA = hpcups hpps dat2drv
- dist_printplugins_DATA = prnt/plugins/hbpl1-arm32.so prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so prnt/plugins/lj-x86_64.so
-diff --git a/configure.in b/configure.in
-index f8f1a28..7fa5d12 100644
---- a/configure.in
-+++ b/configure.in
-@@ -801,5 +801,5 @@ AC_SUBST(udev_sysfs_rules)
- AC_SUBST(epm_class_driver)
- AC_SUBST(epm_class_install)
- 
--AC_CONFIG_FILES(Makefile hplip.conf hplip.desktop hp-uiscan.desktop hplip-systray.desktop prnt/drv/hpijs.drv prnt/drv/hpcups.drv hplip.list data/policykit/com.hp.hplip.service)
-+AC_CONFIG_FILES(Makefile hplip.conf hplip.desktop hp-uiscan.desktop hplip-systray.desktop prnt/drv/hpijs.drv prnt/drv/hpcups.drv hplip.list data/policykit/com.hp.hplip.service hp-plugin)
- AC_OUTPUT

hplip-plugin-stdout.patch

@@ -1,41 +0,0 @@
-diff --git a/base/os_utils.py b/base/os_utils.py
-index 82a8b42..d918822 100644
---- a/base/os_utils.py
-+++ b/base/os_utils.py
-@@ -26,6 +26,7 @@ import locale
- import stat
- import subprocess
- import shlex
-+import sys
- 
- #Local
- from . import logger
-@@ -37,17 +38,22 @@ def execute(cmd):
-         try:
-             # Use shlex.split to safely split the command into arguments
-             args = shlex.split(cmd)
--            process = subprocess.Popen(args,stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+            process = subprocess.Popen(args,stdout=sys.stdout, stderr=sys.stderr, stdin=sys.stdin)
-             process.wait()
-             stdout, stderr = process.communicate()
--            log.debug(f"Command executed: {cmd}\n{stdout.decode()}") 
-+
-+            log.debug(f"Command executed: {cmd}{f'\n{stdout.decode()}' if stdout else ''}")
-+
-             if process.returncode != 0:
--                error_message = f"Command failed with return code {process.returncode}: {cmd}\n{stderr.decode()}"
--                log.error(error_message)
-+                log.error(f"Command failed with return code" \
-+                          f"{process.returncode}: {cmd}" \
-+                          f"{f'\n{stderr.decode()}' if stderr else ''}")
-+
-             return process.returncode
-         except subprocess.CalledProcessError as e:
--            error_message = f"Command failed with return code {e.returncode}: {cmd}\n{e.stderr.decode()}"
--            log.error(error_message)
-+            log.error(f"Command failed with return code" \
-+                      f"{e.returncode}: {cmd}" \
-+                      f"{f'\n{e.stderr.decode()}' if e.stderr else ''}")
-             return e.returncode
-         except Exception as e:
-             log.error(f"Error executing command: {cmd}\n{str(e)}")

hplip-plugin-udevissues.patch

@@ -1,26 +0,0 @@
-diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py
-index 1af8d85..5c498ab 100755
---- a/installer/pluginhandler.py
-+++ b/installer/pluginhandler.py
-@@ -403,7 +403,20 @@ class PluginHandle(object):
-                     log.error("Target file %s does not exist. File copy failed." % trg)
-                     continue
-                 else:
--                    os.chmod(trg, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
-+                    if trg == '/etc/udev/rules.d/S99-2000S1.rules' or \
-+                       trg == '/etc/udev/rules.d/40-libsane.rules':
-+                        os.chmod(trg, 0o644)
-+                        with open(trg, 'r') as udev_f:
-+                            content = udev_f.read()
-+
-+                        content = content.replace('libsane_rules_end', 'libsane_usb_rules_end')
-+                        content = content.replace('GROUP="scanner", ', '')
-+
-+                        with open(trg, 'w') as udev_f:
-+                            udev_f.write(content)
-+
-+                    else:
-+                        os.chmod(trg, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
- 
-                 if link:
-                     if os.path.exists(link):

hplip-pserror-c99.patch

@@ -1,17 +0,0 @@
-prnt/pserror.c: Replace an implicit int with an explicit int
-
-Submitted upstream: <https://bugs.launchpad.net/hplip/+bug/1997875>
-
-diff --git a/prnt/hpps/pserror.c b/prnt/hpps/pserror.c
-index 114d7e1b5fa364fb..493b49c27917a7e6 100644
---- a/prnt/hpps/pserror.c
-+++ b/prnt/hpps/pserror.c
-@@ -24,7 +24,7 @@ extern char *program ;	/* Defined by main program, giving program name */
- void message(int flags, char *format, ...)
- {
-   va_list args ;
--  static column = 0 ;		/* current screen column for message wrap */
-+  static int column = 0 ;	/* current screen column for message wrap */
-   char msgbuf[MAX_MESSAGE] ;	/* buffer in which to put the message */
-   char *bufptr = msgbuf ;	/* message buffer pointer */
- 

hplip-pstotiff-is-rubbish.patch

@@ -57,8 +57,8 @@ diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/
 +TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1
 +gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 \
 +    -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER \
-+   -dSHORTERRORS -dGHOSTSCRIPT -sstdout=%stderr \
-+   -sOutputFile="$TMPFILE" "$IN"
++   -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \
++   -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN"
 +RET=$?
 +cat "$TMPFILE"
 +rm -f "$TMPFILE"

hplip-rebase.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+if [ "$1" == "-h" -o "$1" == "--help" ] 
+then
+  echo "Usage: ./hplip-rebase.sh X.Y.Z"
+  echo "       X.Y.Z - new hplip version"
+  exit 0
+fi
+
+wget -O hplip-plugin.run http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-$1-plugin.run
+
+if [ $? -gt 0 ]
+then
+  echo "Error while downloading plugin. Check version passed by argument or internet connection. For usage run script with -h or --help argument."
+  rm hplip-plugin.run
+  exit 1
+fi
+rm hplip-plugin.run
+
+fedpkg mockbuild
+if [ $? -gt 0 ]
+then
+  echo "Error during mockbuild."
+  exit 1
+fi
+exit 0

hplip-repack.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/bash
-
-
-VERSION=$1
-
-if [ "${VERSION:="*"}" == "*" ]
-then
-  echo "Define a version of hplip as an argument."
-  exit 1
-fi
-
-# extract the original tarball
-tar -xaf hplip-$VERSION.tar.gz || exit 1
-
-# remove unwanted files - license-related ones reported here https://bugs.launchpad.net/hplip/+bug/2028938
-rm hplip-$VERSION/locatedriver
-
-# compress into a new tarball
-tar -cjvf hplip-$VERSION-repack.tar.gz hplip-$VERSION || exit 1
-
-# check whether plugin is available
-wget -O hplip-plugin.run https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-$1-plugin.run || wget -O hplip-plugin.run https://developers.hp.com/sites/default/files/hplip-$1-plugin.run || exit 1
-
-# check whether the file is sane
-file --mime hplip-plugin.run | grep 'x-shellscript' || exit 1
-
-echo "hplip-${VERSION}-repack.tar.gz is prepared for uploading..."
-
-exit 0
-
-# upload a new source tarball
-#fedpkg new-sources hplip-$VERSION-repack.tar.gz || exit 1

hplip-scan-hpaio-include.patch

@@ -1,19 +0,0 @@
-scam/sane/hpaio.c: Include orblite.h for more function prototypes
-
-Otherwise the build fails with compilers which do not support
-implicit function declarations.
-
-Submitted upstream: <https://bugs.launchpad.net/hplip/+bug/1997875>
-
-diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c
-index d342626822fc2190..57d1ddea32fb5816 100644
---- a/scan/sane/hpaio.c
-+++ b/scan/sane/hpaio.c
-@@ -50,6 +50,7 @@
- #include "sclpml.h"
- #include "escl.h"
- #include "io.h"
-+#include "orblite.h"
- #include "orblitei.h"
- 
- 

hplip-scan-orblite-c99.patch

@@ -1,21 +0,0 @@
-diff --git a/scan/sane/orblite.c b/scan/sane/orblite.c
-index ba86640..2eb7aba 100644
---- a/scan/sane/orblite.c
-+++ b/scan/sane/orblite.c
-@@ -20,6 +20,7 @@
- #include "orblitei.h"
- #include "orblite.h"//Added New
- #include <math.h>
-+#include <dlfcn.h>
- #include "utils.h"
- #include "io.h"
- 
-@@ -195,7 +196,7 @@ bugout:
- 
- static int bb_unload(SANE_THandle ps)
- {
--   _DBG("Calling orblite bb_unload: \n");
-+   DBG("Calling orblite bb_unload: \n");
-    if (ps->bb_handle)
-    {
-       dlclose(ps->bb_handle);

hplip-scan-size.patch

@@ -1,37 +0,0 @@
-diff --git a/scan.py b/scan.py
-index b262ef2..cb0ffc1 100755
---- a/scan.py
-+++ b/scan.py
-@@ -83,7 +83,7 @@ edge_erase_value = 0
- contrast = 0
- set_contrast = False
- 
--page_size = ''
-+page_size = 'a4'
- size_desc = ''
- page_units = 'mm'
- default_res = 300
-@@ -1615,7 +1615,7 @@ try:
-                                         else:
-                                             im = im.convert("RGB")
-                                             
--                                        #im = imageprocessing.resize_to_scan_area(im,PAGE_SIZES[size],res)
-+                                        #im = imageprocessing.resize_to_scan_area(im,PAGE_SIZES[page_size],res)
-                                 if barcode_count>0:
-                                     if barcode_first_occurence == True:
-                                         if barcode_first_page == False:
-@@ -1718,12 +1718,12 @@ try:
-         #so that the output image size matches with the input scan area
-         #for Flatbad 
-         if im:    
--            im = imageprocessing.resize_to_scan_area(im,PAGE_SIZES[size],res)
-+            im = imageprocessing.resize_to_scan_area(im,PAGE_SIZES[page_size],res)
-         """
-         #for ADF
-         for Image_file in adf_page_files:
-             image = Image.open(Image_file)
--            resized_image = imageprocessing.resize_to_scan_area(image,PAGE_SIZES[size],res)
-+            resized_image = imageprocessing.resize_to_scan_area(image,PAGE_SIZES[page_size],res)
-             resized_image.save(Image_file)
-         """
-         if adf and (save_file =='jpg' or save_file == 'png' or save_file == 'tiff' or save_file == 'pdf' or save_file == 'bmp'):

hplip-sclpml-strcasestr.patch

@@ -1,16 +0,0 @@
-Switch the whole libsane-hpaio to get proper definition of strcasestr() used in
-sclpml.c
-
-diff --git a/Makefile.am b/Makefile.am
-index 15d953a..7105f74 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -73,7 +73,7 @@ endif
- # The following is a interlibrary dependency that must be compiled first.
- libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la libhpipp.la $(DBUS_LIBS) -lcups -ldl
- #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
--libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol
-+libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) -Iprotocol -D_GNU_SOURCE
- 
- if NETWORK_BUILD
- libsane_hpaio_la_LIBADD += libhpdiscovery.la

hplip-snmp-quirks.patch

@@ -1,18 +1,18 @@
-diff -up hplip-3.19.6/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.19.6/prnt/drv/hpcups.drv.in
---- hplip-3.19.6/prnt/drv/hpcups.drv.in.snmp-quirks	2019-07-12 08:38:36.362527348 +0200
-+++ hplip-3.19.6/prnt/drv/hpcups.drv.in	2019-07-12 08:46:28.236417835 +0200
-@@ -10334,6 +10334,8 @@ Manufacturer "HP"
+diff -up hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.17.11/prnt/drv/hpcups.drv.in
+--- hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks	2017-12-07 15:21:34.149138400 +0100
++++ hplip-3.17.11/prnt/drv/hpcups.drv.in	2017-12-07 15:33:32.443211804 +0100
+@@ -10831,6 +10831,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version"
-       Attribute "ShortNickName" "" "HP OJ Pro 8500 a909a hpijs"
+       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a hpijs"
        Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
 +      // This device lies about its supplies capacity.
 +      Attribute "cupsSNMPQuirks" "" "capacity"
        PCFileName "hp-officejet_pro_8500_a909a.ppd"
        Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
      }
-@@ -10342,6 +10344,8 @@ Manufacturer "HP"
+@@ -10839,6 +10841,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
        Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version"
-       Attribute "ShortNickName" "" "HP OJ Pro 8500 a909g hpijs"
+       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g hpijs"
        Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;"
 +      // This device lies about its supplies capacity.
 +      Attribute "cupsSNMPQuirks" "" "capacity"

hplip-stopiteration.patch

@@ -0,0 +1,12 @@
+diff -up hplip-3.18.6/base/utils.py.stopiteration hplip-3.18.6/base/utils.py
+--- hplip-3.18.6/base/utils.py.stopiteration	2018-11-12 16:27:25.938082056 +0100
++++ hplip-3.18.6/base/utils.py	2018-11-12 16:28:02.678793293 +0100
+@@ -265,7 +265,7 @@ def walkFiles(root, recurse=True, abs_pa
+     try:
+         names = os.listdir(root)
+     except os.error:
+-        raise StopIteration
++        return 
+ 
+     pattern = pattern or '*'
+     pat_list = pattern.split(';')

hplip-strncpy.patch

@@ -1,7 +1,7 @@
-diff -up hplip-3.25.2/prnt/hpcups/HPCupsFilter.cpp.strncpy hplip-3.25.2/prnt/hpcups/HPCupsFilter.cpp
---- hplip-3.25.2/prnt/hpcups/HPCupsFilter.cpp.strncpy	2025-04-11 10:16:00.438702562 +0200
-+++ hplip-3.25.2/prnt/hpcups/HPCupsFilter.cpp	2025-04-11 10:21:25.088096376 +0200
-@@ -211,6 +211,7 @@ HPCupsFilter::HPCupsFilter() : m_pPrinte
+diff -up hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp.strncpy hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp.strncpy	2015-01-21 16:52:44.066497631 +0000
++++ hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp	2015-01-21 16:59:46.216434376 +0000
+@@ -203,6 +203,7 @@ HPCupsFilter::HPCupsFilter() : m_pPrinte
      adj_k_width = 0;
      black_raster = NULL;
      color_raster = NULL;
@@ -9,7 +9,7 @@ diff -up hplip-3.25.2/prnt/hpcups/HPCupsFilter.cpp.strncpy hplip-3.25.2/prnt/hpc
  }
  
  HPCupsFilter::~HPCupsFilter()
-@@ -428,15 +429,15 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
+@@ -384,9 +385,9 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
          m_JA.media_attributes.physical_height = cups_header->PageSize[1];
          m_JA.media_attributes.printable_width = ((cups_header->ImagingBoundingBox[2]-cups_header->ImagingBoundingBox[0]) * horz_res) / 72;
          m_JA.media_attributes.printable_height = ((cups_header->ImagingBoundingBox[3]-cups_header->ImagingBoundingBox[1]) * vert_res) / 72;
@@ -20,18 +20,11 @@ diff -up hplip-3.25.2/prnt/hpcups/HPCupsFilter.cpp.strncpy hplip-3.25.2/prnt/hpc
 +        strncpy(m_JA.media_attributes.MediaTypeName, cups_header->MediaType, sizeof(m_JA.media_attributes.MediaTypeName)-1);
 +        strncpy(m_JA.quality_attributes.hbpl1_print_quality, cups_header->OutputType, sizeof(m_JA.quality_attributes.hbpl1_print_quality)-1);
          m_JA.color_mode = cups_header->cupsRowStep;
- 
-         if (m_JA.media_attributes.PageSizeName[0] == '\0') {
-             // Copy the value of cups_header->cupsPageSizeName if it isnot null
-             if (cups_header->cupsPageSizeName != nullptr) {
--                strncpy(m_JA.media_attributes.PageSizeName, cups_header->cupsPageSizeName, sizeof(m_JA.media_attributes.PageSizeName));
-+                strncpy(m_JA.media_attributes.PageSizeName, cups_header->cupsPageSizeName, sizeof(m_JA.media_attributes.PageSizeName) - 1);
-             }
-         }   
      }
-diff -up hplip-3.25.2/prnt/hpijs/hpijs.cpp.strncpy hplip-3.25.2/prnt/hpijs/hpijs.cpp
---- hplip-3.25.2/prnt/hpijs/hpijs.cpp.strncpy	2025-04-11 10:16:00.434453252 +0200
-+++ hplip-3.25.2/prnt/hpijs/hpijs.cpp	2025-04-11 10:16:00.501228045 +0200
+     else {
+diff -up hplip-3.14.10/prnt/hpijs/hpijs.cpp.strncpy hplip-3.14.10/prnt/hpijs/hpijs.cpp
+--- hplip-3.14.10/prnt/hpijs/hpijs.cpp.strncpy	2015-01-21 17:00:03.225512410 +0000
++++ hplip-3.14.10/prnt/hpijs/hpijs.cpp	2015-01-21 17:04:59.308870785 +0000
 @@ -605,7 +605,7 @@ int main (int argc, char *argv[], char *
     }
  
@@ -41,9 +34,9 @@ diff -up hplip-3.25.2/prnt/hpijs/hpijs.cpp.strncpy hplip-3.25.2/prnt/hpijs/hpijs
  
  #ifdef HAVE_LIBHPIP
     char *pDev;
-diff -up hplip-3.25.2/prnt/hpijs/hpijsfax.cpp.strncpy hplip-3.25.2/prnt/hpijs/hpijsfax.cpp
---- hplip-3.25.2/prnt/hpijs/hpijsfax.cpp.strncpy	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/prnt/hpijs/hpijsfax.cpp	2025-04-11 10:16:00.501403513 +0200
+diff -up hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy hplip-3.14.10/prnt/hpijs/hpijsfax.cpp
+--- hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy	2015-01-21 17:05:06.585904171 +0000
++++ hplip-3.14.10/prnt/hpijs/hpijsfax.cpp	2015-01-21 17:05:15.787946389 +0000
 @@ -282,7 +282,7 @@ int hpijsFaxServer (int argc, char **arg
  	char user_name[32]={0,};
  

hplip-systray-blockerror.patch

@@ -1,20 +0,0 @@
-diff --git a/systray.py b/systray.py
-index 07db0fa..3a35b30 100644
---- a/systray.py
-+++ b/systray.py
-@@ -89,7 +89,14 @@ if __name__ == '__main__':
-     log.debug("Creating pipe: hpssd (%d) ==> systemtray (%d)" % (w1, r1))
-     
-     parent_pid = os.getpid()
--    child_pid1 = os.fork()
-+    try:
-+        child_pid1 = os.fork()
-+    except BlockingIOErrror as e:
-+        log.error("hp-systray: error during fork - %s" % e)
-+        os.close(w1)
-+        os.close(r1)
-+        mod.unlockInstance()
-+        sys.exit(1)
-     
-     if child_pid1:
-         # parent (UI)

hplip-typo.patch

@@ -1,6 +1,6 @@
-diff -up hplip-3.20.11/firmware.py.typo hplip-3.20.11/firmware.py
---- hplip-3.20.11/firmware.py.typo	2021-02-03 10:53:34.311743805 +0100
-+++ hplip-3.20.11/firmware.py	2021-02-03 10:54:13.229386257 +0100
+diff -up hplip-3.17.11/firmware.py.typo hplip-3.17.11/firmware.py
+--- hplip-3.17.11/firmware.py.typo	2018-01-12 16:50:10.338366719 +0100
++++ hplip-3.17.11/firmware.py	2018-01-12 16:50:33.563184939 +0100
 @@ -99,7 +99,7 @@ try:
      if mode == GUI_MODE and (ui_toolkit == 'qt4' or ui_toolkit == 'qt5'):
          if not utils.canEnterGUIMode4():

hplip-ui-optional.patch

@@ -1,96 +1,76 @@
-diff --git a/base/module.py b/base/module.py
-index dd3efa3..04ac5b8 100644
---- a/base/module.py
-+++ b/base/module.py
-@@ -432,6 +432,12 @@ class Module(object):
-         if show_usage is not None:
-             sys.exit(0)
- 
-+        if mode == GUI_MODE:
-+            if not utils.canEnterGUIMode4():
-+                log.warn("GUI mode not available - switching to interactive mode.")
-+                mode = INTERACTIVE_MODE
-+                ui_toolkit = 'none'
-+
-         self.mode = mode
-         return opts, device_uri, printer_name, mode, ui_toolkit, lang
- 
-diff --git a/base/utils.py b/base/utils.py
-index 98437a3..9b8813b 100644
---- a/base/utils.py
-+++ b/base/utils.py
-@@ -722,6 +722,15 @@ def canEnterGUIMode4(): # qt4
-             log.warn(e)
-             return False
- 
-+        try:
-+            import ui4
-+        except ImportError:
-+            try:
-+                import ui5.setupdialog
-+            except ImportError as e:
-+                log.warn(e)
-+                return False
-+
-     return True
- 
- 
-@@ -734,6 +743,11 @@ def checkPyQtImport(): # qt3
+diff -up hplip-3.18.4/base/utils.py.ui-optional hplip-3.18.4/base/utils.py
+--- hplip-3.18.4/base/utils.py.ui-optional	2018-04-25 12:34:16.000000000 +0200
++++ hplip-3.18.4/base/utils.py	2018-04-26 09:27:26.487258888 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ #
+ # (c) Copyright 2001-2015 HP Development Company, L.P.
+@@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3
          if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
              no_qt_message_gtk()
  
++        # hplip-gui sub-package (Fedora)
 +        try:
 +            import ui
 +        except ImportError:
++            log.error("hplip-gui not installed.  GUI not available. Exiting.")
 +            return False
 +
          log.error("PyQt not installed. GUI not available. Exiting.")
          return False
  
-@@ -781,11 +795,13 @@ def checkPyQtImport4():
-         import PyQt4
-         import ui4
-     except ImportError:
--        import PyQt5
--        import ui5
--    else:
+@@ -783,7 +790,8 @@ def checkPyQtImport4():
+         import PyQt5
+         import ui5
+     else:
 -        log.debug("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP again")
--        return False
-+        try:
-+            import PyQt5
-+            import ui5.setupdialog
-+        except ImportError:
-+            log.debug('GUI not available.')
-+            return False
-+
++        # hplip-gui sub-package (Fedora) requires python3-qt5
++        log.error("Install the hplip-gui package for graphical support.")
+         return False
      return True
  
- # def checkPyQtImport5():
-diff --git a/fab.py b/fab.py
-index 5577af5..194ceed 100755
---- a/fab.py
-+++ b/fab.py
-@@ -776,14 +776,15 @@ mod.setUsage(module.USAGE_FLAG_NONE)
- opts, device_uri, printer_name, mode, ui_toolkit, loc = \
-     mod.parseStdOpts(handle_device_printer=False)
+@@ -2434,6 +2442,7 @@ def checkPyQtImport45():
+     except ImportError as e:
+         log.debug(e)
  
--if ui_toolkit == 'qt3':
--    if not utils.canEnterGUIMode():
--        log.error("%s GUI mode requires GUI support (try running with --qt4). Entering interactive mode." % __mod__)
--        mode = INTERACTIVE_MODE
--else:
--    if not utils.canEnterGUIMode4():
--        log.error("%s GUI mode requires GUI support (try running with --qt3). Entering interactive mode." % __mod__)
--        mode = INTERACTIVE_MODE
-+if ui_toolkit != 'none':
-+    if ui_toolkit == 'qt3':
-+        if not utils.canEnterGUIMode():
-+            log.error("%s GUI mode requires GUI support (try running with --qt4). Entering interactive mode." % __mod__)
-+            mode = INTERACTIVE_MODE
-+    else:
-+        if not utils.canEnterGUIMode4():
-+            log.error("%s GUI mode requires GUI support (try running with --qt3). Entering interactive mode." % __mod__)
-+            mode = INTERACTIVE_MODE
++    log.error("Install the hplip-gui package for graphical support.")
+     raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed")
  
  
- if mode == GUI_MODE:
+@@ -2455,6 +2464,7 @@ def import_dialog(ui_toolkit):
+             return  (QApplication, "ui4")
+         except ImportError as e:
+             log.error(e)
++            log.error("Unable to load Qt support. Is hplip-gui package installed?")
+             sys.exit(1)
+     elif ui_toolkit == "qt5":
+         try:
+@@ -2463,9 +2473,7 @@ def import_dialog(ui_toolkit):
+             return (QApplication, "ui5")
+         except ImportError as e:
+             log.error(e)
+-            sys.exit(1)
+-        else:
+-            log.error("Unable to load Qt support. Is it installed?")
++            log.error("Unable to load Qt support. Is hplip-gui package installed?")
+             sys.exit(1)
+ 
+ 
+diff -up hplip-3.18.4/plugin.py.ui-optional hplip-3.18.4/plugin.py
+--- hplip-3.18.4/plugin.py.ui-optional	2018-05-11 10:06:02.925579534 +0200
++++ hplip-3.18.4/plugin.py	2018-05-11 10:25:08.576302069 +0200
+@@ -252,7 +252,11 @@ if mode == GUI_MODE:
+         #     clean_exit(1)
+ 
+         QApplication, ui_package = utils.import_dialog(ui_toolkit)
+-        ui = import_module(ui_package + ".plugindialog")
++        try:
++            ui = import_module(ui_package + ".plugindialog")
++        except ModuleNotFoundError:
++            log.error("hplip-gui not installed. GUI not available. Exiting.")
++            clean_exit(1)
+         if ui_toolkit == "qt5":
+             from PyQt5.QtWidgets import QMessageBox
+         elif ui_toolkit == "qt4":

hplip-unicodeerror.patch

@@ -1,18 +0,0 @@
-diff --git a/base/sixext.py b/base/sixext.py
-index 0bf4fc4..311bf72 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):

hplip-use-raw-strings.patch

@@ -1,123 +0,0 @@
-diff -up hplip-3.25.2/base/device.py.raw-strings hplip-3.25.2/base/device.py
-diff -up hplip-3.25.2/base/g.py.raw-strings hplip-3.25.2/base/g.py
-diff -up hplip-3.25.2/base/LedmWifi.py.raw-strings hplip-3.25.2/base/LedmWifi.py
---- hplip-3.25.2/base/LedmWifi.py.raw-strings	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/base/LedmWifi.py	2025-04-11 10:26:18.519166530 +0200
-@@ -31,7 +31,7 @@ from .g import *
- from . import device, utils
- from .sixext import to_bytes_utf8
- 
--http_result_pat = re.compile("""HTTP/\d.\d\s(\d+)""", re.I)
-+http_result_pat = re.compile(r"""HTTP/\d.\d\s(\d+)""", re.I)
- HTTP_OK = 200
- HTTP_ACCEPTED = 202
- HTTP_NOCONTENT = 204
-diff -up hplip-3.25.2/base/logger.py.raw-strings hplip-3.25.2/base/logger.py
-diff -up hplip-3.25.2/base/models.py.raw-strings hplip-3.25.2/base/models.py
-diff -up hplip-3.25.2/base/password.py.raw-strings hplip-3.25.2/base/password.py
-diff -up hplip-3.25.2/base/queues.py.raw-strings hplip-3.25.2/base/queues.py
---- hplip-3.25.2/base/queues.py.raw-strings	2025-04-11 10:26:18.512773352 +0200
-+++ hplip-3.25.2/base/queues.py	2025-04-11 10:26:18.520514306 +0200
-@@ -46,7 +46,7 @@ HPPS = 3
- HPOTHER = 4
- 
- DEVICE_URI_PATTERN = re.compile(r"""(.*):/(.*?)/(\S*?)\?(?:serial=(\S*)|device=(\S*)|ip=(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}[^&]*)|zc=(\S+))(?:&port=(\d))?""", re.I)
--NICKNAME_PATTERN = re.compile(b'''\*NickName:\s*\"(.*)"''', re.MULTILINE)
-+NICKNAME_PATTERN = re.compile(r'''\*NickName:\s*\"(.*)"''', re.MULTILINE)
- NET_PATTERN = re.compile(r"""(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""")
- NET_ZC_PATTERN = re.compile(r'''zc=(.*)''',re.IGNORECASE)
- NET_OTHER_PATTERN = re.compile(r'''(.*)://(.*)''',re.IGNORECASE)
-@@ -149,7 +149,7 @@ def parseQueues(mode):
-                 desc=''
-             else:
-                 try:
--                    desc = to_string_utf8( NICKNAME_PATTERN.search(fileptr).group(1) )
-+                    desc = to_string_utf8( NICKNAME_PATTERN.search(fileptr.decode('utf-8')).group(1) )
-                 except AttributeError:
-                     desc = ''
- 
-diff -up hplip-3.25.2/base/status.py.raw-strings hplip-3.25.2/base/status.py
-diff -up hplip-3.25.2/base/tui.py.raw-strings hplip-3.25.2/base/tui.py
-diff -up hplip-3.25.2/base/utils.py.raw-strings hplip-3.25.2/base/utils.py
-diff -up hplip-3.25.2/check.py.raw-strings hplip-3.25.2/check.py
---- hplip-3.25.2/check.py.raw-strings	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/check.py	2025-04-11 10:26:18.521601431 +0200
-@@ -627,7 +627,7 @@ class DependenciesCheck(object):
-                     status, output = utils.run("%s -d03f0:" % lsusb)
- 
-                     if output:
--                        lsusb_pat = re.compile("""^Bus\s([0-9a-fA-F]{3,3})\sDevice\s([0-9a-fA-F]{3,3}):\sID\s([0-9a-fA-F]{4,4}):([0-9a-fA-F]{4,4})(.*)""", re.IGNORECASE)
-+                        lsusb_pat = re.compile(r"""^Bus\s([0-9a-fA-F]{3,3})\sDevice\s([0-9a-fA-F]{3,3}):\sID\s([0-9a-fA-F]{4,4}):([0-9a-fA-F]{4,4})(.*)""", re.IGNORECASE)
-                         log.debug(output)
-                         try:
-                             hpmudext = utils.import_ext('hpmudext')
-@@ -682,7 +682,7 @@ class DependenciesCheck(object):
- 
-                                         out =''
-                                         for g in getfacl_out_list:
--                                            if 'getfacl' not in g and '' is not g and 'file' not in g:
-+                                            if 'getfacl' not in g and '' != g and 'file' not in g:
-                                                 pat = re.compile('''.*:(.*)''')
-                                                 if pat.search(g):
-                                                     out = out +' '+ pat.search(g).group(1)
-diff -up hplip-3.25.2/fax/soapfax.py.raw-strings hplip-3.25.2/fax/soapfax.py
---- hplip-3.25.2/fax/soapfax.py.raw-strings	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/fax/soapfax.py	2025-04-11 10:26:18.521745824 +0200
-@@ -42,7 +42,7 @@ from base.sixext import to_bytes_utf8
- 
- # **************************************************************************** #
- 
--http_result_pat = re.compile("""HTTP/\d.\d\s(\d+)""", re.I)
-+http_result_pat = re.compile(r"""HTTP/\d.\d\s(\d+)""", re.I)
- 
- 
- TIME_FORMAT_AM_PM = 1
-diff -up hplip-3.25.2/installer/dcheck.py.raw-strings hplip-3.25.2/installer/dcheck.py
-diff -up hplip-3.25.2/makeuri.py.raw-strings hplip-3.25.2/makeuri.py
---- hplip-3.25.2/makeuri.py.raw-strings	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/makeuri.py	2025-04-11 10:26:18.522024483 +0200
-@@ -46,7 +46,7 @@ USAGE = [ (__doc__, "", "name", True),
-           ("DEVNODE (parallel only):", '"/dev/parportX", X=0,1,2,...', "option", False),
-           ("SERIAL NO. (usb and parallel only):", '"serial no."', "option", True),
-           utils.USAGE_OPTIONS,
--          ("To specify the port on a multi-port JetDirect:", "-p<port> or --port=<port> (Valid values are 1\*, 2, and 3. \*default)", "option", False),
-+          ("To specify the port on a multi-port JetDirect:", r"-p<port> or --port=<port> (Valid values are 1\*, 2, and 3. \*default)", "option", False),
-           ("Show the CUPS URI only (quiet mode):", "-c or --cups", "option", False),
-           ("Show the SANE URI only (quiet mode):", "-s or --sane", "option", False),
-           ("Show the HP Fax URI only (quiet mode):", "-f or --fax", "option", False),
-diff -up hplip-3.25.2/prnt/cups.py.raw-strings hplip-3.25.2/prnt/cups.py
-diff -up hplip-3.25.2/probe.py.raw-strings hplip-3.25.2/probe.py
---- hplip-3.25.2/probe.py.raw-strings	2025-02-27 13:12:29.000000000 +0100
-+++ hplip-3.25.2/probe.py	2025-04-11 10:26:18.522312569 +0200
-@@ -42,11 +42,11 @@ USAGE = [(__doc__, "", "name", True),
-          ("Usage: %s [OPTIONS]" % __mod__, "", "summary", True),
-          utils.USAGE_OPTIONS,
-          ("Bus to probe:", "-b<bus> or --bus=<bus>", "option", False),
--         ("", "<bus>: cups, usb\*, net, bt, fw, par (\*default) (Note: bt and fw not supported in this release.)", "option", False),
-+         ("", r"<bus>: cups, usb\*, net, bt, fw, par (\*default) (Note: bt and fw not supported in this release.)", "option", False),
-          ("Set Time to Live (TTL):", "-t<ttl> or --ttl=<ttl> (Default is 4).", "option", False),
-          ("Set timeout:", "-o<timeout in secs.> or --timeout=<timeout is secs.>", "option", False),
-          ("Filter by functionality:", "-e<filter list> or --filter=<filter list>", "option", False),
--         ("", "<filter list>: comma separated list of one or more of: scan, pcard, fax, copy, or none\*. (\*none is the default)", "option", False),
-+         ("", r"<filter list>: comma separated list of one or more of: scan, pcard, fax, copy, or none\*. (\*none is the default)", "option", False),
-          ("Search:", "-s<search re> or --search=<search re>", "option", False),
-          ("", "<search re> must be a valid regular expression (not case sensitive)", "option", False),
-          ("Network discovery method:", "-m<method> or --method=<method>: <method> is 'slp'* or 'mdns'.", "option", False),
-diff -up hplip-3.25.2/scan.py.raw-strings hplip-3.25.2/scan.py
-diff -up hplip-3.25.2/setup.py.raw-strings hplip-3.25.2/setup.py
---- hplip-3.25.2/setup.py.raw-strings	2025-04-11 10:26:18.496992045 +0200
-+++ hplip-3.25.2/setup.py	2025-04-11 10:26:18.522775511 +0200
-@@ -79,11 +79,11 @@ USAGE = [ (__doc__, "", "name", True),
-           utils.USAGE_SPACE,
-           utils.USAGE_OPTIONS,
-           ("Automatic mode:", "-a or --auto (-i mode only)", "option", False),
--          ("To specify the port on a multi-port JetDirect:", "--port=<port> (Valid values are 1\*, 2, and 3. \*default)", "option", False),
-+          ("To specify the port on a multi-port JetDirect:", r"--port=<port> (Valid values are 1\*, 2, and 3. \*default)", "option", False),
-           ("No testpage in automatic mode:", "-x (-i mode only)", "option", False),
-           ("To specify a CUPS printer queue name:", "-p<printer> or --printer=<printer> (-i mode only)", "option", False),
-           ("To specify a CUPS fax queue name:", "-f<fax> or --fax=<fax> (-i mode only)", "option", False),
--          ("Type of queue(s) to install:", "-t<typelist> or --type=<typelist>. <typelist>: print*, fax\* (\*default) (-i mode only)", "option", False),
-+          ("Type of queue(s) to install:", r"-t<typelist> or --type=<typelist>. <typelist>: print*, fax\* (\*default) (-i mode only)", "option", False),
-           ("To specify the device URI to install:", "-d<device> or --device=<device> (--qt4 mode only)", "option", False),
-           ("Remove printers or faxes instead of setting-up:", "-r or --rm or --remove", "option", False),
-           utils.USAGE_LANGUAGE,

hplip-wifisetup.patch

@@ -1,12 +1,19 @@
-diff -up hplip-3.23.3/ui5/wifisetupdialog.py.wifisetup-bad-call-fix hplip-3.23.3/ui5/wifisetupdialog.py
---- hplip-3.23.3/ui5/wifisetupdialog.py.wifisetup-bad-call-fix	2023-05-29 13:45:35.830961640 +0200
-+++ hplip-3.23.3/ui5/wifisetupdialog.py	2023-05-29 13:48:05.939993288 +0200
-@@ -665,7 +665,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog
+commit 7cdc26da185db2335f1efdc6716804266caa1712
+Author: Tomas Korbar <tkorbar@redhat.com>
+Date:   Thu Sep 20 15:04:47 2018 +0200
+
+    Fix wifi printer setup
+
+diff --git a/ui5/wifisetupdialog.py b/ui5/wifisetupdialog.py
+index 74cc0ef..8daff7d 100644
+--- a/ui5/wifisetupdialog.py
++++ b/ui5/wifisetupdialog.py
+@@ -570,7 +570,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog):
+             try:                
                  self.ip,_,addressmode, subnetmask, gateway, pridns, sec_dns= self.wifiObj.getIPConfiguration(self.dev, self.adapterName)
                  if self.ip == "0.0.0.0":
-                     if not self.wifiObj == CdmWifi:
--                        self.ip, subnetmask, gateway, pri_dns, sec_dns, addressmode = self.wifiObj.getwifiotherdetails(self.dev,self.adapterName)
-+                        self.ip, subnetmask, gateway, pridns, sec_dns, addressmode = self.wifiObj.getwifiotherdetails(self.dev,self.adapterName)
+-                    self.ip, subnetmask, gateway, pri_dns, sec_dns, addressmode = self.wifiobj.getwifiotherdetails(self.dev,self.adapterName)
++                    self.ip, subnetmask, gateway, pridns, sec_dns, addressmode = self.wifiObj.getwifiotherdetails(self.dev,self.adapterName)
                  vsa_codes = self.wifiObj.getVSACodes(self.dev, self.adapterName)
                  ss_max, ss_min, ss_val, ss_dbm = self.wifiObj.getSignalStrength(self.dev, self.adapterName,self.network, self.adaptor_id)                 
                  self.hn = self.wifiObj.getHostname(self.dev) 

hplip.appdata.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<component type="desktop">
-  <id>hplip.desktop</id>
+<component type="desktop-application">
+  <id>HP-hplip.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
+  <project_license>GPL-2.0 and MIT and BSD-2-Clause</project_license>
   <name>HPLIP Graphic Tools</name>
   <summary>HPLIP GUI tools and GUI part of other HPLIP tools</summary>
   <description>

plans.fmf

@@ -1,37 +0,0 @@
-/tier1-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/hplip.git
-      name: /plans/tier1/internal
-
-/tier1-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/hplip.git
-      name: /plans/tier1/public
-
-/tier2-tier3-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/hplip.git
-      name: /plans/tier2-tier3/internal
-
-/tier2-tier3-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/hplip.git
-      name: /plans/tier2-tier3/public
-
-
-/others-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/hplip.git
-      name: /plans/others/internal
-
-/others-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/hplip.git
-      name: /plans/others/public
-

rpminspect.yaml

@@ -1,10 +0,0 @@
----
-badfuncs:
-  allowed:
-    # printers usually do not live on networks which would require
-    # IPv6 due having too many hosts on one network, so it is not
-    # a priority to have IPv6 support.
-    # It is reported upstream at https://bugzilla.redhat.com/show_bug.cgi?id=2275938
-    /usr/lib*/libhpmud.so.*:
-      - gethostbyname
-      - inet_addr

sources

@@ -1 +1 @@
-SHA512 (hplip-3.25.8-repack.tar.gz) = e4f82215e2753bee864e5ba643be2ce3566f1691638c35c74016279f92c872713d06e38a066d283f03f3e571d10c8ac2f1539bd32f6bafd1958641d96fe11059
+SHA512 (hplip-3.18.12.tar.gz) = 7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635

upstream-key.gpg

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+mQGiBEsnpscRBACyclffkMVkXXdtY2qTT2+B6HN4hBoUxBwZBULyHFuSP9lsB7wK
+16Hl5ZTu+oy+GegzzFRrHWxBLN9i67T0plNkqDJhWUrmXR7xvX+dFc+Qrl+uPR0i
+CY1NMnWwnFh01YtYb9NAlb3bLn8RLBH8Zo60i7wfwdW9Wi1mgzmUT/UI9wCg7y6R
+VmF4RjNWJ2WRdL/jVeAB8H0D/0xfePoYWrSGzOp7+Vl+xYo5TdSrzohUUnly6xla
+UIKwlBCG/jpQqKH17803GpkFyh5FxG1Db7VWsciDv7flcBLPtn75gU2fPHXL+gnv
+r1eJ+ugQwCl4/8d4iJ5TMXmHQOW2Pd0U47OmbZYNNgtA+lXhF8n8+6w3GRhqubLF
+/9b/A/4wH37bv1shLhdLpP+9WYHc8z9+jmStVUFdAGoD/n6vOpBX+GQYaEY5Y8RS
+Wf0DFhMF6CFYNZ2ngDyvPt53M2jU7hrxXIfs/b5bLMqG2et9M/avdEWGUKTsC7wu
+0zeGtD07r9EA3WDIhxN9QEGZAq5Q3NSbedMHIVE4Ynq7VNCdsrQ0SFBMSVAgKEhQ
+IExpbnV4IEltYWdpbmcgYW5kIFByaW50aW5nKSA8aHBsaXBAaHAuY29tPohgBBMR
+AgAgBQJLJ6bHAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc9dwzaWQR7n4
+dQCghZgIpxuTC+GhiQIO0dK9wTlbMmoAoOB252fEOvf73v8Ya8qmN1GlmYiXuQIN
+BEsnpscQCACEO/wh+X9Apok41vn+qby5YLvSuXNcub1iVSlsByv+28KQbbvXDNPh
+LP9wdO9DmzfIGwarj0uLtn0h9UWTnEpXSZ0bKJnCYc7GZpUvcNyjIuSs69hK2rLd
+38MSb1hoBaICLjZERUhe+ZGwlx7zvAIghj+ss1udwpc6PcdPNaimp+ck9/+eSpir
+BZsWRDEyYZ8r0Tzh0vCMZG3AJZvm439gsze5ImvAt+xFluYRCHMAkXaYimXAipHd
+Hudqu5B1/KNp3kRc68pDw/kzFSJ4bEdSW/3Qu5gJxb4y9XDTMipyFt1YZrP4sYJN
+EMAjIllnMHqQsK4efdNY/JSk92wEjmN/AAQLB/42X5RSrDQc9k/2RdgbRUQPXAXF
+YRySDMt4XfaQNAYiU2nQ1thxJuLzFLnp8VumzMD4tmsmBNmacVFTAMJyWZrum6eP
+dvyczSBG0e+4t6e2YCGdA8hfxJYNHCEE0i6NI7FCu2OPDqgXKsyViql7vchQAAg3
+N4ILBlcoO86JOCbugj+Yjp8mI2tzw2o3GEZLgHPD+t7ECFmeB6QypH02CXGTsTNQ
+6qt99zr86urV8Ta39Q0A6pVV81fkXaGIg1eLX7LCE5g4lV9D/G6KXYWYju3EBz/t
+eZRyrE3BrKM7MEqVUcgBwjIswBPDfJFW+H6B7Ma9RsT0efJgeruc712Z6cztiEkE
+GBECAAkFAksnpscCGwwACgkQc9dwzaWQR7mkswCcD+QNKEcLN9XmWhlzJfwzjW3N
+JgMAniNROBBXr37dCkmawTcagKSwhiUx
+=2aUQ
+-----END PGP PUBLIC KEY BLOCK-----