rpms/evolution/devel .cvsignore, 1.79, 1.80 evolution-2.8.1-kill-ethread.patch, 1.15, 1.16 evolution-2.9.1-kill-ememory.patch, 1.4, 1.5 evolution.spec, 1.300, 1.301 sources, 1.79, 1.80
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Mon Oct 29 19:27:00 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168
Modified Files:
.cvsignore evolution-2.8.1-kill-ethread.patch
evolution-2.9.1-kill-ememory.patch evolution.spec sources
Log Message:
* Mon Oct 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc9
- Update to 2.21.1
- Remove redundant requirements.
- Bump EDS requirement to 2.21.1.
- Bump gtkhtml requirement to 3.17.1.
- Backup/restore plugin got moved from standard to experimental.
- Revert the per-component menu items (RH bug #222105, #241462, #293771).
- Show the switcher buttons by default (RH bug #186403).
- Alter the desktop file Name and Comment.
- Disable patch for GNOME bug #376991 for now. It may be contributing
to password prompting problems as described in RH bug #296671.
- Remove patch for GNOME bug #417999 (fixed upstream).
- Remove patch for GNOME bug #476040 (fixed upstream).
- Remove patch for GNOME bug #477045 (fixed upstream).
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore 15 Oct 2007 18:26:48 -0000 1.79
+++ .cvsignore 29 Oct 2007 19:26:25 -0000 1.80
@@ -1 +1 @@
-evolution-2.12.1.tar.bz2
+evolution-2.21.1.tar.bz2
evolution-2.8.1-kill-ethread.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.15 -r 1.16 evolution-2.8.1-kill-ethread.patch
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- evolution-2.8.1-kill-ethread.patch 15 Oct 2007 18:26:48 -0000 1.15
+++ evolution-2.8.1-kill-ethread.patch 29 Oct 2007 19:26:25 -0000 1.16
@@ -1,2194 +1,1932 @@
---- evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-09-02 14:56:38.000000000 -0400
-+++ evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-09-04 00:19:08.000000000 -0400
-@@ -44,32 +44,30 @@
-
+diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/mail/mail-send-recv.c
+--- evolution-2.21.1/mail/mail-send-recv.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400
++++ evolution-2.21.1/mail/mail-send-recv.c 2007-10-29 14:47:20.000000000 -0400
+@@ -775,23 +775,22 @@ receive_get_folder(CamelFilterDriver *d,
+ /* ********************************************************************** */
- struct _folder_unsub_t {
+ struct _refresh_folders_msg {
- struct _mail_msg msg;
+ MailMsg base;
-
- char *uri;
+
+ struct _send_info *info;
+ GPtrArray *folders;
+ CamelStore *store;
};
-static char *
--folder_unsubscribe__desc (struct _mail_msg *mm, int done)
+-refresh_folders_desc (struct _mail_msg *mm, int done)
+static gchar *
-+folder_unsubscribe_desc (struct _folder_unsub_t *msg)
++refresh_folders_desc (struct _refresh_folders_msg *m)
{
-- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
--
-- return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri);
-+ return g_strdup_printf (
-+ _("Unsubscribing from folder \"%s\""), msg->uri);
+ return g_strdup_printf(_("Checking for new mail"));
}
static void
--folder_unsubscribe__unsub (struct _mail_msg *mm)
-+folder_unsubscribe_exec (struct _folder_unsub_t *msg)
+-refresh_folders_get (struct _mail_msg *mm)
++refresh_folders_exec (struct _refresh_folders_msg *m)
{
-- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
- extern CamelSession *session;
- const char *path = NULL;
- CamelStore *store;
- CamelURL *url;
-
-- if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex)))
-+ if (!(store = camel_session_get_store (session, msg->uri, &mm->ex)))
- return;
-
-- url = camel_url_new (unsub->uri, NULL);
-+ url = camel_url_new (msg->uri, NULL);
- if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
- path = url->fragment;
- else if (url->path && url->path[0])
-@@ -82,18 +80,17 @@
+- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
+ int i;
+ CamelFolder *folder;
+ CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+@@ -813,17 +812,14 @@ refresh_folders_get (struct _mail_msg *m
}
static void
--folder_unsubscribe__free (struct _mail_msg *mm)
-+folder_unsubscribe_free (struct _folder_unsub_t *msg)
+-refresh_folders_got (struct _mail_msg *mm)
++refresh_folders_done (struct _refresh_folders_msg *m)
{
-- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
--
-- g_free (unsub->uri);
-+ g_free (msg->uri);
+- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
+-
+ receive_done("", m->info);
}
--static struct _mail_msg_op unsubscribe_op = {
-- folder_unsubscribe__desc,
-- folder_unsubscribe__unsub,
-- NULL,
-- folder_unsubscribe__free,
-+static MailMsgInfo unsubscribe_info = {
-+ sizeof (struct _folder_unsub_t),
-+ (MailMsgDescFunc) folder_unsubscribe_desc,
-+ (MailMsgExecFunc) folder_unsubscribe_exec,
-+ (MailMsgDoneFunc) NULL,
-+ (MailMsgFreeFunc) folder_unsubscribe_free
- };
-
+ static void
+-refresh_folders_free (struct _mail_msg *mm)
++refresh_folders_free (struct _refresh_folders_msg *m)
+ {
+- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
+ int i;
-@@ -105,8 +102,8 @@
- if (target->uri == NULL)
- return;
-
-- unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
-+ unsub = mail_msg_new (&unsubscribe_info);
- unsub->uri = g_strdup (target->uri);
-
-- e_thread_put (mail_thread_new, (EMsg *) unsub);
-+ mail_msg_unordered_push (unsub);
- }
---- evolution-2.11.92/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-09-02 14:56:39.000000000 -0400
-+++ evolution-2.11.92/plugins/mark-all-read/mark-all-read.c 2007-09-04 00:19:08.000000000 -0400
-@@ -44,7 +44,7 @@
- return;
- }
-
-- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new);
-+ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push);
+ for (i=0;i<m->folders->len;i++)
+@@ -832,11 +828,12 @@ refresh_folders_free (struct _mail_msg *
+ camel_object_unref(m->store);
}
+-static struct _mail_msg_op refresh_folders_op = {
+- refresh_folders_desc,
+- refresh_folders_get,
+- refresh_folders_got,
+- refresh_folders_free,
++static MailMsgInfo refresh_folders_info = {
++ sizeof (struct _refresh_folders_msg),
++ (MailMsgDescFunc) refresh_folders_desc,
++ (MailMsgExecFunc) refresh_folders_exec,
++ (MailMsgDoneFunc) refresh_folders_done,
++ (MailMsgFreeFunc) refresh_folders_free
+ };
+
static void
---- evolution-2.11.92/plugins/save-attachments/save-attachments.c.kill-ethread 2007-09-02 14:56:45.000000000 -0400
-+++ evolution-2.11.92/plugins/save-attachments/save-attachments.c 2007-09-04 00:19:08.000000000 -0400
-@@ -403,5 +403,5 @@
- camel_object_ref(data->folder);
- data->uid = g_strdup(target->uids->pdata[0]);
+@@ -869,13 +866,13 @@ receive_update_got_folderinfo(CamelStore
-- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
-+ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
- }
---- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-09-02 14:56:38.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c 2007-09-04 00:19:08.000000000 -0400
-@@ -121,7 +121,7 @@
- }
+ get_folders(store, folders, info);
- struct _EMCreateFolder {
+- m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m));
++ m = mail_msg_new(&refresh_folders_info);
+ m->store = store;
+ camel_object_ref(store);
+ m->folders = folders;
+ m->info = sinfo;
+
+- e_thread_put(mail_thread_new, (EMsg *)m);
++ mail_msg_unordered_push (m);
+ } else {
+ receive_done ("", data);
+ }
+diff -up evolution-2.21.1/mail/mail-component.c.kill-ethread evolution-2.21.1/mail/mail-component.c
+--- evolution-2.21.1/mail/mail-component.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400
++++ evolution-2.21.1/mail/mail-component.c 2007-10-29 14:47:20.000000000 -0400
+@@ -1000,7 +1000,7 @@ impl_handleURI (PortableServer_Servant s
+ if (camel_url_get_param(url, "uid") != NULL) {
+ char *curi = em_uri_to_camel(uri);
+
+- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new);
++ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push);
+ g_free(curi);
+ } else {
+ g_warning("email uri's must include a uid parameter");
+diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mail-ops.c
+--- evolution-2.21.1/mail/mail-ops.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400
++++ evolution-2.21.1/mail/mail-ops.c 2007-10-29 14:54:45.000000000 -0400
+@@ -75,7 +75,7 @@
+ /* used for both just filtering a folder + uid's, and for filtering a whole folder */
+ /* used both for fetching mail, and for filtering mail */
+ struct _filter_mail_msg {
- struct _mail_msg msg;
+ MailMsg base;
- /* input data */
[...12069 lines suppressed...]
+
+- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__));
+- e_thread_put(alarm_operation_thread, (EMsg *)msg);
++ message_push ((Message *) msg);
}
- MAIL_MT_UNLOCK(status_lock);
- }
-@@ -930,7 +911,7 @@
- /* ******************************************************************************** */
- struct _op_status_msg {
-- struct _mail_msg msg;
-+ MailMsg base;
+ return TRUE;
+@@ -1981,14 +1970,15 @@ hash_ids (gpointer a)
+ }
- struct _CamelOperation *op;
- char *what;
-@@ -938,16 +919,16 @@
- void *data;
+ struct _alarm_client_msg {
++ Message header;
+ ECal *client;
};
--static void do_op_status(struct _mail_msg *mm)
+-static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data)
+static void
-+op_status_exec (struct _op_status_msg *m)
++alarm_queue_add_async (struct _alarm_client_msg *msg)
{
- EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
-- struct _op_status_msg *m = (struct _op_status_msg *)mm;
-- struct _mail_msg *msg;
-- struct _mail_msg_priv *data;
-+ MailMsg *msg;
-+ MailMsgPrivate *data;
- char *out, *p, *o, c;
- int pc;
-
-- g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ()));
-+ g_return_if_fail (mail_in_main_thread ());
-
- MAIL_MT_LOCK (mail_msg_lock);
-
-@@ -986,8 +967,8 @@
- progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
-
- MAIL_MT_UNLOCK (mail_msg_lock);
-- if (msg->ops->describe_msg)
-- what = msg->ops->describe_msg (msg, FALSE);
-+ if (msg->info->desc)
-+ what = msg->info->desc (msg);
- /* uncommenting because message is not very useful for a user, see bug 271734*/
- else {
- what = g_strdup("");
-@@ -1001,11 +982,7 @@
- MAIL_MT_LOCK (mail_msg_lock);
- if (data->activity_state == 3) {
- MAIL_MT_UNLOCK (mail_msg_lock);
-- if (msg->cancel)
-- camel_operation_unref (msg->cancel);
-- camel_exception_clear (&msg->ex);
-- g_free (msg->priv);
-- g_free (msg);
-+ mail_msg_free (msg);
- } else {
- data->activity_state = 2;
- MAIL_MT_UNLOCK (mail_msg_lock);
-@@ -1021,18 +998,17 @@
+ ClientAlarms *ca;
+- struct _alarm_client_msg *list = msg->data;
+- ECal *client = list->client;
++ ECal *client = msg->client;
+
+ g_return_if_fail (alarm_queue_inited);
+ g_return_if_fail (client != NULL);
+@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre
+ G_CALLBACK (cal_opened_cb),
+ ca);
+ }
++
++ g_slice_free (struct _alarm_client_msg, msg);
}
- static void
--do_op_status_free (struct _mail_msg *mm)
-+op_status_free (struct _op_status_msg *m)
+ /**
+@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre
+ void
+ alarm_queue_add_client (ECal *client)
{
-- struct _op_status_msg *m = (struct _op_status_msg *)mm;
+- AlarmMsg *msg;
+- struct _alarm_client_msg *list;
++ struct _alarm_client_msg *msg;
+
+- /* These two structures will be freed by the msg destroy function*/
+- msg = malloc (sizeof (AlarmMsg));
+- msg->receive_msg = alarm_queue_add_async;
-
- g_free (m->what);
- }
+- list = malloc (sizeof (struct _alarm_client_msg));
+- list->client = client;
+- g_object_ref (client);
+- msg->data = list;
++ msg = g_slice_new (struct _alarm_client_msg);
++ msg->header.func = (MessageFunc) alarm_queue_add_async;
++ msg->client = g_object_ref (client);
--static struct _mail_msg_op op_status_op = {
-- NULL,
-- do_op_status,
-- NULL,
-- do_op_status_free,
-+static MailMsgInfo op_status_info = {
-+ sizeof (struct _op_status_msg),
-+ (MailMsgDescFunc) NULL,
-+ (MailMsgExecFunc) op_status_exec,
-+ (MailMsgDoneFunc) NULL,
-+ (MailMsgFreeFunc) op_status_free
- };
+- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__));
+- e_thread_put(alarm_operation_thread, (EMsg *)msg);
++ message_push ((Message *) msg);
+ }
+ /* Removes a component an its alarms */
+@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca)
+ * Removes a calendar client from the alarm queueing system.
+ **/
static void
-@@ -1042,7 +1018,7 @@
-
- d(printf("got operation statys: %s %d%%\n", what, pc));
+-alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data)
++alarm_queue_remove_async (struct _alarm_client_msg *msg)
+ {
+ ClientAlarms *ca;
+- struct _alarm_client_msg *list = msg->data;
+- ECal *client = list->client;
++ ECal *client = msg->client;
-- m = mail_msg_new(&op_status_op, NULL, sizeof(*m));
-+ m = mail_msg_new(&op_status_info);
- m->op = op;
- m->what = g_strdup(what);
- switch (pc) {
-@@ -1055,7 +1031,7 @@
- }
- m->pc = pc;
- m->data = data;
-- e_msgport_put(mail_gui_port, (EMsg *)m);
-+ mail_msg_main_loop_push(m);
+ g_return_if_fail (alarm_queue_inited);
+ g_return_if_fail (client != NULL);
+@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al
+ g_free (ca);
+
+ g_hash_table_remove (client_alarms_hash, client);
++
++ g_slice_free (struct _alarm_client_msg, msg);
}
- /* ******************** */
+ /** alarm_queue_remove_client
+@@ -2156,24 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al
+ void
+ alarm_queue_remove_client (ECal *client, gboolean immediately)
+ {
+- AlarmMsg *msg;
+- struct _alarm_client_msg *list;
++ struct _alarm_client_msg *msg;
+
+- /* These two structures will be freed by the msg destroy function*/
+- msg = malloc (sizeof (AlarmMsg));
+- msg->receive_msg = alarm_queue_remove_async;
+-
+- list = malloc (sizeof (struct _alarm_client_msg));
+- list->client = client;
+- msg->data = list;
++ msg = g_slice_new (struct _alarm_client_msg);
++ msg->header.func = (MessageFunc) alarm_queue_remove_async;
++ msg->client = client;
+
+- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
+ if (immediately) {
+- alarm_queue_remove_async (NULL, msg, NULL);
+- g_free (list);
+- g_free (msg);
++ alarm_queue_remove_async (msg);
+ } else
+- e_thread_put(alarm_operation_thread, (EMsg *)msg);
++ message_push ((Message *) msg);
+ }
+
+ /* Update non-time related variables for various structures on modification of an existing component
evolution-2.9.1-kill-ememory.patch:
Index: evolution-2.9.1-kill-ememory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.9.1-kill-ememory.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-2.9.1-kill-ememory.patch 4 Sep 2007 04:39:01 -0000 1.4
+++ evolution-2.9.1-kill-ememory.patch 29 Oct 2007 19:26:25 -0000 1.5
@@ -1,6 +1,7 @@
---- evolution-2.9.1/mail/message-list.c.ememory 2006-10-25 11:11:34.000000000 -0400
-+++ evolution-2.9.1/mail/message-list.c 2006-10-25 11:15:12.000000000 -0400
-@@ -412,70 +412,28 @@
+diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail/message-list.c
+--- evolution-2.21.1/mail/message-list.c.kill-ememory 2007-10-29 10:44:57.000000000 -0400
++++ evolution-2.21.1/mail/message-list.c 2007-10-29 10:48:44.000000000 -0400
+@@ -416,70 +416,28 @@ get_message_info (MessageList *message_l
return info;
}
@@ -91,7 +92,7 @@
}
static void
-@@ -1283,12 +1241,23 @@
+@@ -1287,12 +1245,23 @@ ml_tree_value_at (ETreeModel *etm, ETree
str = camel_message_info_from (msg_info);
return (void *)(str ? str : "");
case COL_FROM_NORM:
@@ -117,7 +118,7 @@
case COL_SENT: {
ETreePath child;
-@@ -1312,7 +1281,8 @@
+@@ -1316,7 +1285,8 @@ ml_tree_value_at (ETreeModel *etm, ETree
str = camel_message_info_to (msg_info);
return (void *)(str ? str : "");
case COL_TO_NORM:
@@ -127,10 +128,11 @@
case COL_SIZE:
return GINT_TO_POINTER (camel_message_info_size(msg_info));
case COL_DELETED:
-@@ -2023,9 +1993,10 @@
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-
- message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal);
+@@ -2070,9 +2040,11 @@ message_list_init (MessageList *message_
+ g_str_hash, g_str_equal,
+ (GDestroyNotify) NULL,
+ (GDestroyNotify) e_poolv_destroy);
++
+ message_list->string_chunk = g_string_chunk_new (1024);
message_list->hidden = NULL;
@@ -139,26 +141,9 @@
message_list->hide_before = ML_HIDE_NONE_START;
message_list->hide_after = ML_HIDE_NONE_END;
-@@ -2054,14 +2025,6 @@
- g_signal_connect (((GtkScrolledWindow *) message_list)->vscrollbar, "value-changed", G_CALLBACK (ml_scrolled), message_list);
- }
-
--static gboolean
--normalised_free (gpointer key, gpointer value, gpointer user_data)
--{
-- e_poolv_destroy (value);
--
-- return TRUE;
--}
--
- static void
- message_list_destroy(GtkObject *object)
- {
-@@ -2127,17 +2090,17 @@
- MessageList *message_list = MESSAGE_LIST (object);
+@@ -2166,15 +2138,16 @@ message_list_finalise (GObject *object)
struct _MessageListPrivate *p = message_list->priv;
-- g_hash_table_foreach (message_list->normalised_hash, (GHFunc) normalised_free, NULL);
g_hash_table_destroy (message_list->normalised_hash);
+ g_string_chunk_free (message_list->string_chunk);
@@ -175,38 +160,17 @@
}
g_free(message_list->search);
-@@ -2940,17 +2903,6 @@
- d(printf("changed = %d added = %d removed = %d\n",
- changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
-
-- for (i = 0; i < changes->uid_removed->len; i++) {
-- /* uncache the normalised strings for these uids */
-- EPoolv *poolv;
--
-- poolv = g_hash_table_lookup (ml->normalised_hash, changes->uid_removed->pdata[i]);
-- if (poolv != NULL) {
-- g_hash_table_remove (ml->normalised_hash, changes->uid_removed->pdata[i]);
-- e_poolv_destroy (poolv);
-- }
-- }
--
- /* check if the hidden state has changed, if so modify accordingly, then regenerate */
- if (ml->hidejunk || ml->hidedeleted)
- mail_folder_hide_by_flag (folder, ml, &changes, (ml->hidejunk ? CAMEL_MESSAGE_JUNK : 0) | (ml->hidedeleted ? CAMEL_MESSAGE_DELETED : 0));
-@@ -3028,7 +2980,11 @@
- }
+@@ -3124,6 +3097,9 @@ message_list_set_folder (MessageList *me
/* reset the normalised sort performance hack */
-- g_hash_table_foreach_remove (message_list->normalised_hash, normalised_free, NULL);
-+ /* XXX GLib 2.12 added g_hash_table_remove_all() */
-+ g_hash_table_destroy (message_list->normalised_hash);
-+ message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal);
+ g_hash_table_remove_all (message_list->normalised_hash);
++
+ g_string_chunk_free (message_list->string_chunk);
+ message_list->string_chunk = g_string_chunk_new (1024);
mail_regen_cancel(message_list);
-@@ -3479,14 +3435,14 @@
+@@ -3574,14 +3550,14 @@ message_list_hide_uids (MessageList *ml,
MESSAGE_LIST_LOCK (ml, hide_lock);
if (ml->hidden == NULL) {
ml->hidden = g_hash_table_new (g_str_hash, g_str_equal);
@@ -224,7 +188,7 @@
g_hash_table_insert (ml->hidden, uid, uid);
}
}
-@@ -3507,9 +3463,9 @@
+@@ -3602,9 +3578,9 @@ message_list_hide_clear (MessageList *ml
MESSAGE_LIST_LOCK (ml, hide_lock);
if (ml->hidden) {
g_hash_table_destroy (ml->hidden);
@@ -236,7 +200,7 @@
}
ml->hide_before = ML_HIDE_NONE_START;
ml->hide_after = ML_HIDE_NONE_END;
-@@ -3545,9 +3501,9 @@
+@@ -3640,9 +3616,9 @@ load_hide_state (MessageList *ml)
MESSAGE_LIST_LOCK(ml, hide_lock);
if (ml->hidden) {
g_hash_table_destroy (ml->hidden);
@@ -248,7 +212,7 @@
}
ml->hide_before = ML_HIDE_NONE_START;
ml->hide_after = ML_HIDE_NONE_END;
-@@ -3558,7 +3514,7 @@
+@@ -3653,7 +3629,7 @@ load_hide_state (MessageList *ml)
camel_file_util_decode_fixed_int32 (in, &version);
if (version == HIDE_STATE_VERSION) {
ml->hidden = g_hash_table_new(g_str_hash, g_str_equal);
@@ -257,7 +221,7 @@
camel_file_util_decode_fixed_int32 (in, &lower);
ml->hide_before = lower;
camel_file_util_decode_fixed_int32 (in, &upper);
-@@ -3567,7 +3523,7 @@
+@@ -3662,7 +3638,7 @@ load_hide_state (MessageList *ml)
char *olduid, *uid;
if (camel_file_util_decode_string (in, &olduid) != -1) {
@@ -266,7 +230,7 @@
g_free (olduid);
g_hash_table_insert(ml->hidden, uid, uid);
}
-@@ -3717,12 +3673,12 @@
+@@ -3811,12 +3787,12 @@ regen_list_exec (struct _regen_list_msg
if (m->ml->hidden == NULL) {
m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal);
@@ -281,9 +245,10 @@
g_hash_table_insert (m->ml->hidden, uid, uid);
}
}
---- evolution-2.9.1/mail/message-list.h.ememory 2006-09-28 04:56:51.000000000 -0400
-+++ evolution-2.9.1/mail/message-list.h 2006-10-25 11:15:12.000000000 -0400
-@@ -102,11 +102,12 @@
+diff -up evolution-2.21.1/mail/message-list.h.kill-ememory evolution-2.21.1/mail/message-list.h
+--- evolution-2.21.1/mail/message-list.h.kill-ememory 2007-10-23 06:06:27.000000000 -0400
++++ evolution-2.21.1/mail/message-list.h 2007-10-29 10:44:57.000000000 -0400
+@@ -102,11 +102,12 @@ struct _MessageList {
GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */
GHashTable *normalised_hash;
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- evolution.spec 16 Oct 2007 02:38:30 -0000 1.300
+++ evolution.spec 29 Oct 2007 19:26:25 -0000 1.301
@@ -1,23 +1,22 @@
%define dbus_glib_version 0.70
%define dbus_version 1.0
-%define eds_version 1.11.0
+%define eds_version 2.21.1
%define gnome_doc_utils_version 0.8.0
%define gnome_icon_theme_version 2.19.91
%define gnome_pilot_version 2.0.15
%define gnomevfs2_version 2.4
%define gtk2_version 2.12.0
-%define gtkhtml_version 3.16.0
+%define gtkhtml_version 3.17.1
%define intltool_version 0.35.5
%define last_libgal2_version 2:2.5.3-2
%define libbonobo_version 2.16.0
%define libbonoboui_version 2.4.2
%define orbit2_version 2.9.8
%define pilot_link_version 2:0.12.1
-%define redhat_menus_version 5.0.4
%define scrollkeeper_version 0.1.4
%define soup_version 2.2.2
-%define evo_major 2.12
+%define evo_major 2.22
%define exchange_support 1
%define inline_audio_support 1
@@ -45,8 +44,8 @@
### Abstract ###
Name: evolution
-Version: 2.12.1
-Release: 2%{?dist}
+Version: 2.21.1
+Release: 1%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -71,7 +70,8 @@
Patch12: evolution-2.0.2-fix-145552.patch
# Part of RH bug 170799:
-Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch
+# XXX Revert this for Fedora 9
+#Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch
# Patches for conduits, based upon
# rh-161817-attach-116019-conduit_pilot_link_updates.diff
@@ -114,16 +114,8 @@
Patch31: evolution-2.9.3-meeting-list-view.patch
# GNOME bug #376991
-Patch33: evolution-2.10.0-e-passwords.patch
-
-# GNOME bug #417999
-Patch34: evolution-2.10.0-e-source-combo-box.patch
-
-# GNOME bug #476040
-Patch35: evolution-2.11.92-mail-attachment.patch
-
-# GNOME bug #477045
-Patch36: evolution-2.11.92-icon-names.patch
+# XXX Disabled due to outstanding issues.
+#Patch33: evolution-2.10.0-e-passwords.patch
## Dependencies ###
@@ -131,23 +123,9 @@
Requires(post): scrollkeeper >= %{scrollkeeper_version}
Requires(postun): scrollkeeper >= %{scrollkeeper_version}
-Requires: ORBit2 >= %{orbit2_version}
-Requires: dbus >= %{dbus_version}
-Requires: evolution-data-server >= %{eds_version}
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires: gnome-spell >= 1.0.2
Requires: gnome-themes
-Requires: gnome-vfs2 >= %{gnomevfs2_version}
-Requires: gnutls
-Requires: gtk2 >= %{gtk2_version}
-Requires: libbonobo >= %{libbonobo_version}
-Requires: libbonoboui >= %{libbonoboui_version}
-Requires: libsoup >= %{soup_version}
-Requires: redhat-menus >= %{redhat_menus_version}
-
-%if %{libnotify_support}
-Requires: libnotify >= 0.4
-%endif
### Build Dependencies ###
@@ -251,7 +229,7 @@
%patch10 -p1 -b .ldaphack
%patch11 -p1 -b .commit-enter-on-calendar
%patch12 -p1 -b .fix-164957
-%patch13 -p1 -b .hide-switcher-buttons-by-default
+#patch13 -p1 -b .hide-switcher-buttons-by-default
#patch14 -p1 -b .fix-conduits # leave commented
%patch15 -p1 -b .fix-conduit-dir
%patch16 -p1 -b .no-gnome-common
@@ -264,10 +242,7 @@
#%patch29 -p1 -b .view-attachment-uri
%patch30 -p1 -b .source-path-entry
%patch31 -p1 -b .meeting-list-view
-%patch33 -p1 -b .e-passwords
-%patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .mail-attachment
-%patch36 -p1 -b .icon-names
+#%patch33 -p1 -b .e-passwords
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -394,19 +369,6 @@
# scrollkeeper gets handled in %post
rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \
- $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-mail.desktop
-ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-calendar.desktop \
- $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-calendar.desktop
-ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-contacts.desktop \
- $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-contacts.desktop
-ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \
- $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop
-
-# remove upstream desktop file; use the symlinks from above (#103826)
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop
-
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
@@ -460,22 +422,14 @@
%{_bindir}/evolution
# Desktop files:
-%{_datadir}/applications/redhat-evolution-mail.desktop
-%{_datadir}/applications/redhat-evolution-calendar.desktop
-%{_datadir}/applications/redhat-evolution-contacts.desktop
-%{_datadir}/applications/redhat-evolution-tasks.desktop
+%{_datadir}/applications/evolution.desktop
# Icons:
%{_datadir}/icons/hicolor/16x16/apps/evolution.png
%{_datadir}/icons/hicolor/22x22/apps/evolution.png
%{_datadir}/icons/hicolor/24x24/apps/evolution.png
%{_datadir}/icons/hicolor/32x32/apps/evolution.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-autocompletion.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-certificates.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-composer.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-mail-accounts.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-mail.png
+%{_datadir}/icons/hicolor/48x48/apps/evolution.png
%{_datadir}/icons/hicolor/scalable/apps/evolution.svg
# IDL files (should this be in devel subpackage?)
@@ -530,7 +484,6 @@
%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
-%{_libexecdir}/evolution/%{evo_major}/evolution-backup
%{_libexecdir}/evolution/%{evo_major}/killev
# Various conduits for gnome-pilot:
@@ -598,6 +551,9 @@
%{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
%{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
+%{evo_plugin_dir}/org-gnome-evolution-google.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-google.so
+
%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
@@ -682,10 +638,6 @@
%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug
%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so
-%{evo_plugin_dir}/liborg-gnome-backup-restore.so
-%{evo_plugin_dir}/org-gnome-backup-restore.eplug
-%{evo_plugin_dir}/org-gnome-backup-restore.xml
-
%files devel
%defattr(-, root, root)
%{_includedir}/evolution-%{evo_major}
@@ -718,6 +670,21 @@
%dir %{_datadir}/omf/evolution
%changelog
+* Mon Oct 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc9
+- Update to 2.21.1
+- Remove redundant requirements.
+- Bump EDS requirement to 2.21.1.
+- Bump gtkhtml requirement to 3.17.1.
+- Backup/restore plugin got moved from standard to experimental.
+- Revert the per-component menu items (RH bug #222105, #241462, #293771).
+- Show the switcher buttons by default (RH bug #186403).
+- Alter the desktop file Name and Comment.
+- Disable patch for GNOME bug #376991 for now. It may be contributing
+ to password prompting problems as described in RH bug #296671.
+- Remove patch for GNOME bug #417999 (fixed upstream).
+- Remove patch for GNOME bug #476040 (fixed upstream).
+- Remove patch for GNOME bug #477045 (fixed upstream).
+
* Mon Oct 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc8
- Fix a broken zoom icon.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources 15 Oct 2007 18:26:48 -0000 1.79
+++ sources 29 Oct 2007 19:26:25 -0000 1.80
@@ -1 +1 @@
-392623efa9b79ede17ce90512f2c3c0a evolution-2.12.1.tar.bz2
+53e5927ac3e8a0f1426b010c42ff49f3 evolution-2.21.1.tar.bz2
More information about the fedora-extras-commits
mailing list