From d91dbb3599733e35bbc212a22e3c33a76f5a2024 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:42:55 +0100
Subject: [PATCH] fix patch systray-hide-when-inactive [release
 3.16.5-2mamba;Mon Jul 04 2016]

---
 hplip-3.14.4-systray-hide-when-inactive.patch | 12 -----------
 hplip-3.16.5-systray-hide-when-inactive.patch | 20 +++++++++++++++++++
 hplip.spec                                    |  7 +++++--
 3 files changed, 25 insertions(+), 14 deletions(-)
 delete mode 100644 hplip-3.14.4-systray-hide-when-inactive.patch
 create mode 100644 hplip-3.16.5-systray-hide-when-inactive.patch

diff --git a/hplip-3.14.4-systray-hide-when-inactive.patch b/hplip-3.14.4-systray-hide-when-inactive.patch
deleted file mode 100644
index 6a253e6..0000000
--- a/hplip-3.14.4-systray-hide-when-inactive.patch
+++ /dev/null
@@ -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 = ''
diff --git a/hplip-3.16.5-systray-hide-when-inactive.patch b/hplip-3.16.5-systray-hide-when-inactive.patch
new file mode 100644
index 0000000..de21a0c
--- /dev/null
+++ b/hplip-3.16.5-systray-hide-when-inactive.patch
@@ -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]
+  
diff --git a/hplip.spec b/hplip.spec
index d163f7f..ac166d5 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -3,7 +3,7 @@
 %define cups_ver %(cups-config --api-version)
 Name:          hplip
 Version:       3.16.5
-Release:       1mamba
+Release:       2mamba
 Summary:       A printer driver for HP inkjet devices
 Group:         System/Spooling
 Vendor:        openmamba
@@ -14,7 +14,7 @@ Source:        http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{versio
 Patch0:        %{name}-3.11.7-cups-1.5.patch
 Patch1:        %{name}-3.12.9-cups-1.6.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
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -197,6 +197,9 @@ grep hpaio %{_sysconfdir}/sane.d/dll.conf >/dev/null ||
 %{_datadir}/doc/*
 
 %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
 - automatic version update by autodist