From 44ddcb4a5b3d970c5bfc1609d519e9c7a800c3a5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:17:47 +0000 Subject: [PATCH 01/27] Initialize branch F-13 for evolution --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 6d222160889494648afe3a349b2b1f8bb87c46c6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Feb 2010 16:38:18 +0000 Subject: [PATCH 02/27] - Update to 2.29.91 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4202c2..ff3a71f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.90.tar.bz2 +evolution-2.29.91.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 65fa43f..ccd34e5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,8 +38,8 @@ ### Abstract ### Name: evolution -Version: 2.29.90 -Release: 2%{?dist} +Version: 2.29.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -674,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 22 2010 Milan Crha - 2.29.91-1.fc13 +- Update to 2.29.91 + * Tue Feb 09 2010 Milan Crha - 2.29.90-2.fc13 - Rebuild against evolution-data-server-2.29.90-3 diff --git a/sources b/sources index 5bd04a3..c4bb0ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc62be6f295eef36da32ccbf28cc03da evolution-2.29.90.tar.bz2 +8d04fa06bac8067f12273d6c6f5d85c8 evolution-2.29.91.tar.bz2 From b7deb414ed491e692232057a61987d55463d79ee Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 8 Mar 2010 13:04:59 +0000 Subject: [PATCH 03/27] - Update to 2.29.92 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ff3a71f..91307e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.91.tar.bz2 +evolution-2.29.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index ccd34e5..a771f89 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,7 +38,7 @@ ### Abstract ### Name: evolution -Version: 2.29.91 +Version: 2.29.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -674,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 02 2010 Matthew Barnes - 2.29.92-1.fc13 +- Update to 2.29.92 + * Mon Feb 22 2010 Milan Crha - 2.29.91-1.fc13 - Update to 2.29.91 diff --git a/sources b/sources index c4bb0ad..35f1be9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d04fa06bac8067f12273d6c6f5d85c8 evolution-2.29.91.tar.bz2 +58b24433c877d339bb53921ec7769bd0 evolution-2.29.92.tar.bz2 From deb4cc3d342b86c2c786c67bb8c7c725871628f5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 14 Mar 2010 18:09:42 +0000 Subject: [PATCH 04/27] - Require gvfs so that hypertext links and email attachments open as expected on KDE. --- evolution.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index a771f89..82315a0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.29.92 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -73,6 +73,7 @@ Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-themes +Requires: gvfs ### Build Dependencies ### @@ -95,7 +96,6 @@ BuildRequires: gtk-doc BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: gtkimageview-devel -BuildRequires: gvfs BuildRequires: intltool >= %{intltool_version} BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 @@ -674,6 +674,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Mar 14 2010 Matthew Barnes - 2.29.92-2.fc13 +- Require gvfs so that hypertext links and email attachments open as + expected on KDE. + * Mon Mar 02 2010 Matthew Barnes - 2.29.92-1.fc13 - Update to 2.29.92 From 4e90000c5ed67ff6e8f7ac07705d39a49dee8dad Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Mar 2010 07:59:11 +0000 Subject: [PATCH 05/27] - Update to 2.30.0 --- .cvsignore | 2 +- evolution.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 91307e1..c266055 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.92.tar.bz2 +evolution-2.30.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 82315a0..02b58c5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,17 +1,17 @@ -%define dbus_glib_version 0.70 +%define dbus_glib_version 0.74 %define dbus_version 1.0 -%define glib2_version 2.16.0 +%define glib2_version 2.22.0 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 -%define gnome_pilot_version 2.0.15 -%define gtk2_version 2.14.0 -%define gtkhtml_version 3.29.6 +%define gnome_pilot_version 2.0.16 +%define gtk2_version 2.18.0 +%define gtkhtml_version 3.30.0 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libgweather_version 2.25.4 %define pilot_link_version 2:0.12.1 -%define soup_version 2.2.2 +%define soup_version 2.4.0 %define evo_major 2.30 @@ -38,14 +38,14 @@ ### Abstract ### Name: evolution -Version: 2.29.92 -Release: 2%{?dist} +Version: 2.30.0 +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}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -674,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Mar 30 2010 Milan Crha - 2.30.0-1.fc13 +- Update to 2.30.0 + * Sun Mar 14 2010 Matthew Barnes - 2.29.92-2.fc13 - Require gvfs so that hypertext links and email attachments open as expected on KDE. diff --git a/sources b/sources index 35f1be9..0da4f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58b24433c877d339bb53921ec7769bd0 evolution-2.29.92.tar.bz2 +8a87a929a5b4ce73f91b62d8f664ddc9 evolution-2.30.0.tar.bz2 From 36b18c42c9e1d0992d2d8f2e4b1ac2d3a80b760c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Mar 2010 18:01:59 +0000 Subject: [PATCH 06/27] Update to 2.30.0.1 --- .cvsignore | 2 +- evolution.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index c266055..ee18925 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.30.0.tar.bz2 +evolution-2.30.0.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 02b58c5..26948b9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ 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}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}.1-%{release}-XXXXXX) +Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.1.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -224,7 +224,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %endif %prep -%setup -q -n evolution-%{version} +%setup -q -n evolution-%{version}.1 %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset @@ -675,7 +675,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Mar 30 2010 Milan Crha - 2.30.0-1.fc13 -- Update to 2.30.0 +- Update to 2.30.0.1 * Sun Mar 14 2010 Matthew Barnes - 2.29.92-2.fc13 - Require gvfs so that hypertext links and email attachments open as diff --git a/sources b/sources index 0da4f72..6c8b4a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a87a929a5b4ce73f91b62d8f664ddc9 evolution-2.30.0.tar.bz2 +59746fd314deed2fea7fc5da7d92ff17 evolution-2.30.0.1.tar.bz2 From 0d0a652aacb971c0f2432d275e84d6706770bd8c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Mar 2010 19:00:35 +0000 Subject: [PATCH 07/27] New files in build --- evolution.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/evolution.spec b/evolution.spec index 26948b9..8646698 100644 --- a/evolution.spec +++ b/evolution.spec @@ -446,8 +446,11 @@ rm -rf $RPM_BUILD_ROOT # The alarm notify daemon %{_bindir}/evolution-alarm-notify +%{_bindir}/evolution-settings + # Desktop files: %{_datadir}/applications/evolution.desktop +%{_datadir}/applications/evolution-settings.desktop %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop # Icons: @@ -487,6 +490,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.* %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* %{_libdir}/evolution/%{evo_major}/libevolution-mail.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-mail-settings.so.* %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* %{_libdir}/evolution/%{evo_major}/libfilter.so.* %{_libdir}/evolution/%{evo_major}/libmenus.so.* @@ -626,6 +630,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so %{_libdir}/evolution/%{evo_major}/libevolution-mail.so +%{_libdir}/evolution/%{evo_major}/libevolution-mail-settings.so %{_libdir}/evolution/%{evo_major}/libevolution-smime.so %{_libdir}/evolution/%{evo_major}/libfilter.so %{_libdir}/evolution/%{evo_major}/libmenus.so From 94a873064e406523d10fbe76b979d5d19a714984 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 14 Apr 2010 19:04:00 +0000 Subject: [PATCH 08/27] - Remove the dependency on libytnef, which apparently isn't needed for the PST importer and we don't build the experimental TNEF attachments plugin. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8646698..c8f8bc1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -139,7 +139,6 @@ BuildRequires: libnotify-devel %if %{libpst_support} BuildRequires: libpst-devel -BuildRequires: libytnef-devel %endif %description @@ -216,7 +215,6 @@ Group: Applications/Productivity Summary: PST importer plugin for Evolution Requires: %{name} = %{version}-%{release} Requires: libpst -Requires: libytnef %description pst This package contains the plugin to import Microsoft Personal Storage Table @@ -679,6 +677,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Apr 14 2010 Matthew Barnes - 2.30.0-2.fc13 +- Remove the dependency on libytnef, which apparently isn't needed for the + PST importer and we don't build the experimental TNEF attachments plugin. + * Tue Mar 30 2010 Milan Crha - 2.30.0-1.fc13 - Update to 2.30.0.1 From 1ae00e9feb6a5f43fb55a68d9aa68b8b7082ed62 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 14 Apr 2010 19:25:07 +0000 Subject: [PATCH 09/27] Gah, bump release. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c8f8bc1..73bd8b4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL From f08ea249dabf1d382c2c7e31d2288ab4b832f315 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 22 Apr 2010 23:07:23 +0000 Subject: [PATCH 10/27] - Work around another dropped icon in gnome-icon-theme. --- evolution-2.30.0-mail-mark-not-junk.patch | 94 +++++++++++++++++++++++ evolution.spec | 9 ++- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.0-mail-mark-not-junk.patch diff --git a/evolution-2.30.0-mail-mark-not-junk.patch b/evolution-2.30.0-mail-mark-not-junk.patch new file mode 100644 index 0000000..f4dc3c1 --- /dev/null +++ b/evolution-2.30.0-mail-mark-not-junk.patch @@ -0,0 +1,94 @@ +diff -up evolution-2.30.0.1/mail/e-mail-reader.c.mail-mark-not-junk evolution-2.30.0.1/mail/e-mail-reader.c +--- evolution-2.30.0.1/mail/e-mail-reader.c.mail-mark-not-junk 2010-03-24 06:36:09.000000000 -0400 ++++ evolution-2.30.0.1/mail/e-mail-reader.c 2010-04-22 19:04:08.742721547 -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-notjunk", +- "mail-mark-notjunk", ++ { "mail-mark-not-junk", ++ "mail-mark-not-junk", + 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-notjunk", ++ { "mail-popup-mark-not-junk", + N_("Mark as _Not Junk"), +- "mail-mark-notjunk" }, ++ "mail-mark-not-junk" }, + + { "mail-popup-mark-read", + N_("Mar_k as Read"), +@@ -2312,7 +2312,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-notjunk"; ++ action_name = "mail-mark-not-junk"; + 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.0.1/modules/mail/e-mail-shell-view-actions.c.mail-mark-not-junk evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.c +--- evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.c.mail-mark-not-junk 2010-02-22 01:41:56.000000000 -0500 ++++ evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.c 2010-04-22 19:04:08.744721529 -0400 +@@ -1219,7 +1219,7 @@ static GtkRadioActionEntry mail_filter_e + MAIL_FILTER_LAST_5_DAYS_MESSAGES }, + + { "mail-filter-messages-not-junk", +- "mail-mark-notjunk", ++ "mail-mark-not-junk", + N_("Messages Not Junk"), + NULL, + NULL, /* XXX Add a tooltip! */ +diff -up evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h.mail-mark-not-junk evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h +--- evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h.mail-mark-not-junk 2010-01-24 22:33:45.000000000 -0500 ++++ evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h 2010-04-22 19:04:08.745721869 -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_NOTJUNK(window) \ +- E_SHELL_WINDOW_ACTION ((window), "mail-mark-notjunk") ++#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_READ(window) \ + E_SHELL_WINDOW_ACTION ((window), "mail-mark-read") + #define E_SHELL_WINDOW_ACTION_MAIL_MARK_UNIMPORTANT(window) \ +diff -up evolution-2.30.0.1/ui/evolution-mail-reader.ui.mail-mark-not-junk evolution-2.30.0.1/ui/evolution-mail-reader.ui +--- evolution-2.30.0.1/ui/evolution-mail-reader.ui.mail-mark-not-junk 2010-03-24 06:36:08.000000000 -0400 ++++ evolution-2.30.0.1/ui/evolution-mail-reader.ui 2010-04-22 19:04:08.747722341 -0400 +@@ -82,7 +82,7 @@ + + + +- ++ + + + +@@ -127,7 +127,7 @@ + #endif + + +- ++ + + + +diff -up evolution-2.30.0.1/ui/evolution-mail.ui.mail-mark-not-junk evolution-2.30.0.1/ui/evolution-mail.ui +--- evolution-2.30.0.1/ui/evolution-mail.ui.mail-mark-not-junk 2010-03-24 06:36:08.000000000 -0400 ++++ evolution-2.30.0.1/ui/evolution-mail.ui 2010-04-22 19:04:08.750721756 -0400 +@@ -109,7 +109,7 @@ + + + +- ++ + + + diff --git a/evolution.spec b/evolution.spec index 73bd8b4..7961df9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -62,6 +62,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# Work around another dropped icon in gnome-icon-theme. +Patch13: evolution-2.30.0-mail-mark-not-junk.patch + ## Dependencies ### Requires(pre): GConf2 @@ -226,6 +229,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .mail-mark-not-junk mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -677,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Apr 22 2010 Matthew Barnes - 2.30.0-3.fc13 +- Work around another dropped icon in gnome-icon-theme. + * Wed Apr 14 2010 Matthew Barnes - 2.30.0-2.fc13 - Remove the dependency on libytnef, which apparently isn't needed for the PST importer and we don't build the experimental TNEF attachments plugin. From d2020f96b1eb53c49c6cd820f9a98818d7062c52 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 26 Apr 2010 07:58:23 +0000 Subject: [PATCH 11/27] - Update to 2.30.1 - Remove patch for missing icons (fixed upstream) --- .cvsignore | 2 +- evolution-1.4.4-ldap-x86_64-hack.patch | 23 ++++-- evolution-2.30.0-mail-mark-not-junk.patch | 94 ----------------------- evolution.spec | 18 ++--- sources | 2 +- 5 files changed, 27 insertions(+), 112 deletions(-) delete mode 100644 evolution-2.30.0-mail-mark-not-junk.patch diff --git a/.cvsignore b/.cvsignore index ee18925..5d01c57 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.30.0.1.tar.bz2 +evolution-2.30.1.tar.bz2 diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch index f37328b..42d4f93 100644 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ b/evolution-1.4.4-ldap-x86_64-hack.patch @@ -1,12 +1,21 @@ -diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure ---- evolution-2.24.1/configure.ldaphack 2008-10-19 23:37:55.000000000 -0400 -+++ evolution-2.24.1/configure 2008-10-21 13:16:16.000000000 -0400 -@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} +diff -up evolution-2.30.1/configure.ldaphack evolution-2.30.1/configure +--- evolution-2.30.1/configure.ldaphack 2010-04-26 05:22:50.000000000 +0200 ++++ evolution-2.30.1/configure 2010-04-26 09:52:22.000000000 +0200 +@@ -15791,7 +15791,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" +LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16123,7 +16123,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" ++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/evolution-2.30.0-mail-mark-not-junk.patch b/evolution-2.30.0-mail-mark-not-junk.patch deleted file mode 100644 index f4dc3c1..0000000 --- a/evolution-2.30.0-mail-mark-not-junk.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -up evolution-2.30.0.1/mail/e-mail-reader.c.mail-mark-not-junk evolution-2.30.0.1/mail/e-mail-reader.c ---- evolution-2.30.0.1/mail/e-mail-reader.c.mail-mark-not-junk 2010-03-24 06:36:09.000000000 -0400 -+++ evolution-2.30.0.1/mail/e-mail-reader.c 2010-04-22 19:04:08.742721547 -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-notjunk", -- "mail-mark-notjunk", -+ { "mail-mark-not-junk", -+ "mail-mark-not-junk", - 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-notjunk", -+ { "mail-popup-mark-not-junk", - N_("Mark as _Not Junk"), -- "mail-mark-notjunk" }, -+ "mail-mark-not-junk" }, - - { "mail-popup-mark-read", - N_("Mar_k as Read"), -@@ -2312,7 +2312,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-notjunk"; -+ action_name = "mail-mark-not-junk"; - 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.0.1/modules/mail/e-mail-shell-view-actions.c.mail-mark-not-junk evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.c ---- evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.c.mail-mark-not-junk 2010-02-22 01:41:56.000000000 -0500 -+++ evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.c 2010-04-22 19:04:08.744721529 -0400 -@@ -1219,7 +1219,7 @@ static GtkRadioActionEntry mail_filter_e - MAIL_FILTER_LAST_5_DAYS_MESSAGES }, - - { "mail-filter-messages-not-junk", -- "mail-mark-notjunk", -+ "mail-mark-not-junk", - N_("Messages Not Junk"), - NULL, - NULL, /* XXX Add a tooltip! */ -diff -up evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h.mail-mark-not-junk evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h ---- evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h.mail-mark-not-junk 2010-01-24 22:33:45.000000000 -0500 -+++ evolution-2.30.0.1/modules/mail/e-mail-shell-view-actions.h 2010-04-22 19:04:08.745721869 -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_NOTJUNK(window) \ -- E_SHELL_WINDOW_ACTION ((window), "mail-mark-notjunk") -+#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_READ(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-mark-read") - #define E_SHELL_WINDOW_ACTION_MAIL_MARK_UNIMPORTANT(window) \ -diff -up evolution-2.30.0.1/ui/evolution-mail-reader.ui.mail-mark-not-junk evolution-2.30.0.1/ui/evolution-mail-reader.ui ---- evolution-2.30.0.1/ui/evolution-mail-reader.ui.mail-mark-not-junk 2010-03-24 06:36:08.000000000 -0400 -+++ evolution-2.30.0.1/ui/evolution-mail-reader.ui 2010-04-22 19:04:08.747722341 -0400 -@@ -82,7 +82,7 @@ - - - -- -+ - - - -@@ -127,7 +127,7 @@ - #endif - - -- -+ - - - -diff -up evolution-2.30.0.1/ui/evolution-mail.ui.mail-mark-not-junk evolution-2.30.0.1/ui/evolution-mail.ui ---- evolution-2.30.0.1/ui/evolution-mail.ui.mail-mark-not-junk 2010-03-24 06:36:08.000000000 -0400 -+++ evolution-2.30.0.1/ui/evolution-mail.ui 2010-04-22 19:04:08.750721756 -0400 -@@ -109,7 +109,7 @@ - - - -- -+ - - - diff --git a/evolution.spec b/evolution.spec index 7961df9..3992155 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,14 +38,14 @@ ### Abstract ### Name: evolution -Version: 2.30.0 -Release: 3%{?dist} +Version: 2.30.1 +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}.1-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.1.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,9 +62,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Work around another dropped icon in gnome-icon-theme. -Patch13: evolution-2.30.0-mail-mark-not-junk.patch - ## Dependencies ### Requires(pre): GConf2 @@ -225,11 +222,10 @@ This package contains the plugin to import Microsoft Personal Storage Table %endif %prep -%setup -q -n evolution-%{version}.1 +%setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .mail-mark-not-junk mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -681,6 +677,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 26 2010 Milan Crha - 2.30.1-1.fc13 +- Update to 2.30.1 +- Remove patch for missing icons (fixed upstream) + * Thu Apr 22 2010 Matthew Barnes - 2.30.0-3.fc13 - Work around another dropped icon in gnome-icon-theme. diff --git a/sources b/sources index 6c8b4a0..19903f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59746fd314deed2fea7fc5da7d92ff17 evolution-2.30.0.1.tar.bz2 +6a4eb1a35bfcee6e2bcd549198dd6c68 evolution-2.30.1.tar.bz2 From 8020038b1297e4c498fbc690505b1c52cecd8cf6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 26 Apr 2010 15:09:08 +0000 Subject: [PATCH 12/27] Update to 2.30.1.1 --- .cvsignore | 2 +- evolution.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5d01c57..6933c7b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.30.1.tar.bz2 +evolution-2.30.1.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 3992155..f8d44f5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ 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}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}.1-%{release}-XXXXXX) +Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.1.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -222,7 +222,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %endif %prep -%setup -q -n evolution-%{version} +%setup -q -n evolution-%{version}.1 %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset @@ -284,7 +284,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com %configure \ --enable-gtk-doc \ --enable-ipv6 \ - --with-sub-version=" (%{version}-%{release})" \ + --with-sub-version=" (%{version}.1-%{release})" \ --with-kde-applnk-path=no \ %ldap_flags %pilot_flags %krb5_flags \ %nntp_flags %ssl_flags %exchange_flags \ @@ -678,7 +678,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Apr 26 2010 Milan Crha - 2.30.1-1.fc13 -- Update to 2.30.1 +- Update to 2.30.1.1 - Remove patch for missing icons (fixed upstream) * Thu Apr 22 2010 Matthew Barnes - 2.30.0-3.fc13 diff --git a/sources b/sources index 19903f0..13c0513 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a4eb1a35bfcee6e2bcd549198dd6c68 evolution-2.30.1.tar.bz2 +b5f1552d23e46dc043b2262e42c69eea evolution-2.30.1.1.tar.bz2 From 1abe6e08983f33b101bda5d27215614b3ec76658 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 27 Apr 2010 14:45:09 +0000 Subject: [PATCH 13/27] - Update to 2.30.1.2 --- .cvsignore | 2 +- evolution.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6933c7b..1556a24 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.30.1.1.tar.bz2 +evolution-2.30.1.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index f8d44f5..7881502 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,13 +39,13 @@ Name: evolution Version: 2.30.1 -Release: 1%{?dist} +Release: 2%{?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}.1-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.1.tar.bz2 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}.2-%{release}-XXXXXX) +Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.2.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -222,7 +222,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %endif %prep -%setup -q -n evolution-%{version}.1 +%setup -q -n evolution-%{version}.2 %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset @@ -284,7 +284,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com %configure \ --enable-gtk-doc \ --enable-ipv6 \ - --with-sub-version=" (%{version}.1-%{release})" \ + --with-sub-version=" (%{version}.2-%{release})" \ --with-kde-applnk-path=no \ %ldap_flags %pilot_flags %krb5_flags \ %nntp_flags %ssl_flags %exchange_flags \ @@ -677,6 +677,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Apr 27 2010 Milan Crha - 2.30.1-2.fc13 +- Update to 2.30.1.2 + * Mon Apr 26 2010 Milan Crha - 2.30.1-1.fc13 - Update to 2.30.1.1 - Remove patch for missing icons (fixed upstream) diff --git a/sources b/sources index 13c0513..3ba818b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5f1552d23e46dc043b2262e42c69eea evolution-2.30.1.1.tar.bz2 +833d2ccff2a34e595e09fc9d499de231 evolution-2.30.1.2.tar.bz2 From a2c80d7ea72f0f6b577ea5ace41d429c7b51152e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 1 May 2010 19:31:55 +0000 Subject: [PATCH 14/27] - Add patch to fix the giant "mail-mark-notjunk" icon. --- evolution-2.30.1.2-notjunk-icon.patch | 94 +++++++++++++++++++++++++++ evolution.spec | 9 ++- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.1.2-notjunk-icon.patch diff --git a/evolution-2.30.1.2-notjunk-icon.patch b/evolution-2.30.1.2-notjunk-icon.patch new file mode 100644 index 0000000..afa050e --- /dev/null +++ b/evolution-2.30.1.2-notjunk-icon.patch @@ -0,0 +1,94 @@ +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.spec b/evolution.spec index 7881502..e751ab2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -62,6 +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 + ## Dependencies ### Requires(pre): GConf2 @@ -226,6 +229,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .notjunk-icon mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -677,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat May 01 2010 Matthew Barnes - 2.30.1-3.fc13 +- Add patch to fix the giant "mail-mark-notjunk" icon. + * Tue Apr 27 2010 Milan Crha - 2.30.1-2.fc13 - Update to 2.30.1.2 From 344a73d3f376ac5a35ace58ccd9262de8093bf6b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 8 May 2010 03:59:00 +0000 Subject: [PATCH 15/27] - Require yelp in evolution-help (RH bug #589555). - Add patch for RH bug #589555 (hide Help->Contents if evolution-help is not installed). --- evolution-2.30.1-help-contents.patch | 18 ++++++++++++++++++ evolution.spec | 12 +++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.1-help-contents.patch diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch new file mode 100644 index 0000000..e53d67a --- /dev/null +++ b/evolution-2.30.1-help-contents.patch @@ -0,0 +1,18 @@ +diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c +--- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents 2010-04-26 09:13:18.000000000 -0400 ++++ evolution-2.30.1.2/shell/e-shell-window-actions.c 2010-05-07 21:29:06.269059830 -0400 +@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo + if (path == NULL) + gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE); + g_free (path); ++ ++ /* Viewing user documentation requires the evolution-help ++ * Fedora package. Look for one of the files it installs. */ ++ path = g_build_filename ( ++ EVOLUTION_DATADIR, "omf", PACKAGE, "evolution-C.omf", NULL); ++ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) ++ gtk_action_set_visible (ACTION (CONTENTS), FALSE); ++ g_free (path); + } + + static GList * diff --git a/evolution.spec b/evolution.spec index e751ab2..b802b4b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -65,6 +65,9 @@ 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 + ## Dependencies ### Requires(pre): GConf2 @@ -169,6 +172,7 @@ Development files needed for building things which link against %{name}. Group: Applications/Productivity Summary: Help files for %{name} Requires: %{name} = %{version}-%{release} +Requires: yelp BuildArch: noarch %description help @@ -230,6 +234,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .notjunk-icon +%patch14 -p1 -b .help-contents mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -681,6 +686,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri May 07 2010 Matthew Barnes - 2.30.1-4.fc13 +- Require yelp in evolution-help (RH bug #589555). +- Add patch for RH bug #589555 (hide Help->Contents if evolution-help + is not installed). + * Sat May 01 2010 Matthew Barnes - 2.30.1-3.fc13 - Add patch to fix the giant "mail-mark-notjunk" icon. From 9806362066ffd833553a445f3ceff81472040f8c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 8 May 2010 15:59:40 +0000 Subject: [PATCH 16/27] - Add patch for RH bug #588004 (missing icon in alarm dialogs). --- evolution-2.30.1.2-alarm-notify-icons.patch | 43 +++++++++++++++++++++ evolution.spec | 9 ++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.1.2-alarm-notify-icons.patch diff --git a/evolution-2.30.1.2-alarm-notify-icons.patch b/evolution-2.30.1.2-alarm-notify-icons.patch new file mode 100644 index 0000000..c8b3da7 --- /dev/null +++ b/evolution-2.30.1.2-alarm-notify-icons.patch @@ -0,0 +1,43 @@ +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.spec b/evolution.spec index b802b4b..1ae85de 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,6 +68,9 @@ 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 + ## Dependencies ### Requires(pre): GConf2 @@ -235,6 +238,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .notjunk-icon %patch14 -p1 -b .help-contents +%patch15 -p1 -b .alarm-notify-icons mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -686,6 +690,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat May 08 2010 Matthew Barnes - 2.30.1-5.fc13 +- Add patch for RH bug #588004 (missing icon in alarm dialogs). + * Fri May 07 2010 Matthew Barnes - 2.30.1-4.fc13 - Require yelp in evolution-help (RH bug #589555). - Add patch for RH bug #589555 (hide Help->Contents if evolution-help From 30232b93ff12372ee984b83ec1adb1a7c6c41665 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 18 May 2010 13:09:37 +0000 Subject: [PATCH 17/27] - Add patch for GNOME bug #618902 (mail browser window crash). --- evolution-2.30.1.2-mail-browser-crash.patch | 133 ++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.1.2-mail-browser-crash.patch diff --git a/evolution-2.30.1.2-mail-browser-crash.patch b/evolution-2.30.1.2-mail-browser-crash.patch new file mode 100644 index 0000000..eb08d44 --- /dev/null +++ b/evolution-2.30.1.2-mail-browser-crash.patch @@ -0,0 +1,133 @@ +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.spec b/evolution.spec index 1ae85de..7e50d89 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.1 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -71,6 +71,9 @@ 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 + ## Dependencies ### Requires(pre): GConf2 @@ -239,6 +242,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch13 -p1 -b .notjunk-icon %patch14 -p1 -b .help-contents %patch15 -p1 -b .alarm-notify-icons +%patch16 -p1 -b .mail-browser-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -690,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue May 18 2010 Matthew Barnes - 2.30.1-6.fc13 +- Add patch for GNOME bug #618902 (mail browser window crash). + * Sat May 08 2010 Matthew Barnes - 2.30.1-5.fc13 - Add patch for RH bug #588004 (missing icon in alarm dialogs). From 58600480dc1a8a3c4ec2132b7e38e06f259fa55b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 27 May 2010 17:35:13 +0000 Subject: [PATCH 18/27] - Add patch for GNOME bug #618400 (missing keyboard shortcut). --- evolution-2.30.1.2-missing-shortcut.patch | 12 ++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.1.2-missing-shortcut.patch diff --git a/evolution-2.30.1.2-missing-shortcut.patch b/evolution-2.30.1.2-missing-shortcut.patch new file mode 100644 index 0000000..6d5b172 --- /dev/null +++ b/evolution-2.30.1.2-missing-shortcut.patch @@ -0,0 +1,12 @@ +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.spec b/evolution.spec index 7e50d89..70ac00b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.1 -Release: 6%{?dist} +Release: 7%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -74,6 +74,9 @@ 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 + ## Dependencies ### Requires(pre): GConf2 @@ -243,6 +246,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch14 -p1 -b .help-contents %patch15 -p1 -b .alarm-notify-icons %patch16 -p1 -b .mail-browser-crash +%patch17 -p1 -b .missing-shortcut mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -694,6 +698,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu May 27 2010 Matthew Barnes - 2.30.1-7.fc13 +- Add patch for GNOME bug #618400 (missing keyboard shortcut). + * Tue May 18 2010 Matthew Barnes - 2.30.1-6.fc13 - Add patch for GNOME bug #618902 (mail browser window crash). From 99e93af5a1d97e82d9e59559bb0e89bc66e1ee0f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 May 2010 21:06:12 +0000 Subject: [PATCH 19/27] - Add patch for RH bug #590373 (quietly close unchanged drafts). --- evolution-2.30.1.2-quietly-close-drafts.patch | 21 +++++++++++++++++++ evolution.spec | 9 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.1.2-quietly-close-drafts.patch diff --git a/evolution-2.30.1.2-quietly-close-drafts.patch b/evolution-2.30.1.2-quietly-close-drafts.patch new file mode 100644 index 0000000..69408c0 --- /dev/null +++ b/evolution-2.30.1.2-quietly-close-drafts.patch @@ -0,0 +1,21 @@ +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 70ac00b..3a98d05 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.1 -Release: 7%{?dist} +Release: 8%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -77,6 +77,9 @@ 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 @@ -247,6 +250,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %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 @@ -698,6 +702,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri May 28 2010 Matthew Barnes - 2.30.1-8.fc13 +- Add patch for RH bug #590373 (quietly close unchanged drafts). + * Thu May 27 2010 Matthew Barnes - 2.30.1-7.fc13 - Add patch for GNOME bug #618400 (missing keyboard shortcut). From 9f37c03bdbdf2c31f06eeb81ae8e718e8b6e800a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Jun 2010 08:26:43 +0000 Subject: [PATCH 20/27] - 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) --- .cvsignore | 2 +- evolution-2.30.1.2-alarm-notify-icons.patch | 43 ------ evolution-2.30.1.2-mail-browser-crash.patch | 133 ------------------ evolution-2.30.1.2-missing-shortcut.patch | 12 -- evolution-2.30.1.2-notjunk-icon.patch | 94 ------------- evolution-2.30.1.2-quietly-close-drafts.patch | 21 --- evolution.spec | 42 ++---- sources | 2 +- 8 files changed, 17 insertions(+), 332 deletions(-) delete mode 100644 evolution-2.30.1.2-alarm-notify-icons.patch delete mode 100644 evolution-2.30.1.2-mail-browser-crash.patch delete mode 100644 evolution-2.30.1.2-missing-shortcut.patch delete mode 100644 evolution-2.30.1.2-notjunk-icon.patch delete mode 100644 evolution-2.30.1.2-quietly-close-drafts.patch 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 From 5dee3b9f9f805fb057d6477a4932c82de96ec68c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 23 Jun 2010 07:32:43 +0000 Subject: [PATCH 21/27] evolution-alarm-notify moved to libexec --- evolution.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 66d9191..dbf96fa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -445,10 +445,6 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution - -# The alarm notify daemon -%{_bindir}/evolution-alarm-notify - %{_bindir}/evolution-settings # Desktop files: @@ -502,6 +498,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution %dir %{_libexecdir}/evolution/%{evo_major} %{_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 From 1d0ab7b6e3bb28ba6b1c13897f3f98d50d040a7b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Jun 2010 15:21:32 +0000 Subject: [PATCH 22/27] - Add patch for GNOME bug #622547 (uncancelled idle cb in destroy). --- evolution-2.30.2-async-event-idle-cb.patch | 77 ++++++++++++++++++++++ evolution.spec | 9 ++- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.2-async-event-idle-cb.patch diff --git a/evolution-2.30.2-async-event-idle-cb.patch b/evolution-2.30.2-async-event-idle-cb.patch new file mode 100644 index 0000000..bed6fa9 --- /dev/null +++ b/evolution-2.30.2-async-event-idle-cb.patch @@ -0,0 +1,77 @@ +diff -up evolution-2.30.2/mail/mail-mt.c.async-event-idle-cb evolution-2.30.2/mail/mail-mt.c +--- evolution-2.30.2/mail/mail-mt.c.async-event-idle-cb 2010-06-20 08:15:05.000000000 -0400 ++++ evolution-2.30.2/mail/mail-mt.c 2010-06-24 11:18:16.718108542 -0400 +@@ -608,6 +608,7 @@ struct _proxy_msg { + mail_async_event_t type; + + GThread *thread; ++ guint idle_id; + + MailAsyncFunc func; + gpointer o; +@@ -628,10 +629,11 @@ do_async_event(struct _proxy_msg *m) + } + + static gint +-idle_async_event(gpointer mm) ++idle_async_event (struct _proxy_msg *m) + { +- do_async_event(mm); +- mail_msg_unref(mm); ++ m->idle_id = 0; ++ do_async_event (m); ++ mail_msg_unref (m); + + return FALSE; + } +@@ -655,7 +657,7 @@ mail_async_event_new (void) + return ea; + } + +-gint ++guint + mail_async_event_emit (MailAsyncEvent *ea, + mail_async_event_t type, + MailAsyncFunc func, +@@ -664,7 +666,7 @@ mail_async_event_emit (MailAsyncEvent *e + gpointer data) + { + struct _proxy_msg *m; +- gint id; ++ guint id; + + /* We dont have a reply port for this, we dont + * care when/if it gets executed, just queue it. */ +@@ -687,7 +689,8 @@ mail_async_event_emit (MailAsyncEvent *e + * overflow and deadlock us. */ + if (type == MAIL_ASYNC_GUI) { + if (mail_in_main_thread ()) +- g_idle_add(idle_async_event, m); ++ m->idle_id = g_idle_add ( ++ (GSourceFunc) idle_async_event, m); + else + mail_msg_main_loop_push(m); + } else +@@ -712,6 +715,10 @@ mail_async_event_destroy (MailAsyncEvent + errno = EDEADLK; + return -1; + } ++ if (m->idle_id > 0) { ++ g_source_remove (m->idle_id); ++ m->idle_id = 0; ++ } + g_mutex_unlock(ea->lock); + mail_msg_wait(id); + g_mutex_lock(ea->lock); +diff -up evolution-2.30.2/mail/mail-mt.h.async-event-idle-cb evolution-2.30.2/mail/mail-mt.h +--- evolution-2.30.2/mail/mail-mt.h.async-event-idle-cb 2010-06-20 08:15:04.000000000 -0400 ++++ evolution-2.30.2/mail/mail-mt.h 2010-06-24 11:18:16.718108542 -0400 +@@ -102,7 +102,7 @@ typedef void (*MailAsyncFunc)(gpointer , + /* create a new async event handler */ + MailAsyncEvent *mail_async_event_new(void); + /* forward a camel event (or other call) to the gui thread */ +-gint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer , gpointer , gpointer ); ++guint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer , gpointer , gpointer ); + /* wait for all outstanding async events to complete */ + gint mail_async_event_destroy(MailAsyncEvent *ea); + diff --git a/evolution.spec b/evolution.spec index dbf96fa..13c5c59 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -65,6 +65,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch14: evolution-2.30.1-help-contents.patch +# GNOME bug #622547 +Patch15: evolution-2.30.2-async-event-idle-cb.patch + ## Dependencies ### Requires(pre): GConf2 @@ -231,6 +234,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset %patch14 -p1 -b .help-contents +%patch15 -p1 -b .async-event-idle-cb mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -679,6 +683,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jun 24 2010 Matthew Barnes - 2.30.2-2.fc13 +- Add patch for GNOME bug #622547 (uncancelled idle cb in destroy). + * 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) From 41b392d4a034890c9c2d9f760349a067cb98dc32 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Jun 2010 17:28:59 +0000 Subject: [PATCH 23/27] - Add patch for GNOME bug #622633 (handle startdate URIs). --- evolution-2.30.2-handle-startdate-uris.patch | 189 +++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.2-handle-startdate-uris.patch diff --git a/evolution-2.30.2-handle-startdate-uris.patch b/evolution-2.30.2-handle-startdate-uris.patch new file mode 100644 index 0000000..ad68c15 --- /dev/null +++ b/evolution-2.30.2-handle-startdate-uris.patch @@ -0,0 +1,189 @@ +diff -up evolution-2.30.2/modules/calendar/e-cal-shell-backend.c.handle-startdate-uris evolution-2.30.2/modules/calendar/e-cal-shell-backend.c +--- evolution-2.30.2/modules/calendar/e-cal-shell-backend.c.handle-startdate-uris 2010-06-20 08:14:46.000000000 -0400 ++++ evolution-2.30.2/modules/calendar/e-cal-shell-backend.c 2010-06-24 13:26:43.866095974 -0400 +@@ -48,6 +48,7 @@ + #include "e-cal-shell-content.h" + #include "e-cal-shell-migrate.h" + #include "e-cal-shell-settings.h" ++#include "e-cal-shell-sidebar.h" + #include "e-cal-shell-view.h" + + #define E_CAL_SHELL_BACKEND_GET_PRIVATE(obj) \ +@@ -539,6 +540,8 @@ cal_shell_backend_handle_uri_cb (EShellB + gchar *source_uid = NULL; + gchar *comp_uid = NULL; + gchar *comp_rid = NULL; ++ GDate start_date; ++ GDate end_date; + gboolean handled = FALSE; + GError *error = NULL; + +@@ -553,6 +556,9 @@ cal_shell_backend_handle_uri_cb (EShellB + if (cp == NULL) + goto exit; + ++ g_date_clear (&start_date, 1); ++ g_date_clear (&end_date, 1); ++ + while (*cp != '\0') { + gchar *header; + gchar *content; +@@ -572,7 +578,13 @@ cal_shell_backend_handle_uri_cb (EShellB + content_len = strcspn (cp, "&"); + + content = g_strndup (cp, content_len); +- if (g_ascii_strcasecmp (header, "source-uid") == 0) ++ if (g_ascii_strcasecmp (header, "startdate") == 0) ++ g_date_set_time_t ( ++ &start_date, time_from_isodate (content)); ++ else if (g_ascii_strcasecmp (header, "enddate") == 0) ++ g_date_set_time_t ( ++ &end_date, time_from_isodate (content)); ++ else if (g_ascii_strcasecmp (header, "source-uid") == 0) + source_uid = g_strdup (content); + else if (g_ascii_strcasecmp (header, "comp-uid") == 0) + comp_uid = g_strdup (content); +@@ -588,6 +600,21 @@ cal_shell_backend_handle_uri_cb (EShellB + } + } + ++ /* This is primarily for launching Evolution ++ * from the calendar in the clock applet. */ ++ if (g_date_valid (&start_date)) { ++ if (g_date_valid (&end_date)) ++ e_cal_shell_backend_open_date_range ( ++ E_CAL_SHELL_BACKEND (shell_backend), ++ &start_date, &end_date); ++ else ++ e_cal_shell_backend_open_date_range ( ++ E_CAL_SHELL_BACKEND (shell_backend), ++ &start_date, NULL); ++ handled = TRUE; ++ goto exit; ++ } ++ + if (source_uid == NULL || comp_uid == NULL) + goto exit; + +@@ -831,3 +858,57 @@ e_cal_shell_backend_get_source_list (ECa + + return cal_shell_backend->priv->source_list; + } ++ ++void ++e_cal_shell_backend_open_date_range (ECalShellBackend *cal_shell_backend, ++ const GDate *start_date, ++ const GDate *end_date) ++{ ++ EShell *shell; ++ EShellView *shell_view; ++ EShellBackend *shell_backend; ++ EShellSidebar *shell_sidebar; ++ GtkWidget *shell_window = NULL; ++ ECalendar *navigator; ++ GList *watched_windows; ++ ++ g_return_if_fail (E_IS_CAL_SHELL_BACKEND (cal_shell_backend)); ++ ++ shell_backend = E_SHELL_BACKEND (cal_shell_backend); ++ shell = e_shell_backend_get_shell (shell_backend); ++ watched_windows = e_shell_get_watched_windows (shell); ++ ++ /* Try to find an EShellWindow already in calendar view. */ ++ while (watched_windows != NULL) { ++ GtkWidget *window = GTK_WIDGET (watched_windows->data); ++ ++ if (E_IS_SHELL_WINDOW (window)) { ++ const gchar *active_view; ++ ++ active_view = e_shell_window_get_active_view ( ++ E_SHELL_WINDOW (window)); ++ if (g_strcmp0 (active_view, "calendar") == 0) { ++ gtk_window_present (GTK_WINDOW (window)); ++ shell_window = window; ++ break; ++ } ++ } ++ ++ watched_windows = g_list_next (watched_windows); ++ } ++ ++ /* Otherwise create a new EShellWindow in calendar view. */ ++ if (shell_window == NULL) ++ shell_window = e_shell_create_shell_window (shell, "calendar"); ++ ++ /* Now dig up the date navigator and select the date range. */ ++ ++ shell_view = e_shell_window_get_shell_view ( ++ E_SHELL_WINDOW (shell_window), "calendar"); ++ shell_sidebar = e_shell_view_get_shell_sidebar (shell_view); ++ navigator = e_cal_shell_sidebar_get_date_navigator ( ++ E_CAL_SHELL_SIDEBAR (shell_sidebar)); ++ ++ e_calendar_item_set_selection ( ++ navigator->calitem, start_date, end_date); ++} +diff -up evolution-2.30.2/modules/calendar/e-cal-shell-backend.h.handle-startdate-uris evolution-2.30.2/modules/calendar/e-cal-shell-backend.h +--- evolution-2.30.2/modules/calendar/e-cal-shell-backend.h.handle-startdate-uris 2010-06-20 08:14:47.000000000 -0400 ++++ evolution-2.30.2/modules/calendar/e-cal-shell-backend.h 2010-06-24 13:26:43.867095475 -0400 +@@ -64,6 +64,10 @@ void e_cal_shell_backend_register_type + (GTypeModule *type_module); + ESourceList * e_cal_shell_backend_get_source_list + (ECalShellBackend *cal_shell_backend); ++void e_cal_shell_backend_open_date_range ++ (ECalShellBackend *cal_shell_backend, ++ const GDate *start_date, ++ const GDate *end_date); + + G_END_DECLS + +diff -up evolution-2.30.2/widgets/misc/e-calendar-item.c.handle-startdate-uris evolution-2.30.2/widgets/misc/e-calendar-item.c +--- evolution-2.30.2/widgets/misc/e-calendar-item.c.handle-startdate-uris 2010-06-20 08:14:29.000000000 -0400 ++++ evolution-2.30.2/widgets/misc/e-calendar-item.c 2010-06-24 13:26:43.871094945 -0400 +@@ -188,8 +188,8 @@ static void e_calendar_item_date_range_c + static void e_calendar_item_queue_signal_emission (ECalendarItem *calitem); + static gboolean e_calendar_item_signal_emission_idle_cb (gpointer data); + static void e_calendar_item_set_selection_if_emission (ECalendarItem *calitem, +- GDate *start_date, +- GDate *end_date, ++ const GDate *start_date, ++ const GDate *end_date, + gboolean emission); + + /* Our arguments. */ +@@ -3094,8 +3094,8 @@ e_calendar_item_get_selection (ECalenda + + static void + e_calendar_item_set_selection_if_emission (ECalendarItem *calitem, +- GDate *start_date, +- GDate *end_date, ++ const GDate *start_date, ++ const GDate *end_date, + gboolean emission) + { + gint start_year, start_month, start_day; +@@ -3197,8 +3197,8 @@ e_calendar_item_style_set (GtkWidget *wi + + void + e_calendar_item_set_selection (ECalendarItem *calitem, +- GDate *start_date, +- GDate *end_date) ++ const GDate *start_date, ++ const GDate *end_date) + { + /* If the user is in the middle of a selection, we must abort it. */ + if (calitem->selecting) { +diff -up evolution-2.30.2/widgets/misc/e-calendar-item.h.handle-startdate-uris evolution-2.30.2/widgets/misc/e-calendar-item.h +--- evolution-2.30.2/widgets/misc/e-calendar-item.h.handle-startdate-uris 2010-06-20 08:14:33.000000000 -0400 ++++ evolution-2.30.2/widgets/misc/e-calendar-item.h 2010-06-24 13:26:43.871094945 -0400 +@@ -319,8 +319,8 @@ gboolean + the start of the selection is shown. If start_date is NULL it clears the + selection. */ + void e_calendar_item_set_selection (ECalendarItem *calitem, +- GDate *start_date, +- GDate *end_date); ++ const GDate *start_date, ++ const GDate *end_date); + + /* Marks a particular day. Passing E_CALENDAR_ITEM_MARK_BOLD as the day style + will result in the day being shown as bold by default. The style callback diff --git a/evolution.spec b/evolution.spec index 13c5c59..4d871e7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,6 +68,9 @@ Patch14: evolution-2.30.1-help-contents.patch # GNOME bug #622547 Patch15: evolution-2.30.2-async-event-idle-cb.patch +# GNOME bug #622633 +Patch16: evolution-2.30.2-handle-startdate-uris.patch + ## Dependencies ### Requires(pre): GConf2 @@ -235,6 +238,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch12 -p1 -b .im-context-reset %patch14 -p1 -b .help-contents %patch15 -p1 -b .async-event-idle-cb +%patch16 -p1 -b .handle-startdate-uris mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -683,6 +687,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jun 24 2010 Matthew Barnes - 2.30.2-3.fc13 +- Add patch for GNOME bug #622633 (handle startdate URIs). + * Thu Jun 24 2010 Matthew Barnes - 2.30.2-2.fc13 - Add patch for GNOME bug #622547 (uncancelled idle cb in destroy). From d05d06d457758e5c9036c0468827a44d1068cf9f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 25 Jul 2010 10:34:55 +0000 Subject: [PATCH 24/27] - Add patch for RH bug #617875 (help figure softlinks to itself). --- evolution-2.30.2-unused-help-figure.patch | 22 ++++++++++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.2-unused-help-figure.patch diff --git a/evolution-2.30.2-unused-help-figure.patch b/evolution-2.30.2-unused-help-figure.patch new file mode 100644 index 0000000..f0c573e --- /dev/null +++ b/evolution-2.30.2-unused-help-figure.patch @@ -0,0 +1,22 @@ +diff -up evolution-2.30.2/help/Makefile.am.unused-help-figure evolution-2.30.2/help/Makefile.am +--- evolution-2.30.2/help/Makefile.am.unused-help-figure 2010-07-25 06:29:21.199792883 -0400 ++++ evolution-2.30.2/help/Makefile.am 2010-07-25 06:29:31.812054726 -0400 +@@ -42,7 +42,6 @@ DOC_FIGURES = \ + figures/evo_mboxreceive_a.png \ + figures/evo_memo_a.png \ + figures/evo_mhreceive_a.png \ +- figures/evo_mail_notifier.png \ + figures/evo_memo_a.png \ + figures/evo_newmess_a.png \ + figures/evo_newmail.png \ +diff -up evolution-2.30.2/help/Makefile.in.unused-help-figure evolution-2.30.2/help/Makefile.in +--- evolution-2.30.2/help/Makefile.in.unused-help-figure 2010-07-25 06:30:40.501792368 -0400 ++++ evolution-2.30.2/help/Makefile.in 2010-07-25 06:30:57.463793008 -0400 +@@ -563,7 +563,6 @@ DOC_FIGURES = \ + figures/evo_mboxreceive_a.png \ + figures/evo_memo_a.png \ + figures/evo_mhreceive_a.png \ +- figures/evo_mail_notifier.png \ + figures/evo_memo_a.png \ + figures/evo_newmess_a.png \ + figures/evo_newmail.png \ diff --git a/evolution.spec b/evolution.spec index 4d871e7..23e596d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.30.2 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -71,6 +71,9 @@ Patch15: evolution-2.30.2-async-event-idle-cb.patch # GNOME bug #622633 Patch16: evolution-2.30.2-handle-startdate-uris.patch +# RH bug #617875 / GNOME bug #598833 +Patch17: evolution-2.30.2-unused-help-figure.patch + ## Dependencies ### Requires(pre): GConf2 @@ -239,6 +242,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch14 -p1 -b .help-contents %patch15 -p1 -b .async-event-idle-cb %patch16 -p1 -b .handle-startdate-uris +%patch17 -p1 -b .unused-help-figure mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -687,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Jul 25 2010 Matthew Barnes - 2.30.2-4.fc13 +- Add patch for RH bug #617875 (help figure softlinks to itself). + * Thu Jun 24 2010 Matthew Barnes - 2.30.2-3.fc13 - Add patch for GNOME bug #622633 (handle startdate URIs). From 5d033f74717145069da90f10ee46773dd8b3f6fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:00:12 +0000 Subject: [PATCH 25/27] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c22b7db..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: evolution -# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $ -NAME := evolution -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From e1c4a0e35450cd66362e67de6fc6134d02a3c38a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 11 Aug 2010 20:18:40 -0400 Subject: [PATCH 26/27] Update to 2.30.3 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dba6b50..7574c55 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ evolution-2.30.2.tar.bz2 +evolution-2.30.3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 23e596d..8bef2d1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,8 +38,8 @@ ### Abstract ### Name: evolution -Version: 2.30.2 -Release: 4%{?dist} +Version: 2.30.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -691,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Aug 11 2010 Matthew Barnes - 2.30.3-1.fc13 +- Update to 2.30.3 + * Sun Jul 25 2010 Matthew Barnes - 2.30.2-4.fc13 - Add patch for RH bug #617875 (help figure softlinks to itself). diff --git a/sources b/sources index 4dbfb0b..b4f397e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff2f1843d9f61e151a6bccf89eeff088 evolution-2.30.2.tar.bz2 +02d225cf130ed0cfcf90915b6ba977bf evolution-2.30.3.tar.bz2 From 402e4ae7d83d0bc1014ec87bf1595e8816030654 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 11 Aug 2010 22:20:03 -0400 Subject: [PATCH 27/27] Remove unneeded patches. --- evolution.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8bef2d1..345de76 100644 --- a/evolution.spec +++ b/evolution.spec @@ -65,15 +65,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch14: evolution-2.30.1-help-contents.patch -# GNOME bug #622547 -Patch15: evolution-2.30.2-async-event-idle-cb.patch - -# GNOME bug #622633 -Patch16: evolution-2.30.2-handle-startdate-uris.patch - -# RH bug #617875 / GNOME bug #598833 -Patch17: evolution-2.30.2-unused-help-figure.patch - ## Dependencies ### Requires(pre): GConf2 @@ -240,9 +231,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset %patch14 -p1 -b .help-contents -%patch15 -p1 -b .async-event-idle-cb -%patch16 -p1 -b .handle-startdate-uris -%patch17 -p1 -b .unused-help-figure mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -693,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Aug 11 2010 Matthew Barnes - 2.30.3-1.fc13 - Update to 2.30.3 +- Remove patch for RH bug #617875 (fixed upstream). +- Remove patch for GNOME bug #622547 (fixed upstream). +- Remove patch for GNOME bug #622633 (fixed upstream). * Sun Jul 25 2010 Matthew Barnes - 2.30.2-4.fc13 - Add patch for RH bug #617875 (help figure softlinks to itself).