From 73b7a2516027bb99b5bddca9f5598f8e5e33a416 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 12 Aug 2016 11:02:21 +0200 Subject: [PATCH] adding jpopelka's patch into hplip-ui-optional.patch (launchpad #1612132) --- hplip-ui-optional.patch | 21 ++++++++++++++++++++- hplip.spec | 5 ++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch index 647082e..fa64da8 100644 --- a/hplip-ui-optional.patch +++ b/hplip-ui-optional.patch @@ -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) + + diff --git a/hplip.spec b/hplip.spec index 72e479f..ca71345 100644 --- a/hplip.spec +++ b/hplip.spec @@ -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 - 3.16.7-4 +- adding jpopelka's patch into hplip-ui-optional.patch + * Wed Aug 10 2016 Zdenek Dohnal - 3.16.7-3 - editing previous commit