[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#693166: unblock: kpart-webkit/1.3~git20120518.9a111005-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package kpart-webkit

This upload fixes a crash which we the maintainers consider an important bug
(we didn't filled the bug in the Debian BTS, though). The patch simply checks
that a parent object does not returns NULL.

I also added a missing epoch on Build-Depends: kdelibs.

diffstat:

 changelog            |   13 +++++++++++++
 control              |    2 +-
 patches/series       |    2 ++
 patches/webview.diff |   22 ++++++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

Thanks!

unblock kpart-webkit/1.3~git20120518.9a111005-3

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: mips
i386

Kernel: Linux 3.2.21+edid (SMP w/2 CPU cores)
Locale: LANG=es_AR.UTF-8, LC_CTYPE=es_AR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru webkitkde-1.3~git20120518.9a111005/debian/changelog webkitkde-1.3~git20120518.9a111005/debian/changelog
--- webkitkde-1.3~git20120518.9a111005/debian/changelog	2012-06-30 06:33:41.000000000 -0300
+++ webkitkde-1.3~git20120518.9a111005/debian/changelog	2012-11-13 18:04:18.000000000 -0300
@@ -1,3 +1,16 @@
+webkitkde (1.3~git20120518.9a111005-3) unstable; urgency=low
+
+  * Team upload.
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Bump Build-Depends on kdelibs to 4:4.8.3. Thanks Nobuhiro for noticing!
+    (Closes: #684436).
+
+  [ Adrien Grellier ]
+  * Backport fix 0821d519 to avoid a crash.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Tue, 13 Nov 2012 18:04:15 -0300
+
 webkitkde (1.3~git20120518.9a111005-2) unstable; urgency=low
 
   * fix dh: Unknown sequence build-stamp (Closes: #679472) 
diff -Nru webkitkde-1.3~git20120518.9a111005/debian/control webkitkde-1.3~git20120518.9a111005/debian/control
--- webkitkde-1.3~git20120518.9a111005/debian/control	2012-06-30 06:33:21.000000000 -0300
+++ webkitkde-1.3~git20120518.9a111005/debian/control	2012-08-09 21:45:37.000000000 -0300
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Adrien Grellier <adrien.grellier@laposte.net>,
  Raúl Sánchez Siles <rasasi78@gmail.com>,
-Build-Depends: cmake, debhelper (>= 9), kdelibs5-dev (>= 4:4.6), libqtwebkit-dev, pkg-kde-tools, dpkg-dev (>=1.16.1)
+Build-Depends: cmake, debhelper (>= 9), kdelibs5-dev (>= 4:4.8.3), libqtwebkit-dev, pkg-kde-tools, dpkg-dev (>=1.16.1)
 Standards-Version: 3.9.3
 Homepage: https://projects.kde.org/projects/extragear/base/kwebkitpart
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/webkitkde.git
diff -Nru webkitkde-1.3~git20120518.9a111005/debian/patches/series webkitkde-1.3~git20120518.9a111005/debian/patches/series
--- webkitkde-1.3~git20120518.9a111005/debian/patches/series	1969-12-31 21:00:00.000000000 -0300
+++ webkitkde-1.3~git20120518.9a111005/debian/patches/series	2012-11-07 09:54:28.000000000 -0300
@@ -0,0 +1,2 @@
+
+webview.diff
diff -Nru webkitkde-1.3~git20120518.9a111005/debian/patches/webview.diff webkitkde-1.3~git20120518.9a111005/debian/patches/webview.diff
--- webkitkde-1.3~git20120518.9a111005/debian/patches/webview.diff	1969-12-31 21:00:00.000000000 -0300
+++ webkitkde-1.3~git20120518.9a111005/debian/patches/webview.diff	2012-11-07 09:54:28.000000000 -0300
@@ -0,0 +1,22 @@
+commit 0821d5191045306cecc0834929853c86ca085e03
+Author: Dawit Alemayehu <adawit@kde.org>
+Date:   Thu Sep 6 15:00:06 2012 -0400
+
+    Do not crash when QWebHitTestResult::frame() returns NULL.
+    
+    BUG: 306102
+    FIXED-IN: 1.3
+
+diff --git a/src/webview.cpp b/src/webview.cpp
+index e0d2407..b6ba0e8 100644
+--- a/src/webview.cpp
++++ b/src/webview.cpp
+@@ -547,7 +547,7 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part
+                 partActions.append(action);
+             }
+         }
+-    } else if (m_result.frame()->parentFrame() && !m_result.isContentSelected() && m_result.linkUrl().isEmpty()) {
++    } else if (m_result.frame() && m_result.frame()->parentFrame() && !m_result.isContentSelected() && m_result.linkUrl().isEmpty()) {
+         KActionMenu * menu = new KActionMenu(i18nc("@title:menu HTML frame/iframe", "Frame"), this);
+ 
+         KAction* action = new KAction(KIcon("window-new"), i18n("Open in New &Window"), this);

Reply to: