rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

2015910 - [GUI] hp-setup crashes when loading smart_install module

Browse Source 
1959242 - hplip-3.21.12 is available
This commit is contained in:
Zdenek Dohnal 2022-01-17 16:12:31 +01:00
parent 11664de4a6
commit fea1bc106d
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hplip-qt5-smart-install.py Normal file
View File

@ -0,0 +1,13 @@
diff --git a/base/smart_install.py b/base/smart_install.py
index ec30aef..dd95e09 100755
--- a/base/smart_install.py
+++ b/base/smart_install.py
@@ -226,7 +226,7 @@ def disable(mode, ui_toolkit='qt4', dialog=None, app=None, passwordObj = None):
dialog.init(printer_names, "", QUEUES_SMART_INSTALL_ENABLED)
else: # If QT object is not created, creating QT app
try:
- from ui4.queuesconf import QueuesDiagnose
+ from ui5.queuesconf import QueuesDiagnose
except ImportError:
log.error("Unable to load Qt4 support. Is it installed?")
else: # app = QApplication(sys.argv) # caller needs to inoke this, if already QApplication object is not created.

8
hplip.spec
View File

@ -195,6 +195,9 @@ Patch61: hplip-osname-mismatch.patch
# 2015428 - python3.10 has Callable in collections.abc # 2015428 - python3.10 has Callable in collections.abc
# reported as https://bugs.launchpad.net/hplip/+bug/1948801 # reported as https://bugs.launchpad.net/hplip/+bug/1948801
Patch62: hplip-py310-collections-abc.patch Patch62: hplip-py310-collections-abc.patch
# 2015910 - [GUI] hp-setup crashes when loading smart_install module
# reported as https://bugs.launchpad.net/hplip/+bug/1957891
Patch63: hplip-qt5-smart-install.py
%if 0%{?fedora} || 0%{?rhel} <= 8 %if 0%{?fedora} || 0%{?rhel} <= 8
# mention hplip-gui if you want to have GUI # mention hplip-gui if you want to have GUI
@ -513,6 +516,8 @@ done
%patch61 -p1 -b .osname-mismatch %patch61 -p1 -b .osname-mismatch
# 2015428 - python3.10 has Callable in collections.abc # 2015428 - python3.10 has Callable in collections.abc
%patch62 -p1 -b .abc %patch62 -p1 -b .abc
# 2015910 - [GUI] hp-setup crashes when loading smart_install module
%patch63 -p1 -b .qt5-smart
%if 0%{?fedora} || 0%{?rhel} <= 8 %if 0%{?fedora} || 0%{?rhel} <= 8
# mention hplip-gui should be installed if you want GUI # mention hplip-gui should be installed if you want GUI
@ -868,6 +873,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog %changelog
* Mon Jan 17 2022 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.12-1
- 2015910 - [GUI] hp-setup crashes when loading smart_install module
* Fri Jan 14 2022 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.12-1 * Fri Jan 14 2022 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.12-1
- 1959242 - hplip-3.21.12 is available - 1959242 - hplip-3.21.12 is available