From cdc90255e838467f7a10b2dab30a365781b939f9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Sep 2016 14:44:40 +0200 Subject: [PATCH] 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);