Accepting request 672868 from home:mwilck:branches:Printing

- 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

OBS-URL: https://build.opensuse.org/request/show/672868
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=163
This commit is contained in:
2019-02-11 14:50:05 +00:00
committed by Git OBS Bridge
parent 168349c63e
commit 345f52c428
4 changed files with 68 additions and 2 deletions

View File

@@ -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 @@ 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
Patch301: hplip-misc-missing-includes-and-definitions.patch
@@ -397,6 +399,8 @@ 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
%patch302 -p1 -b .hp_ipp_missing_prototypes