rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch for GNOME bug #534080 (fix attachment saving).

Browse Source
This commit is contained in:
Matthew Barnes 2008-07-03 14:46:10 +00:00
parent 4f22dc85c9
commit cf3eb8ee19
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
evolution-data-server-2.23.4-fix-attachment-saving.patch Normal file
View File

@ -0,0 +1,28 @@
diff -up evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving evolution-data-server-2.23.4/camel/camel-stream-vfs.c
--- evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving 2008-06-15 23:18:01.000000000 -0400
+++ evolution-data-server-2.23.4/camel/camel-stream-vfs.c 2008-07-03 07:15:10.000000000 -0400
@@ -211,20 +211,20 @@ stream_read (CamelStream *stream, char *
static ssize_t
stream_write (CamelStream *stream, const char *buffer, size_t n)
{
- gssize nwritten;
+ gboolean success;
+ gsize bytes_written;
GError *error = NULL;
CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (stream);
g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream_vfs->stream), 0);
- nwritten = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, NULL, NULL, &error);
+ success = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, &bytes_written, NULL, &error);
if (error) {
g_warning ("%s", error->message);
g_error_free (error);
}
-
- return nwritten;
+ return success ? bytes_written : -1;
}
static int

9
evolution-data-server.spec
View File

@ -28,7 +28,7 @@
Name: evolution-data-server Name: evolution-data-server
Version: 2.23.4 Version: 2.23.4
Release: 1%{?dist} Release: 2%{?dist}
License: LGPL License: LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
@ -50,6 +50,9 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
# RH bug #243296 # RH bug #243296
Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
# RH bug #534080
Patch14: evolution-data-server-2.23.4-fix-attachment-saving.patch
### Build Dependencies ### ### Build Dependencies ###
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
@ -126,6 +129,7 @@ This package contains developer documentation for %{name}.
%patch11 -p1 -b .fix-ldap-query %patch11 -p1 -b .fix-ldap-query
%patch12 -p1 -b .camel-folder-summary-crash %patch12 -p1 -b .camel-folder-summary-crash
%patch13 -p1 -b .fix-64bit-acinclude %patch13 -p1 -b .fix-64bit-acinclude
%patch14 -p1 -b .fix-attachment-saving
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -372,6 +376,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui %{_datadir}/gtk-doc/html/libedataserverui
%changelog %changelog
* Thu Jul 03 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-2.fc10
- Add patch for GNOME bug #534080 (fix attachment saving).
* Mon Jun 16 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-1.fc10 * Mon Jun 16 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-1.fc10
- Update to 2.23.4 - Update to 2.23.4