[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.8.3-1-15-g5af3b20

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=d826849

The following commit has been merged in the kde4.8 branch:
commit d82684987e5c28bf1914669d8b929fdf7372d753
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Jun 4 22:36:37 2012 +0200

    Drop 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, 0 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 930015e..f2c91e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,6 @@ kde4libs (4:4.8.4-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
 
-  [ Raúl Sánchez Siles ]
-  * Added: upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
-    Backport upstream commit 5feb2da93c4fcd18d3a38659abb9fb040704d123 to fix
-    KHTML infinite recursion.
-
   [ Modestas Vainius ]
   * Update symbol files.
 
diff --git a/debian/patches/series b/debian/patches/series
index 1ae291e..18d67be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,4 +22,3 @@ ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 python3-support-bytecode.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
deleted file mode 100644
index 8517aab..0000000
--- a/debian/patches/upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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