fix patch systray-hide-when-inactive [release 3.16.5-2mamba;Mon Jul 04 2016]

This commit is contained in:
Silvan Calarco 2024-01-05 23:42:55 +01:00
parent e5f71d07a8
commit d91dbb3599
3 changed files with 25 additions and 14 deletions

View File

@ -1,12 +0,0 @@
diff -Nru hplip-3.14.4.orig/ui4/ui_utils.py hplip-3.14.4/ui4/ui_utils.py
--- hplip-3.14.4.orig/ui4/ui_utils.py 2014-04-04 12:40:22.000000000 +0200
+++ hplip-3.14.4/ui4/ui_utils.py 2014-04-11 14:42:20.298791428 +0200
@@ -108,7 +108,7 @@
else:
QSettings.__init__(self, os.path.join(prop.user_dir, 'hplip.conf'), QSettings.IniFormat)
- self.systray_visible = SYSTRAY_VISIBLE_SHOW_ALWAYS
+ self.systray_visible = SYSTRAY_VISIBLE_HIDE_WHEN_INACTIVE
self.systray_messages = SYSTRAY_MESSAGES_SHOW_ALL
self.last_used_device_uri = ''
self.last_used_printer = ''

View File

@ -0,0 +1,20 @@
--- hplip-3.16.5/ui4/ui_utils.py.orig 2016-05-04 07:23:05.000000000 +0200
+++ hplip-3.16.5/ui4/ui_utils.py 2016-07-04 20:36:14.571475245 +0200
@@ -156,7 +156,7 @@
else:
QSettings.__init__(self, os.path.join(prop.user_dir, 'hplip.conf'), QSettings.IniFormat)
- self.systray_visible = SYSTRAY_VISIBLE_SHOW_ALWAYS
+ self.systray_visible = SYSTRAY_VISIBLE_HIDE_WHEN_INACTIVE
self.systray_messages = SYSTRAY_MESSAGES_SHOW_ALL
self.last_used_device_uri = ''
self.last_used_printer = ''
@@ -197,7 +197,7 @@
self.sync()
self.beginGroup("settings")
- self.systray_visible = value_int(self.value("systray_visible"))[0]
+ self.systray_visible = value_int(self.value("systray_visible", self.systray_visible))[0]
self.systray_messages = value_int(self.value("systray_messages"))[0]

View File

@ -3,7 +3,7 @@
%define cups_ver %(cups-config --api-version) %define cups_ver %(cups-config --api-version)
Name: hplip Name: hplip
Version: 3.16.5 Version: 3.16.5
Release: 1mamba Release: 2mamba
Summary: A printer driver for HP inkjet devices Summary: A printer driver for HP inkjet devices
Group: System/Spooling Group: System/Spooling
Vendor: openmamba Vendor: openmamba
@ -14,7 +14,7 @@ Source: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{versio
Patch0: %{name}-3.11.7-cups-1.5.patch Patch0: %{name}-3.11.7-cups-1.5.patch
Patch1: %{name}-3.12.9-cups-1.6.patch Patch1: %{name}-3.12.9-cups-1.6.patch
Patch2: hplip-3.14.4-openmamba-AUTH_TYPES-warning.patch Patch2: hplip-3.14.4-openmamba-AUTH_TYPES-warning.patch
Patch3: hplip-3.14.4-systray-hide-when-inactive.patch Patch3: hplip-3.16.5-systray-hide-when-inactive.patch
License: BSD, LGPL License: BSD, LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -197,6 +197,9 @@ grep hpaio %{_sysconfdir}/sane.d/dll.conf >/dev/null ||
%{_datadir}/doc/* %{_datadir}/doc/*
%changelog %changelog
* Mon Jul 04 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.16.5-2mamba
- fix patch systray-hide-when-inactive
* Sat May 07 2016 Automatic Build System <autodist@mambasoft.it> 3.16.5-1mamba * Sat May 07 2016 Automatic Build System <autodist@mambasoft.it> 3.16.5-1mamba
- automatic version update by autodist - automatic version update by autodist