adding jpopelka's patch into hplip-ui-optional.patch (launchpad #1612132)
This commit is contained in:
parent
911f38a200
commit
73b7a25160
@ -1,6 +1,6 @@
|
||||
diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py
|
||||
--- hplip-3.16.7/base/utils.py.ui-optional 2016-07-15 12:12:28.000000000 +0200
|
||||
+++ hplip-3.16.7/base/utils.py 2016-08-10 18:02:25.126595787 +0200
|
||||
+++ hplip-3.16.7/base/utils.py 2016-08-12 10:12:24.599398769 +0200
|
||||
@@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3
|
||||
if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
|
||||
no_qt_message_gtk()
|
||||
@ -33,3 +33,22 @@ diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py
|
||||
raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed")
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.16.7
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: GPLv2+ and MIT and BSD
|
||||
|
||||
Url: http://hplip.sourceforge.net/
|
||||
@ -466,6 +466,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Fri Aug 12 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-4
|
||||
- adding jpopelka's patch into hplip-ui-optional.patch
|
||||
|
||||
* Wed Aug 10 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.7-3
|
||||
- editing previous commit
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user