[packages/gnome-mail-notification] - patch from Fedora to make it compatible with Evolution >= 3.11.2 - author Milan Crha

[kiesiu]

commit e8a702b49200dcaf3e1fb8365e399c038311c240
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date:   Tue Apr 15 16:16:50 2014 +0200

    - patch from Fedora to make it compatible with Evolution >= 3.11.2 - author Milan Crha

 evolution-3.12.patch | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
---
diff --git a/evolution-3.12.patch b/evolution-3.12.patch
new file mode 100644
index 0000000..eb954e1
--- /dev/null
+++ b/evolution-3.12.patch
@@ -0,0 +1,97 @@
+diff -up epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob.evo3_11_2 epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob
+--- epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob.evo3_11_2	2012-11-21 19:57:35.000000000 +0100
++++ epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob	2013-11-20 09:26:27.159056391 +0100
+@@ -20,14 +20,18 @@
+ %privateheader{
+ #include <gtk/gtk.h>
+ #include <libedataserver/eds-version.h>
+-#if EDS_CHECK_VERSION(3,3,5)
+-  #include <libemail-engine/e-mail-session.h>
++#if EDS_CHECK_VERSION(3,11,2)
++  #include <libemail-engine/libemail-engine.h>
+ #else
+-  #if EDS_CHECK_VERSION(2,91,0)
+-    #include <mail/e-mail-session.h>
++  #if EDS_CHECK_VERSION(3,3,5)
++    #include <libemail-engine/e-mail-session.h>
+   #else
+-    /* GOB2 doesn't support private members guarded with an #if */
+-    typedef EMailSession void;
++    #if EDS_CHECK_VERSION(2,91,0)
++      #include <mail/e-mail-session.h>
++    #else
++      /* GOB2 doesn't support private members guarded with an #if */
++      typedef EMailSession void;
++    #endif
+   #endif
+ #endif
+ %}
+@@ -40,10 +44,14 @@
+   #include <mail/mail-component.h>
+ #endif
+ #if EDS_CHECK_VERSION(3,1,0)
+-  #if EDS_CHECK_VERSION(3,3,5)
+-    #include <libemail-engine/e-mail-folder-utils.h>
++  #if EDS_CHECK_VERSION(3,11,2)
++    #include <libemail-engine/libemail-engine.h>
+   #else
+-    #include <mail/e-mail-folder-utils.h>
++    #if EDS_CHECK_VERSION(3,3,5)
++      #include <libemail-engine/e-mail-folder-utils.h>
++    #else
++      #include <mail/e-mail-folder-utils.h>
++    #endif
+   #endif
+   #include <mail/e-mail-browser.h>
+   #include <mail/e-mail-reader.h>
+diff -up epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c.evo3_11_2 epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c
+--- epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c.evo3_11_2	2012-11-21 19:57:35.000000000 +0100
++++ epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c	2013-11-20 08:57:17.779176014 +0100
+@@ -27,6 +27,9 @@
+ #include <camel/camel.h>
+ #include <libedataserver/eds-version.h>
+ #include <mail/em-event.h>
++#if EDS_CHECK_VERSION(3,11,2)
++#include <libemail-engine/libemail-engine.h>
++#else
+ #if EDS_CHECK_VERSION(3,3,5)
+ #include <libemail-engine/e-mail-folder-utils.h>
+ #include <libemail-engine/mail-tools.h>
+@@ -34,6 +37,7 @@
+ #include <mail/mail-tools.h>
+ #include <mail/e-mail-folder-utils.h>
+ #endif
++#endif
+ #include "mn-evolution.h"
+ #include "mn-evolution-server.h"
+ #include "mn-evolution-plugin.h"
+diff -up epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob.evo3_11_2 epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob
+--- epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob.evo3_11_2	2012-11-21 19:57:35.000000000 +0100
++++ epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob	2013-11-20 09:26:47.055055030 +0100
+@@ -36,15 +36,19 @@
+   #include <mail/em-message-browser.h>
+ #endif
+ #include <mail/em-utils.h>
+-#if EDS_CHECK_VERSION(3,3,5)
+-  #include <libemail-engine/e-mail-session.h>
+-  #include <libemail-engine/mail-tools.h>
++#if EDS_CHECK_VERSION(3,11,2)
++  #include <libemail-engine/libemail-engine.h>
+ #else
+-  #include <mail/mail-tools.h>
+-  #if EDS_CHECK_VERSION(2,91,0)
+-    #include <mail/e-mail-session.h>
++  #if EDS_CHECK_VERSION(3,3,5)
++    #include <libemail-engine/e-mail-session.h>
++    #include <libemail-engine/mail-tools.h>
+   #else
+-    #include <mail/mail-session.h>
++    #include <mail/mail-tools.h>
++    #if EDS_CHECK_VERSION(2,91,0)
++      #include <mail/e-mail-session.h>
++    #else
++      #include <mail/mail-session.h>
++    #endif
+   #endif
+ #endif
+ #include "mn-evolution.h"
================================================================

---- gitweb:

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