[evolution-rss] Add an upstream patch for a build break due to evolution changes

[Milan Crha]

commit 6d4361ab4b3c448240cfc445b38694b6b420babe
Author: Milan Crha <mcrha at redhat.com>
Date:   Fri Jan 17 18:38:10 2014 +0100

    Add an upstream patch for a build break due to evolution changes

 evo-3.11.3-changes.patch |   28 ++++++++++++++++++++++++++++
 evolution-rss.spec       |    5 ++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/evo-3.11.3-changes.patch b/evo-3.11.3-changes.patch
new file mode 100644
index 0000000..8fcb11c
--- /dev/null
+++ b/evo-3.11.3-changes.patch
@@ -0,0 +1,28 @@
+diff -up evolution-rss-0.3.94/src/rss-image.c.evo-3.11.3-changes evolution-rss-0.3.94/src/rss-image.c
+--- evolution-rss-0.3.94/src/rss-image.c.evo-3.11.3-changes	2014-01-17 18:32:58.283903722 +0100
++++ evolution-rss-0.3.94/src/rss-image.c	2014-01-17 18:34:36.142899575 +0100
+@@ -539,7 +539,9 @@ display_folder_icon(GtkTreeStore *tree_s
+ 	GtkTreePath *path;
+ 	GtkTreeRowReference *row;
+ 	EMFolderTreeModel *mod = (EMFolderTreeModel *)tree_store;
++#if (EVOLUTION_VERSION < 31103)
+ 	struct _EMFolderTreeModelStoreInfo *si;
++#endif
+ 	CamelStore *store = rss_component_peek_local_store();
+ 	CamelFolderInfo *rssi = NULL;
+ 	gint i=0, size;
+@@ -589,9 +591,14 @@ display_folder_icon(GtkTreeStore *tree_s
+ 				icon);
+ 		g_free(sizes);
+ 
++#if (EVOLUTION_VERSION < 31103)
+ 		si = em_folder_tree_model_lookup_store_info (
+ 			EM_FOLDER_TREE_MODEL (mod), store);
+ 		row = g_hash_table_lookup (si->full_hash, full_name);
++#else
++		row = em_folder_tree_model_get_row_reference (
++			EM_FOLDER_TREE_MODEL (mod), store, full_name);
++#endif
+ 		if (!row) goto out;
+ 		path = gtk_tree_row_reference_get_path (row);
+ 		gtk_tree_model_get_iter (
diff --git a/evolution-rss.spec b/evolution-rss.spec
index 57971c8..3008750 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -18,6 +18,7 @@ Requires:	evolution
 Patch01: evolution-rss-0.3.94-camel-api-changes.patch
 
 Patch02: eds-evo-3.11.2-changes.patch
+Patch03: evo-3.11.3-changes.patch
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -39,6 +40,7 @@ This is an evolution plugin which enables evolution to read rss feeds.
 %setup -q -n evolution-rss-%{version}
 %patch01 -p1 -b .camel-api-changes
 %patch02 -p1 -b .eds-evo-3.11.2-changes
+%patch03 -p1 -b .evo-3.11.3-changes
 
 %build
 %configure --with-primary-render=webkit
@@ -101,8 +103,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/evolution/*/modules/evolution-module-rss.so
 
 %changelog
-* Tue Jan 14 2014 Milan Crha <mcrha at redhat.com> - 1:0.3.94-4
+* Fri Jan 17 2014 Milan Crha <mcrha at redhat.com> - 1:0.3.94-4
 - Rebuild against newer evolution-data-server
+- Add an upstream patch for a build break due to evolution changes
 
 * Thu Jan 09 2014 Milan Crha <mcrha at redhat.com> - 1:0.3.94-3
 - Add an upstream patch for a build break due to eds/evo changes