From c5a13c22888606628f80cb93c42a932fd290a12e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Nov 2007 22:09:25 +0000 Subject: [PATCH] - Update to 2.21.2 --- .cvsignore | 2 +- evolution-2.8.1-kill-ethread.patch | 14 +++++++------- evolution-2.9.1-kill-ememory.patch | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 583e3b1..0951394 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.1.tar.bz2 +evolution-2.21.2.tar.bz2 diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index ee76394..30b4b49 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -3940,7 +3940,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma -}; - -#ifdef LOG_STREAM --int dolog; +-static int dolog; -#endif - -/* Should probably expose messages to outside world ... so subclasses can extend */ @@ -5927,18 +5927,18 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2); - - mail_thread_queued = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0); +- e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, NULL); +- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, NULL); - e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port); - - mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, 0); +- e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, NULL); +- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, NULL); - e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port); - - mail_thread_new = e_thread_new(E_THREAD_NEW); -- e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0); +- e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, NULL); +- e_thread_set_msg_received(mail_thread_new, mail_msg_received, NULL); - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index 700d85e..5f27b0a 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -239,7 +239,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } for (i = 0; i < uidnew->len; i++) { - if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == 0) { + if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) { - char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); + char *uid = g_string_chunk_insert (m->ml->hidden_string_chunk, uidnew->pdata[i]); g_hash_table_insert (m->ml->hidden, uid, uid); diff --git a/evolution.spec b/evolution.spec index efa1446..08e8e33 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.21.1 -Release: 2%{?dist} +Version: 2.21.2 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -676,7 +676,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Tue Oct 30 2007 Matthew Barnes - 2.12.1-2.fc9 +* Mon Nov 12 2007 Matthew Barnes - 2.21.2-1.fc9 +- Update to 2.21.2 + +* Tue Oct 30 2007 Matthew Barnes - 2.21.1-2.fc9 - Attempt to split the gnome-pilot stuff into a separate evolution-conduits subpackage (RH bug #178155). diff --git a/sources b/sources index fb67034..b630403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53e5927ac3e8a0f1426b010c42ff49f3 evolution-2.21.1.tar.bz2 +833cf5f76ec30170d22f04948fba9997 evolution-2.21.2.tar.bz2