From fc61e518ff9477c2c8de6b9fd898ae5b0b57f86c Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 9 Aug 2005 00:52:00 +0000 Subject: Update to 1.3.7. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4428 df743ca5-7f9a-e211-a948-0013205c9059 --- databases/evolution-data-server/Makefile | 4 ++-- databases/evolution-data-server/distinfo | 4 ++-- ...el_providers_groupwise_camel-groupwise-folder.c | 28 ++++++++++++++++++---- databases/evolution-data-server/pkg-plist | 4 ++-- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 63e58dc92..342150cf7 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.51 2005/07/13 06:31:57 marcus Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.52 2005/07/29 21:50:53 marcus Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 1.3.6.1 +PORTVERSION= 1.3.7 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3 diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index 375e86b8a..1a8a8536a 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-data-server-1.3.6.1.tar.bz2) = 5a8e0309b19b8a4b1a54c38a4b41e49a -SIZE (gnome2/evolution-data-server-1.3.6.1.tar.bz2) = 14453677 +MD5 (gnome2/evolution-data-server-1.3.7.tar.bz2) = e05fe0e8607ed4403b19a9d3f407e8f9 +SIZE (gnome2/evolution-data-server-1.3.7.tar.bz2) = 14453689 diff --git a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c b/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c index 366f01dad..67fde3fa4 100644 --- a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c +++ b/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c @@ -1,14 +1,32 @@ ---- camel/providers/groupwise/camel-groupwise-folder.c.orig Wed Jul 13 02:14:43 2005 -+++ camel/providers/groupwise/camel-groupwise-folder.c Wed Jul 13 02:15:18 2005 -@@ -947,9 +947,10 @@ gw_update_summary ( CamelFolder *folder, +--- camel/providers/groupwise/camel-groupwise-folder.c.orig Mon Aug 8 05:12:44 2005 ++++ camel/providers/groupwise/camel-groupwise-folder.c Mon Aug 8 20:42:33 2005 +@@ -929,10 +929,11 @@ gw_update_cache ( CamelFolder *folder, G char *temp_date = NULL; const char *id; GSList *recp_list = NULL; - status_flags = 0; CamelStream *cache_stream; CamelMimeMessage *mail_msg = NULL; -+ -+ status_flags = 0; ++ status_flags = 0; ++ id = e_gw_item_get_id (temp_item); + cache_stream = camel_data_cache_get (gw_folder->cache, "cache", id, ex); +@@ -1609,6 +1610,7 @@ groupwise_transfer_messages_to (CamelFol + const char *old_uid = (const char*)uids->pdata[index]; + char **tmp; + guint32 temp_flags = 0; ++ CamelGroupwiseMessageInfo *dest_info; + CamelGroupwiseMessageInfo *src_info = (CamelGroupwiseMessageInfo *)camel_folder_summary_uid (source->summary, (const char*)uids->pdata[index]); + + /* we don't want to blindly copy the info: reset some flags not suitable for destination*/ +@@ -1617,7 +1619,7 @@ groupwise_transfer_messages_to (CamelFol + else if (!strcmp(destination->full_name, JUNK_FOLDER)) + camel_folder_set_message_flags (source, old_uid, CAMEL_MESSAGE_JUNK, CAMEL_GW_MESSAGE_JUNK); + +- CamelGroupwiseMessageInfo *dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info); ++ dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info); + tmp = g_strsplit (old_uid, ":", -1); + dest_info->info.uid = g_strdup_printf ("%s:%s",tmp[0], dest_container_id); + temp_flags = camel_folder_get_message_flags (source, (const char *)uids->pdata[index]); diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index d339b4d77..2141cf893 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -309,7 +309,7 @@ lib/libcamel-provider-%%EVO_VERSION%%.so lib/libcamel-provider-%%EVO_VERSION%%.so.6 lib/libebook-%%EVO_VERSION%%.a lib/libebook-%%EVO_VERSION%%.so -lib/libebook-%%EVO_VERSION%%.so.4 +lib/libebook-%%EVO_VERSION%%.so.5 lib/libecal-%%EVO_VERSION%%.a lib/libecal-%%EVO_VERSION%%.so lib/libecal-%%EVO_VERSION%%.so.4 @@ -324,7 +324,7 @@ lib/libedataserver-%%EVO_VERSION%%.so lib/libedataserver-%%EVO_VERSION%%.so.4 lib/libedataserverui-%%EVO_VERSION%%.a lib/libedataserverui-%%EVO_VERSION%%.so -lib/libedataserverui-%%EVO_VERSION%%.so.5 +lib/libedataserverui-%%EVO_VERSION%%.so.6 lib/libegroupwise-%%EVO_VERSION%%.a lib/libegroupwise-%%EVO_VERSION%%.so lib/libegroupwise-%%EVO_VERSION%%.so.8 -- cgit v1.2.3