diff --git a/hplip.changes b/hplip.changes index 23d4619..356d59e 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 12 21:03:40 UTC 2017 - mgorse@suse.com + +- Add no-systray-failure-message.patch: don't display an error if + unable to find a system tray (boo#1061211). + ------------------------------------------------------------------- Wed Oct 4 14:28:17 UTC 2017 - mwilck@suse.com diff --git a/hplip.spec b/hplip.spec index 913e699..8bcb97a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -73,6 +73,8 @@ Patch107: hplip-udev-rules-in-usr.patch # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 Patch108: add_missing_includes_and_define_GNU_SOURCE.patch +# PATCH-FIX-SUSE: GNOME no longer provides a system tray, so don't warn the user that we can't find it +Patch109: no-systray-failure-message.patch # Patch200 fixes device communication and detection via MDNS in some network setups: Patch200: hplip-mdns.patch # Patch201 makes MDNS lookups more robust by retrying queries: @@ -368,6 +370,7 @@ This sub-package is only required by developers. # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig +%patch109 -p1 -b systemtray.py.orig %patch200 -p1 -b .mdns %patch201 -p1 -b .mdns-retry diff --git a/no-systray-failure-message.patch b/no-systray-failure-message.patch new file mode 100644 index 0000000..da5c560 --- /dev/null +++ b/no-systray-failure-message.patch @@ -0,0 +1,17 @@ +diff -urp hplip-3.17.9.orig/ui5/systemtray.py hplip-3.17.9/ui5/systemtray.py +--- hplip-3.17.9.orig/ui5/systemtray.py 2017-09-19 02:29:18.000000000 -0500 ++++ hplip-3.17.9/ui5/systemtray.py 2017-10-12 15:39:43.456026353 -0500 +@@ -848,12 +848,7 @@ def run(read_pipe): + i += 1 + + if not QSystemTrayIcon.isSystemTrayAvailable(): +- FailureUI(None, +- QApplication.translate("SystemTray", +- "No system tray detected on this system.

Unable to start, exiting.

", +- None), +- QApplication.translate("SystemTray", "HPLIP Status Service", +- None)) ++ exit(0) + else: + notifier = QSocketNotifier(read_pipe, QSocketNotifier.Read) + # QObject.notifier.activated[int].connect(app.notifierActivated)