packages: gnome-mail-notification/gnome-mail-notification.spec, gnome-mail-...

baggins baggins at pld-linux.org
Sun Jul 1 23:49:29 CEST 2012 

Author: baggins                      Date: Sun Jul  1 21:49:29 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for evolution 3.3.5+

---- Files affected:
packages/gnome-mail-notification:
   gnome-mail-notification.spec (1.61 -> 1.62) , gnome-mail-notification-libemail.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-mail-notification/gnome-mail-notification.spec
diff -u packages/gnome-mail-notification/gnome-mail-notification.spec:1.61 packages/gnome-mail-notification/gnome-mail-notification.spec:1.62
--- packages/gnome-mail-notification/gnome-mail-notification.spec:1.61	Sun Jul  1 23:42:02 2012
+++ packages/gnome-mail-notification/gnome-mail-notification.spec	Sun Jul  1 23:49:24 2012
@@ -15,6 +15,7 @@
 Patch3:		%{name}-camel_headers.patch
 Patch4:		%{name}-evolution-3-0.patch
 Patch5:		%{name}-gtk3-support.patch
+Patch6:		%{name}-libemail.patch
 URL:		http://www.nongnu.org/mailnotify/
 BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.59
@@ -81,6 +82,7 @@
 %patch3 -p1
 %patch4 -p0
 %patch5 -p0
+%patch6 -p1
 
 %build
 ./jb configure \
@@ -134,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2012/07/01 21:49:24  baggins
+- fix for evolution 3.3.5+
+
 Revision 1.61  2012/07/01 21:42:02  baggins
 - gnome-keyring is now libgnome-keyring
 

================================================================
Index: packages/gnome-mail-notification/gnome-mail-notification-libemail.patch
diff -u /dev/null packages/gnome-mail-notification/gnome-mail-notification-libemail.patch:1.1
--- /dev/null	Sun Jul  1 23:49:29 2012
+++ packages/gnome-mail-notification/gnome-mail-notification-libemail.patch	Sun Jul  1 23:49:24 2012
@@ -0,0 +1,100 @@
+diff -up mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c.libemail mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c
+--- mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c.libemail	2012-02-08 10:18:21.261982020 +0100
++++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c	2012-02-08 10:19:27.879757995 +0100
+@@ -30,7 +30,11 @@
+ #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>
++#else
+ #include <mail/e-mail-folder-utils.h>
++#endif
+ #include <mail/e-mail-browser.h>
+ #include <mail/e-mail-reader.h>
+ #include <shell/e-shell.h>
+diff -up mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.libemail mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h
+--- mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.libemail	2012-02-08 10:18:32.773116469 +0100
++++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h	2012-02-08 10:19:27.879757995 +0100
+@@ -5,9 +5,13 @@
+ 
+ #include "mn-evolution-folder-tree-server.h"
+ #include <libedataserver/eds-version.h>
++#if EDS_CHECK_VERSION(3,3,5)
++#include <libemail-engine/e-mail-session.h>
++#else
+ #if EDS_CHECK_VERSION(2,91,0)
+ #include <mail/e-mail-session.h>
+ #endif
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff -up mail-notification-5.4/build/src/mn-evolution-server.c.libemail mail-notification-5.4/build/src/mn-evolution-server.c
+--- mail-notification-5.4/build/src/mn-evolution-server.c.libemail	2012-02-08 10:18:43.965246700 +0100
++++ mail-notification-5.4/build/src/mn-evolution-server.c	2012-02-08 10:19:27.909758343 +0100
+@@ -37,12 +37,17 @@
+ #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>
++#else
++#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
+-#include <mail/mail-tools.h>
++#endif
+ #include "mn-evolution.h"
+ #include "mn-evolution-folder-tree-server.h"
+ #include "mn-evolution-plugin.h"
+diff -up mail-notification-5.4/jbsrc/jb.c.libemail mail-notification-5.4/jbsrc/jb.c
+--- mail-notification-5.4/jbsrc/jb.c.libemail	2012-02-08 10:18:55.885385460 +0100
++++ mail-notification-5.4/jbsrc/jb.c	2012-02-08 10:19:27.940758702 +0100
+@@ -635,6 +635,7 @@ jb_package_add_resources (void)
+       jb_group_add_data_file(group, "org-jylefort-mail-notification.eplug", "$evolution-plugin-dir");
+ 
+       jb_compile_options_add_cflags(object->compile_options, "$evolution-plugin-cflags");
++      jb_compile_options_add_cflags(object->compile_options, "$libemail-engine-cflags");
+ 
+       jb_group_add_dbus_interface(group,
+ 				  "org.freedesktop.DBus.Properties",
+@@ -662,6 +663,7 @@ jb_package_add_resources (void)
+ 
+       jb_compile_options_add_package(plugin->compile_options, "gettext");
+       jb_compile_options_add_package(plugin->compile_options, "evolution-plugin");
++      jb_compile_options_add_package(plugin->compile_options, "libemail-engine");
+       jb_compile_options_add_package(plugin->compile_options, "dbus");
+ 
+       jb_group_add_dbus_interface(group,
+diff -up mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c.libemail mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c
+--- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c.libemail	2012-02-08 10:19:06.006503405 +0100
++++ mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2012-02-08 10:19:27.969759042 +0100
+@@ -63,5 +63,5 @@ jb_evolution_plugin_check (const char *m
+       g_free(plugindir);
+     }
+ 
+-  return TRUE;
++  return jb_check_packages("Evolution", "libemail-engine", "libemail-engine");
+ }
+diff -up mail-notification-5.4/src/mn-evolution-plugin.c.libemail mail-notification-5.4/src/mn-evolution-plugin.c
+--- mail-notification-5.4/src/mn-evolution-plugin.c.libemail	2012-02-08 10:19:16.006619648 +0100
++++ mail-notification-5.4/src/mn-evolution-plugin.c	2012-02-08 10:19:27.970759054 +0100
+@@ -27,8 +27,13 @@
+ #include <camel/camel.h>
+ #include <libedataserver/eds-version.h>
+ #include <mail/em-event.h>
++#if EDS_CHECK_VERSION(3,3,5)
++#include <libemail-engine/e-mail-folder-utils.h>
++#include <libemail-engine/mail-tools.h>
++#else
+ #include <mail/mail-tools.h>
+ #include <mail/e-mail-folder-utils.h>
++#endif
+ #include "mn-evolution.h"
+ #include "mn-evolution-server.h"
+ #include "mn-evolution-plugin.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gnome-mail-notification/gnome-mail-notification.spec?r1=1.61&r2=1.62

More information about the pld-cvs-commit mailing list