From efc61722ded1a9c2b952bc2cb8d80b2f488513eb Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 3 Sep 2018 09:53:10 +0200
Subject: [PATCH] Update to 3.30.0; Add patch for GNOME Evolution issue #86
 (Quoting of plain text mail into HTML mode mangles deeper levels)

---
 .gitignore                                    |  1 +
 ...tion-data-server-3.30.0-evo-issue-86.patch | 47 +++++++++++++++++++
 evolution-data-server.spec                    | 11 ++++-
 sources                                       |  2 +-
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 evolution-data-server-3.30.0-evo-issue-86.patch

diff --git a/.gitignore b/.gitignore
index b2f9df7..aef9f18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-3.29.90.tar.xz
 /evolution-data-server-3.29.91.tar.xz
 /evolution-data-server-3.29.92.tar.xz
+/evolution-data-server-3.30.0.tar.xz
diff --git a/evolution-data-server-3.30.0-evo-issue-86.patch b/evolution-data-server-3.30.0-evo-issue-86.patch
new file mode 100644
index 0000000..5a4e797
--- /dev/null
+++ b/evolution-data-server-3.30.0-evo-issue-86.patch
@@ -0,0 +1,47 @@
+diff --git a/src/camel/camel-mime-filter-tohtml.c b/src/camel/camel-mime-filter-tohtml.c
+index 07024aa1a..df6283655 100644
+--- a/src/camel/camel-mime-filter-tohtml.c
++++ b/src/camel/camel-mime-filter-tohtml.c
+@@ -303,6 +303,7 @@ html_convert (CamelMimeFilter *mime_filter,
+ 	outend = mime_filter->outbuf + mime_filter->outsize;
+ 
+ 	if (priv->flags & CAMEL_MIME_FILTER_TOHTML_PRE && !priv->pre_open) {
++		outptr = check_size (mime_filter, outptr, &outend, 6);
+ 		outptr = g_stpcpy (outptr, "<pre>");
+ 		priv->pre_open = TRUE;
+ 	}
+@@ -339,13 +340,13 @@ html_convert (CamelMimeFilter *mime_filter,
+ 
+ 			depth = citation_depth (start, inend, &skip);
+ 			while (priv->blockquote_depth < depth) {
+-				outptr = check_size (mime_filter, outptr, &outend, 30);
+-				outptr = g_stpcpy (outptr, "<blockquote type=\"cite\">\n");
++				outptr = check_size (mime_filter, outptr, &outend, 25);
++				outptr = g_stpcpy (outptr, "<blockquote type=\"cite\">");
+ 				priv->blockquote_depth++;
+ 			}
+ 			while (priv->blockquote_depth > depth) {
+-				outptr = check_size (mime_filter, outptr, &outend, 15);
+-				outptr = g_stpcpy (outptr, "</blockquote>\n");
++				outptr = check_size (mime_filter, outptr, &outend, 14);
++				outptr = g_stpcpy (outptr, "</blockquote>");
+ 				priv->blockquote_depth--;
+ 			}
+ #if FOOLISHLY_UNMUNGE_FROM
+@@ -463,14 +464,14 @@ html_convert (CamelMimeFilter *mime_filter,
+ 				outptr, &outend);
+ 
+ 		while (priv->blockquote_depth > 0) {
+-			outptr = check_size (mime_filter, outptr, &outend, 15);
++			outptr = check_size (mime_filter, outptr, &outend, 14);
+ 			outptr = g_stpcpy (outptr, "</blockquote>");
+ 			priv->blockquote_depth--;
+ 		}
+ 
+ 		if (priv->pre_open) {
+ 			/* close the pre-tag */
+-			outptr = check_size (mime_filter, outptr, &outend, 10);
++			outptr = check_size (mime_filter, outptr, &outend, 7);
+ 			outptr = g_stpcpy (outptr, "</pre>");
+ 			priv->pre_open = FALSE;
+ 		}
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index b45bcdb..df6ac7e 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -32,15 +32,16 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.29.92
+Version: 3.30.0
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
 
 ### Patches ###
+Patch01: evolution-data-server-3.30.0-evo-issue-86.patch
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
@@ -172,6 +173,8 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q
 
+%patch01 -p1 -b .evo-issue-86
+
 %build
 
 mkdir -p _build
@@ -440,6 +443,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Sep 03 2018 Milan Crha <mcrha@redhat.com> - 3.30.0-1
+- Update to 3.30.0
+- Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels)
+
 * Mon Aug 27 2018 Milan Crha <mcrha@redhat.com> - 3.29.92-1
 - Update to 3.29.92
 
diff --git a/sources b/sources
index f45a282..e9cf946 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-data-server-3.29.92.tar.xz) = b2f017dbe71ce8ecbf601482c5b00f741bf3eb65ccb961e03ea6a4645bb706fee271fcdf92a6813267e017b6c85457e18c8208f39e12323d995bbd6ca1110d47
+SHA512 (evolution-data-server-3.30.0.tar.xz) = 1a14b55b66f22c9134736494f8b94ee1ac5c64613122441ca96f3c031848d095073c68fd7b9c2f1566a6a355dd474883dfc372e1d6598b99644e7e1c7bd184c9