Apply some minor tweaks to get this package compiling with SunPro and possibly

other non-gcc compilers.

6 files changed, 73 insertions, 1 deletions

diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index a78926f1407..8382677e941 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2004/10/22 16:03:14 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2004/11/18 14:20:26 sketch Exp $
 
 SHA1 (evolution-data-server-1.0.2.tar.bz2) = 9b030961f5c55d9cb9a7fd62cf8913cbeabc09cc
 Size (evolution-data-server-1.0.2.tar.bz2) = 4939846 bytes
@@ -7,3 +7,8 @@ SHA1 (patch-ab) = b64824194ff4bd6b97745d40afd0f08fae1e4cf7
 SHA1 (patch-ac) = 15bd17cc1a26e00a4d8e3507f387270934c78110
 SHA1 (patch-ad) = 5c41eb12e630461c6ec076a48d4ff06d32d9b110
 SHA1 (patch-ae) = cc12c4a526cb4652d14449929d2779d33396ba45
+SHA1 (patch-af) = 81c1800ab79ff872b83b5a79fad980e119738751
+SHA1 (patch-ag) = 3b98f839509014856240966a0a5f4d56aaeced5c
+SHA1 (patch-ah) = fe05e242d12148f2a29356ada254131482774f35
+SHA1 (patch-ai) = 4031c5d07e8b133e435520359140748a763671a0
+SHA1 (patch-aj) = 3644733e7bf95ce61a1c4c0e7af4a781826a89fb
diff --git a/mail/evolution-data-server/patches/patch-af b/mail/evolution-data-server/patches/patch-af
new file mode 100644
index 00000000000..b3b255e4d94
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/11/18 14:20:26 sketch Exp $
+
+--- config.h.in.orig	2004-11-13 22:06:01.870247000 +0000
++++ config.h.in	2004-11-13 22:07:10.887923000 +0000
+@@ -99,3 +99,8 @@
+ #ifndef __cplusplus
+ #undef inline
+ #endif
++
++/* __PRETTY_FUNCTION__ is a GNUism only */
++#ifndef __GNUC__
++#define __PRETTY_FUNCTION__ __func__
++#endif
diff --git a/mail/evolution-data-server/patches/patch-ag b/mail/evolution-data-server/patches/patch-ag
new file mode 100644
index 00000000000..4b6afccf524
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/11/18 14:20:26 sketch Exp $
+
+--- calendar/libedata-cal/e-cal-backend.c.orig	2004-11-14 07:43:27.517476000 +0000
++++ calendar/libedata-cal/e-cal-backend.c	2004-11-14 07:44:07.683122000 +0000
+@@ -732,7 +732,7 @@
+ 	g_return_if_fail (E_IS_CAL_BACKEND (backend));
+ 
+ 	g_assert (CLASS (backend)->get_object_list != NULL);
+-	return (* CLASS (backend)->get_object_list) (backend, cal, sexp);
++	(* CLASS (backend)->get_object_list) (backend, cal, sexp);
+ }
+ 
+ /**
diff --git a/mail/evolution-data-server/patches/patch-ah b/mail/evolution-data-server/patches/patch-ah
new file mode 100644
index 00000000000..127a4bfd7c3
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2004/11/18 14:20:26 sketch Exp $
+
+--- ./calendar/backends/file/e-cal-backend-file-events.c.orig	2003-11-03 18:24:02.000000000 +0000
++++ ./calendar/backends/file/e-cal-backend-file-events.c	2004-11-18 07:42:17.178309000 +0000
+@@ -30,6 +30,9 @@
+ 
+ /* Private part of the CalBackendFileEvents structure */
+ struct _ECalBackendFileEventsPrivate {
++#if defined(__SUNPRO_C)
++	unsigned char a_variable_to_avoid_empty_struct;
++#endif
+ };
+ 
+ 
diff --git a/mail/evolution-data-server/patches/patch-ai b/mail/evolution-data-server/patches/patch-ai
new file mode 100644
index 00000000000..f541b4c1acc
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2004/11/18 14:20:26 sketch Exp $
+
+--- ./calendar/backends/file/e-cal-backend-file-todos.c.orig	2003-11-03 18:24:02.000000000 +0000
++++ ./calendar/backends/file/e-cal-backend-file-todos.c	2004-11-18 07:43:17.101414000 +0000
+@@ -26,6 +26,9 @@
+ 
+ /* Private part of the ECalBackendFileTodos structure */
+ struct _ECalBackendFileTodosPrivate {
++#if defined(__SUNPRO_C)
++	unsigned char a_variable_to_avoid_empty_struct;
++#endif
+ };
+ 
+ 
diff --git a/mail/evolution-data-server/patches/patch-aj b/mail/evolution-data-server/patches/patch-aj
new file mode 100644
index 00000000000..3a39f3011d6
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/11/18 14:20:26 sketch Exp $
+
+--- ./calendar/backends/groupwise/e-cal-backend-groupwise-utils.c.orig	2004-11-17 16:08:49.662762000 +0000
++++ ./calendar/backends/groupwise/e-cal-backend-groupwise-utils.c	2004-11-17 16:10:43.269896000 +0000
+@@ -614,7 +614,7 @@
+ 			alarm = e_cal_component_alarm_new ();
+ 			e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY);
+ 			trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
+-			trigger.u.rel_duration = (struct icaldurationtype) icaldurationtype_from_int (alarm_duration);
++			trigger.u.rel_duration = icaldurationtype_from_int (alarm_duration);
+ 			e_cal_component_alarm_set_trigger (alarm, trigger);
+ 			e_cal_component_add_alarm (comp, alarm);
+ 		}