Re-import of evolution-1.2.4nb6, the gnome1 version of evolution as

evolution12.

12 files changed, 280 insertions, 0 deletions

diff --git a/mail/evolution12/patches/patch-aa b/mail/evolution12/patches/patch-aa
new file mode 100644
index 00000000000..1230490f284
--- /dev/null
+++ b/mail/evolution12/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- configure.orig	Thu Jun 20 19:55:20 2002
++++ configure	Wed Jul 10 22:44:39 2002
+@@ -9237,8 +9237,8 @@
+ # This can only change between Evolution versions (and then can only
+ # go up.)
+ evolution_db_version_major=3
+-evolution_db_version_minor=1
+-evolution_db_version_patch=17
++evolution_db_version_minor=3
++evolution_db_version_patch=11
+ 
+ evolution_db_version=${evolution_db_version_major}.${evolution_db_version_minor}.${evolution_db_version_patch}
+ cat >> confdefs.h <<EOF
diff --git a/mail/evolution12/patches/patch-ab b/mail/evolution12/patches/patch-ab
new file mode 100644
index 00000000000..8af193ac752
--- /dev/null
+++ b/mail/evolution12/patches/patch-ab
@@ -0,0 +1,42 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- mail/main.c.orig	Sat Sep 14 02:53:20 2002
++++ mail/main.c
+@@ -36,6 +36,26 @@
+ #include "mail.h"
+ #include "mail-mt.h"
+ 
++
++#ifdef __NetBSD__
++#include <gtk/gtk.h>
++#include <pthread.h>
++
++/*
++ * Pth is non-preemptive, so we yield the processor periodically
++ */
++
++#ifdef _PTH_PTHREAD_H_
++static gint
++pth_nbschedule (gpointer data)
++{
++	sched_yield();
++
++	return TRUE;
++}
++#endif /* _PTH_PTHREAD_H_ */
++#endif /* __NetBSD__ */
++
+ /*#define DO_MCHECK*/
+ 
+ #ifdef DO_MCHECK
+@@ -156,6 +176,10 @@ main (int argc, char *argv [])
+ 	
+ 	g_print ("Evolution Mail ready and running.\n");
+ 	
++#ifdef _PTH_PTHREAD_H_
++	gtk_timeout_add (200, pth_nbschedule, NULL);
++#endif
++
+ 	GDK_THREADS_ENTER ();
+ 	bonobo_main ();
+ 	
diff --git a/mail/evolution12/patches/patch-ac b/mail/evolution12/patches/patch-ac
new file mode 100644
index 00000000000..829657f47d0
--- /dev/null
+++ b/mail/evolution12/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- shell/main.c.orig	Tue Nov 19 07:35:13 2002
++++ shell/main.c
+@@ -77,6 +77,25 @@ static gboolean force_upgrade = FALSE;
+ 
+ extern char *evolution_debug_log;
+ 
++#ifdef __NetBSD__
++#include <gtk/gtk.h>
++#include <pthread.h>
++
++/*
++ * Pth is non-preemptive, so we yield the processor periodically
++ */
++
++#ifdef _PTH_PTHREAD_H_
++static gint
++pth_nbschedule (gpointer data)
++{
++	sched_yield();
++
++	return TRUE;
++}
++#endif /* _PTH_PTHREAD_H_ */
++#endif /* __NetBSD__ */
++
+ 
+ static GtkWidget *
+ quit_box_new (void)
+@@ -307,6 +326,10 @@ idle_cb (void *data)
+ 	else
+ 		startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE;
+ 
++#ifdef _PTH_PTHREAD_H_
++	sched_yield();
++#endif
++
+ 	shell = e_shell_new (evolution_directory, ! no_splash, startup_line_mode, &result);
+ 	g_free (evolution_directory);
+ 
+@@ -496,6 +519,10 @@ main (int argc, char **argv)
+ 	}
+ 
+ 	gtk_idle_add (idle_cb, uri_list);
++
++#ifdef _PTH_PTHREAD_H_
++	gtk_timeout_add (200, pth_nbschedule, NULL);
++#endif
+ 
+ 	gtk_widget_push_visual (gdk_rgb_get_visual ());
+ 	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
diff --git a/mail/evolution12/patches/patch-ad b/mail/evolution12/patches/patch-ad
new file mode 100644
index 00000000000..370732b4983
--- /dev/null
+++ b/mail/evolution12/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- camel/providers/imap/camel-imap-store.c.orig	Fri Dec  6 03:06:49 2002
++++ camel/providers/imap/camel-imap-store.c
+@@ -24,6 +24,10 @@
+  *
+  */
+ 
++#ifdef	_POSIX_THREAD_SYSCALL_SOFT
++#undef	_POSIX_THREAD_SYSCALL_SOFT
++#endif
++#define	_POSIX_THREAD_SYSCALL_SOFT	0
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
diff --git a/mail/evolution12/patches/patch-ae b/mail/evolution12/patches/patch-ae
new file mode 100644
index 00000000000..11a6be9cbb1
--- /dev/null
+++ b/mail/evolution12/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- camel/providers/nntp/camel-nntp-summary.h.orig	Tue May  7 23:53:40 2002
++++ camel/providers/nntp/camel-nntp-summary.h
+@@ -24,7 +24,6 @@
+ #include <camel/camel-folder-summary.h>
+ #include <camel/camel-folder.h>
+ #include <camel/camel-exception.h>
+-#include <libibex/ibex.h>
+ 
+ #define CAMEL_NNTP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary)
+ #define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass)
diff --git a/mail/evolution12/patches/patch-af b/mail/evolution12/patches/patch-af
new file mode 100644
index 00000000000..ae924389def
--- /dev/null
+++ b/mail/evolution12/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- e-util/e-db3-utils.c.orig	Fri Jun  1 03:02:11 2001
++++ e-util/e-db3-utils.c
+@@ -14,9 +14,9 @@
+ #include <libgnome/gnome-util.h>
+ 
+ #if DB_VERSION_MAJOR != 3 || \
+-    DB_VERSION_MINOR != 1 || \
+-    DB_VERSION_PATCH != 17
+-#error Including wrong DB3.  Need libdb 3.1.17.
++    DB_VERSION_MINOR != 3 || \
++    DB_VERSION_PATCH != 11
++#error Including wrong DB3.  Need libdb 3.3.11.
+ #endif
+ 
+ static char *
diff --git a/mail/evolution12/patches/patch-ag b/mail/evolution12/patches/patch-ag
new file mode 100644
index 00000000000..ebe43ce1ae0
--- /dev/null
+++ b/mail/evolution12/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- e-util/e-dbhash.c.orig	Mon Oct 22 23:54:12 2001
++++ e-util/e-dbhash.c
+@@ -16,9 +16,9 @@
+ #include "md5-utils.h"
+ 
+ #if DB_VERSION_MAJOR != 3 || \
+-    DB_VERSION_MINOR != 1 || \
+-    DB_VERSION_PATCH != 17
+-#error Including wrong DB3.  Need libdb 3.1.17.
++    DB_VERSION_MINOR != 3 || \
++    DB_VERSION_PATCH != 11
++#error Including wrong DB3.  Need libdb 3.3.11.
+ #endif
+ 
+ struct _EDbHashPrivate 
+@@ -37,9 +37,9 @@
+ 
+ 	db_version (&major, &minor, &patch);
+ 
+-	if (major != 3 ||
+-	    minor != 1 ||
+-	    patch != 17) {
++	if (major != DB_VERSION_MAJOR ||
++	    minor != DB_VERSION_MINOR ||
++	    patch != DB_VERSION_PATCH) {
+ 		g_warning ("Wrong version of libdb.");
+ 		return NULL;
+ 	}
diff --git a/mail/evolution12/patches/patch-ah b/mail/evolution12/patches/patch-ah
new file mode 100644
index 00000000000..8be43428d5b
--- /dev/null
+++ b/mail/evolution12/patches/patch-ah
@@ -0,0 +1,23 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- shell/e-setup.c.orig	Sat Mar 16 14:26:48 2002
++++ shell/e-setup.c
+@@ -210,6 +210,18 @@
+ 		retval = TRUE;
+ 	}
+ 
++	command = g_strconcat ("chmod -R u+w ",
++			       evolution_directory,
++			       NULL);
++
++	if (system (command) != 0) {
++		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
++			  _("An error occurred changing mode of\n`%s'."), evolution_directory);
++		retval = FALSE;
++	} else {
++		retval = TRUE;
++	}
++
+ 	/* Temporary block of code to keep it from using the older
+            shortcuts.xml that exists for current users in
+            $GNOME/share/evolution/default_user.  Remove this by 1.0 */
diff --git a/mail/evolution12/patches/patch-ai b/mail/evolution12/patches/patch-ai
new file mode 100644
index 00000000000..ecfad1dea8e
--- /dev/null
+++ b/mail/evolution12/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- camel/camel-transport.c.orig	Sat Oct 27 18:59:27 2001
++++ camel/camel-transport.c	Tue Mar 26 15:01:50 2002
+@@ -23,6 +23,11 @@
+  * USA
+  */
+ 
++#ifdef	_POSIX_THREAD_SYSCALL_SOFT
++#undef	_POSIX_THREAD_SYSCALL_SOFT
++#endif
++#define	_POSIX_THREAD_SYSCALL_SOFT	0
++
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
diff --git a/mail/evolution12/patches/patch-aj b/mail/evolution12/patches/patch-aj
new file mode 100644
index 00000000000..bab63faf619
--- /dev/null
+++ b/mail/evolution12/patches/patch-aj
@@ -0,0 +1,30 @@
+$NetBSD: patch-aj,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- addressbook/backend/pas/pas-backend-file.c.orig	Sun Jun 16 08:54:02 2002
++++ addressbook/backend/pas/pas-backend-file.c
+@@ -21,9 +21,9 @@
+ #include <e-util/e-db3-utils.h>
+ 
+ #if DB_VERSION_MAJOR != 3 || \
+-    DB_VERSION_MINOR != 1 || \
+-    DB_VERSION_PATCH != 17
+-#error Including wrong DB3.  Need libdb 3.1.17.
++    DB_VERSION_MINOR != 3 || \
++    DB_VERSION_PATCH != 11
++#error Including wrong DB3.  Need libdb 3.3.11.
+ #endif
+ 
+ #include <gtk/gtksignal.h>
+@@ -1244,9 +1244,9 @@
+ 
+ 	db_version (&major, &minor, &patch);
+ 
+-	if (major != 3 ||
+-	    minor != 1 ||
+-	    patch != 17) {
++	if (major != DB_VERSION_MAJOR ||
++	    minor != DB_VERSION_MINOR ||
++	    patch != DB_VERSION_PATCH) {
+ 		g_warning ("Wrong version of libdb.");
+ 		return GNOME_Evolution_Addressbook_BookListener_OtherError;
+ 	}
diff --git a/mail/evolution12/patches/patch-ak b/mail/evolution12/patches/patch-ak
new file mode 100644
index 00000000000..7c55a496740
--- /dev/null
+++ b/mail/evolution12/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- composer/e-msg-composer.c.orig	Tue Dec  3 04:29:51 2002
++++ composer/e-msg-composer.c
+@@ -51,6 +51,10 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+ 
++#ifdef send
++#undef send
++#endif
++
+ #include <gtk/gtkoptionmenu.h>
+ #include <gal/unicode/gunicode.h>
+ #include <gal/util/e-unicode-i18n.h>
diff --git a/mail/evolution12/patches/patch-al b/mail/evolution12/patches/patch-al
new file mode 100644
index 00000000000..3820099f76a
--- /dev/null
+++ b/mail/evolution12/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2004/01/04 21:39:51 rh Exp $
+
+--- doc/devel/calendar/cal-util/Makefile.in.orig	Fri Dec  6 09:14:26 2002
++++ doc/devel/calendar/cal-util/Makefile.in
+@@ -266,7 +266,7 @@ extra_files = 
+ GTKDOC_CFLAGS =  	-I$(top_srcdir)/calendar				-I$(top_srcdir)						-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(EVOLUTION_CALENDAR_CFLAGS)
+ 
+ 
+-GTKDOC_LIBS =  	$(EVOLUTION_CALENDAR_LIBS)						$(top_builddir)/calendar/cal-util/libcal-util-static.la			$(top_builddir)/libical/src/libical/libical-static.la			$(top_builddir)/libversit/libversit.a
++GTKDOC_LIBS =  	$(EVOLUTION_CALENDAR_LIBS)						$(top_builddir)/calendar/cal-util/libcal-util.la			$(top_builddir)/libical/src/libical/libical-evolution.la
+ 
+ 
+ GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)