diff --git a/.gitignore b/.gitignore index 8cf6409..cfdb4d2 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,13 @@ 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 +/evolution-3.21.91.tar.xz +/evolution-3.21.92.tar.xz +/evolution-3.22.0.tar.xz +/evolution-3.22.1.tar.xz +/evolution-3.22.2.tar.xz +/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/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 0eed1b3..41ededd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -2,13 +2,14 @@ %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 %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.90 %define evo_base_version 3.22 @@ -28,23 +29,21 @@ ### Abstract ### Name: evolution -Version: 3.21.4 -Release: 1%{?dist} +Version: 3.22.6 +Release: 2%{?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} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### - -# RH bug # -#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +Patch0: 0001-Can-t-change-the-font-color-on-caret-in-WebKitGTK-2..patch ## Dependencies ### @@ -77,6 +76,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} @@ -94,7 +95,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 @@ -199,7 +200,8 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -#%patch01 -p1 -b .doc-e-cell-renderer-color + +%patch0 -p1 -b .input_event_only_keypress # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -239,7 +241,6 @@ autoconf %configure \ --disable-maintainer-mode \ - --disable-autoar \ --with-sub-version=" (%{version}-%{release})" \ %ldap_flags %ssl_flags %gtkdoc_flags \ --enable-plugins=all \ @@ -294,6 +295,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 +406,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 +427,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 +526,55 @@ 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 + +* 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) + +* 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) + +* 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) + +* 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 + +* 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) + +* 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 + +* 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..142969b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d04dd8ab5a88c1b90e33dc1a3250b42 evolution-3.21.4.tar.xz +SHA512 (evolution-3.22.6.tar.xz) = c699adae640d05558b583b05eda5c5ad3de99aa1d1bbfa24af6110be41251f715ff4b16ff0efb96c8de7faa8c895d82460b504c2704974d4c9731f1bc3e7739f