Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2019-02-24 16:59:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip" Sun Feb 24 16:59:16 2019 rev:120 rq:673387 version:3.18.6 Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2018-09-04 22:47:16.267169616 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new.28833/hplip.changes 2019-02-24 16:59:19.120796804 +0100 @@ -1,0 +2,7 @@ +Fri Feb 8 17:45:07 UTC 2019 - Martin Wilck <[email protected]> + + - Fix hang during GNOME session logout (bsc#1112331, lp#1721534) + * added ui5-systemtray.py-make-children-exit-if-no-systray-f.patch + * added ui5-systemtray-wait-only-10s-for-system-tray.patch + +------------------------------------------------------------------- New: ---- ui5-systemtray-wait-only-10s-for-system-tray.patch ui5-systemtray.py-make-children-exit-if-no-systray-f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.nTvTQ0/_old 2019-02-24 16:59:20.228796277 +0100 +++ /var/tmp/diff_new_pack.nTvTQ0/_new 2019-02-24 16:59:20.228796277 +0100 @@ -1,7 +1,7 @@ # # spec file for package hplip # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -92,6 +92,8 @@ # 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 Patch110: hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.patch +Patch111: ui5-systemtray.py-make-children-exit-if-no-systray-f.patch +Patch112: ui5-systemtray-wait-only-10s-for-system-tray.patch # Python3 port: cleanup patches Patch300: pcardext-python3-fixes.patch Patch301: hplip-misc-missing-includes-and-definitions.patch @@ -397,6 +399,8 @@ %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig %patch109 -p1 -b .systemtray.py.orig %patch110 -p1 -b .boo1094141 +%patch111 -p1 +%patch112 -p1 %patch300 -p1 -b .pcardext-python3 %patch301 -p1 -b .misc-headers %patch302 -p1 -b .hp_ipp_missing_prototypes ++++++ ui5-systemtray-wait-only-10s-for-system-tray.patch ++++++ >From 1b6030a6b94731c06f3dcc04bec88bf63af85f61 Mon Sep 17 00:00:00 2001 From: Martin Wilck <[email protected]> Date: Fri, 16 Nov 2018 11:00:44 +0100 Subject: [PATCH 2/2] ui5/systemtray: wait only 10s for system tray On GNOME >= 3.26, it will never show up. This may cause hangs on logout if users log in and log out quickly again. Signed-off-by: Martin Wilck <[email protected]> --- ui5/systemtray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui5/systemtray.py b/ui5/systemtray.py index 2d6cfd2..c71375b 100644 --- a/ui5/systemtray.py +++ b/ui5/systemtray.py @@ -841,7 +841,7 @@ def run(read_pipe): app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app i = 0 - while i < 60: + while i < 10: if QSystemTrayIcon.isSystemTrayAvailable(): break time.sleep(1.0) -- 2.19.1 ++++++ ui5-systemtray.py-make-children-exit-if-no-systray-f.patch ++++++ >From 3104eac2494b041d0eca9d29ff9430512a597444 Mon Sep 17 00:00:00 2001 From: Martin Wilck <[email protected]> Date: Fri, 16 Nov 2018 10:59:30 +0100 Subject: [PATCH 1/2] ui5/systemtray.py: make children exit if no systray found Signed-off-by: Martin Wilck <[email protected]> --- ui5/systemtray.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui5/systemtray.py b/ui5/systemtray.py index a0cdaf1..2d6cfd2 100644 --- a/ui5/systemtray.py +++ b/ui5/systemtray.py @@ -848,6 +848,8 @@ def run(read_pipe): i += 1 if not QSystemTrayIcon.isSystemTrayAvailable(): + app.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT) + app.quit() exit(0) else: notifier = QSocketNotifier(read_pipe, QSocketNotifier.Read) -- 2.19.1
