From 982e968ef61a94e0de75d733e9036e5c60afca34 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Wed, 25 Aug 2021 15:29:51 +0200 Subject: print/hplip(-plugin): update to 3.22.2 - Convert post-patch to real patches because they are easier to maintain. - Fix a NULL dereference in the scanner backend when D-Bus isn't running. - Depend on sysutils/py-distro to make hp-toolbox (Device Manager) work again. - Upstream switched to Avahi for mDNS support. Rename the SNMP option to NETWORK because it's not just SNMP now. - Don't install some programs related to uninstalling and upgrading of HPLIP and the installation of firmware plugins because they circumvent the package system. - Install icons in share/icons so desktops can choose an appropriate resolution. Portions taken from a patch by Oleg Sidorkin . PR: 255586, 257034, 257512 --- print/hplip/files/patch-ui5_scandialog.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 print/hplip/files/patch-ui5_scandialog.py (limited to 'print/hplip/files/patch-ui5_scandialog.py') diff --git a/print/hplip/files/patch-ui5_scandialog.py b/print/hplip/files/patch-ui5_scandialog.py new file mode 100644 index 000000000000..cd15c95d1c61 --- /dev/null +++ b/print/hplip/files/patch-ui5_scandialog.py @@ -0,0 +1,23 @@ +--- ui5/scandialog.py.orig 2022-02-23 07:41:05 UTC ++++ ui5/scandialog.py +@@ -242,17 +242,17 @@ class Ui_HpScan(object): + self.label_Flatbed = QtWidgets.QLabel(self.dockWidgetContents) + self.label_Flatbed.setGeometry(QtCore.QRect(10, 150, 51, 41)) + self.label_Flatbed.setText("") +- self.label_Flatbed.setPixmap(QtGui.QPixmap("/usr/share/hplip/data/images/other/flat1.png")) ++ self.label_Flatbed.setPixmap(QtGui.QPixmap("/usr/local/share/hplip/data/images/other/flat1.png")) + self.label_Flatbed.setObjectName("label_Flatbed") + self.label_Color = QtWidgets.QLabel(self.dockWidgetContents) + self.label_Color.setGeometry(QtCore.QRect(20, 210, 61, 41)) + self.label_Color.setText("") +- self.label_Color.setPixmap(QtGui.QPixmap("/usr/share/hplip/data/images/other/viewer.png")) ++ self.label_Color.setPixmap(QtGui.QPixmap("/usr/local/share/hplip/data/images/other/viewer.png")) + self.label_Color.setObjectName("label_Color") + self.label_Resolution = QtWidgets.QLabel(self.dockWidgetContents) + self.label_Resolution.setGeometry(QtCore.QRect(20, 270, 51, 51)) + self.label_Resolution.setText("") +- self.label_Resolution.setPixmap(QtGui.QPixmap("/usr/share/hplip/data/images/other/resolution.png")) ++ self.label_Resolution.setPixmap(QtGui.QPixmap("/usr/local/share/hplip/data/images/other/resolution.png")) + self.label_Resolution.setObjectName("label_Resolution") + self.auto_orient = QtWidgets.QCheckBox(self.dockWidgetContents) + self.auto_orient.setGeometry(QtCore.QRect(300,70,117, 22)) -- cgit v1.2.3