diff --git a/.cvsignore b/.cvsignore index 1556a24..dba6b50 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.30.1.2.tar.bz2 +evolution-2.30.2.tar.bz2 diff --git a/evolution-2.30.1.2-alarm-notify-icons.patch b/evolution-2.30.1.2-alarm-notify-icons.patch deleted file mode 100644 index c8b3da7..0000000 --- a/evolution-2.30.1.2-alarm-notify-icons.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am.alarm-notify-icons evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am ---- evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am.alarm-notify-icons 2010-04-22 17:39:58.000000000 -0500 -+++ evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am 2010-05-08 09:48:00.889170350 -0500 -@@ -11,6 +11,7 @@ evolution_alarm_notify_CPPFLAGS = \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/calendar \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -+ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ -diff -up evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in.alarm-notify-icons evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in ---- evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in.alarm-notify-icons 2010-05-08 09:48:54.431525421 -0500 -+++ evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in 2010-05-08 09:52:30.640143364 -0500 -@@ -427,6 +427,7 @@ evolution_alarm_notify_CPPFLAGS = \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/calendar \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -+ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ -diff -up evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c.alarm-notify-icons evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c ---- evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c.alarm-notify-icons 2010-04-26 08:13:16.000000000 -0500 -+++ evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c 2010-05-08 09:48:00.895746969 -0500 -@@ -45,6 +45,7 @@ - gint - main (gint argc, gchar **argv) - { -+ GtkIconTheme *icon_theme; - AlarmNotify *alarm_notify_service; - UniqueApp *app; - -@@ -71,6 +72,9 @@ main (gint argc, gchar **argv) - /* Initialize Camel's type system. */ - camel_object_get_type(); - -+ icon_theme = gtk_icon_theme_get_default (); -+ gtk_icon_theme_append_search_path (icon_theme, EVOLUTION_ICONDIR); -+ - gtk_main (); - - if (alarm_notify_service != NULL) diff --git a/evolution-2.30.1.2-mail-browser-crash.patch b/evolution-2.30.1.2-mail-browser-crash.patch deleted file mode 100644 index eb08d44..0000000 --- a/evolution-2.30.1.2-mail-browser-crash.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -up evolution-2.30.1.2/mail/e-mail-browser.c.mail-browser-crash evolution-2.30.1.2/mail/e-mail-browser.c ---- evolution-2.30.1.2/mail/e-mail-browser.c.mail-browser-crash 2010-04-27 07:43:02.000000000 -0400 -+++ evolution-2.30.1.2/mail/e-mail-browser.c 2010-05-18 09:04:12.033130077 -0400 -@@ -446,7 +446,8 @@ mail_browser_dispose (GObject *object) - } - - if (priv->message_list != NULL) { -- g_object_unref (priv->message_list); -+ /* This will cancel a regen operation. */ -+ gtk_widget_destroy (priv->message_list); - priv->message_list = NULL; - } - -diff -up evolution-2.30.1.2/mail/e-mail-reader.c.mail-browser-crash evolution-2.30.1.2/mail/e-mail-reader.c ---- evolution-2.30.1.2/mail/e-mail-reader.c.mail-browser-crash 2010-05-08 10:58:11.961137959 -0400 -+++ evolution-2.30.1.2/mail/e-mail-reader.c 2010-05-18 09:04:12.053130003 -0400 -@@ -52,7 +52,8 @@ - #include "mail/message-list.h" - - #define E_MAIL_READER_GET_PRIVATE(obj) \ -- (mail_reader_get_private (G_OBJECT (obj))) -+ ((EMailReaderPrivate *) g_object_get_qdata \ -+ (G_OBJECT (obj), quark_private)) - - typedef struct _EMailReaderPrivate EMailReaderPrivate; - -@@ -92,31 +93,24 @@ static GQuark quark_private; - static guint signals[LAST_SIGNAL]; - - static void --mail_reader_finalize (EMailReaderPrivate *priv) -+mail_reader_destroy (GObject *object) - { -- if (priv->message_selected_timeout_id > 0) -- g_source_remove (priv->message_selected_timeout_id); -- -- g_free (priv->mark_read_message_uid); -- -- g_slice_free (EMailReaderPrivate, priv); -+ /* This will free the private struct. */ -+ g_object_set_qdata (object, quark_private, NULL); - } - --static EMailReaderPrivate * --mail_reader_get_private (GObject *object) -+static void -+mail_reader_private_free (EMailReaderPrivate *priv) - { -- EMailReaderPrivate *priv; -+ if (priv->message_selected_timeout_id > 0) -+ g_source_remove (priv->message_selected_timeout_id); - -- priv = g_object_get_qdata (object, quark_private); -+ if (priv->retrieving_message_operation_id > 0) -+ mail_msg_cancel (priv->retrieving_message_operation_id); - -- if (G_UNLIKELY (priv == NULL)) { -- priv = g_slice_new0 (EMailReaderPrivate); -- g_object_set_qdata_full ( -- object, quark_private, priv, -- (GDestroyNotify) mail_reader_finalize); -- } -+ g_free (priv->mark_read_message_uid); - -- return priv; -+ g_slice_free (EMailReaderPrivate, priv); - } - - static void -@@ -1830,6 +1824,14 @@ mail_reader_message_loaded_cb (CamelFold - - priv = E_MAIL_READER_GET_PRIVATE (reader); - -+ /* If the private struct is NULL, the EMailReader was destroyed -+ * while we were loading the message and we're likely holding the -+ * last reference. Nothing to do but drop the reference. */ -+ if (priv == NULL) { -+ g_object_unref (reader); -+ return; -+ } -+ - html_display = e_mail_reader_get_html_display (reader); - message_list = e_mail_reader_get_message_list (reader); - -@@ -2551,7 +2553,7 @@ e_mail_reader_get_type (void) - type = g_type_register_static ( - G_TYPE_INTERFACE, "EMailReader", &type_info, 0); - -- g_type_interface_add_prerequisite (type, G_TYPE_OBJECT); -+ g_type_interface_add_prerequisite (type, GTK_TYPE_OBJECT); - } - - return type; -@@ -2726,6 +2728,19 @@ e_mail_reader_init (EMailReader *reader) - g_signal_connect_swapped ( - message_list, "selection-change", - G_CALLBACK (e_mail_reader_changed), reader); -+ -+ /* Install a private struct for storing things like flags and -+ * timeout and asynchronous operation IDs. We delete it when -+ * the EMailReader is destroyed rather than finalized so that -+ * asynchronous callbacks holding a reference can detect that -+ * the reader has been destroyed and drop their reference. */ -+ g_object_set_qdata_full ( -+ G_OBJECT (reader), quark_private, -+ g_slice_new0 (EMailReaderPrivate), -+ (GDestroyNotify) mail_reader_private_free); -+ g_signal_connect ( -+ reader, "destroy", -+ G_CALLBACK (mail_reader_destroy), NULL); - } - - void -diff -up evolution-2.30.1.2/mail/message-list.c.mail-browser-crash evolution-2.30.1.2/mail/message-list.c ---- evolution-2.30.1.2/mail/message-list.c.mail-browser-crash 2010-04-26 09:13:17.000000000 -0400 -+++ evolution-2.30.1.2/mail/message-list.c 2010-05-18 09:04:12.066888552 -0400 -@@ -4900,7 +4900,7 @@ mail_regen_list (MessageList *ml, const - #endif - - m = mail_msg_new (®en_list_info); -- m->ml = ml; -+ m->ml = g_object_ref (ml); - m->search = g_strdup (search); - m->hideexpr = g_strdup (hideexpr); - m->changes = changes; -@@ -4908,7 +4908,6 @@ mail_regen_list (MessageList *ml, const - m->hidedel = ml->hidedeleted; - m->hidejunk = ml->hidejunk; - m->thread_subject = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/thread_subject", NULL); -- g_object_ref(ml); - m->folder = ml->folder; - camel_object_ref(m->folder); - m->last_row = -1; diff --git a/evolution-2.30.1.2-missing-shortcut.patch b/evolution-2.30.1.2-missing-shortcut.patch deleted file mode 100644 index 6d5b172..0000000 --- a/evolution-2.30.1.2-missing-shortcut.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c.missing-shortcut evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c ---- evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c.missing-shortcut 2010-05-27 12:12:08.094092271 -0400 -+++ evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c 2010-05-27 12:12:34.962872560 -0400 -@@ -913,7 +913,7 @@ static GtkActionEntry mail_entries[] = { - { "mail-folder-mark-all-as-read", - "mail-read", - N_("Mar_k All Messages as Read"), -- NULL, -+ "slash", - N_("Mark all messages in the folder as read"), - G_CALLBACK (action_mail_folder_mark_all_as_read_cb) }, - diff --git a/evolution-2.30.1.2-notjunk-icon.patch b/evolution-2.30.1.2-notjunk-icon.patch deleted file mode 100644 index afa050e..0000000 --- a/evolution-2.30.1.2-notjunk-icon.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -up evolution-2.30.1.2/mail/e-mail-reader.c.notjunk-icon evolution-2.30.1.2/mail/e-mail-reader.c ---- evolution-2.30.1.2/mail/e-mail-reader.c.notjunk-icon 2010-04-26 09:13:17.000000000 -0400 -+++ evolution-2.30.1.2/mail/e-mail-reader.c 2010-05-01 15:28:20.750200600 -0400 -@@ -1292,8 +1292,8 @@ static GtkActionEntry mail_reader_entrie - N_("Mark the selected messages as junk"), - G_CALLBACK (action_mail_mark_junk_cb) }, - -- { "mail-mark-not-junk", -- "mail-mark-not-junk", -+ { "mail-mark-notjunk", -+ "mail-mark-notjunk", - N_("_Not Junk"), - "j", - N_("Mark the selected messages as not being junk"), -@@ -1602,9 +1602,9 @@ static EPopupActionEntry mail_reader_pop - N_("Mark as _Junk"), - "mail-mark-junk" }, - -- { "mail-popup-mark-not-junk", -+ { "mail-popup-mark-notjunk", - N_("Mark as _Not Junk"), -- "mail-mark-not-junk" }, -+ "mail-mark-notjunk" }, - - { "mail-popup-mark-read", - N_("Mar_k as Read"), -@@ -2316,7 +2316,7 @@ mail_reader_update_actions (EMailReader - action = e_mail_reader_get_action (reader, action_name); - gtk_action_set_sensitive (action, sensitive); - -- action_name = "mail-mark-not-junk"; -+ action_name = "mail-mark-notjunk"; - sensitive = selection_has_junk_messages; - action = e_mail_reader_get_action (reader, action_name); - gtk_action_set_sensitive (action, sensitive); -diff -up evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c.notjunk-icon evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c ---- evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c.notjunk-icon 2010-04-26 09:13:17.000000000 -0400 -+++ evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.c 2010-05-01 15:28:20.751200588 -0400 -@@ -1223,7 +1223,7 @@ static GtkRadioActionEntry mail_filter_e - MAIL_FILTER_LAST_5_DAYS_MESSAGES }, - - { "mail-filter-messages-not-junk", -- "mail-mark-not-junk", -+ "mail-mark-notjunk", - N_("Messages Not Junk"), - NULL, - NULL, /* XXX Add a tooltip! */ -diff -up evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.h.notjunk-icon evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.h ---- evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.h.notjunk-icon 2010-04-26 09:13:17.000000000 -0400 -+++ evolution-2.30.1.2/modules/mail/e-mail-shell-view-actions.h 2010-05-01 15:28:20.752201064 -0400 -@@ -115,8 +115,8 @@ - E_SHELL_WINDOW_ACTION ((window), "mail-mark-important") - #define E_SHELL_WINDOW_ACTION_MAIL_MARK_JUNK(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-mark-junk") --#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOT_JUNK(window) \ -- E_SHELL_WINDOW_ACTION ((window), "mail-mark-not-junk") -+#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOTJUNK(window) \ -+ E_SHELL_WINDOW_ACTION ((window), "mail-mark-notjunk") - #define E_SHELL_WINDOW_ACTION_MAIL_MARK_READ(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-mark-read") - #define E_SHELL_WINDOW_ACTION_MAIL_MARK_UNIMPORTANT(window) \ -diff -up evolution-2.30.1.2/ui/evolution-mail-reader.ui.notjunk-icon evolution-2.30.1.2/ui/evolution-mail-reader.ui ---- evolution-2.30.1.2/ui/evolution-mail-reader.ui.notjunk-icon 2010-04-22 18:40:18.000000000 -0400 -+++ evolution-2.30.1.2/ui/evolution-mail-reader.ui 2010-05-01 15:28:20.754202368 -0400 -@@ -82,7 +82,7 @@ - - - -- -+ - - - -@@ -127,7 +127,7 @@ - #endif - - -- -+ - - - -diff -up evolution-2.30.1.2/ui/evolution-mail.ui.notjunk-icon evolution-2.30.1.2/ui/evolution-mail.ui ---- evolution-2.30.1.2/ui/evolution-mail.ui.notjunk-icon 2010-04-26 09:13:18.000000000 -0400 -+++ evolution-2.30.1.2/ui/evolution-mail.ui 2010-05-01 15:28:20.754202368 -0400 -@@ -109,7 +109,7 @@ - - - -- -+ - - - diff --git a/evolution-2.30.1.2-quietly-close-drafts.patch b/evolution-2.30.1.2-quietly-close-drafts.patch deleted file mode 100644 index 69408c0..0000000 --- a/evolution-2.30.1.2-quietly-close-drafts.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up evolution-2.30.1.2/mail/em-composer-utils.c.quietly-close-drafts evolution-2.30.1.2/mail/em-composer-utils.c ---- evolution-2.30.1.2/mail/em-composer-utils.c.quietly-close-drafts 2010-04-26 09:13:17.000000000 -0400 -+++ evolution-2.30.1.2/mail/em-composer-utils.c 2010-05-28 17:03:41.058084199 -0400 -@@ -585,8 +585,6 @@ save_draft_done (CamelFolder *folder, Ca - if (!ok) - goto done; - -- composer_set_no_change (sdi->composer, FALSE, FALSE); -- - if ((emcs = sdi->emcs) == NULL) - emcs = emcs_new (); - -@@ -994,7 +992,7 @@ edit_message (CamelMimeMessage *message, - emcs_set_drafts_info (emcs, drafts, uid); - } - -- composer_set_no_change (composer, TRUE, FALSE); -+ composer_set_no_change (composer, TRUE, TRUE); - - if (!e_msg_composer_get_lite()) - gtk_widget_show (GTK_WIDGET (composer)); diff --git a/evolution.spec b/evolution.spec index 3a98d05..66d9191 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.16 %define gtk2_version 2.18.0 -%define gtkhtml_version 3.30.0 +%define gtkhtml_version 3.30.2 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libgweather_version 2.25.4 @@ -38,14 +38,14 @@ ### Abstract ### Name: evolution -Version: 2.30.1 -Release: 8%{?dist} +Version: 2.30.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}.2-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.2.tar.bz2 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -62,24 +62,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Fixes the giant "mail-mark-notjunk" icon. -Patch13: evolution-2.30.1.2-notjunk-icon.patch - # RH bug #589555 Patch14: evolution-2.30.1-help-contents.patch -# RH bug #588004 / GNOME bug #618113 -Patch15: evolution-2.30.1.2-alarm-notify-icons.patch - -# GNOME bug #618902 -Patch16: evolution-2.30.1.2-mail-browser-crash.patch - -# GNOME bug #618400 -Patch17: evolution-2.30.1.2-missing-shortcut.patch - -# RH bug #590373 / GNOME bug #599794 -Patch18: evolution-2.30.1.2-quietly-close-drafts.patch - ## Dependencies ### Requires(pre): GConf2 @@ -241,16 +226,11 @@ This package contains the plugin to import Microsoft Personal Storage Table %endif %prep -%setup -q -n evolution-%{version}.2 +%setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .notjunk-icon %patch14 -p1 -b .help-contents -%patch15 -p1 -b .alarm-notify-icons -%patch16 -p1 -b .mail-browser-crash -%patch17 -p1 -b .missing-shortcut -%patch18 -p1 -b .quietly-close-drafts mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -309,7 +289,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com %configure \ --enable-gtk-doc \ --enable-ipv6 \ - --with-sub-version=" (%{version}.2-%{release})" \ + --with-sub-version=" (%{version}-%{release})" \ --with-kde-applnk-path=no \ %ldap_flags %pilot_flags %krb5_flags \ %nntp_flags %ssl_flags %exchange_flags \ @@ -702,6 +682,14 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 21 2010 Milan Crha - 2.30.2-1.fc13 +- Update to 2.30.2 +- Remove patch to fix the giant "mail-mark-notjunk" icon (fixed upstream) +- Remove patch for RH bug #588004 (fixed upstream) +- Remove patch for RH bug #590373 (fixed upstream) +- Remove patch for GNOME bug #618400 (fixed upstream) +- Remove patch for GNOME bug #618902 (fixed upstream) + * Fri May 28 2010 Matthew Barnes - 2.30.1-8.fc13 - Add patch for RH bug #590373 (quietly close unchanged drafts). diff --git a/sources b/sources index 3ba818b..4dbfb0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -833d2ccff2a34e595e09fc9d499de231 evolution-2.30.1.2.tar.bz2 +ff2f1843d9f61e151a6bccf89eeff088 evolution-2.30.2.tar.bz2