include patches in repo

3 files changed, 122 insertions, 0 deletions

diff --git a/mail-notification-dont-link-against-bsd-compat.patch b/mail-notification-dont-link-against-bsd-compat.patch
new file mode 100644
index 000000000000..e246a8cc9389
--- /dev/null
+++ b/mail-notification-dont-link-against-bsd-compat.patch
@@ -0,0 +1,10 @@
+--- jbsrc/jb.c.orig	2014-01-19 20:06:48.525462981 +0100
++++ jbsrc/jb.c	2014-01-19 20:07:36.087934897 +0100
+@@ -425,7 +425,6 @@
+        */
+       jb_compile_options_add_cflags(object->compile_options, "-std=c99");
+       jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
+-      jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
+     }
+ 
+   jb_compile_options_add_string_defines(object->compile_options,
diff --git a/mail-notification-evo3_11_2.patch b/mail-notification-evo3_11_2.patch
new file mode 100644
index 000000000000..eb954e16aeb5
--- /dev/null
+++ b/mail-notification-evo3_11_2.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"
diff --git a/mail-notification-jb-gcc-format.patch b/mail-notification-jb-gcc-format.patch
new file mode 100644
index 000000000000..c99b01eda48f
--- /dev/null
+++ b/mail-notification-jb-gcc-format.patch
@@ -0,0 +1,15 @@
+Index: epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+===================================================================
+--- epienbroek-mail-notification-eab5c13.orig/jbsrc/lib/src/core/jb-util.c
++++ epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+@@ -208,6 +208,10 @@ jb_message_result_string_format (const c
+   g_free(message);
+ }
+ 
++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
++static void print_warning_or_error (const char *prefix, const char *format, va_list args) __attribute__ ((format(printf, 1, 0)));
++#endif
++
+ static void
+ print_warning_or_error (const char *prefix, const char *format, va_list args)
+ {