[SCM] qt5webkit packaging branch, master, updated. debian/5.3.2+dfsg-2-3-ga4fd723

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=a4fd723

The following commit has been merged in the master branch:
commit a4fd723bb26dcb7e1a39bc5878c44b6487dbe85e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Oct 14 15:54:54 2014 -0300

    Backport blacklist_libkpartsplugin.patch.
---
 debian/changelog                               |  2 ++
 debian/patches/blacklist_libkpartsplugin.patch | 30 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d1607dc..6064fc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtwebkit-opensource-src (5.3.2+dfsg-3) UNRELEASED; urgency=medium
     - do_not_use_jit_on_big_endian_machines.patch
     - fix_cloop_on_big_endian_machines.patch
     - fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch
+  * Backport blacklist_libkpartsplugin.patch to prevent a crash due to a plugin
+    built against Qt4 (Closes: #744006).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 14 Oct 2014 15:47:33 -0300
 
diff --git a/debian/patches/blacklist_libkpartsplugin.patch b/debian/patches/blacklist_libkpartsplugin.patch
new file mode 100644
index 0000000..1508042
--- /dev/null
+++ b/debian/patches/blacklist_libkpartsplugin.patch
@@ -0,0 +1,30 @@
+From a322d1b1ba39bb83a2ffd41c4dc0c00de5bd77e0 Mon Sep 17 00:00:00 2001
+From: Sune Vuorela <sune at vuorela.dk>
+Date: Mon, 13 Oct 2014 20:39:26 +0200
+Subject: [PATCH] Blacklist libkpartsplugin
+
+KPartsPlugin is built using qt4, and loading that into a Qt5 QtWebkit
+makes stuff crash.
+
+Change-Id: I47d01dfe3b215192b012911013b352ea5b5b1530
+---
+ Source/WebCore/plugins/qt/PluginPackageQt.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+index 679480b..a674ad3 100644
+--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+@@ -146,7 +146,8 @@ bool PluginPackage::isPluginBlacklisted()
+ {
+     // TODO: enumerate all plugins that are incompatible with Qt5.
+     const QLatin1String pluginBlacklist[] = {
+-        QLatin1String("skypebuttons")
++        QLatin1String("skypebuttons"),
++        QLatin1String("libkpartsplugin")
+     };
+ 
+     QString baseName = QFileInfo(static_cast<QString>(m_path)).baseName();
+-- 
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 83c64e8..86c8cd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 do_not_use_jit_on_big_endian_machines.patch
 fix_cloop_on_big_endian_machines.patch
 fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch
+blacklist_libkpartsplugin.patch
 
 # debian patches
 reduce_memory_usage.patch

-- 
qt5webkit packaging