Hello community,

here is the log from the commit of package hplip for openSUSE:Factory checked 
in at 2017-10-23 16:36:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hplip (Old)
 and      /work/SRC/openSUSE:Factory/.hplip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hplip"

Mon Oct 23 16:36:46 2017 rev:114 rq:533876 version:3.17.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/hplip/hplip.changes      2017-10-10 
11:35:44.114567722 +0200
+++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2017-10-23 
16:36:47.495018170 +0200
@@ -1,0 +2,6 @@
+Thu Oct 12 21:03:40 UTC 2017 - [email protected]
+
+- Add no-systray-failure-message.patch: don't display an error if
+  unable to find a system tray (boo#1061211). 
+
+-------------------------------------------------------------------

New:
----
  no-systray-failure-message.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hplip.spec ++++++
--- /var/tmp/diff_new_pack.rzMSCF/_old  2017-10-23 16:36:48.714961058 +0200
+++ /var/tmp/diff_new_pack.rzMSCF/_new  2017-10-23 16:36:48.718960870 +0200
@@ -73,6 +73,8 @@
 # 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 @@
 # 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
 




++++++ no-systray-failure-message.patch ++++++
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",
-            "<b>No system tray detected on this system.</b><p>Unable to start, 
exiting.</p>",
-            None),
-            QApplication.translate("SystemTray", "HPLIP Status Service",
-            None))
+        exit(0)
     else:
         notifier = QSocketNotifier(read_pipe, QSocketNotifier.Read)
         # QObject.notifier.activated[int].connect(app.notifierActivated)

Reply via email to