Add patch for GNOME bug 761883 (Typo in the previous fix)

This commit is contained in:
Milan Crha 2016-02-18 10:29:13 +01:00
parent 881f6ea4e6
commit 8e693f88f8
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index b7ffba8..2abf9c2 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -3263,8 +3263,8 @@ merge_siblings_if_necessary (WebKitDOMDocument *document,
goto signature;
repeat:
child = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (element));
- if (WEBKIT_DOM_IS_ELEMENT (prev_element))
- prev_element = WEBKIT_DOM_ELEMENT (prev_element);
+ if (WEBKIT_DOM_IS_ELEMENT (child))
+ prev_element = WEBKIT_DOM_ELEMENT (child);
else
goto signature;

View File

@ -29,7 +29,7 @@
Name: evolution
Version: 3.19.90
Release: 1%{?dist}
Release: 2%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -46,6 +46,8 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
# RH bug #
#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch
Patch01: evolution-3.19.90-gnbug761883.patch
## Dependencies ###
Requires: gvfs
@ -208,6 +210,7 @@ the functionality of the installed %{name} package.
%prep
%setup -q -n evolution-%{version}
#%patch01 -p1 -b .doc-e-cell-renderer-color
%patch01 -p1 -b .gnbug761883
# Remove the welcome email from Novell
for inbox in mail/default/*/Inbox; do
@ -527,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/installed-tests
%changelog
* Thu Feb 18 2016 Milan Crha <mcrha@redhat.com> - 3.19.90-2
- Add patch for GNOME bug 761883 (Typo in the previous fix)
* Mon Feb 15 2016 Milan Crha <mcrha@redhat.com> - 3.19.90-1
- Update to 3.19.90