From 42bac94ca41d746fa049a39e108abf6ff66906b6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Aug 2016 17:53:26 +0200 Subject: [PATCH 01/17] Update to 3.21.90 --- .gitignore | 1 + evolution-3.21.90-ldflags.patch | 46 +++++++++++++++++++++++++++++++++ evolution.spec | 24 ++++++++++++++--- sources | 2 +- 4 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 evolution-3.21.90-ldflags.patch diff --git a/.gitignore b/.gitignore index 8cf6409..5e36a3a 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.2.tar.xz /evolution-3.21.3.tar.xz /evolution-3.21.4.tar.xz +/evolution-3.21.90.tar.xz diff --git a/evolution-3.21.90-ldflags.patch b/evolution-3.21.90-ldflags.patch new file mode 100644 index 0000000..6dee6ce --- /dev/null +++ b/evolution-3.21.90-ldflags.patch @@ -0,0 +1,46 @@ +diff --git a/modules/itip-formatter/web-extension/Makefile.am b/modules/itip-formatter/web-extension/Makefile.am +index a519744..87df8e6 100644 +--- a/modules/itip-formatter/web-extension/Makefile.am ++++ b/modules/itip-formatter/web-extension/Makefile.am +@@ -21,6 +21,6 @@ libmoduleitipformatterwebextension_la_LIBADD = \ + $(WEB_EXTENSIONS_LIBS) + + libmoduleitipformatterwebextension_la_LDFLAGS = \ +- -module -avoid-version -no-undefined ++ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) + + -include $(top_srcdir)/git.mk +diff --git a/modules/webkit-editor/web-extension/Makefile.am b/modules/webkit-editor/web-extension/Makefile.am +index f2a7b02..2d31253 100644 +--- a/modules/webkit-editor/web-extension/Makefile.am ++++ b/modules/webkit-editor/web-extension/Makefile.am +@@ -33,6 +33,6 @@ libewebkiteditorwebextension_la_LIBADD = \ + $(WEB_EXTENSIONS_LIBS) + + libewebkiteditorwebextension_la_LDFLAGS = \ +- -module -avoid-version -no-undefined ++ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) + + -include $(top_srcdir)/git.mk +diff --git a/web-extensions/Makefile.am b/web-extensions/Makefile.am +index 07854c2..d98f361 100644 +--- a/web-extensions/Makefile.am ++++ b/web-extensions/Makefile.am +@@ -16,6 +16,8 @@ libedomutils_la_LIBADD = \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) + ++libedomutils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) ++ + libewebextension_la_SOURCES = \ + e-web-extension.h \ + e-web-extension-names.h \ +@@ -38,7 +40,6 @@ libewebextension_la_LIBADD = \ + $(GNOME_PLATFORM_LIBS) \ + $(WEB_EXTENSIONS_LIBS) + +-libewebextension_la_LDFLAGS = \ +- -module -avoid-version -no-undefined ++libewebextension_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) + + -include $(top_srcdir)/git.mk diff --git a/evolution.spec b/evolution.spec index 0eed1b3..1d31b0d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -8,7 +8,7 @@ %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 %define libsoup_version 2.42 -%define webkit_version 2.2.0 +%define webkit2gtk_version 2.13.0 %define evo_base_version 3.22 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.21.4 +Version: 3.21.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -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.21.90-ldflags.patch + ## Dependencies ### Requires: gvfs @@ -94,7 +96,7 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(shared-mime-info) -BuildRequires: pkgconfig(webkitgtk-3.0) >= %{webkit_version} +BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 @@ -200,6 +202,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 .ldflags # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -294,6 +297,9 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; +# remove test GIO modules directory +rm -r $RPM_BUILD_ROOT/%{_libdir}/evolution/test-gio-modules + %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang @@ -402,7 +408,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/modules/module-startup-wizard.so %{_libdir}/evolution/modules/module-text-highlight.so %{_libdir}/evolution/modules/module-vcard-inline.so -%{_libdir}/evolution/modules/module-web-inspector.so +%{_libdir}/evolution/modules/module-webkit-editor.so +%{_libdir}/evolution/modules/module-webkit-inspector.so # Shared libraries: %{_libdir}/evolution/libevolution-mail-composer.so @@ -422,6 +429,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/libevolution-smime.so %{_libdir}/evolution/libgnomecanvas.so +# WebKit2 Extensions +%{_libdir}/evolution/web-extensions/libedomutils.so +%{_libdir}/evolution/web-extensions/libewebextension.so +%{_libdir}/evolution/web-extensions/libmoduleitipformatterwebextension.so +%{_libdir}/evolution/web-extensions/webkit-editor/libewebkiteditorwebextension.so + # Various libexec programs: %dir %{_libexecdir}/evolution %{_libexecdir}/evolution/evolution-alarm-notify @@ -515,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 15 2016 Milan Crha - 3.21.90-1 +- Update to 3.21.90 + * Mon Jul 18 2016 Milan Crha - 3.21.4-1 - Update to 3.21.4 - Remove the "perl" subpackage (code moved to the evolution-data-server) diff --git a/sources b/sources index d9a2e1f..feb2be8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d04dd8ab5a88c1b90e33dc1a3250b42 evolution-3.21.4.tar.xz +58cdef8655a79b05dcb132cc7a547849 evolution-3.21.90.tar.xz From 44168059b12de853a4f5a078fbad1edeb61fc925 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Aug 2016 15:53:53 +0200 Subject: [PATCH 02/17] Update to 3.21.91 --- .gitignore | 1 + evolution-3.21.90-ldflags.patch | 46 --------------------------------- evolution.spec | 8 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 evolution-3.21.90-ldflags.patch diff --git a/.gitignore b/.gitignore index 5e36a3a..5cfd0da 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.3.tar.xz /evolution-3.21.4.tar.xz /evolution-3.21.90.tar.xz +/evolution-3.21.91.tar.xz diff --git a/evolution-3.21.90-ldflags.patch b/evolution-3.21.90-ldflags.patch deleted file mode 100644 index 6dee6ce..0000000 --- a/evolution-3.21.90-ldflags.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/modules/itip-formatter/web-extension/Makefile.am b/modules/itip-formatter/web-extension/Makefile.am -index a519744..87df8e6 100644 ---- a/modules/itip-formatter/web-extension/Makefile.am -+++ b/modules/itip-formatter/web-extension/Makefile.am -@@ -21,6 +21,6 @@ libmoduleitipformatterwebextension_la_LIBADD = \ - $(WEB_EXTENSIONS_LIBS) - - libmoduleitipformatterwebextension_la_LDFLAGS = \ -- -module -avoid-version -no-undefined -+ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) - - -include $(top_srcdir)/git.mk -diff --git a/modules/webkit-editor/web-extension/Makefile.am b/modules/webkit-editor/web-extension/Makefile.am -index f2a7b02..2d31253 100644 ---- a/modules/webkit-editor/web-extension/Makefile.am -+++ b/modules/webkit-editor/web-extension/Makefile.am -@@ -33,6 +33,6 @@ libewebkiteditorwebextension_la_LIBADD = \ - $(WEB_EXTENSIONS_LIBS) - - libewebkiteditorwebextension_la_LDFLAGS = \ -- -module -avoid-version -no-undefined -+ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) - - -include $(top_srcdir)/git.mk -diff --git a/web-extensions/Makefile.am b/web-extensions/Makefile.am -index 07854c2..d98f361 100644 ---- a/web-extensions/Makefile.am -+++ b/web-extensions/Makefile.am -@@ -16,6 +16,8 @@ libedomutils_la_LIBADD = \ - $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) - -+libedomutils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) -+ - libewebextension_la_SOURCES = \ - e-web-extension.h \ - e-web-extension-names.h \ -@@ -38,7 +40,6 @@ libewebextension_la_LIBADD = \ - $(GNOME_PLATFORM_LIBS) \ - $(WEB_EXTENSIONS_LIBS) - --libewebextension_la_LDFLAGS = \ -- -module -avoid-version -no-undefined -+libewebextension_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) - - -include $(top_srcdir)/git.mk diff --git a/evolution.spec b/evolution.spec index 1d31b0d..671824e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.21.90 +Version: 3.21.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -46,8 +46,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch -Patch01: evolution-3.21.90-ldflags.patch - ## Dependencies ### Requires: gvfs @@ -202,7 +200,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color -%patch01 -p1 -b .ldflags # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -528,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 29 2016 Milan Crha - 3.21.91-1 +- Update to 3.21.91 + * Mon Aug 15 2016 Milan Crha - 3.21.90-1 - Update to 3.21.90 diff --git a/sources b/sources index feb2be8..31deac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58cdef8655a79b05dcb132cc7a547849 evolution-3.21.90.tar.xz +6a3472597314433111f672544537243c evolution-3.21.91.tar.xz From b002248052aedfaf24b5161994b6df218e89120f Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 1 Sep 2016 17:48:19 +0200 Subject: [PATCH 03/17] Adapt to WebKit Unstable DOM API changes --- evolution.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 671824e..4fbde1f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -8,7 +8,7 @@ %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 %define libsoup_version 2.42 -%define webkit2gtk_version 2.13.0 +%define webkit2gtk_version 2.13.90 %define evo_base_version 3.22 @@ -29,7 +29,7 @@ Name: evolution Version: 3.21.91 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -42,6 +42,7 @@ Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### +Patch01: webkit_dom_insert_adjacent_text.patch # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch @@ -199,6 +200,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} +%patch01 -p1 -b .webkit_dom_insert_adjacent_text #%patch01 -p1 -b .doc-e-cell-renderer-color # Remove the welcome email from Novell @@ -525,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Thu Sep 01 2016 Tomas Popela - 3.21.91-2 +- Adapt to WebKit Unstable DOM API changes + * Mon Aug 29 2016 Milan Crha - 3.21.91-1 - Update to 3.21.91 From 81ba31ee94d1515dffcf95beaea3ec59bb5534e0 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 1 Sep 2016 17:52:44 +0200 Subject: [PATCH 04/17] Commit the missing patch --- webkit_dom_insert_adjacent_text.patch | 180 ++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 webkit_dom_insert_adjacent_text.patch diff --git a/webkit_dom_insert_adjacent_text.patch b/webkit_dom_insert_adjacent_text.patch new file mode 100644 index 0000000..6900389 --- /dev/null +++ b/webkit_dom_insert_adjacent_text.patch @@ -0,0 +1,180 @@ +diff --git a/configure.ac b/configure.ac +index 7eccb7d..a1ba2c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -50,7 +50,7 @@ m4_define([gcr_minimum_version], [3.4]) + m4_define([enchant_minimum_version], [1.1.7]) + m4_define([gnome_desktop_minimum_version], [2.91.3]) + m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) +-m4_define([webkit2gtk_minimum_version], [2.13.0]) ++m4_define([webkit2gtk_minimum_version], [2.13.90]) + m4_define([libxml_minimum_version], [2.7.3]) + m4_define([shared_mime_info_minimum_version], [0.22]) + m4_define([libpst_minimum_version], [0.6.54]) +diff --git a/modules/webkit-editor/web-extension/e-composer-dom-functions.c b/modules/webkit-editor/web-extension/e-composer-dom-functions.c +index a54b180..221c0af 100644 +--- a/modules/webkit-editor/web-extension/e-composer-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-composer-dom-functions.c +@@ -25,7 +25,7 @@ + #define WEBKIT_DOM_USE_UNSTABLE_API + #include + #include +-#include ++#include + #undef WEBKIT_DOM_USE_UNSTABLE_API + + #include +@@ -370,8 +370,8 @@ e_composer_dom_insert_signature (EEditorPage *editor_page, + WEBKIT_DOM_NODE (insert_signature_in), node, NULL); + remove_node (WEBKIT_DOM_NODE (converted_signature)); + } else +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (insert_signature_in), ++ webkit_dom_element_insert_adjacent_html ( ++ insert_signature_in, + "beforeend", + signature_text, + NULL); +diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c +index b3ac1bf..d3699a2 100644 +--- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c +@@ -1087,7 +1087,7 @@ e_dialogs_dom_spell_check_run (EEditorPage *editor_page, + * reached only when we reach the beginning/end of the document */ + if (start && end) + webkit_dom_dom_selection_set_base_and_extent ( +- dom_selection, start, start_offset, end, end_offset, NULL); ++ dom_selection, start, start_offset, end, end_offset); + + g_clear_object (&dom_selection); + +diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index e778849..7d89495 100644 +--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #undef WEBKIT_DOM_USE_UNSTABLE_API + +@@ -1677,8 +1678,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, + new_href); + + if (appending_to_link) { +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (parent), + "beforeend", + text_to_append, + NULL); +@@ -1710,8 +1711,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, + new_href); + + if (appending_to_link) { +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (parent), + "beforeend", + text_to_append, + NULL); +@@ -2087,8 +2088,8 @@ emoticon_insert_span (EEmoticon *emoticon, + + if (!e_editor_page_get_unicode_smileys_enabled (editor_page)) { + /* ​ == UNICODE_ZERO_WIDTH_SPACE */ +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (span), "afterend", "​", NULL); ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (span), "afterend", "​", NULL); + } + + if (ev) { +@@ -2112,8 +2113,8 @@ emoticon_insert_span (EEmoticon *emoticon, + dom_create_selection_marker (document, FALSE)), + NULL); + } else +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); + ev->data.fragment = g_object_ref (fragment); + } + +@@ -3910,8 +3911,8 @@ e_editor_dom_body_key_up_event_process_return_key (EEditorPage *editor_page) + if (!webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker)) && + (!webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)) || + WEBKIT_DOM_IS_HTML_BR_ELEMENT (webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker))))) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_text ( ++ WEBKIT_DOM_ELEMENT (parent), + "afterbegin", + UNICODE_ZERO_WIDTH_SPACE, + NULL); +@@ -5494,14 +5495,14 @@ e_editor_dom_quote_and_insert_text_into_selection (EEditorPage *editor_page, + static void + mark_citation (WebKitDOMElement *citation) + { +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (citation), ++ webkit_dom_element_insert_adjacent_text ( ++ citation, + "beforebegin", + "##CITATION_START##", + NULL); + +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (citation), ++ webkit_dom_element_insert_adjacent_text ( ++ citation, + "afterend", + "##CITATION_END##", + NULL); +@@ -5537,8 +5538,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) + selection_marker = webkit_dom_element_query_selector ( + element, "#-x-evo-selection-start-marker", NULL); + if (selection_marker) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (selection_marker), ++ webkit_dom_element_insert_adjacent_text ( ++ selection_marker, + "afterend", + "##SELECTION_START##", + NULL); +@@ -5546,8 +5547,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) + selection_marker = webkit_dom_element_query_selector ( + element, "#-x-evo-selection-end-marker", NULL); + if (selection_marker) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (selection_marker), ++ webkit_dom_element_insert_adjacent_text ( ++ selection_marker, + "afterend", + "##SELECTION_END##", + NULL); +@@ -11090,8 +11091,8 @@ e_editor_dom_insert_base64_image (EEditorPage *editor_page, + webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (resizable_wrapper), TRUE, NULL), + NULL); + +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); + ev->data.fragment = g_object_ref (fragment); + + e_editor_dom_selection_get_coordinates (editor_page, +@@ -14617,8 +14618,8 @@ set_font_style (WebKitDOMDocument *document, + text_content = webkit_dom_node_get_text_content (first_child); + + if (g_strcmp0 (text_content, UNICODE_ZERO_WIDTH_SPACE) != 0) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_text ( ++ WEBKIT_DOM_ELEMENT (parent), + "afterend", + UNICODE_ZERO_WIDTH_SPACE, + NULL); From be4510a19f08e56152bd8ec7f0a4d73a2661eb4d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Sep 2016 14:44:40 +0200 Subject: [PATCH 05/17] Update to 3.21.92 --- .gitignore | 1 + evolution.spec | 10 +- sources | 2 +- webkit_dom_insert_adjacent_text.patch | 180 -------------------------- 4 files changed, 8 insertions(+), 185 deletions(-) delete mode 100644 webkit_dom_insert_adjacent_text.patch diff --git a/.gitignore b/.gitignore index 5cfd0da..cf94a27 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.4.tar.xz /evolution-3.21.90.tar.xz /evolution-3.21.91.tar.xz +/evolution-3.21.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 4fbde1f..1fcd27d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.21.91 -Release: 2%{?dist} +Version: 3.21.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -42,7 +42,6 @@ Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### -Patch01: webkit_dom_insert_adjacent_text.patch # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch @@ -200,7 +199,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -%patch01 -p1 -b .webkit_dom_insert_adjacent_text #%patch01 -p1 -b .doc-e-cell-renderer-color # Remove the welcome email from Novell @@ -527,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 12 2016 Milan Crha - 3.21.92-1 +- Update to 3.21.92 +- Remove patch for "Adapt to WebKit Unstable DOM API changes: (fixed upstream) + * Thu Sep 01 2016 Tomas Popela - 3.21.91-2 - Adapt to WebKit Unstable DOM API changes diff --git a/sources b/sources index 31deac6..9e15bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a3472597314433111f672544537243c evolution-3.21.91.tar.xz +0f301ca945f9be3d2827f76c02c5dcb6 evolution-3.21.92.tar.xz diff --git a/webkit_dom_insert_adjacent_text.patch b/webkit_dom_insert_adjacent_text.patch deleted file mode 100644 index 6900389..0000000 --- a/webkit_dom_insert_adjacent_text.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 7eccb7d..a1ba2c0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,7 +50,7 @@ m4_define([gcr_minimum_version], [3.4]) - m4_define([enchant_minimum_version], [1.1.7]) - m4_define([gnome_desktop_minimum_version], [2.91.3]) - m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) --m4_define([webkit2gtk_minimum_version], [2.13.0]) -+m4_define([webkit2gtk_minimum_version], [2.13.90]) - m4_define([libxml_minimum_version], [2.7.3]) - m4_define([shared_mime_info_minimum_version], [0.22]) - m4_define([libpst_minimum_version], [0.6.54]) -diff --git a/modules/webkit-editor/web-extension/e-composer-dom-functions.c b/modules/webkit-editor/web-extension/e-composer-dom-functions.c -index a54b180..221c0af 100644 ---- a/modules/webkit-editor/web-extension/e-composer-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-composer-dom-functions.c -@@ -25,7 +25,7 @@ - #define WEBKIT_DOM_USE_UNSTABLE_API - #include - #include --#include -+#include - #undef WEBKIT_DOM_USE_UNSTABLE_API - - #include -@@ -370,8 +370,8 @@ e_composer_dom_insert_signature (EEditorPage *editor_page, - WEBKIT_DOM_NODE (insert_signature_in), node, NULL); - remove_node (WEBKIT_DOM_NODE (converted_signature)); - } else -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (insert_signature_in), -+ webkit_dom_element_insert_adjacent_html ( -+ insert_signature_in, - "beforeend", - signature_text, - NULL); -diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c -index b3ac1bf..d3699a2 100644 ---- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c -@@ -1087,7 +1087,7 @@ e_dialogs_dom_spell_check_run (EEditorPage *editor_page, - * reached only when we reach the beginning/end of the document */ - if (start && end) - webkit_dom_dom_selection_set_base_and_extent ( -- dom_selection, start, start_offset, end, end_offset, NULL); -+ dom_selection, start, start_offset, end, end_offset); - - g_clear_object (&dom_selection); - -diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -index e778849..7d89495 100644 ---- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #undef WEBKIT_DOM_USE_UNSTABLE_API - -@@ -1677,8 +1678,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, - new_href); - - if (appending_to_link) { -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (parent), - "beforeend", - text_to_append, - NULL); -@@ -1710,8 +1711,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, - new_href); - - if (appending_to_link) { -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (parent), - "beforeend", - text_to_append, - NULL); -@@ -2087,8 +2088,8 @@ emoticon_insert_span (EEmoticon *emoticon, - - if (!e_editor_page_get_unicode_smileys_enabled (editor_page)) { - /* ​ == UNICODE_ZERO_WIDTH_SPACE */ -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (span), "afterend", "​", NULL); -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (span), "afterend", "​", NULL); - } - - if (ev) { -@@ -2112,8 +2113,8 @@ emoticon_insert_span (EEmoticon *emoticon, - dom_create_selection_marker (document, FALSE)), - NULL); - } else -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); - ev->data.fragment = g_object_ref (fragment); - } - -@@ -3910,8 +3911,8 @@ e_editor_dom_body_key_up_event_process_return_key (EEditorPage *editor_page) - if (!webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker)) && - (!webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)) || - WEBKIT_DOM_IS_HTML_BR_ELEMENT (webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker))))) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_text ( -+ WEBKIT_DOM_ELEMENT (parent), - "afterbegin", - UNICODE_ZERO_WIDTH_SPACE, - NULL); -@@ -5494,14 +5495,14 @@ e_editor_dom_quote_and_insert_text_into_selection (EEditorPage *editor_page, - static void - mark_citation (WebKitDOMElement *citation) - { -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (citation), -+ webkit_dom_element_insert_adjacent_text ( -+ citation, - "beforebegin", - "##CITATION_START##", - NULL); - -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (citation), -+ webkit_dom_element_insert_adjacent_text ( -+ citation, - "afterend", - "##CITATION_END##", - NULL); -@@ -5537,8 +5538,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) - selection_marker = webkit_dom_element_query_selector ( - element, "#-x-evo-selection-start-marker", NULL); - if (selection_marker) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (selection_marker), -+ webkit_dom_element_insert_adjacent_text ( -+ selection_marker, - "afterend", - "##SELECTION_START##", - NULL); -@@ -5546,8 +5547,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) - selection_marker = webkit_dom_element_query_selector ( - element, "#-x-evo-selection-end-marker", NULL); - if (selection_marker) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (selection_marker), -+ webkit_dom_element_insert_adjacent_text ( -+ selection_marker, - "afterend", - "##SELECTION_END##", - NULL); -@@ -11090,8 +11091,8 @@ e_editor_dom_insert_base64_image (EEditorPage *editor_page, - webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (resizable_wrapper), TRUE, NULL), - NULL); - -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); - ev->data.fragment = g_object_ref (fragment); - - e_editor_dom_selection_get_coordinates (editor_page, -@@ -14617,8 +14618,8 @@ set_font_style (WebKitDOMDocument *document, - text_content = webkit_dom_node_get_text_content (first_child); - - if (g_strcmp0 (text_content, UNICODE_ZERO_WIDTH_SPACE) != 0) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_text ( -+ WEBKIT_DOM_ELEMENT (parent), - "afterend", - UNICODE_ZERO_WIDTH_SPACE, - NULL); From 363260d8e0152327d8419094e5d4a9611a3fddcf Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Sep 2016 11:19:44 +0200 Subject: [PATCH 06/17] Update to 3.22.0; Add gnome-autoar dependency --- .gitignore | 1 + evolution.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cf94a27..fa88735 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.90.tar.xz /evolution-3.21.91.tar.xz /evolution-3.21.92.tar.xz +/evolution-3.22.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 1fcd27d..92cd149 100644 --- a/evolution.spec +++ b/evolution.spec @@ -2,6 +2,7 @@ %define glib2_version 2.46.0 %define gtk3_version 3.10.0 +%define gnome_autoar_version 0.1.1 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define intltool_version 0.35.5 @@ -28,14 +29,14 @@ ### Abstract ### Name: evolution -Version: 3.21.92 +Version: 3.22.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.21/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -77,6 +78,8 @@ BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version} +BuildRequires: pkgconfig(gnome-autoar-gtk-0) >= %{gnome_autoar_version} BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} @@ -239,7 +242,6 @@ autoconf %configure \ --disable-maintainer-mode \ - --disable-autoar \ --with-sub-version=" (%{version}-%{release})" \ %ldap_flags %ssl_flags %gtkdoc_flags \ --enable-plugins=all \ @@ -525,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 19 2016 Milan Crha - 3.22.0-1 +- Update to 3.22.0 +- Add gnome-autoar dependency + * Mon Sep 12 2016 Milan Crha - 3.21.92-1 - Update to 3.21.92 - Remove patch for "Adapt to WebKit Unstable DOM API changes: (fixed upstream) diff --git a/sources b/sources index 9e15bad..f8ec951 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f301ca945f9be3d2827f76c02c5dcb6 evolution-3.21.92.tar.xz +16e508bb90ab7ca9861e26195a866b73 evolution-3.22.0.tar.xz From 0470f9fc9aa07a346fbf1719699ad756bdcd4126 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 10 Oct 2016 11:44:33 +0200 Subject: [PATCH 07/17] Update to 3.22.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fa88735..816d8f4 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.91.tar.xz /evolution-3.21.92.tar.xz /evolution-3.22.0.tar.xz +/evolution-3.22.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 92cd149..43e731c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.22.0 +Version: 3.22.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 10 2016 Milan Crha - 3.22.1-1 +- Update to 3.22.1 + * Mon Sep 19 2016 Milan Crha - 3.22.0-1 - Update to 3.22.0 - Add gnome-autoar dependency diff --git a/sources b/sources index f8ec951..63ce26b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16e508bb90ab7ca9861e26195a866b73 evolution-3.22.0.tar.xz +828493ae3eefeb0594ef816fbab9c617 evolution-3.22.1.tar.xz From 36aa9c4580896bc699d4a1e135df7cd52e03711b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 13 Oct 2016 13:08:40 +0200 Subject: [PATCH 08/17] Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess) --- evolution-3.22.1-inline-images-reply.patch | 26 ++++++++++++++++++++++ evolution.spec | 7 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 evolution-3.22.1-inline-images-reply.patch diff --git a/evolution-3.22.1-inline-images-reply.patch b/evolution-3.22.1-inline-images-reply.patch new file mode 100644 index 0000000..c241487 --- /dev/null +++ b/evolution-3.22.1-inline-images-reply.patch @@ -0,0 +1,26 @@ +From d74c18bcc12f056d98cc1fcdb90f4372015ebf0e Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Thu, 13 Oct 2016 13:00:36 +0200 +Subject: [PATCH] Bug 772803 - Inline images cause busy loop on Reply in + WebKitWebProcess + +--- + src/modules/webkit-editor/web-extension/e-editor-dom-functions.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index c61d365..0e8da0d 100644 +--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -8419,7 +8419,7 @@ change_cid_images_src_to_base64 (EEditorPage *editor_page) + + list = webkit_dom_document_query_selector_all ( + document, selector, NULL); +- for (jj = webkit_dom_node_list_get_length (list) - 1; jj--;) { ++ for (jj = webkit_dom_node_list_get_length (list); jj--;) { + WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); + + set_base64_to_element_attribute ( +-- +2.7.4 + diff --git a/evolution.spec b/evolution.spec index 43e731c..7c87868 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.22.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,6 +46,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +Patch01: evolution-3.22.1-inline-images-reply.patch ## Dependencies ### @@ -203,6 +204,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 .inline-images-reply # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -527,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Thu Oct 13 2016 Milan Crha - 3.22.1-2 +- Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess) + * Mon Oct 10 2016 Milan Crha - 3.22.1-1 - Update to 3.22.1 From ae3d2f60e62f63c9598b0fc7496d50fbf2c28555 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Nov 2016 10:56:48 +0100 Subject: [PATCH 09/17] Update to 3.22.2 --- .gitignore | 1 + evolution-3.22.1-inline-images-reply.patch | 26 ---------------------- evolution.spec | 10 +++++---- sources | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 evolution-3.22.1-inline-images-reply.patch diff --git a/.gitignore b/.gitignore index 816d8f4..6a515de 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.92.tar.xz /evolution-3.22.0.tar.xz /evolution-3.22.1.tar.xz +/evolution-3.22.2.tar.xz diff --git a/evolution-3.22.1-inline-images-reply.patch b/evolution-3.22.1-inline-images-reply.patch deleted file mode 100644 index c241487..0000000 --- a/evolution-3.22.1-inline-images-reply.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d74c18bcc12f056d98cc1fcdb90f4372015ebf0e Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 13 Oct 2016 13:00:36 +0200 -Subject: [PATCH] Bug 772803 - Inline images cause busy loop on Reply in - WebKitWebProcess - ---- - src/modules/webkit-editor/web-extension/e-editor-dom-functions.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -index c61d365..0e8da0d 100644 ---- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -@@ -8419,7 +8419,7 @@ change_cid_images_src_to_base64 (EEditorPage *editor_page) - - list = webkit_dom_document_query_selector_all ( - document, selector, NULL); -- for (jj = webkit_dom_node_list_get_length (list) - 1; jj--;) { -+ for (jj = webkit_dom_node_list_get_length (list); jj--;) { - WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); - - set_base64_to_element_attribute ( --- -2.7.4 - diff --git a/evolution.spec b/evolution.spec index 7c87868..ac11c28 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,8 +29,8 @@ ### Abstract ### Name: evolution -Version: 3.22.1 -Release: 2%{?dist} +Version: 3.22.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,7 +46,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch -Patch01: evolution-3.22.1-inline-images-reply.patch ## Dependencies ### @@ -204,7 +203,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color -%patch01 -p1 -b .inline-images-reply # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -529,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Nov 07 2016 Milan Crha - 3.22.2-1 +- Update to 3.22.2 +- Remove patch for GNOME bug #772803 (fixed upstream) + * Thu Oct 13 2016 Milan Crha - 3.22.1-2 - Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess) diff --git a/sources b/sources index 63ce26b..411565f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -828493ae3eefeb0594ef816fbab9c617 evolution-3.22.1.tar.xz +f23d051f89c82f4b8edc1e328487cf21 evolution-3.22.2.tar.xz From 6176ee6bbe09873c2cb5b43fd270021fa119fa80 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Dec 2016 17:45:50 +0100 Subject: [PATCH 10/17] Update to 3.22.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a515de..f05d934 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.22.0.tar.xz /evolution-3.22.1.tar.xz /evolution-3.22.2.tar.xz +/evolution-3.22.3.tar.xz diff --git a/evolution.spec b/evolution.spec index ac11c28..3139c97 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.22.2 +Version: 3.22.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Dec 12 2016 Milan Crha - 3.22.3-1 +- Update to 3.22.3 + * Mon Nov 07 2016 Milan Crha - 3.22.2-1 - Update to 3.22.2 - Remove patch for GNOME bug #772803 (fixed upstream) diff --git a/sources b/sources index 411565f..8d224c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f23d051f89c82f4b8edc1e328487cf21 evolution-3.22.2.tar.xz +SHA512 (evolution-3.22.3.tar.xz) = 33d31d8c7dff30e026280fddc599085c1f9d0624e9c3ed95d9815787a48aebefc198b1bb2cb4bab75d283120c72275144ba4f158e8d82a6055c60dcd02b6addc From 8f2bbfe89b0e2b3071f097a6f142df8e21cd2bea Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 11 Jan 2017 19:54:27 -0600 Subject: [PATCH 11/17] Fix crash pasting into editor (rhbz#1406510) --- ...f-a-vCard-into-a-message-composer-bo.patch | 57 +++++++++++++++++++ evolution.spec | 7 ++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch diff --git a/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch b/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch new file mode 100644 index 0000000..44ae3f1 --- /dev/null +++ b/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch @@ -0,0 +1,57 @@ +From 960890f1babaed48216fc0e93871dc0fe9683a12 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Wed, 21 Dec 2016 11:36:22 +0100 +Subject: [PATCH] Crash on paste of a vCard into a message composer body + +This had been reported downstream as: +https://bugzilla.redhat.com/show_bug.cgi?id=1406510 + +Copying (right click Copy) a contact from the Contacts page and +the trying to Paste into the body of a new email message, causes +a crash in webkit_editor_paste_clipboard_targets_cb(). +--- + src/e-util/e-html-editor-actions.c | 3 +++ + src/modules/webkit-editor/e-webkit-editor.c | 5 ++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/e-util/e-html-editor-actions.c b/src/e-util/e-html-editor-actions.c +index f0649e6..9fb9b0f 100644 +--- a/src/e-util/e-html-editor-actions.c ++++ b/src/e-util/e-html-editor-actions.c +@@ -555,6 +555,9 @@ clipboard_text_received_for_paste_as_text (GtkClipboard *clipboard, + { + EContentEditor *cnt_editor; + ++ if (!text || !*text) ++ return; ++ + cnt_editor = e_html_editor_get_content_editor (editor); + e_content_editor_insert_content ( + cnt_editor, +diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c +index 4dbd878..43cc223 100644 +--- a/src/modules/webkit-editor/e-webkit-editor.c ++++ b/src/modules/webkit-editor/e-webkit-editor.c +@@ -5665,6 +5665,7 @@ webkit_editor_paste_clipboard_targets_cb (GtkClipboard *clipboard, + + webkit_editor_insert_image (E_CONTENT_EDITOR (wk_editor), uri); + ++ g_free (content); + g_free (uri); + + return; +@@ -5676,8 +5677,10 @@ webkit_editor_paste_clipboard_targets_cb (GtkClipboard *clipboard, + /* Prefer plain text over HTML when in the plain text mode, but only + * when pasting content from outside the editor view. */ + +- if (!content && !*content) ++ if (!content || !*content) { ++ g_free (content); + return; ++ } + + if (is_html) + webkit_editor_insert_content ( +-- +2.9.3 + diff --git a/evolution.spec b/evolution.spec index 3139c97..33c32bf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.22.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,6 +46,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +Patch0: 0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch ## Dependencies ### @@ -203,6 +204,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color +%patch0 -p1 -b .composer-crash # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -527,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Wed Jan 11 2017 Dan Williams - 3.22.3-2 +- Fix crash pasting into editor (rhbz#1406510) + * Mon Dec 12 2016 Milan Crha - 3.22.3-1 - Update to 3.22.3 From 3f1e11e2a343f001962ca28551d3b0fb3118b3da Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 11 Jan 2017 20:00:04 -0600 Subject: [PATCH 12/17] Fix patch paths for "Fix crash pasting into editor (rhbz#1406510)" --- ...h-on-paste-of-a-vCard-into-a-message-composer-bo.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch b/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch index 44ae3f1..2cd80e0 100644 --- a/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch +++ b/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch @@ -16,8 +16,8 @@ a crash in webkit_editor_paste_clipboard_targets_cb(). diff --git a/src/e-util/e-html-editor-actions.c b/src/e-util/e-html-editor-actions.c index f0649e6..9fb9b0f 100644 ---- a/src/e-util/e-html-editor-actions.c -+++ b/src/e-util/e-html-editor-actions.c +--- evolution-3.22.3/e-util/e-html-editor-actions.c ++++ evolution-3.22.3/e-util/e-html-editor-actions.c @@ -555,6 +555,9 @@ clipboard_text_received_for_paste_as_text (GtkClipboard *clipboard, { EContentEditor *cnt_editor; @@ -30,8 +30,8 @@ index f0649e6..9fb9b0f 100644 cnt_editor, diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c index 4dbd878..43cc223 100644 ---- a/src/modules/webkit-editor/e-webkit-editor.c -+++ b/src/modules/webkit-editor/e-webkit-editor.c +--- evolution-3.22.3/modules/webkit-editor/e-webkit-editor.c ++++ evolution-3.22.3/modules/webkit-editor/e-webkit-editor.c @@ -5665,6 +5665,7 @@ webkit_editor_paste_clipboard_targets_cb (GtkClipboard *clipboard, webkit_editor_insert_image (E_CONTENT_EDITOR (wk_editor), uri); From 0334c627c13e1454a93aac009a57f75105ab7170 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jan 2017 14:09:07 +0100 Subject: [PATCH 13/17] Update to 3.22.4 --- .gitignore | 1 + ...f-a-vCard-into-a-message-composer-bo.patch | 57 ------------------- evolution.spec | 9 +-- sources | 2 +- 4 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch diff --git a/.gitignore b/.gitignore index f05d934..4f1ebf3 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.22.1.tar.xz /evolution-3.22.2.tar.xz /evolution-3.22.3.tar.xz +/evolution-3.22.4.tar.xz diff --git a/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch b/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch deleted file mode 100644 index 2cd80e0..0000000 --- a/0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 960890f1babaed48216fc0e93871dc0fe9683a12 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Wed, 21 Dec 2016 11:36:22 +0100 -Subject: [PATCH] Crash on paste of a vCard into a message composer body - -This had been reported downstream as: -https://bugzilla.redhat.com/show_bug.cgi?id=1406510 - -Copying (right click Copy) a contact from the Contacts page and -the trying to Paste into the body of a new email message, causes -a crash in webkit_editor_paste_clipboard_targets_cb(). ---- - src/e-util/e-html-editor-actions.c | 3 +++ - src/modules/webkit-editor/e-webkit-editor.c | 5 ++++- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/e-util/e-html-editor-actions.c b/src/e-util/e-html-editor-actions.c -index f0649e6..9fb9b0f 100644 ---- evolution-3.22.3/e-util/e-html-editor-actions.c -+++ evolution-3.22.3/e-util/e-html-editor-actions.c -@@ -555,6 +555,9 @@ clipboard_text_received_for_paste_as_text (GtkClipboard *clipboard, - { - EContentEditor *cnt_editor; - -+ if (!text || !*text) -+ return; -+ - cnt_editor = e_html_editor_get_content_editor (editor); - e_content_editor_insert_content ( - cnt_editor, -diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c -index 4dbd878..43cc223 100644 ---- evolution-3.22.3/modules/webkit-editor/e-webkit-editor.c -+++ evolution-3.22.3/modules/webkit-editor/e-webkit-editor.c -@@ -5665,6 +5665,7 @@ webkit_editor_paste_clipboard_targets_cb (GtkClipboard *clipboard, - - webkit_editor_insert_image (E_CONTENT_EDITOR (wk_editor), uri); - -+ g_free (content); - g_free (uri); - - return; -@@ -5676,8 +5677,10 @@ webkit_editor_paste_clipboard_targets_cb (GtkClipboard *clipboard, - /* Prefer plain text over HTML when in the plain text mode, but only - * when pasting content from outside the editor view. */ - -- if (!content && !*content) -+ if (!content || !*content) { -+ g_free (content); - return; -+ } - - if (is_html) - webkit_editor_insert_content ( --- -2.9.3 - diff --git a/evolution.spec b/evolution.spec index 33c32bf..8adc904 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,8 +29,8 @@ ### Abstract ### Name: evolution -Version: 3.22.3 -Release: 2%{?dist} +Version: 3.22.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,7 +46,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch -Patch0: 0001-Crash-on-paste-of-a-vCard-into-a-message-composer-bo.patch ## Dependencies ### @@ -204,7 +203,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color -%patch0 -p1 -b .composer-crash # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -529,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jan 16 2017 Milan Crha - 3.22.4-1 +- Update to 3.22.4 + * Wed Jan 11 2017 Dan Williams - 3.22.3-2 - Fix crash pasting into editor (rhbz#1406510) diff --git a/sources b/sources index 8d224c5..237c32b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.22.3.tar.xz) = 33d31d8c7dff30e026280fddc599085c1f9d0624e9c3ed95d9815787a48aebefc198b1bb2cb4bab75d283120c72275144ba4f158e8d82a6055c60dcd02b6addc +SHA512 (evolution-3.22.4.tar.xz) = dd73a11d4d7903be6a99bf0d937f5a217a26f0dffb9dc0cea2ca81142d5783c42f889a8b913d565678e9f55b7f2f2a1d42f06c30e3cb004926c19f44dae3b70f From e01ff53a07049a149d493c68667062a879dba2a6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 17 Jan 2017 10:53:00 +0100 Subject: [PATCH 14/17] Add patch for RH bug #1413807 (Headers in forwarded message credits in opposite order) --- evolution-3.22.4-forward-credit-headers.patch | 85 +++++++++++++++++++ evolution.spec | 11 ++- 2 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 evolution-3.22.4-forward-credit-headers.patch diff --git a/evolution-3.22.4-forward-credit-headers.patch b/evolution-3.22.4-forward-credit-headers.patch new file mode 100644 index 0000000..d13cea3 --- /dev/null +++ b/evolution-3.22.4-forward-credit-headers.patch @@ -0,0 +1,85 @@ +From bc1b64c72dd9c355d61eef492026c216b93899ce Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 17 Jan 2017 10:45:40 +0100 +Subject: [PATCH] Bug 777373 - Headers in forwarded message credits in opposite + order + +--- + .../web-extension/e-editor-dom-functions.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index f625e96..a14b693 100644 +--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -1343,7 +1343,7 @@ move_elements_to_body (EEditorPage *editor_page) + WebKitDOMDocument *document; + WebKitDOMHTMLElement *body; + WebKitDOMNodeList *list = NULL; +- gint ii; ++ gint ii, jj; + + g_return_if_fail (E_IS_EDITOR_PAGE (editor_page)); + +@@ -1351,8 +1351,8 @@ move_elements_to_body (EEditorPage *editor_page) + body = webkit_dom_document_get_body (document); + list = webkit_dom_document_query_selector_all ( + document, "div[data-headers]", NULL); +- for (ii = webkit_dom_node_list_get_length (list); ii--;) { +- WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); ++ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { ++ WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); + + webkit_dom_element_remove_attribute ( + WEBKIT_DOM_ELEMENT (node), "data-headers"); +@@ -1368,10 +1368,10 @@ move_elements_to_body (EEditorPage *editor_page) + + list = webkit_dom_document_query_selector_all ( + document, "span.-x-evo-to-body[data-credits]", NULL); +- for (ii = webkit_dom_node_list_get_length (list); ii--;) { ++ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { + char *credits; + WebKitDOMElement *element; +- WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); ++ WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); + + element = e_editor_dom_get_paragraph_element (editor_page, -1, 0); + credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); +@@ -5735,7 +5735,7 @@ e_editor_dom_convert_content (EEditorPage *editor_page, + WebKitDOMDOMWindow *dom_window = NULL; + gboolean start_bottom, empty = FALSE, cite_body = FALSE; + gchar *inner_html; +- gint ii, length; ++ gint ii, jj, length; + GSettings *settings; + + g_return_if_fail (E_IS_EDITOR_PAGE (editor_page)); +@@ -5823,10 +5823,10 @@ e_editor_dom_convert_content (EEditorPage *editor_page, + /* Move credits to the body */ + list = webkit_dom_document_query_selector_all ( + document, "span.-x-evo-to-body[data-credits]", NULL); +- for (ii = webkit_dom_node_list_get_length (list); ii--;) { ++ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { + char *credits; + WebKitDOMElement *element; +- WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); ++ WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); + + element = e_editor_dom_get_paragraph_element (editor_page, -1, 0); + credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); +@@ -5847,10 +5847,10 @@ e_editor_dom_convert_content (EEditorPage *editor_page, + /* Move headers to body */ + list = webkit_dom_document_query_selector_all ( + document, "div[data-headers]", NULL); +- for (ii = webkit_dom_node_list_get_length (list); ii--;) { ++ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { + WebKitDOMNode *node; + +- node = webkit_dom_node_list_item (list, ii); ++ node = webkit_dom_node_list_item (list, jj); + webkit_dom_element_remove_attribute ( + WEBKIT_DOM_ELEMENT (node), "data-headers"); + e_editor_dom_set_paragraph_style (editor_page, WEBKIT_DOM_ELEMENT (node), -1, 0, NULL); +-- +2.9.3 + diff --git a/evolution.spec b/evolution.spec index 8adc904..cd42b4f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.22.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -44,8 +44,8 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### -# RH bug # -#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +# RH bug #1413807 +Patch01: evolution-3.22.4-forward-credit-headers.patch ## Dependencies ### @@ -202,7 +202,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 .forward-credit-headers # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Tue Jan 17 2017 Milan Crha - 3.22.4-2 +- Add patch for RH bug #1413807 (Headers in forwarded message credits in opposite order) + * Mon Jan 16 2017 Milan Crha - 3.22.4-1 - Update to 3.22.4 From e51525ec8627d2836250d96a31e5ad30070a9f09 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Feb 2017 14:09:17 +0100 Subject: [PATCH 15/17] Update to 3.22.5 --- .gitignore | 1 + evolution-3.22.4-forward-credit-headers.patch | 85 ------------------- evolution.spec | 12 +-- sources | 2 +- 4 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 evolution-3.22.4-forward-credit-headers.patch diff --git a/.gitignore b/.gitignore index 4f1ebf3..a6de7f4 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.22.2.tar.xz /evolution-3.22.3.tar.xz /evolution-3.22.4.tar.xz +/evolution-3.22.5.tar.xz diff --git a/evolution-3.22.4-forward-credit-headers.patch b/evolution-3.22.4-forward-credit-headers.patch deleted file mode 100644 index d13cea3..0000000 --- a/evolution-3.22.4-forward-credit-headers.patch +++ /dev/null @@ -1,85 +0,0 @@ -From bc1b64c72dd9c355d61eef492026c216b93899ce Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 17 Jan 2017 10:45:40 +0100 -Subject: [PATCH] Bug 777373 - Headers in forwarded message credits in opposite - order - ---- - .../web-extension/e-editor-dom-functions.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -index f625e96..a14b693 100644 ---- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -@@ -1343,7 +1343,7 @@ move_elements_to_body (EEditorPage *editor_page) - WebKitDOMDocument *document; - WebKitDOMHTMLElement *body; - WebKitDOMNodeList *list = NULL; -- gint ii; -+ gint ii, jj; - - g_return_if_fail (E_IS_EDITOR_PAGE (editor_page)); - -@@ -1351,8 +1351,8 @@ move_elements_to_body (EEditorPage *editor_page) - body = webkit_dom_document_get_body (document); - list = webkit_dom_document_query_selector_all ( - document, "div[data-headers]", NULL); -- for (ii = webkit_dom_node_list_get_length (list); ii--;) { -- WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); -+ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { -+ WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); - - webkit_dom_element_remove_attribute ( - WEBKIT_DOM_ELEMENT (node), "data-headers"); -@@ -1368,10 +1368,10 @@ move_elements_to_body (EEditorPage *editor_page) - - list = webkit_dom_document_query_selector_all ( - document, "span.-x-evo-to-body[data-credits]", NULL); -- for (ii = webkit_dom_node_list_get_length (list); ii--;) { -+ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { - char *credits; - WebKitDOMElement *element; -- WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); -+ WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); - - element = e_editor_dom_get_paragraph_element (editor_page, -1, 0); - credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); -@@ -5735,7 +5735,7 @@ e_editor_dom_convert_content (EEditorPage *editor_page, - WebKitDOMDOMWindow *dom_window = NULL; - gboolean start_bottom, empty = FALSE, cite_body = FALSE; - gchar *inner_html; -- gint ii, length; -+ gint ii, jj, length; - GSettings *settings; - - g_return_if_fail (E_IS_EDITOR_PAGE (editor_page)); -@@ -5823,10 +5823,10 @@ e_editor_dom_convert_content (EEditorPage *editor_page, - /* Move credits to the body */ - list = webkit_dom_document_query_selector_all ( - document, "span.-x-evo-to-body[data-credits]", NULL); -- for (ii = webkit_dom_node_list_get_length (list); ii--;) { -+ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { - char *credits; - WebKitDOMElement *element; -- WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); -+ WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); - - element = e_editor_dom_get_paragraph_element (editor_page, -1, 0); - credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); -@@ -5847,10 +5847,10 @@ e_editor_dom_convert_content (EEditorPage *editor_page, - /* Move headers to body */ - list = webkit_dom_document_query_selector_all ( - document, "div[data-headers]", NULL); -- for (ii = webkit_dom_node_list_get_length (list); ii--;) { -+ for (jj = 0, ii = webkit_dom_node_list_get_length (list); ii--; jj++) { - WebKitDOMNode *node; - -- node = webkit_dom_node_list_item (list, ii); -+ node = webkit_dom_node_list_item (list, jj); - webkit_dom_element_remove_attribute ( - WEBKIT_DOM_ELEMENT (node), "data-headers"); - e_editor_dom_set_paragraph_style (editor_page, WEBKIT_DOM_ELEMENT (node), -1, 0, NULL); --- -2.9.3 - diff --git a/evolution.spec b/evolution.spec index cd42b4f..65573be 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,8 +29,8 @@ ### Abstract ### Name: evolution -Version: 3.22.4 -Release: 2%{?dist} +Version: 3.22.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -44,9 +44,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### -# RH bug #1413807 -Patch01: evolution-3.22.4-forward-credit-headers.patch - ## Dependencies ### Requires: gvfs @@ -202,7 +199,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -%patch01 -p1 -b .forward-credit-headers # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -527,6 +523,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 13 2017 Milan Crha - 3.22.5-1 +- Update to 3.22.5 +- Remove patch for RH bug #1413807 (fixed upstream) + * Tue Jan 17 2017 Milan Crha - 3.22.4-2 - Add patch for RH bug #1413807 (Headers in forwarded message credits in opposite order) diff --git a/sources b/sources index 237c32b..2ff30e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.22.4.tar.xz) = dd73a11d4d7903be6a99bf0d937f5a217a26f0dffb9dc0cea2ca81142d5783c42f889a8b913d565678e9f55b7f2f2a1d42f06c30e3cb004926c19f44dae3b70f +SHA512 (evolution-3.22.5.tar.xz) = 62cd91ed0011572efa2fac180f033410899813406e61ea97c331a5875cce34f8078d70354006f0ed49ca7954f4c535ee790123825a3b1677a4f0287532e4dd59 From 575d8604f2382712ada6f726bba8ec8931e50f47 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Mar 2017 12:40:33 +0100 Subject: [PATCH 16/17] Update to 3.22.6 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a6de7f4..cfdb4d2 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.22.3.tar.xz /evolution-3.22.4.tar.xz /evolution-3.22.5.tar.xz +/evolution-3.22.6.tar.xz diff --git a/evolution.spec b/evolution.spec index 65573be..00b0af1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.22.5 +Version: 3.22.6 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -523,6 +523,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 13 2017 Milan Crha - 3.22.6-1 +- Update to 3.22.6 + * Mon Feb 13 2017 Milan Crha - 3.22.5-1 - Update to 3.22.5 - Remove patch for RH bug #1413807 (fixed upstream) diff --git a/sources b/sources index 2ff30e3..142969b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.22.5.tar.xz) = 62cd91ed0011572efa2fac180f033410899813406e61ea97c331a5875cce34f8078d70354006f0ed49ca7954f4c535ee790123825a3b1677a4f0287532e4dd59 +SHA512 (evolution-3.22.6.tar.xz) = c699adae640d05558b583b05eda5c5ad3de99aa1d1bbfa24af6110be41251f715ff4b16ff0efb96c8de7faa8c895d82460b504c2704974d4c9731f1bc3e7739f From d9f3f89887aa0bb08e5617f8ac99ecd907c8c125 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 24 Mar 2017 11:17:35 +0100 Subject: [PATCH 17/17] Fix font style changes in editor with webkitgtk4 >= 2.16 --- ...-font-color-on-caret-in-WebKitGTK-2..patch | 105 ++++++++++++++++++ evolution.spec | 8 +- 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 0001-Can-t-change-the-font-color-on-caret-in-WebKitGTK-2..patch diff --git a/0001-Can-t-change-the-font-color-on-caret-in-WebKitGTK-2..patch b/0001-Can-t-change-the-font-color-on-caret-in-WebKitGTK-2..patch new file mode 100644 index 0000000..d02af76 --- /dev/null +++ b/0001-Can-t-change-the-font-color-on-caret-in-WebKitGTK-2..patch @@ -0,0 +1,105 @@ +From 5210de41a7759780f290fae3bfb580a268f5401a Mon Sep 17 00:00:00 2001 +From: Tomas Popela +Date: Fri, 24 Mar 2017 10:50:25 +0100 +Subject: [PATCH] Can't change the font color on caret in WebKitGTK+ 2.16 + +Only process the input event if it was triggered by the key press and not +i.e. by exexCommand. This behavior changed when the support for beforeinput +event was introduced in WebKit. +--- + .../web-extension/e-editor-dom-functions.c | 10 +++++++++- + .../webkit-editor/web-extension/e-editor-page.c | 19 +++++++++++++++++++ + .../webkit-editor/web-extension/e-editor-page.h | 5 +++++ + 3 files changed, 33 insertions(+), 1 deletion(-) + +diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index f545c01..c1e01e0 100644 +--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -2832,6 +2832,8 @@ body_keypress_event_cb (WebKitDOMElement *element, + + g_return_if_fail (E_IS_EDITOR_PAGE (editor_page)); + ++ e_editor_page_set_is_processing_keypress_event (editor_page, TRUE); ++ + document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element)); + dom_window = webkit_dom_document_get_default_view (document); + dom_selection = webkit_dom_dom_window_get_selection (dom_window); +@@ -3581,7 +3583,13 @@ body_input_event_cb (WebKitDOMElement *element, + { + g_return_if_fail (E_IS_EDITOR_PAGE (editor_page)); + +- e_editor_dom_body_input_event_process (editor_page, event); ++ /* Only process the input event if it was triggered by the key press ++ * and not i.e. by exexCommand. This behavior changed when the support ++ * for beforeinput event was introduced in WebKit. */ ++ if (e_editor_page_is_processing_keypress_event (editor_page)) ++ e_editor_dom_body_input_event_process (editor_page, event); ++ ++ e_editor_page_set_is_processing_keypress_event (editor_page, FALSE); + } + + void +diff --git a/modules/webkit-editor/web-extension/e-editor-page.c b/modules/webkit-editor/web-extension/e-editor-page.c +index 9da8b8c..ddacdf1 100644 +--- a/modules/webkit-editor/web-extension/e-editor-page.c ++++ b/modules/webkit-editor/web-extension/e-editor-page.c +@@ -62,6 +62,7 @@ struct _EEditorPagePrivate { + gboolean pasting_content_from_itself; + gboolean renew_history_after_coordinates; + gboolean allow_top_signature; ++ gboolean processing_keypress_event; + + GHashTable *inline_images; + +@@ -244,6 +245,7 @@ e_editor_page_init (EEditorPage *editor_page) + editor_page->priv->block_format = E_CONTENT_EDITOR_BLOCK_FORMAT_PARAGRAPH; + editor_page->priv->force_image_load = FALSE; + editor_page->priv->html_mode = TRUE; ++ editor_page->priv->processing_keypress_event = FALSE; + editor_page->priv->return_key_pressed = FALSE; + editor_page->priv->space_key_pressed = FALSE; + editor_page->priv->smiley_written = FALSE; +@@ -557,6 +559,23 @@ e_editor_page_set_alignment (EEditorPage *editor_page, + } + + gboolean ++e_editor_page_is_processing_keypress_event (EEditorPage *editor_page) ++{ ++ g_return_val_if_fail (E_IS_EDITOR_PAGE (editor_page), FALSE); ++ ++ return editor_page->priv->processing_keypress_event; ++} ++ ++void ++e_editor_page_set_is_processing_keypress_event (EEditorPage *editor_page, ++ gboolean processing_keypress_event) ++{ ++ g_return_if_fail (E_IS_EDITOR_PAGE (editor_page)); ++ ++ editor_page->priv->processing_keypress_event = processing_keypress_event; ++} ++ ++gboolean + e_editor_page_get_return_key_pressed (EEditorPage *editor_page) + { + g_return_val_if_fail (E_IS_EDITOR_PAGE (editor_page), FALSE); +diff --git a/modules/webkit-editor/web-extension/e-editor-page.h b/modules/webkit-editor/web-extension/e-editor-page.h +index 201fb53..909e130 100644 +--- a/modules/webkit-editor/web-extension/e-editor-page.h ++++ b/modules/webkit-editor/web-extension/e-editor-page.h +@@ -112,6 +112,11 @@ void e_editor_page_set_alignment (EEditorPage *editor_page, + EContentEditorAlignment value); + gint e_editor_page_get_word_wrap_length + (EEditorPage *editor_page); ++gboolean e_editor_page_is_processing_keypress_event ++ (EEditorPage *editor_page); ++void e_editor_page_set_is_processing_keypress_event ++ (EEditorPage *editor_page, ++ gboolean processing_keypress_event); + gboolean e_editor_page_get_return_key_pressed + (EEditorPage *editor_page); + void e_editor_page_set_return_key_pressed +-- +2.9.3 + diff --git a/evolution.spec b/evolution.spec index 00b0af1..41ededd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.22.6 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -43,6 +43,7 @@ Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### +Patch0: 0001-Can-t-change-the-font-color-on-caret-in-WebKitGTK-2..patch ## Dependencies ### @@ -200,6 +201,8 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} +%patch0 -p1 -b .input_event_only_keypress + # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do echo -n "" > $inbox @@ -523,6 +526,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Fri Mar 24 2017 Tomas Popela - 3.22.6-2 +- Fix font style changes in editor with webkitgtk4 >= 2.16 + * Mon Mar 13 2017 Milan Crha - 3.22.6-1 - Update to 3.22.6