From 80c20d11f731df42a1d43125b96b21a1802f921b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Mar 2013 08:55:40 +0100 Subject: [PATCH 01/11] Update to 3.7.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ba5a492..7e01a24 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.5.tar.xz /evolution-3.7.90.tar.xz /evolution-3.7.91.tar.xz +/evolution-3.7.92.tar.xz diff --git a/evolution.spec b/evolution.spec index fc5dffc..630bccc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.7.91 +Version: 3.7.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 18 2013 Milan Crha - 3.7.92-1 +- Update to 3.7.92 + * Mon Mar 04 2013 Milan Crha - 3.7.91-1 - Update to 3.7.91 diff --git a/sources b/sources index b841fe6..7705a06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51749a034e3990a93b4d0701d8fc0f1c evolution-3.7.91.tar.xz +791ce4d466c6e46965a8d98b8dd0dcce evolution-3.7.92.tar.xz From 2a3d9897b6e7da01f98ac7641212301da4278d56 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 Mar 2013 11:02:04 +0100 Subject: [PATCH 02/11] Update to 3.8.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7e01a24..1170d53 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.90.tar.xz /evolution-3.7.91.tar.xz /evolution-3.7.92.tar.xz +/evolution-3.8.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 630bccc..221bd8e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.7.92 +Version: 3.8.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}/3.7/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 25 2013 Milan Crha - 3.8.0-1 +- Update to 3.8.0 + * Mon Mar 18 2013 Milan Crha - 3.7.92-1 - Update to 3.7.92 diff --git a/sources b/sources index 7705a06..ffd1aa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -791ce4d466c6e46965a8d98b8dd0dcce evolution-3.7.92.tar.xz +73391003d81db656a9e91814cbd08fe4 evolution-3.8.0.tar.xz From 1373d29b11dfbb35f61d1868d94421d01037afab Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 14 Apr 2013 12:11:27 -0400 Subject: [PATCH 03/11] 3.8.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1170d53..25fa5a7 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.91.tar.xz /evolution-3.7.92.tar.xz /evolution-3.8.0.tar.xz +/evolution-3.8.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 221bd8e..6177d10 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.8.0 +Version: 3.8.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Apr 14 2013 Matthew Barnes - 3.8.1-1 +- Update to 3.8.1 + * Mon Mar 25 2013 Milan Crha - 3.8.0-1 - Update to 3.8.0 diff --git a/sources b/sources index ffd1aa6..4cb5262 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73391003d81db656a9e91814cbd08fe4 evolution-3.8.0.tar.xz +25f605fc03cba1f999c51c40cba884ca evolution-3.8.1.tar.xz From 8f9f69f2bb699be617acdbbb89703bc4e7c72b82 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 May 2013 12:46:55 -0400 Subject: [PATCH 04/11] 3.8.2 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 25fa5a7..d39acc6 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.92.tar.xz /evolution-3.8.0.tar.xz /evolution-3.8.1.tar.xz +/evolution-3.8.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 6177d10..378e87a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.8.1 +Version: 3.8.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun May 12 2013 Matthew Barnes - 3.8.2-1 +- Update to 3.8.2 + * Sun Apr 14 2013 Matthew Barnes - 3.8.1-1 - Update to 3.8.1 diff --git a/sources b/sources index 4cb5262..60b7e6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25f605fc03cba1f999c51c40cba884ca evolution-3.8.1.tar.xz +2ed96d832348c8ccf61f3b484b21c022 evolution-3.8.2.tar.xz From 45fdc31ccd80d4d62fc3d830fcf2423725090eea Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 10 Jun 2013 08:46:22 +0200 Subject: [PATCH 05/11] Update to 3.8.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d39acc6..7090fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.8.0.tar.xz /evolution-3.8.1.tar.xz /evolution-3.8.2.tar.xz +/evolution-3.8.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 378e87a..e193327 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.8.2 +Version: 3.8.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 10 2013 Milan Crha - 3.8.3-1 +- Update to 3.8.3 + * Sun May 12 2013 Matthew Barnes - 3.8.2-1 - Update to 3.8.2 diff --git a/sources b/sources index 60b7e6a..79213c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ed96d832348c8ccf61f3b484b21c022 evolution-3.8.2.tar.xz +5181f4d8199a9c6b383ee0c1dab83333 evolution-3.8.3.tar.xz From f4839ca91db3b863f2ff1160164a84a3a2c742b1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 22 Jun 2013 09:06:14 -0400 Subject: [PATCH 06/11] Save some space --- evolution.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index e193327..0d46cda 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,3 +1,5 @@ +%global _changelog_trimtime %(date +%s -d "1 year ago") + %define glib2_version 2.34.0 %define gtk3_version 3.4.0 %define gtkhtml_version 4.5.2 @@ -317,7 +319,7 @@ rm -rf $RPM_BUILD_ROOT %files -f translations.lang %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING NEWS README # GSettings schemas: %{_datadir}/GConf/gsettings/evolution.convert @@ -515,6 +517,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Jun 22 2013 Matthias Clasen - 3.8.3-2 +- Don't install ChangeLog +- Trim %%changelog + * Mon Jun 10 2013 Milan Crha - 3.8.3-1 - Update to 3.8.3 From 31a853a212bcfe20b34b5bfa9116fdf5bb6caeed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 22 Jun 2013 09:08:07 -0400 Subject: [PATCH 07/11] Bump rev --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 0d46cda..e5ff739 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL From 48331087f3470e02b445e8d1710d4c3fdc3093ba Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 23 Jul 2013 19:17:19 +0200 Subject: [PATCH 08/11] Update to 3.8.4 --- .gitignore | 1 + evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7090fa7..8ea69d9 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.8.1.tar.xz /evolution-3.8.2.tar.xz /evolution-3.8.3.tar.xz +/evolution-3.8.4.tar.xz diff --git a/evolution.spec b/evolution.spec index e5ff739..8d5d9c2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.8.3 -Release: 2%{?dist} +Version: 3.8.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -517,6 +517,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 23 2013 Milan Crha - 3.8.4-1 +- Update to 3.8.4 + * Sat Jun 22 2013 Matthias Clasen - 3.8.3-2 - Don't install ChangeLog - Trim %%changelog @@ -561,7 +564,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Dec 20 2012 Kalev Lember - 3.7.3.2-2 - Rebuilt for libgnome-desktop3 3.7.3 soname bump -* Tue Dec 19 2012 Matthew Barnes - 3.7.3.2-1 +* Wed Dec 19 2012 Matthew Barnes - 3.7.3.2-1 - Update to 3.7.3.2 - Remove obsolete BuildRequires: bison diff --git a/sources b/sources index 79213c1..05d589e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5181f4d8199a9c6b383ee0c1dab83333 evolution-3.8.3.tar.xz +a2fa3270da291fbc54573d3778b74e93 evolution-3.8.4.tar.xz From 0a39784e424591a8055e5a704016e2dc29f3f467 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 31 Jul 2013 06:59:58 +0200 Subject: [PATCH 09/11] Add patch to not use custom alarm messages if backend doesn't support it Add patch for GNOME bug #705119 (File descriptors for images not closed) --- evolution-3.8.4-custom-alarm-messages.patch | 64 +++++++++++++++++++ ...on-3.8.4-leak-image-file-descriptors.patch | 37 +++++++++++ evolution.spec | 14 +++- 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 evolution-3.8.4-custom-alarm-messages.patch create mode 100644 evolution-3.8.4-leak-image-file-descriptors.patch diff --git a/evolution-3.8.4-custom-alarm-messages.patch b/evolution-3.8.4-custom-alarm-messages.patch new file mode 100644 index 0000000..88481de --- /dev/null +++ b/evolution-3.8.4-custom-alarm-messages.patch @@ -0,0 +1,64 @@ +From f81c52332e44e2b1ae1d7ef2e91c719fb207ed5c Mon Sep 17 00:00:00 2001 +From: Fabiano Fidêncio +Date: Wed, 24 Jul 2013 09:46:42 +0000 +Subject: Only use the alarm description if the client supports it + +https://bugzilla.gnome.org/show_bug.cgi?id=386113 +--- +diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c +index 87b6e92..20bf1fd 100644 +--- a/calendar/alarm-notify/alarm-queue.c ++++ b/calendar/alarm-notify/alarm-queue.c +@@ -1594,7 +1594,8 @@ tray_list_add_new (TrayIconData *data) + } + + static void +-alarm_queue_get_alarm_summary (ECalComponent *comp, ++alarm_queue_get_alarm_summary (ECalClient *cal_client, ++ ECalComponent *comp, + const ECalComponentAlarmInstance *instance, + ECalComponentText *text, + ECalComponentAlarm **palarm) +@@ -1607,12 +1608,16 @@ alarm_queue_get_alarm_summary (ECalComponent *comp, + + text->value = NULL; + +- *palarm = e_cal_component_get_alarm (comp, instance->auid); +- if (*palarm) { +- e_cal_component_alarm_get_description (*palarm, text); +- if (!text->value || !*text->value) { +- text->value = NULL; +- e_cal_component_alarm_free (*palarm); ++ if (e_client_check_capability (E_CLIENT (cal_client), "alarm-description")) { ++ *palarm = e_cal_component_get_alarm (comp, instance->auid); ++ if (*palarm) { ++ e_cal_component_alarm_get_description (*palarm, text); ++ if (!text->value || !*text->value) { ++ text->value = NULL; ++ e_cal_component_alarm_free (*palarm); ++ *palarm = NULL; ++ } ++ } else { + *palarm = NULL; + } + } +@@ -1647,7 +1652,7 @@ display_notification (time_t trigger, + return; + + /* get a sensible description for the event */ +- alarm_queue_get_alarm_summary (comp, qa->instance, &text, &comp_alarm); ++ alarm_queue_get_alarm_summary (cqa->parent_client->cal_client, comp, qa->instance, &text, &comp_alarm); + e_cal_component_get_organizer (comp, &organiser); + + if (text.value) +@@ -1785,7 +1790,7 @@ popup_notification (time_t trigger, + notify_init (_("Evolution Reminders")); + + /* get a sensible description for the event */ +- alarm_queue_get_alarm_summary (comp, qa->instance, &text, &comp_alarm); ++ alarm_queue_get_alarm_summary (cqa->parent_client->cal_client, comp, qa->instance, &text, &comp_alarm); + e_cal_component_get_organizer (comp, &organiser); + + if (text.value) +-- +cgit v0.9.2 diff --git a/evolution-3.8.4-leak-image-file-descriptors.patch b/evolution-3.8.4-leak-image-file-descriptors.patch new file mode 100644 index 0000000..823a132 --- /dev/null +++ b/evolution-3.8.4-leak-image-file-descriptors.patch @@ -0,0 +1,37 @@ +From 05d0c5f26019eddee1cad15cd7792704902cb148 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 30 Jul 2013 10:32:48 +0000 +Subject: Bug #705119 - File descriptors for images not closed + +--- +diff --git a/mail/e-http-request.c b/mail/e-http-request.c +index e77a4e5..b5ac480 100644 +--- a/mail/e-http-request.c ++++ b/mail/e-http-request.c +@@ -378,16 +378,18 @@ handle_http_request (GSimpleAsyncResult *res, + camel_stream_write ( + cache_stream, message->response_body->data, + message->response_body->length, cancellable, &error); ++ ++ camel_stream_close (cache_stream, cancellable, NULL); ++ g_object_unref (cache_stream); ++ + if (error != NULL) { +- g_warning ( +- "Failed to write data to cache stream: %s", +- error->message); ++ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) ++ g_warning ( ++ "Failed to write data to cache stream: %s", ++ error->message); + g_clear_error (&error); + goto cleanup; + } +- +- camel_stream_close (cache_stream, cancellable, NULL); +- g_object_unref (cache_stream); + } + + /* Send the response body to WebKit */ +-- +cgit v0.9.2 diff --git a/evolution.spec b/evolution.spec index 8d5d9c2..0d02040 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,6 +51,12 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# Do not use custom alarm messages if backend doesn't support it +Patch03: evolution-3.8.4-custom-alarm-messages.patch + +# GNOME bug #705119 +Patch04: evolution-3.8.4-leak-image-file-descriptors.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -192,6 +198,8 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .custom-alarm-messages +%patch04 -p1 -b .leak-image-file-descriptors mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -517,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jul 31 2013 Milan Crha - 3.8.4-2 +- Add patch to not use custom alarm messages if backend doesn't support it +- Add patch for GNOME bug #705119 (File descriptors for images not closed) + * Tue Jul 23 2013 Milan Crha - 3.8.4-1 - Update to 3.8.4 From 4df00c3850315b6666e99b78b56aaace90c312f9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Aug 2013 11:27:34 -0400 Subject: [PATCH 10/11] 3.8.5 --- .gitignore | 1 + evolution-3.8.4-custom-alarm-messages.patch | 64 ------------------- ...on-3.8.4-leak-image-file-descriptors.patch | 37 ----------- evolution.spec | 16 ++--- sources | 2 +- 5 files changed, 8 insertions(+), 112 deletions(-) delete mode 100644 evolution-3.8.4-custom-alarm-messages.patch delete mode 100644 evolution-3.8.4-leak-image-file-descriptors.patch diff --git a/.gitignore b/.gitignore index 8ea69d9..04ce141 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.8.2.tar.xz /evolution-3.8.3.tar.xz /evolution-3.8.4.tar.xz +/evolution-3.8.5.tar.xz diff --git a/evolution-3.8.4-custom-alarm-messages.patch b/evolution-3.8.4-custom-alarm-messages.patch deleted file mode 100644 index 88481de..0000000 --- a/evolution-3.8.4-custom-alarm-messages.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f81c52332e44e2b1ae1d7ef2e91c719fb207ed5c Mon Sep 17 00:00:00 2001 -From: Fabiano Fidêncio -Date: Wed, 24 Jul 2013 09:46:42 +0000 -Subject: Only use the alarm description if the client supports it - -https://bugzilla.gnome.org/show_bug.cgi?id=386113 ---- -diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c -index 87b6e92..20bf1fd 100644 ---- a/calendar/alarm-notify/alarm-queue.c -+++ b/calendar/alarm-notify/alarm-queue.c -@@ -1594,7 +1594,8 @@ tray_list_add_new (TrayIconData *data) - } - - static void --alarm_queue_get_alarm_summary (ECalComponent *comp, -+alarm_queue_get_alarm_summary (ECalClient *cal_client, -+ ECalComponent *comp, - const ECalComponentAlarmInstance *instance, - ECalComponentText *text, - ECalComponentAlarm **palarm) -@@ -1607,12 +1608,16 @@ alarm_queue_get_alarm_summary (ECalComponent *comp, - - text->value = NULL; - -- *palarm = e_cal_component_get_alarm (comp, instance->auid); -- if (*palarm) { -- e_cal_component_alarm_get_description (*palarm, text); -- if (!text->value || !*text->value) { -- text->value = NULL; -- e_cal_component_alarm_free (*palarm); -+ if (e_client_check_capability (E_CLIENT (cal_client), "alarm-description")) { -+ *palarm = e_cal_component_get_alarm (comp, instance->auid); -+ if (*palarm) { -+ e_cal_component_alarm_get_description (*palarm, text); -+ if (!text->value || !*text->value) { -+ text->value = NULL; -+ e_cal_component_alarm_free (*palarm); -+ *palarm = NULL; -+ } -+ } else { - *palarm = NULL; - } - } -@@ -1647,7 +1652,7 @@ display_notification (time_t trigger, - return; - - /* get a sensible description for the event */ -- alarm_queue_get_alarm_summary (comp, qa->instance, &text, &comp_alarm); -+ alarm_queue_get_alarm_summary (cqa->parent_client->cal_client, comp, qa->instance, &text, &comp_alarm); - e_cal_component_get_organizer (comp, &organiser); - - if (text.value) -@@ -1785,7 +1790,7 @@ popup_notification (time_t trigger, - notify_init (_("Evolution Reminders")); - - /* get a sensible description for the event */ -- alarm_queue_get_alarm_summary (comp, qa->instance, &text, &comp_alarm); -+ alarm_queue_get_alarm_summary (cqa->parent_client->cal_client, comp, qa->instance, &text, &comp_alarm); - e_cal_component_get_organizer (comp, &organiser); - - if (text.value) --- -cgit v0.9.2 diff --git a/evolution-3.8.4-leak-image-file-descriptors.patch b/evolution-3.8.4-leak-image-file-descriptors.patch deleted file mode 100644 index 823a132..0000000 --- a/evolution-3.8.4-leak-image-file-descriptors.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05d0c5f26019eddee1cad15cd7792704902cb148 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 30 Jul 2013 10:32:48 +0000 -Subject: Bug #705119 - File descriptors for images not closed - ---- -diff --git a/mail/e-http-request.c b/mail/e-http-request.c -index e77a4e5..b5ac480 100644 ---- a/mail/e-http-request.c -+++ b/mail/e-http-request.c -@@ -378,16 +378,18 @@ handle_http_request (GSimpleAsyncResult *res, - camel_stream_write ( - cache_stream, message->response_body->data, - message->response_body->length, cancellable, &error); -+ -+ camel_stream_close (cache_stream, cancellable, NULL); -+ g_object_unref (cache_stream); -+ - if (error != NULL) { -- g_warning ( -- "Failed to write data to cache stream: %s", -- error->message); -+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -+ g_warning ( -+ "Failed to write data to cache stream: %s", -+ error->message); - g_clear_error (&error); - goto cleanup; - } -- -- camel_stream_close (cache_stream, cancellable, NULL); -- g_object_unref (cache_stream); - } - - /* Send the response body to WebKit */ --- -cgit v0.9.2 diff --git a/evolution.spec b/evolution.spec index 0d02040..00a54a3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.8.4 -Release: 2%{?dist} +Version: 3.8.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,12 +51,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# Do not use custom alarm messages if backend doesn't support it -Patch03: evolution-3.8.4-custom-alarm-messages.patch - -# GNOME bug #705119 -Patch04: evolution-3.8.4-leak-image-file-descriptors.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -198,8 +192,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .custom-alarm-messages -%patch04 -p1 -b .leak-image-file-descriptors mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -525,6 +517,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Aug 11 2013 Matthew Barnes - 3.8.5-1 +- Update to 3.8.5 +- Remove patches from 3.8.4-2 update (both fixed upstream). + * Wed Jul 31 2013 Milan Crha - 3.8.4-2 - Add patch to not use custom alarm messages if backend doesn't support it - Add patch for GNOME bug #705119 (File descriptors for images not closed) diff --git a/sources b/sources index 05d589e..f666969 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2fa3270da291fbc54573d3778b74e93 evolution-3.8.4.tar.xz +5ba2002066100c8e9fe28b78bb34f536 evolution-3.8.5.tar.xz From 86e90070833e83859c8eaf00c2e7c0875cce5ab2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Aug 2013 09:20:43 +0200 Subject: [PATCH 11/11] Add patch for RH bug #995516 (Crash in certificate viewer) --- evolution-3.8.5-cert-viewer-crash.patch | 12 ++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 evolution-3.8.5-cert-viewer-crash.patch diff --git a/evolution-3.8.5-cert-viewer-crash.patch b/evolution-3.8.5-cert-viewer-crash.patch new file mode 100644 index 0000000..9f0b3fa --- /dev/null +++ b/evolution-3.8.5-cert-viewer-crash.patch @@ -0,0 +1,12 @@ +diff -up evolution-3.8.5/smime/gui/certificate-viewer.c.cert-viewer-crash evolution-3.8.5/smime/gui/certificate-viewer.c +--- evolution-3.8.5/smime/gui/certificate-viewer.c.cert-viewer-crash 2013-07-23 14:52:23.000000000 +0200 ++++ evolution-3.8.5/smime/gui/certificate-viewer.c 2013-08-12 09:19:29.826358628 +0200 +@@ -538,7 +538,7 @@ get_window_title (CERTCertificate *cert) + return title; + } + +- return cert->subjectName; ++ return g_strdup (cert->subjectName); + } + + GtkWidget * diff --git a/evolution.spec b/evolution.spec index 00a54a3..52b5e9e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,6 +51,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# RH bug #995516 +Patch03: evolution-3.8.5-cert-viewer-crash.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -192,6 +195,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .cert-viewer-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -517,6 +521,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 12 2013 Milan Crha - 3.8.5-2 +- Add patch for RH bug #995516 (Crash in certificate viewer) + * Sun Aug 11 2013 Matthew Barnes - 3.8.5-1 - Update to 3.8.5 - Remove patches from 3.8.4-2 update (both fixed upstream).