diff --git a/hplip.changes b/hplip.changes index 5eb17a5..2169dd8 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Mar 11 11:36:36 UTC 2019 - Martin Wilck + +- don't mark /usr/lib/udev/rules.d/56-hpmud.rules as config file, + fixes rpmlint warning (override it by copying it to + /etc/udev/rules.d). + +------------------------------------------------------------------- +Fri Mar 8 00:00:15 UTC 2019 - Martin Wilck + +- 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 diff --git a/hplip.spec b/hplip.spec index dcf3a84..a5342e2 100644 --- a/hplip.spec +++ b/hplip.spec @@ -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 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 @@ -399,7 +398,6 @@ This sub-package is only required by developers. %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 @@ -725,7 +723,7 @@ exit 0 %dir %{_prefix}/lib/udev %dir %{_prefix}/lib/udev/rules.d %endif -%config %{_udevrulesdir}/56-hpmud.rules +%{_udevrulesdir}/56-hpmud.rules %{_bindir}/hp-align %{_bindir}/hp-check %{_bindir}/hp-clean diff --git a/ui5-systemtray-wait-only-10s-for-system-tray.patch b/ui5-systemtray-wait-only-10s-for-system-tray.patch index 5c46993..8107080 100644 --- a/ui5-systemtray-wait-only-10s-for-system-tray.patch +++ b/ui5-systemtray-wait-only-10s-for-system-tray.patch @@ -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 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 logout if users log in and log out quickly again. - -Signed-off-by: Martin Wilck --- 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 +index a0cdaf1..101807a 100644 --- a/ui5/systemtray.py +++ b/ui5/systemtray.py @@ -841,7 +841,7 @@ def run(read_pipe): @@ -25,5 +23,5 @@ index 2d6cfd2..c71375b 100644 break time.sleep(1.0) -- -2.19.1 +2.21.0 diff --git a/ui5-systemtray.py-make-children-exit-if-no-systray-f.patch b/ui5-systemtray.py-make-children-exit-if-no-systray-f.patch deleted file mode 100644 index c2496b9..0000000 --- a/ui5-systemtray.py-make-children-exit-if-no-systray-f.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3104eac2494b041d0eca9d29ff9430512a597444 Mon Sep 17 00:00:00 2001 -From: Martin Wilck -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 ---- - 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 -