rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.21.1

Browse Source 
- 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).
This commit is contained in:
Matthew Barnes 2007-10-29 19:26:25 +00:00
parent c707096ebf
commit 5e441ab5cd
5 changed files with 3294 additions and 3225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-2.12.1.tar.bz2
evolution-2.21.1.tar.bz2

6311
evolution-2.8.1-kill-ethread.patch
View File

File diff suppressed because it is too large Load Diff

85
evolution-2.9.1-kill-ememory.patch
View File

@ -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;

95
evolution.spec
View File

@ -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 @@ Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch
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 @@ Patch30: evolution-2.9.3-source-path-entry.patch
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): GConf2
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 @@ This package contains the help for Evolution.
%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 @@ This package contains the help for Evolution.
#%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 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
# 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 @@ rm -rf $RPM_BUILD_ROOT
%{_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 @@ rm -rf $RPM_BUILD_ROOT
%{_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 @@ rm -rf $RPM_BUILD_ROOT
%{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 @@ rm -rf $RPM_BUILD_ROOT
%{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 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/omf/evolution
%changelog
* Mon Oct 29 2007 Matthew Barnes <mbarnes@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@redhat.com> - 2.12.1-2.fc8
- Fix a broken zoom icon.

2
sources
View File

@ -1 +1 @@
392623efa9b79ede17ce90512f2c3c0a evolution-2.12.1.tar.bz2
53e5927ac3e8a0f1426b010c42ff49f3 evolution-2.21.1.tar.bz2