[evolution/f19] Add patch to not use custom alarm messages if backend doesn't support it Add patch for GNOME bug #70
Milan Crha
mcrha at fedoraproject.org
Wed Jul 31 05:00:19 UTC 2013
commit 0a39784e424591a8055e5a704016e2dc29f3f467
Author: Milan Crha <mcrha at redhat.com>
Date: Wed Jul 31 06:59:58 2013 +0200
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 +++++++++++++++++++++
evolution-3.8.4-leak-image-file-descriptors.patch | 37 ++++++++++++
evolution.spec | 14 ++++-
3 files changed, 114 insertions(+), 1 deletions(-)
---
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 <fidencio at redhat.com>
+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 <mcrha at redhat.com>
+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 <mcrha at redhat.com> - 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 <mcrha at redhat.com> - 3.8.4-1
- Update to 3.8.4
More information about the scm-commits
mailing list