diff options
author | rh <rh> | 2001-08-11 18:39:25 +0000 |
---|---|---|
committer | rh <rh> | 2001-08-11 18:39:25 +0000 |
commit | 2a815d9d8904888e8a32f2ec2fa68e441031b838 (patch) | |
tree | 03d5a3de97e7989481b42cf19f9fab04617abb33 /mail/evolution/patches | |
parent | 054a7746ab7c339547b53b2c5b8eb95ed2d821bf (diff) | |
download | pkgsrc-2a815d9d8904888e8a32f2ec2fa68e441031b838.tar.gz |
Update evolution to 0.12. Changes are too numerous to list here. For
a detailed list, see the release notes on the package's homepage.
Diffstat (limited to 'mail/evolution/patches')
-rw-r--r-- | mail/evolution/patches/patch-aa | 21 | ||||
-rw-r--r-- | mail/evolution/patches/patch-ac | 18 | ||||
-rw-r--r-- | mail/evolution/patches/patch-ad | 11 | ||||
-rw-r--r-- | mail/evolution/patches/patch-ae | 8 | ||||
-rw-r--r-- | mail/evolution/patches/patch-af | 38 | ||||
-rw-r--r-- | mail/evolution/patches/patch-ag | 33 | ||||
-rw-r--r-- | mail/evolution/patches/patch-ah | 17 | ||||
-rw-r--r-- | mail/evolution/patches/patch-ai | 34 | ||||
-rw-r--r-- | mail/evolution/patches/patch-aj | 33 | ||||
-rw-r--r-- | mail/evolution/patches/patch-al | 43 |
10 files changed, 126 insertions, 130 deletions
diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa index 23b1e33d235..80187165d95 100644 --- a/mail/evolution/patches/patch-aa +++ b/mail/evolution/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2001/05/25 06:16:17 rh Exp $ +$NetBSD: patch-aa,v 1.3 2001/08/11 18:39:25 rh Exp $ ---- configure.orig Thu Apr 26 23:50:36 2001 +--- configure.orig Tue Jul 31 20:06:13 2001 +++ configure -@@ -4660,13 +4660,13 @@ - if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -4757,13 +4757,13 @@ + if { (eval echo configure:4758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo - DATADIRNAME=share @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2001/05/25 06:16:17 rh Exp $ fi rm -f conftest* INSTOBJEXT=.mo -@@ -4895,7 +4895,7 @@ +@@ -4992,7 +4992,7 @@ # We need to process the po/ directory. POSUB=po else @@ -27,3 +27,14 @@ $NetBSD: patch-aa,v 1.2 2001/05/25 06:16:17 rh Exp $ nls_cv_header_intl=intl/libintl.h nls_cv_header_libgt=intl/libgettext.h fi +@@ -5607,8 +5607,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=2 ++evolution_db_version_patch=9 + + evolution_db_version=${evolution_db_version_major}.${evolution_db_version_minor}.${evolution_db_version_patch} + cat >> confdefs.h <<EOF diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac index a031635e621..72bdce3b466 100644 --- a/mail/evolution/patches/patch-ac +++ b/mail/evolution/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +$NetBSD: patch-ac,v 1.2 2001/08/11 18:39:25 rh Exp $ ---- shell/main.c.orig Tue Apr 24 17:31:26 2001 +--- shell/main.c.orig Mon Jul 30 16:22:50 2001 +++ shell/main.c -@@ -35,6 +35,23 @@ - - #include "e-shell.h" +@@ -53,6 +53,23 @@ + static gboolean no_splash = FALSE; + extern char *evolution_debug_log; +#ifdef __NetBSD__ +#include <gtk/gtk.h> @@ -24,12 +24,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +#endif + - #define STARTUP_URI "evolution:/local/Inbox" - -@@ -206,6 +223,10 @@ + static void + no_views_left_cb (EShell *shell, gpointer data) +@@ -273,6 +290,10 @@ } - gtk_idle_add (idle_cb, evolution_directory); + gtk_idle_add (idle_cb, uri_list); + +#ifdef __NetBSD__ + gtk_timeout_add (200, pth_nbschedule, NULL); diff --git a/mail/evolution/patches/patch-ad b/mail/evolution/patches/patch-ad index b5584db6404..57bdb999a5c 100644 --- a/mail/evolution/patches/patch-ad +++ b/mail/evolution/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +$NetBSD: patch-ad,v 1.2 2001/08/11 18:39:25 rh Exp $ ---- camel/providers/imap/camel-imap-store.c.orig Tue Apr 24 17:50:27 2001 +--- camel/providers/imap/camel-imap-store.c.orig Thu Jul 26 21:07:40 2001 +++ camel/providers/imap/camel-imap-store.c -@@ -22,6 +22,10 @@ +@@ -24,6 +24,11 @@ * */ @@ -10,6 +10,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +#undef _POSIX_THREAD_SYSCALL_SOFT +#endif +#define _POSIX_THREAD_SYSCALL_SOFT 0 - ++ + #ifdef HAVE_CONFIG_H #include <config.h> - + #endif diff --git a/mail/evolution/patches/patch-ae b/mail/evolution/patches/patch-ae index be4403838f1..d3a53b649b9 100644 --- a/mail/evolution/patches/patch-ae +++ b/mail/evolution/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +$NetBSD: patch-ae,v 1.2 2001/08/11 18:39:25 rh Exp $ ---- camel/camel-remote-store.c.orig Tue Apr 24 17:56:15 2001 +--- camel/camel-remote-store.c.orig Tue Jul 17 23:22:19 2001 +++ camel/camel-remote-store.c @@ -23,6 +23,11 @@ * @@ -11,6 +11,6 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +#endif +#define _POSIX_THREAD_SYSCALL_SOFT 0 + + #ifdef HAVE_CONFIG_H #include <config.h> - - #include <sys/time.h> + #endif diff --git a/mail/evolution/patches/patch-af b/mail/evolution/patches/patch-af index 85dd5bbf5be..5f9c0649fd7 100644 --- a/mail/evolution/patches/patch-af +++ b/mail/evolution/patches/patch-af @@ -1,25 +1,17 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +$NetBSD: patch-af,v 1.2 2001/08/11 18:39:25 rh Exp $ ---- shell/e-setup.c.orig Wed Apr 25 18:42:46 2001 -+++ shell/e-setup.c -@@ -224,9 +224,18 @@ - _("Cannot copy files into\n`%s'."), evolution_directory); - retval = FALSE; - } else { -- e_notice (NULL, GNOME_MESSAGE_BOX_INFO, -+ char *cmd2 = g_strconcat ("chmod -R u+w ", evolution_directory, -+ NULL); -+ -+ if (system (cmd2) != 0) { -+ e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, -+ _("Cannot chmod files in\n`%s'."), evolution_directory); -+ retval = FALSE; -+ } else { -+ e_notice (NULL, GNOME_MESSAGE_BOX_INFO, - _("Evolution files successfully installed.")); -- retval = TRUE; -+ retval = TRUE; -+ } - } +--- 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> - g_free (command); + #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 != 2 || \ ++ DB_VERSION_PATCH != 9 ++#error Including wrong DB3. Need libdb 3.2.9. + #endif + + static char * diff --git a/mail/evolution/patches/patch-ag b/mail/evolution/patches/patch-ag index 3813e00f7a6..c0db9c8134e 100644 --- a/mail/evolution/patches/patch-ag +++ b/mail/evolution/patches/patch-ag @@ -1,22 +1,17 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +$NetBSD: patch-ag,v 1.2 2001/08/11 18:39:25 rh Exp $ ---- calendar/cal-client/Makefile.in.orig Tue Mar 13 21:13:06 2001 -+++ calendar/cal-client/Makefile.in -@@ -212,7 +212,7 @@ - client_test_INCLUDES = $(INCLUDES) -DG_LOG_DOMAIN=\"client-test\" +--- e-util/e-dbhash.c.orig Sat Jul 28 00:14: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 != 2 || \ ++ DB_VERSION_PATCH != 9 ++#error Including wrong DB3. Need libdb 3.2.9. + #endif --client_test_LDADD = $(BONOBO_VFS_GNOME_LIBS) $(EXTRA_GNOME_LIBS) -lunicode $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libversit/libversit.la $(top_builddir)/libical/src/libical/libical.la libcal-client.la -+client_test_LDADD = $(BONOBO_VFS_GNOME_LIBS) $(EXTRA_GNOME_LIBS) -lunicode $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libversit/libversit.la -L`pwd` -lical libcal-client.la - - - BUILT_SOURCES = $(CORBA_GENERATED) -@@ -360,6 +360,8 @@ - maintainer-clean-noinstPROGRAMS: - - client-test: $(client_test_OBJECTS) $(client_test_DEPENDENCIES) -+ cp $(top_builddir)/libical/src/libical/.libs/libical.a . -+ -cp $(top_builddir)/libical/src/libical/.libs/libical.so* . - @rm -f client-test - $(LINK) $(client_test_LDFLAGS) $(client_test_OBJECTS) $(client_test_LDADD) $(LIBS) - + struct _EDbHashPrivate diff --git a/mail/evolution/patches/patch-ah b/mail/evolution/patches/patch-ah index 88f9ac4ba5d..766909196e7 100644 --- a/mail/evolution/patches/patch-ah +++ b/mail/evolution/patches/patch-ah @@ -1,17 +1,16 @@ -$NetBSD: patch-ah,v 1.1.1.1 2001/04/26 05:57:22 rh Exp $ +$NetBSD: patch-ah,v 1.2 2001/08/11 18:39:26 rh Exp $ ---- camel/camel-service.c.orig Wed Apr 25 20:22:29 2001 -+++ camel/camel-service.c -@@ -23,6 +23,12 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA +--- camel/camel-tcp-stream-openssl.c.orig Mon Jul 9 00:15:30 2001 ++++ camel/camel-tcp-stream-openssl.c +@@ -20,6 +20,11 @@ + * */ -+ + +#ifdef _POSIX_THREAD_SYSCALL_SOFT +#undef _POSIX_THREAD_SYSCALL_SOFT +#endif +#define _POSIX_THREAD_SYSCALL_SOFT 0 + + #ifdef HAVE_CONFIG_H #include <config.h> - #include "camel-service.h" - #include "camel-session.h" + #endif diff --git a/mail/evolution/patches/patch-ai b/mail/evolution/patches/patch-ai index 10f6fe93408..d1a0364b535 100644 --- a/mail/evolution/patches/patch-ai +++ b/mail/evolution/patches/patch-ai @@ -1,22 +1,16 @@ -$NetBSD: patch-ai,v 1.2 2001/05/25 06:16:18 rh Exp $ +$NetBSD: patch-ai,v 1.3 2001/08/11 18:39:26 rh Exp $ ---- wombat/Makefile.in.orig Thu Apr 26 23:53:05 2001 -+++ wombat/Makefile.in -@@ -172,7 +172,7 @@ - wombat_SOURCES = wombat-moniker.c wombat-moniker.h wombat.c - - --wombat_LDADD = $(EXTRA_GNOME_LIBS) $(BONOBO_VFS_GNOME_LIBS) $(top_builddir)/addressbook/backend/pas/libpas.a $(top_builddir)/addressbook/backend/ebook/libebook.la $(top_builddir)/e-util/ename/libename.la $(top_builddir)/calendar/pcs/libpcs.a $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libical/src/libical/libical.la $(top_builddir)/libversit/libversit.la $(top_builddir)/e-util/libeutil.la $(LDAP_LIBS) -+wombat_LDADD = $(EXTRA_GNOME_LIBS) $(BONOBO_VFS_GNOME_LIBS) $(top_builddir)/addressbook/backend/pas/libpas.a $(top_builddir)/addressbook/backend/ebook/libebook.la $(top_builddir)/e-util/ename/libename.la $(top_builddir)/calendar/pcs/libpcs.a $(top_builddir)/calendar/cal-util/libcal-util.la -L`pwd` -lical $(top_builddir)/libversit/libversit.la $(top_builddir)/e-util/libeutil.la $(LDAP_LIBS) - - - oafdir = $(datadir)/oaf -@@ -295,6 +295,8 @@ - maintainer-clean-libtool: - - wombat: $(wombat_OBJECTS) $(wombat_DEPENDENCIES) -+ cp $(top_builddir)/libical/src/libical/.libs/libical.a . -+ -cp $(top_builddir)/libical/src/libical/.libs/libical.so* . - @rm -f wombat - $(LINK) $(wombat_LDFLAGS) $(wombat_OBJECTS) $(wombat_LDADD) $(LIBS) +--- camel/camel-transport.c.orig Thu Jun 28 00:43:00 2001 ++++ camel/camel-transport.c +@@ -24,6 +24,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/evolution/patches/patch-aj b/mail/evolution/patches/patch-aj index c3eeffe757d..a04cf40f79e 100644 --- a/mail/evolution/patches/patch-aj +++ b/mail/evolution/patches/patch-aj @@ -1,22 +1,17 @@ -$NetBSD: patch-aj,v 1.2 2001/05/25 06:16:18 rh Exp $ +$NetBSD: patch-aj,v 1.3 2001/08/11 18:39:26 rh Exp $ ---- calendar/gui/Makefile.in.orig Thu May 24 07:19:17 2001 -+++ calendar/gui/Makefile.in -@@ -186,7 +186,7 @@ - evolution_calendar_SOURCES = $(IDL_GENERATED) calendar-config.c calendar-config.h calendar-commands.c calendar-commands.h calendar-model.c calendar-model.h calendar-summary.c calendar-summary.h comp-util.c comp-util.h control-factory.c control-factory.h component-factory.c component-factory.h e-calendar-table.h e-calendar-table.c e-day-view-main-item.c e-day-view-main-item.h e-day-view-time-item.c e-day-view-time-item.h e-day-view-top-item.c e-day-view-top-item.h e-day-view.c e-day-view.h e-itip-control.h e-itip-control.c e-meeting-edit.h e-meeting-edit.c e-week-view-event-item.c e-week-view-event-item.h e-week-view-main-item.c e-week-view-main-item.h e-week-view-titles-item.c e-week-view-titles-item.h e-week-view.c e-week-view.h e-tasks.c e-tasks.h event-editor.c event-editor.h gnome-cal.c gnome-cal.h goto.c goto.h itip-utils.c itip-utils.h main.c print.c print.h tag-calendar.c tag-calendar.h tasks-control-factory.c tasks-control-factory.h tasks-control.c tasks-control.h tasks-migrate.c tasks-migrate.h weekday-picker.c weekday-picker.h widget-util.c widget-util.h +--- addressbook/backend/pas/pas-backend-file.c.orig Tue Jul 10 06:49:49 2001 ++++ addressbook/backend/pas/pas-backend-file.c +@@ -18,9 +18,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 != 2 || \ ++ DB_VERSION_PATCH != 9 ++#error Including wrong DB3. Need libdb 3.2.9. + #endif --evolution_calendar_LDADD = alarm-notify/libalarm.a $(top_builddir)/shell/libeshell.a $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/e-util/libeutil.la $(top_builddir)/executive-summary/evolution-services/libevolution-services.la $(top_builddir)/libversit/libversit.la $(top_builddir)/libical/src/libical/libical.la $(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a $(top_builddir)/widgets/misc/libemiscwidgets.a $(top_builddir)/widgets/menus/libmenus.la dialogs/libcal-dialogs.a $(BONOBO_HTML_GNOME_LIBS) $(BONOBO_VFS_GNOME_LIBS) $(EXTRA_GNOME_LIBS) $(INTLLIBS) -+evolution_calendar_LDADD = alarm-notify/libalarm.a $(top_builddir)/shell/libeshell.a $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/e-util/libeutil.la $(top_builddir)/executive-summary/evolution-services/libevolution-services.la $(top_builddir)/libversit/libversit.la -L`pwd` -lical $(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a $(top_builddir)/widgets/misc/libemiscwidgets.a $(top_builddir)/widgets/menus/libmenus.la dialogs/libcal-dialogs.a $(BONOBO_HTML_GNOME_LIBS) $(BONOBO_VFS_GNOME_LIBS) $(EXTRA_GNOME_LIBS) $(INTLLIBS) - - - #evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf` -@@ -328,6 +328,8 @@ - maintainer-clean-libtool: - - evolution-calendar: $(evolution_calendar_OBJECTS) $(evolution_calendar_DEPENDENCIES) -+ cp $(top_builddir)/libical/src/libical/.libs/libical.a . -+ -cp $(top_builddir)/libical/src/libical/.libs/libical.so* . - @rm -f evolution-calendar - $(LINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS) - + #include <gtk/gtksignal.h> diff --git a/mail/evolution/patches/patch-al b/mail/evolution/patches/patch-al index 371045ffb8d..d60533240ca 100644 --- a/mail/evolution/patches/patch-al +++ b/mail/evolution/patches/patch-al @@ -1,22 +1,31 @@ -$NetBSD: patch-al,v 1.1 2001/05/25 06:16:18 rh Exp $ +$NetBSD: patch-al,v 1.2 2001/08/11 18:39:26 rh Exp $ ---- calendar/gui/alarm-notify/Makefile.in.orig Fri May 25 07:40:13 2001 -+++ calendar/gui/alarm-notify/Makefile.in -@@ -185,7 +185,7 @@ - evolution_alarm_notify_SOURCES = $(CORBA_GENERATED) alarm-notify.c alarm-notify.h alarm-queue.c alarm-queue.h notify-main.c +--- camel/camel-disco-diary.c.orig Tue May 29 23:07:11 2001 ++++ camel/camel-disco-diary.c +@@ -270,14 +270,14 @@ + off_t size; + double pc; +- fseeko (diary->file, 0, SEEK_END); +- size = ftello (diary->file); ++ fseek (diary->file, 0, SEEK_END); ++ size = ftell (diary->file); + g_return_if_fail (size != 0); + rewind (diary->file); --evolution_alarm_notify_LDADD = libalarm.a $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la $(top_builddir)/libical/src/libical/libical.la $(BONOBO_VFS_GNOME_LIBS) $(EXTRA_GNOME_LIBS) $(INTLLIBS) -+evolution_alarm_notify_LDADD = libalarm.a $(top_builddir)/calendar/cal-client/libcal-client.la $(top_builddir)/calendar/cal-util/libcal-util.la -L`pwd` -lical $(BONOBO_VFS_GNOME_LIBS) $(EXTRA_GNOME_LIBS) $(INTLLIBS) + camel_operation_start (NULL, _("Resynchronizing with server")); + while (!camel_exception_is_set (ex)) { +- pc = ftello (diary->file) / size; ++ pc = ftell (diary->file) / size; + camel_operation_progress (NULL, pc * 100); + if (camel_file_util_decode_uint32 (diary->file, &action) == -1) +@@ -399,7 +399,7 @@ + gboolean + camel_disco_diary_empty (CamelDiscoDiary *diary) + { +- return ftello (diary->file) == 0; ++ return ftell (diary->file) == 0; + } - # evolution_alarm_client_SOURCES = \ -@@ -337,6 +337,8 @@ - done - - evolution-alarm-notify: $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_DEPENDENCIES) -+ cp $(top_builddir)/libical/src/libical/.libs/libical.a . -+ -cp $(top_builddir)/libical/src/libical/.libs/libical.so* . - @rm -f evolution-alarm-notify - $(LINK) $(evolution_alarm_notify_LDFLAGS) $(evolution_alarm_notify_OBJECTS) $(evolution_alarm_notify_LDADD) $(LIBS) - + void |