diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index f72d08f..647305b 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -38,7 +38,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.8.0 -Release: 10%{?dist} +Release: 11%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -108,6 +108,8 @@ Patch15: qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch # upstream fix for blank pages when a link opens in a new tab Patch100: qtwebengine-opensource-src-5.8.0-fix-open-in-new-tab.patch +# upstream fix for non-functional dead keys in text fields +Patch101: qtwebengine-opensource-src-5.8.0-fix-dead-keys.patch %if 0%{?fedora} && 0%{?fedora} < 25 # work around missing qt5_qtwebengine_arches macro on F24 @@ -356,6 +358,7 @@ BuildArch: noarch %patch15 -p1 -b .wtf-gcc7 %patch20 -p1 -b .qt57 %patch100 -p1 -b .fix-open-in-new-tab +%patch101 -p1 -b .fix-dead-keys # fix // in #include in content/renderer/gpu to avoid debugedit failure sed -i -e 's!gpu//!gpu/!g' \ src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc @@ -563,6 +566,9 @@ done %changelog +* Fri Apr 28 2017 Kevin Kofler - 5.8.0-11 +- Backport upstream fix for non-functional dead keys in text fields + * Tue Apr 25 2017 Kevin Kofler - 5.8.0-10 - Backport upstream fix for blank pages when a link opens in a new tab diff --git a/qtwebengine-opensource-src-5.8.0-fix-dead-keys.patch b/qtwebengine-opensource-src-5.8.0-fix-dead-keys.patch new file mode 100644 index 0000000..a0cf81c --- /dev/null +++ b/qtwebengine-opensource-src-5.8.0-fix-dead-keys.patch @@ -0,0 +1,40 @@ +From 31374ba98829e984c7600419c0e5fa71b96fc530 Mon Sep 17 00:00:00 2001 +From: Peter Varga +Date: Fri, 24 Mar 2017 14:31:02 +0100 +Subject: Forward input method events to RWHV in widget + +Task-number: QTBUG-58362 +Change-Id: Id4cf57c60da17538b224bb9bc91277c324c6a55d +Reviewed-by: Viktor Engelmann +Reviewed-by: Allan Sandfeld Jensen +--- + .../render_widget_host_view_qt_delegate_widget.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +index 14c4d72..fd58a07 100644 +--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp ++++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +@@ -84,10 +84,19 @@ protected: + { + m_client->forwardEvent(event); + } ++ void inputMethodEvent(QInputMethodEvent *event) override ++ { ++ m_client->forwardEvent(event); ++ } + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override + { + return m_client->updatePaintNode(oldNode); + } ++ ++ QVariant inputMethodQuery(Qt::InputMethodQuery query) const override ++ { ++ return m_client->inputMethodQuery(query); ++ } + private: + RenderWidgetHostViewQtDelegateClient *m_client; + }; +-- +cgit v1.0-4-g1e03 +