From 9c0456e0c65afd9733cc5565f23464499eaee193 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Tue, 2 Oct 2018 20:23:49 +0200
Subject: [PATCH] Upgrade liferea

---
 .../liferea-1.12.1-dont-hide-window.patch     | 23 ------------
 .../liferea-1.12.5a-dont-hide-window.patch    | 37 +++++++++++++++++++
 satellites/liferea.sat                        | 12 +++---
 3 files changed, 43 insertions(+), 29 deletions(-)
 delete mode 100644 satellites/extrafiles/liferea/liferea-1.12.1-dont-hide-window.patch
 create mode 100644 satellites/extrafiles/liferea/liferea-1.12.5a-dont-hide-window.patch

diff --git a/satellites/extrafiles/liferea/liferea-1.12.1-dont-hide-window.patch b/satellites/extrafiles/liferea/liferea-1.12.1-dont-hide-window.patch
deleted file mode 100644
index bfe3b4f..0000000
--- a/satellites/extrafiles/liferea/liferea-1.12.1-dont-hide-window.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-+++ plugins/trayicon.py
-@@ -110,8 +110,6 @@
-         self.window = self.shell.get_window()
-         self.minimize_to_tray_delete_handler = self.window.connect("delete_event",
-                                                                    self.trayicon_minimize_on_close)
--        self.minimize_to_tray_minimize_handler = self.window.connect("window-state-event",
--                                                                     self.window_state_event_cb)
- 
-         # show the window if it is hidden when starting liferea
-         self.window.deiconify()
-@@ -123,12 +121,6 @@
-         self.feedlist_new_items_cb_id = sigid
-         self.feedlist = feedlist
- 
--    def window_state_event_cb(self, widget, event):
--        "Hide window when minimize"
--        if event.changed_mask & event.new_window_state & Gdk.WindowState.ICONIFIED:
--            self.window.deiconify()
--            self.window.hide()
--
-     def trayicon_click(self, widget, data = None):
-         self.window.deiconify()
-         self.window.show()
diff --git a/satellites/extrafiles/liferea/liferea-1.12.5a-dont-hide-window.patch b/satellites/extrafiles/liferea/liferea-1.12.5a-dont-hide-window.patch
new file mode 100644
index 0000000..9dd3362
--- /dev/null
+++ b/satellites/extrafiles/liferea/liferea-1.12.5a-dont-hide-window.patch
@@ -0,0 +1,37 @@
++++ plugins/trayicon.py
+@@ -109,11 +109,7 @@
+ 
+         self.window = self.shell.get_window()
+         self.delete_signal_id = GObject.signal_lookup("delete_event", Gtk.Window)
+-        GObject.signal_handlers_block_matched (self.window,
+-                                               GObject.SignalMatchType.ID | GObject.SignalMatchType.DATA,
+-                                               self.delete_signal_id, 0, None, None, None)
+         self.window.connect("delete_event", self.trayicon_minimize_on_close)
+-        self.window.connect("window-state-event", self.window_state_event_cb)
+ 
+         # show the window if it is hidden when starting liferea
+         self.window.deiconify()
+@@ -125,12 +121,6 @@
+         self.feedlist_new_items_cb_id = sigid
+         self.feedlist = feedlist
+ 
+-    def window_state_event_cb(self, widget, event):
+-        "Hide window when minimize"
+-        if event.changed_mask & event.new_window_state & Gdk.WindowState.ICONIFIED:
+-            self.window.deiconify()
+-            self.window.hide()
+-
+     def trayicon_click(self, widget, data = None):
+         self.window.deiconify()
+         self.window.show()
+@@ -189,10 +179,6 @@
+     def do_deactivate(self):
+         self.staticon.set_visible(False)
+         self.window.disconnect_by_func(self.trayicon_minimize_on_close)
+-        GObject.signal_handlers_unblock_matched (self.window,
+-                                                 GObject.SignalMatchType.ID | GObject.SignalMatchType.DATA,
+-                                                 self.delete_signal_id, 0, None,None,None)
+-        self.window.disconnect_by_func(self.window_state_event_cb)
+ 
+         self.feedlist.disconnect(self.feedlist_new_items_cb_id)
+ 
diff --git a/satellites/liferea.sat b/satellites/liferea.sat
index 71a52c1..726de35 100644
--- a/satellites/liferea.sat
+++ b/satellites/liferea.sat
@@ -1,17 +1,17 @@
 import 'compile/configure'
 
 name=liferea
-version=1.12.4
+version=1.12.5
 
 define_option '!patch: Apply some custom patches'
 
-dlextract "https://github.com/lwindolf/$name/releases/download/v$version/$name-$version.tar.bz2" \
-          '862cd7f6920ef3dfc1bc98c9930da5b4'
-option patch extrafile "$name-1.12.1-dont-hide-window.patch"
+dlextract "https://github.com/lwindolf/$name/releases/download/v$version/$name-${version}a.tar.bz2" \
+          '743e64cb319b20b6adc7c26c6cdab548'
+option patch extrafile "$name-1.12.5a-dont-hide-window.patch"
 _
 
-cd "$name-$version"
-option patch patch -p0 -i "../$name-1.12.1-dont-hide-window.patch"
+cd "$name-${version}a"
+option patch patch -p0 -i "../$name-1.12.5a-dont-hide-window.patch"
 
 compile_configure -- --disable-schemas-compile --disable-static