From 02b5af48ae9e9607df1b0da98cb4ebba2858b704 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Dec 10 2006 00:48:58 +0000 Subject: - Update to 2.9.3 - Configure with scrollkeeper disabled. - Ship our own icons from gnome-icon-theme. - Explicitly turn off automake portability checking. - Add patch for RH bug #215478 (Maildir and MH accounts). - Add patch for RH bug #215695 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing attachments). - Add patch for RH bug #218801 (count unread messages first). - Add patch for GNOME bug #350253 (ship our own icons). - Add patch for GNOME bug #382431 (implicit function declaration). - Revise patch for GNOME bug #360946 (improved "about" dialog). - Remove patch for GNOME bug #357970 (fixed upstream). --- diff --git a/evolution-2.9.3-source-path-entry.patch b/evolution-2.9.3-source-path-entry.patch new file mode 100644 index 0000000..2a6337a --- /dev/null +++ b/evolution-2.9.3-source-path-entry.patch @@ -0,0 +1,19 @@ +--- evolution-2.9.3/mail/mail-config.glade.source-path-entry 2006-12-08 20:15:16.000000000 -0500 ++++ evolution-2.9.3/mail/mail-config.glade 2006-12-08 20:16:13.000000000 -0500 +@@ -1343,7 +1343,7 @@ + + True + Mailbox location +- GTK_FILE_CHOOSER_ACTION_OPEN ++ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + True + False + False +@@ -1354,7 +1354,6 @@ + 2 + 2 + 3 +- fill + + + diff --git a/evolution-2.9.3-unread-messages.patch b/evolution-2.9.3-unread-messages.patch new file mode 100644 index 0000000..9eb3b97 --- /dev/null +++ b/evolution-2.9.3-unread-messages.patch @@ -0,0 +1,63 @@ +--- evolution-2.9.3/mail/em-folder-properties.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 ++++ evolution-2.9.3/mail/em-folder-properties.c 2006-12-09 09:00:09.000000000 -0500 +@@ -145,27 +145,27 @@ + gtk_widget_show (table); + gtk_box_pack_start ((GtkBox *) parent, table, TRUE, TRUE, 0); + +- /* TODO: can this be done in a loop? */ + /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ +- label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); ++ label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); + gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); + +- sprintf(countstr, "%d", prop_data->total); ++ sprintf(countstr, "%d", prop_data->unread); + label = gtk_label_new (countstr); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); + gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0); + row++; + ++ /* TODO: can this be done in a loop? */ + /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ +- label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); ++ label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); + gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); + +- sprintf(countstr, "%d", prop_data->unread); ++ sprintf(countstr, "%d", prop_data->total); + label = gtk_label_new (countstr); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); +--- evolution-2.9.3/mail/mail-component.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 ++++ evolution-2.9.3/mail/mail-component.c 2006-12-09 09:00:09.000000000 -0500 +@@ -544,6 +544,9 @@ + || g_ascii_strcasecmp(emfv->folder->full_name, ".") == 0) + bits |= 8; + ++ if (selected->len > 1) ++ g_string_append_printf(tmp, ngettext ("%d selected, ", "%d selected, ", selected->len), selected->len); ++ + if (bits == 1) + g_string_append_printf(tmp, ngettext ("%d draft", "%d drafts", visible), visible); + else if (bits == 2) +@@ -553,13 +556,11 @@ + else { + if (!emfv->hide_deleted) + visible += deleted; ++ if (unread && selected->len <= 1) ++ g_string_append_printf(tmp, ngettext ("%d unread, ", "%d unread, ", unread), unread); + g_string_append_printf(tmp, ngettext ("%d total", "%d total", visible), visible); +- if (unread && selected->len <=1) +- g_string_append_printf(tmp, ngettext (", %d unread", ", %d unread", unread), unread); + } + +- if (selected->len > 1) +- g_string_append_printf(tmp, ngettext (", %d selected", ", %d selected", selected->len), selected->len); + message_list_free_uids(emfv->list, selected); + } + diff --git a/evolution.spec b/evolution.spec index 16d1489..670b597 100644 --- a/evolution.spec +++ b/evolution.spec @@ -157,6 +157,12 @@ Patch40: evolution-2.9.3-view-attachment-uri.patch # GNOME bug #350253 Patch41: evolution-2.9.3-adopt-icons.patch +# RH bug #215478 / GNOME bug #383842 +Patch42: evolution-2.9.3-source-path-entry.patch + +# RH bug #218801 / GNOME bug #383953 +Patch43: evolution-2.9.3-unread-messages.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -300,6 +306,8 @@ Development files needed for building things which link against evolution. %patch39 -p1 -b .dont-assume-default-account %patch40 -p1 -b .view-attachment-uri %patch41 -p1 -b .adopt-icons +%patch42 -p1 -b .source-path-entry +%patch43 -p1 -b .unread-messages mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -385,12 +393,9 @@ CFLAGS="$CFLAGS \ %endif # Rerun the GNU Autotools since we patched some of the input files. -aclocal -autoheader -automake -libtoolize -intltoolize --force -autoconf +# Note: Automake 1.10 enables portability checking by default, which +# breaks compilation. So we have to explicitly disable it. +autoreconf --warnings=no-portability %configure \ --disable-scrollkeeper \ @@ -718,12 +723,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Thu Dec 07 2006 Matthew Barnes - 2.9.3-1.fc7 +* Thu Dec 09 2006 Matthew Barnes - 2.9.3-1.fc7 - Update to 2.9.3 - Configure with scrollkeeper disabled. - Ship our own icons from gnome-icon-theme. +- Explicitly turn off automake portability checking. +- Add patch for RH bug #215478 (Maildir and MH accounts). - Add patch for RH bug #215695 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing attachments). +- Add patch for RH bug #218801 (count unread messages first). - Add patch for GNOME bug #350253 (ship our own icons). - Add patch for GNOME bug #382431 (implicit function declaration). - Revise patch for GNOME bug #360946 (improved "about" dialog).