Source: mail-notification
Version: 5.4.dfsg.1-5
Severity: important
Tags: patch
Hi,
mail-notification fails to build from source against evolution 3.4,
since a few headers were moved around.
The attached patch makes mail-notification compile successfully against
evolution 3.4 and is also backwards-compatible with the current version
3.2 in unstable, so it can be safely applied.
Please apply the patch at your earliest convenience, so
mail-notification is ready once evolution 3.4 is uploaded to unstable.
Cheers,
Michael
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Description: Make mail-notification compile against evolution 3.4
Author: Michael Biebl <bi...@debian.org>, Mathieu Trudel-Lapierre <mathieu...@ubuntu.com>
Index: mail-notification-5.4.dfsg.1/src/mn-evolution-folder-tree-server.gob
===================================================================
--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-folder-tree-server.gob 2012-06-14 05:42:23.826116963 +0200
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-folder-tree-server.gob 2012-06-14 05:42:26.730116860 +0200
@@ -21,8 +21,12 @@
#include <gtk/gtkx.h>
#include <libedataserver/eds-version.h>
#if EDS_CHECK_VERSION(2,91,0)
+#if EDS_CHECK_VERSION(3,3,0)
+#include <libemail-engine/e-mail-session.h>
+#else
#include <mail/e-mail-session.h>
#endif
+#endif
%}
%{
@@ -33,7 +37,11 @@
#include <mail/mail-component.h>
#endif
#if EDS_CHECK_VERSION(3,1,0)
+#if EDS_CHECK_VERSION(3,3,0)
+#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>
Index: mail-notification-5.4.dfsg.1/jbsrc/lib/src/extras/jb-evolution-plugin.c
===================================================================
--- mail-notification-5.4.dfsg.1.orig/jbsrc/lib/src/extras/jb-evolution-plugin.c 2012-06-14 05:42:23.826116963 +0200
+++ mail-notification-5.4.dfsg.1/jbsrc/lib/src/extras/jb-evolution-plugin.c 2012-06-14 05:43:28.030114691 +0200
@@ -18,6 +18,7 @@
*/
#include <string.h>
+#include <libedataserver/eds-version.h>
#include "jb-tests.h"
#include "jb-util.h"
#include "jb-variable.h"
@@ -41,7 +42,11 @@
if (! minversion)
minversion = "2.12";
+#if EDS_CHECK_VERSION(3,3,0)
+ packages = g_strdup_printf("evolution-plugin-3.0 >= %s libemail-engine", minversion);
+#else
packages = g_strdup_printf("evolution-plugin-3.0 >= %s", minversion);
+#endif
result = jb_check_packages("Evolution", "evolution-plugin", packages);
g_free(packages);
Index: mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
===================================================================
--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob 2012-06-14 05:42:23.826116963 +0200
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob 2012-06-14 05:42:26.738116860 +0200
@@ -39,7 +39,11 @@
#if !EDS_CHECK_VERSION(2,91,0)
#include <mail/mail-session.h>
#endif
+#if EDS_CHECK_VERSION(3,3,0)
+#include <libemail-engine/mail-tools.h>
+#else
#include <mail/mail-tools.h>
+#endif
#include "mn-evolution.h"
#include "mn-evolution-folder-tree-server.h"
#include "mn-evolution-plugin.h"
Index: mail-notification-5.4.dfsg.1/src/mn-evolution-plugin.c
===================================================================
--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-plugin.c 2012-06-14 05:42:23.826116963 +0200
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-plugin.c 2012-06-14 05:42:26.738116860 +0200
@@ -27,8 +27,13 @@
#include <camel/camel.h>
#include <libedataserver/eds-version.h>
#include <mail/em-event.h>
+#if EDS_CHECK_VERSION(3,3,0)
+#include <libemail-engine/mail-tools.h>
+#include <libemail-engine/e-mail-folder-utils.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"
Index: mail-notification-5.4.dfsg.1/jb
===================================================================
--- mail-notification-5.4.dfsg.1.orig/jb 2012-06-14 05:42:23.826116963 +0200
+++ mail-notification-5.4.dfsg.1/jb 2012-06-14 05:42:26.738116860 +0200
@@ -93,6 +93,10 @@
echo "ERROR: the GLib library was not found" >&2
exit 1
fi
+ if ! libedataserver_cflags=`pkg-config --cflags 'libedataserver-1.2' 2>/dev/null`; then
+ echo "ERROR: the Evolution Data Server Utility library was not found" >&2
+ exit 1
+ fi
sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \
jbsrc/jb.c > build/jbsrc/jb.c || exit 1
@@ -104,6 +108,7 @@
-DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \
-DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \
$gobject_cflags_libs \
+ $libedataserver_cflags \
$jb_cflags \
$jb_cppflags \
$jb_ldflags \
