pool/hplip
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 682656 from home:mwilck:branches:Printing

Browse Source 
- Fix hp-toolbox exiting after 10s under GNOME (bsc#1112331)
  * removed ui5-systemtray.py-make-children-exit-if-no-systray-f.patch
  Patch "ui5-systemtray-wait-only-10s-for-system-tray.patch" is
  sufficient to fix the logout problem (bsc#1112331, lp#1721534)

OBS-URL: https://build.opensuse.org/request/show/682656
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=165
This commit is contained in:
Martin Wilck 2019-03-08 21:44:06 +00:00 committed by Git OBS Bridge
parent 345f52c428
commit 27dc72374e
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hplip.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Mar 8 00:00:15 UTC 2019 - Martin Wilck <mwilck@suse.com>
- Fix hp-toolbox exiting after 10s under GNOME (bsc#1112331)
* removed ui5-systemtray.py-make-children-exit-if-no-systray-f.patch
Patch "ui5-systemtray-wait-only-10s-for-system-tray.patch" is
sufficient to fix the logout problem (bsc#1112331, lp#1721534)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 8 17:45:07 UTC 2019 - Martin Wilck <mwilck@suse.com> Fri Feb 8 17:45:07 UTC 2019 - Martin Wilck <mwilck@suse.com>

2
hplip.spec
View File

@ -92,7 +92,6 @@ 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 # 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 Patch109: no-systray-failure-message.patch
Patch110: hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.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 Patch112: ui5-systemtray-wait-only-10s-for-system-tray.patch
# Python3 port: cleanup patches # Python3 port: cleanup patches
Patch300: pcardext-python3-fixes.patch Patch300: pcardext-python3-fixes.patch
@ -399,7 +398,6 @@ This sub-package is only required by developers.
%patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig
%patch109 -p1 -b .systemtray.py.orig %patch109 -p1 -b .systemtray.py.orig
%patch110 -p1 -b .boo1094141 %patch110 -p1 -b .boo1094141
%patch111 -p1
%patch112 -p1 %patch112 -p1
%patch300 -p1 -b .pcardext-python3 %patch300 -p1 -b .pcardext-python3
%patch301 -p1 -b .misc-headers %patch301 -p1 -b .misc-headers

10
ui5-systemtray-wait-only-10s-for-system-tray.patch
View File

@ -1,18 +1,16 @@
From 1b6030a6b94731c06f3dcc04bec88bf63af85f61 Mon Sep 17 00:00:00 2001 From 92ddbb36e2a589fe4d1cf27c30b67a1bb12bf9dc Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com> From: Martin Wilck <mwilck@suse.com>
Date: Fri, 16 Nov 2018 11:00:44 +0100 Date: Fri, 16 Nov 2018 11:00:44 +0100
Subject: [PATCH 2/2] ui5/systemtray: wait only 10s for system tray Subject: [PATCH] ui5/systemtray: wait only 10s for system tray
On GNOME >= 3.26, it will never show up. This may cause hangs on On GNOME >= 3.26, it will never show up. This may cause hangs on
logout if users log in and log out quickly again. logout if users log in and log out quickly again.
Signed-off-by: Martin Wilck <mwilck@suse.com>
--- ---
ui5/systemtray.py | 2 +- ui5/systemtray.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui5/systemtray.py b/ui5/systemtray.py diff --git a/ui5/systemtray.py b/ui5/systemtray.py
index 2d6cfd2..c71375b 100644 index a0cdaf1..101807a 100644
--- a/ui5/systemtray.py --- a/ui5/systemtray.py
+++ b/ui5/systemtray.py +++ b/ui5/systemtray.py
@@ -841,7 +841,7 @@ def run(read_pipe): @@ -841,7 +841,7 @@ def run(read_pipe):
@ -25,5 +23,5 @@ index 2d6cfd2..c71375b 100644
break break
time.sleep(1.0) time.sleep(1.0)
-- --
2.19.1 2.21.0