diff --git a/hplip-no-system-tray.patch b/hplip-no-system-tray.patch new file mode 100644 index 0000000..a3ae50f --- /dev/null +++ b/hplip-no-system-tray.patch @@ -0,0 +1,20 @@ +diff -up hplip-3.10.2/ui4/systemtray.py.no-system-tray hplip-3.10.2/ui4/systemtray.py +--- hplip-3.10.2/ui4/systemtray.py.no-system-tray 2010-05-11 14:40:57.000000000 +0200 ++++ hplip-3.10.2/ui4/systemtray.py 2010-05-11 15:25:20.000000000 +0200 +@@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000 + BLIP_DELAY = 2000 + SET_MENU_DELAY = 1000 + MAX_MENU_EVENTS = 10 ++TRAY_AVAILABLE_DELAY = 30 + + ERROR_STATE_TO_ICON = { + ERROR_STATE_CLEAR: QSystemTrayIcon.Information, +@@ -707,7 +708,7 @@ def run(read_pipe): + app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app + + i = 0 +- while i < 10: ++ while i < TRAY_AVAILABLE_DELAY: + if QSystemTrayIcon.isSystemTrayAvailable(): + break + time.sleep(1.0) diff --git a/hplip.spec b/hplip.spec index e74fd9d..421526f 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -31,6 +31,7 @@ Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch +Patch20: hplip-no-system-tray.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -193,6 +194,9 @@ done # Added missing newline to string argument in dbglog() call (bug #585275). %patch19 -p1 -b .dbglog-newline +# Wait for max 30s to see if a system tray becomes available (bug #569969). +%patch20 -p1 -b .no-system-tray + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -414,6 +418,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Wed May 12 2010 Jiri Popelka - 3.10.2-14 +- Wait for max 30s to see if a system tray becomes available (bug #569969). + * Wed Apr 28 2010 Tim Waugh - 3.10.2-13 - Clear old printer-state-reasons we used to manage (bug #510926).