[evolution-data-server/f18] Add patch for Red Hat bug #901942 (mbox read broken)

[Milan Crha]

commit 636c7f7f60fb6e3119745801603f97df534afc4a
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Feb 4 13:09:19 2013 +0100

    Add patch for Red Hat bug #901942 (mbox read broken)

 evolution-data-server-3.6.3-mbox-read-broken.patch |   44 ++++++++++++++++++++
 evolution-data-server.spec                         |    8 +++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.6.3-mbox-read-broken.patch b/evolution-data-server-3.6.3-mbox-read-broken.patch
new file mode 100644
index 0000000..f8e5a21
--- /dev/null
+++ b/evolution-data-server-3.6.3-mbox-read-broken.patch
@@ -0,0 +1,44 @@
+diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
+index 71c0091..6925c33 100644
+--- a/camel/providers/local/camel-mbox-summary.c
++++ b/camel/providers/local/camel-mbox-summary.c
+@@ -748,8 +748,8 @@ mbox_summary_sync_full (CamelMboxSummary *mbs,
+ }
+ 
+ static gint
+-cms_sort_frompos (gpointer a,
+-                  gpointer b,
++cms_sort_frompos (gconstpointer a,
++                  gconstpointer b,
+                   gpointer data)
+ {
+ 	CamelFolderSummary *summary = (CamelFolderSummary *) data;
+@@ -832,7 +832,7 @@ mbox_summary_sync_quick (CamelMboxSummary *mbs,
+ 	/* Sync only the changes */
+ 	summary = camel_folder_summary_get_changed ((CamelFolderSummary *) mbs);
+ 	if (summary->len)
+-		g_ptr_array_sort_with_data (summary, (GCompareDataFunc) cms_sort_frompos, (gpointer) mbs);
++		g_ptr_array_sort_with_data (summary, cms_sort_frompos, mbs);
+ 
+ 	for (i = 0; i < summary->len; i++) {
+ 		gint xevoffset;
+@@ -1099,6 +1099,9 @@ camel_mbox_summary_sync_mbox (CamelMboxSummary *cls,
+ 
+ 	camel_folder_summary_prepare_fetch_all (s, NULL);
+ 	known_uids = camel_folder_summary_get_array (s);
++	/* walk them in the same order as stored in the file */
++	if (known_uids->len)
++		g_ptr_array_sort_with_data (known_uids, cms_sort_frompos, mbs);
+ 	for (i = 0; known_uids && i < known_uids->len; i++) {
+ 		gint pc = (i + 1) * 100 / known_uids->len;
+ 
+@@ -1131,8 +1134,7 @@ camel_mbox_summary_sync_mbox (CamelMboxSummary *cls,
+ 
+ 		if (camel_mime_parser_tell_start_from (mp) != info->frompos) {
+ 			g_warning (
+-				"Didn't get the next message where "
+-				"I expected (%d) got %d instead",
++				"Didn't get the next message where I expected (%d) got %d instead",
+ 				(gint) info->frompos,
+ 				(gint) camel_mime_parser_tell_start_from (mp));
+ 			g_set_error (
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 4cbed85..763f4b1 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
 
 Name: evolution-data-server
 Version: 3.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -43,6 +43,8 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+Patch02: evolution-data-server-3.6.3-mbox-read-broken.patch
+
 ### Build Dependencies ###
 
 BuildRequires: bison
@@ -123,6 +125,7 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch01 -p1 -b .fix-64bit-acinclude
+%patch02 -p1 -b .mbox-read-broken
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -367,6 +370,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Feb 04 2013 Milan Crha <mcrha at redhat.com> - 3.6.3-2
+- Add patch for Red Hat bug #901942 (mbox read broken)
+
 * Tue Jan 22 2013 Milan Crha <mcrha at redhat.com> - 3.6.3-1
 - Update to 3.6.3
 - Remove patch for Red Hat bug #877562 (fixed upstream)