From eb99e22922684e6a5db37e4a36c578e81c56d4e9 Mon Sep 17 00:00:00 2001 From: kwm Date: Sun, 14 Nov 2010 13:41:05 +0000 Subject: * Add some more plugins to plugin_srcs in fixplugin.sh, while here update the module_srcs list and sort it. * When using evolution with another locale then english or C. The send folder does a disapearing act. It tries to display a error and the error pointer is null. There is no error, so evolution aborts. Submitted by: Sergio de Almeida Lenzi git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14869 df743ca5-7f9a-e211-a948-0013205c9059 --- mail/evolution/Makefile | 3 ++- mail/evolution/files/fix-plugins.sh | 4 ++-- mail/evolution/files/patch-mail_mail-ops.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 mail/evolution/files/patch-mail_mail-ops.c diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index ba00a8767..ec8a6d2e5 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/mail/evolution/Makefile,v 1.229 2010/09/19 19:10:12 kwm Exp $ +# $MCom: ports/mail/evolution/Makefile,v 1.230 2010/09/27 17:11:50 kwm Exp $ # PORTNAME= evolution PORTVERSION= 2.32.0 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh index 76216fa1a..cadd97bae 100755 --- a/mail/evolution/files/fix-plugins.sh +++ b/mail/evolution/files/fix-plugins.sh @@ -1,8 +1,8 @@ #!/bin/sh -plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c default-mailer/default-mailer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c hula-account-setup/hula-account-setup.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c startup-wizard/startup-wizard.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c" +plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c dbx-import/dbx-importer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c" -module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c mail/evolution-module-mail.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.c" +module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c composer-autosave/e-composer-autosave.c connman/evolution-connman.c mail/evolution-module-mail.c mailto-handler/evolution-mailto-handler.c network-manager/evolution-network-manager.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.c startup-wizard/evolution-startup-wizard.c windows-sens/evolution-windows-sens.c" WRKSRC=$1 diff --git a/mail/evolution/files/patch-mail_mail-ops.c b/mail/evolution/files/patch-mail_mail-ops.c new file mode 100644 index 000000000..bc8d0a0b9 --- /dev/null +++ b/mail/evolution/files/patch-mail_mail-ops.c @@ -0,0 +1,14 @@ +--- mail/mail-ops.c.orig 2010-11-14 14:21:13.000000000 +0100 ++++ mail/mail-ops.c 2010-11-14 14:22:02.000000000 +0100 +@@ -605,9 +605,9 @@ mail_send_message (struct _send_queue_ms + sent_folder_uri, 0, &local_error); + if (folder == NULL) { + g_string_append_printf ( +- err, _("Failed to append to %s: %s\n" ++ err, _("Failed to append to %s\n" + "Appending to local 'Sent' folder instead."), +- sent_folder_uri, local_error->message); ++ sent_folder_uri); + g_clear_error (&local_error); + } + } -- cgit v1.2.3