[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.8.3-1-3-g06bf5a8
Raúl Sánchez Siles
kebianizao-guest at alioth.debian.org
Thu May 31 14:22:35 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=06bf5a8
The following commit has been merged in the kde4.8 branch:
commit 06bf5a8610430647b311ed90c30956c490b2f973
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date: Thu May 31 14:28:09 2012 +0200
Fix event handling recursion in khtml. This affected text web editors and gmail.
Added patch upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
---
debian/changelog | 5 +++
debian/patches/series | 1 +
...e_recursion_khtml_renderwigdet_handleevent.diff | 32 ++++++++++++++++++++
3 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4a7dc9e..2729bb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ kde4libs (4:4.8.3-2) UNRELEASED; urgency=low
* Backport upstream commit 4f35dfae765a29819dc0bf7ac0dfdba21239f3ca to fix
Twitter in KHTML.
+ [ Raúl Sánchez Siles ]
+ * Added: upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
+ Backport upstream commit 5feb2da93c4fcd18d3a38659abb9fb040704d123 to fix
+ KHTML infinite recursion.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 27 May 2012 12:10:37 +0200
kde4libs (4:4.8.3-1) experimental; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 445ce85..0f2f3ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ ktar_longlink_length_in_bytes.diff
glibc_filesystem.diff
python3-support-bytecode.patch
upstream_Increase-max-global-stack-size-back-to-1000.patch
+upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
diff --git a/debian/patches/upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff b/debian/patches/upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
new file mode 100644
index 0000000..8517aab
--- /dev/null
+++ b/debian/patches/upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
@@ -0,0 +1,32 @@
+commit 5feb2da93c4fcd18d3a38659abb9fb040704d123
+Author: Andrea Iacovitti <aiacovitti at libero.it>
+Date: Mon May 28 07:18:20 2012 +0200
+
+ Do not duplicate mouse move events
+ (patch by Allan Sandfeld)
+
+ BUG: 243910
+ FIXED-IN: 4.8.4
+
+diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
+index 5f2a2f9..984ec9e 100644
+--- a/khtml/rendering/render_replaced.cpp
++++ b/khtml/rendering/render_replaced.cpp
+@@ -1062,7 +1062,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
+ }
+ m_underMouse = target;
+ }
+-
++#if 0
+ if (target && ev.id() == EventImpl::MOUSEMOVE_EVENT) {
+ // ### is this one still necessary? it doubles every mouse event...
+ // I'd reckon it's no longer needed since Harri made the event propagation bubble
+@@ -1070,7 +1070,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
+ QApplication::mouseButtons(), QApplication::keyboardModifiers());
+ QApplication::sendEvent(target, &evt);
+ }
+-
++#endif
+ if (ev.id() == EventImpl::MOUSEDOWN_EVENT) {
+ if (!target || (!::qobject_cast<QScrollBar*>(target) &&
+ !::qobject_cast<KUrlRequester*>(m_widget) &&
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list