[packages/gnome-mail-notification] - fix building with evolution 3.16 - rel 20

[baggins]

commit 09ff214b7bfde83a19ede836dd3f2efccc6f32b8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 12 12:30:40 2015 +0200

    - fix building with evolution 3.16
    - rel 20

 evolution-3.16.patch         | 26 ++++++++++++++++++++++++++
 gnome-mail-notification.spec |  6 ++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/gnome-mail-notification.spec b/gnome-mail-notification.spec
index d51e152..fc19103 100644
--- a/gnome-mail-notification.spec
+++ b/gnome-mail-notification.spec
@@ -1,10 +1,10 @@
-%define		evo_ver	3.12
+%define		evo_ver	3.16
 %define		rname mail-notification
 Summary:	GNOME notification area mail monitor
 Summary(pl.UTF-8):	Monitor poczty widoczny w obszarze powiadamiania GNOME
 Name:		gnome-mail-notification
 Version:	5.4
-Release:	19
+Release:	20
 License:	GPL v3+
 Group:		X11/Applications
 Source0:	https://github.com/epienbroek/mail-notification/tarball/master/%{rname}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Patch0:		mail-notification-jb-gcc-format.patch
 Patch1:		jb-glibc-2.19.patch
 Patch2:		jb-evolution-plugin-detect.patch
 Patch3:		evolution-3.12.patch
+Patch4:		evolution-3.16.patch
 URL:		http://www.nongnu.org/mailnotify/
 BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.59
@@ -79,6 +80,7 @@ Wsparcie dla skrzynek pocztowych Evolution w Mail Notification.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./jb configure \
diff --git a/evolution-3.16.patch b/evolution-3.16.patch
new file mode 100644
index 0000000..f479b82
--- /dev/null
+++ b/evolution-3.16.patch
@@ -0,0 +1,26 @@
+--- epienbroek-mail-notification-45d11d2/src/mn-evolution-folder-tree-server.gob~	2015-04-12 11:28:14.000000000 +0200
++++ epienbroek-mail-notification-45d11d2/src/mn-evolution-folder-tree-server.gob	2015-04-12 12:23:10.500641532 +0200
+@@ -96,7 +96,9 @@
+ #if EDS_CHECK_VERSION(3,1,0)
+     EShell *shell = e_shell_get_default();
+     EShellBackend *shell_backend = e_shell_get_backend_by_name(shell, "mail");
+-#if EDS_CHECK_VERSION(3,5,1)
++#if EDS_CHECK_VERSION(3,16,0)
++    GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), E_MAIL_FORMATTER_MODE_NORMAL);
++#elif EDS_CHECK_VERSION(3,5,1)
+     GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, E_MAIL_FORMATTER_MODE_NORMAL);
+ #else
+     GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
+--- epienbroek-mail-notification-45d11d2/src/mn-evolution-server.gob~	2015-04-12 11:28:14.000000000 +0200
++++ epienbroek-mail-notification-45d11d2/src/mn-evolution-server.gob	2015-04-12 12:28:57.267305686 +0200
+@@ -378,7 +378,9 @@
+ 	shell = e_shell_get_default ();
+ 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
+ 
+-#if EDS_CHECK_VERSION(3,5,1)
++#if EDS_CHECK_VERSION(3,16,0)
++	browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), E_MAIL_FORMATTER_MODE_NORMAL);
++#elif EDS_CHECK_VERSION(3,5,1)
+ 	browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, E_MAIL_FORMATTER_MODE_NORMAL);
+ #else
+ 	browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-mail-notification.git/commitdiff/09ff214b7bfde83a19ede836dd3f2efccc6f32b8