update for new evolution-data-server memory management rules,

make it build on newer versions of e-d-s

4 files changed, 58 insertions, 2 deletions

diff --git a/comms/libopensync-plugin-evolution2/Makefile b/comms/libopensync-plugin-evolution2/Makefile
index 1815f32e756..222be0b9630 100644
--- a/comms/libopensync-plugin-evolution2/Makefile
+++ b/comms/libopensync-plugin-evolution2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/09/06 20:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/02/27 17:42:23 drochner Exp $
 #
 
 DISTNAME=	libopensync-plugin-evolution2-0.22
@@ -16,6 +16,8 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
+CPPFLAGS+=	-DHANDLE_LIBICAL_MEMORY
+
 .include "../../comms/libopensync/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
diff --git a/comms/libopensync-plugin-evolution2/distinfo b/comms/libopensync-plugin-evolution2/distinfo
index b52e6107a65..c747d845839 100644
--- a/comms/libopensync-plugin-evolution2/distinfo
+++ b/comms/libopensync-plugin-evolution2/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/20 19:11:32 drochner Exp $
+$NetBSD: distinfo,v 1.2 2009/02/27 17:42:23 drochner Exp $
 
 SHA1 (libopensync-plugin-evolution2-0.22.tar.bz2) = 8d8bf10c4323e9c8e4c39f431f7c19a64718a37a
 RMD160 (libopensync-plugin-evolution2-0.22.tar.bz2) = 30c93ff7669d1405bc141909667f53c2242a23bd
 Size (libopensync-plugin-evolution2-0.22.tar.bz2) = 219916 bytes
+SHA1 (patch-aa) = ccd840cb82c14edd48b480952279f43bb4bf63db
+SHA1 (patch-ab) = 99fb0d91e08c68d447d3505c889aeb0e514dd645
diff --git a/comms/libopensync-plugin-evolution2/patches/patch-aa b/comms/libopensync-plugin-evolution2/patches/patch-aa
new file mode 100644
index 00000000000..2209312c8e2
--- /dev/null
+++ b/comms/libopensync-plugin-evolution2/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1 2009/02/27 17:42:23 drochner Exp $
+
+--- src/evolution2_ecal.c.orig	2007-03-27 13:49:55.000000000 +0200
++++ src/evolution2_ecal.c
+@@ -106,11 +106,13 @@ void evo2_calendar_get_changes(OSyncCont
+ 					data = e_cal_get_component_as_string(env->calendar, e_cal_component_get_icalcomponent(ecc->comp));
+ 					datasize = strlen(data) + 1;
+ 					evo2_report_change(ctx, "event", "vevent20", data, datasize, uid, CHANGE_ADDED);
++					g_free(data);
+ 					break;
+ 				case E_CAL_CHANGE_MODIFIED:
+ 					data = e_cal_get_component_as_string(env->calendar, e_cal_component_get_icalcomponent(ecc->comp));
+ 					datasize = strlen(data) + 1;
+ 					evo2_report_change(ctx, "event", "vevent20", data, datasize, uid, CHANGE_MODIFIED);
++					g_free(data);
+ 					break;
+ 				case E_CAL_CHANGE_DELETED:
+ 					evo2_report_change(ctx, "event", "vevent20", NULL, 0, uid, CHANGE_DELETED);
+@@ -132,6 +134,7 @@ void evo2_calendar_get_changes(OSyncCont
+ 			e_cal_component_get_uid(comp, &uid);
+ 			int datasize = strlen(data) + 1;
+ 			evo2_report_change(ctx, "event", "vevent20", data, datasize, uid, CHANGE_ADDED);
++			g_free(data);
+ 			g_object_unref (comp);
+ 		}
+ 	}
diff --git a/comms/libopensync-plugin-evolution2/patches/patch-ab b/comms/libopensync-plugin-evolution2/patches/patch-ab
new file mode 100644
index 00000000000..d4d8a0d402d
--- /dev/null
+++ b/comms/libopensync-plugin-evolution2/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.1 2009/02/27 17:42:23 drochner Exp $
+
+--- src/evolution2_etodo.c.orig	2007-03-27 13:49:55.000000000 +0200
++++ src/evolution2_etodo.c
+@@ -105,11 +105,13 @@ void evo2_todo_get_changes(OSyncContext 
+ 					data = e_cal_get_component_as_string(env->calendar, e_cal_component_get_icalcomponent(ecc->comp));
+ 					datasize = strlen(data) + 1;
+ 					evo2_report_change(ctx, "todo", "vtodo20", data, datasize, uid, CHANGE_ADDED);
++					g_free(data);
+ 					break;
+ 				case E_CAL_CHANGE_MODIFIED:
+ 					data = e_cal_get_component_as_string(env->calendar, e_cal_component_get_icalcomponent(ecc->comp));
+ 					datasize = strlen(data) + 1;
+ 					evo2_report_change(ctx, "todo", "vtodo20", data, datasize, uid, CHANGE_MODIFIED);
++					g_free(data);
+ 					break;
+ 				case E_CAL_CHANGE_DELETED:
+ 					evo2_report_change(ctx, "todo", "vtodo20", NULL, 0, uid, CHANGE_DELETED);
+@@ -131,6 +133,7 @@ void evo2_todo_get_changes(OSyncContext 
+ 			e_cal_component_get_uid(comp, &uid);
+ 			int datasize = strlen(data) + 1;
+ 			evo2_report_change(ctx, "todo", "vtodo20", data, datasize, uid, CHANGE_ADDED);
++			g_free(data);
+ 			g_object_unref (comp);
+ 		}
+ 	}