diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-11-21 10:27:09 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-11-21 10:27:09 +0300 |
| commit | 9ccbb8b53bffc27420ad8b360c581668bb8837bd (patch) | |
| tree | b7d67963d3a25cb4d4854572a82d70c66af01fa1 /debian/patches/blacklist_libkpartsplugin.patch | |
| parent | 4d58bc068bed0c9c6a976c4641ec799dd91e153b (diff) | |
| parent | e03edf7c770d2531e731bcc69663d985c12185dd (diff) | |
| download | qt5webkit-9ccbb8b53bffc27420ad8b360c581668bb8837bd.tar.gz | |
Merge branch 'master' of https://anonscm.debian.org/git/pkg-kde/qt/qt5webkit
Diffstat (limited to 'debian/patches/blacklist_libkpartsplugin.patch')
| -rw-r--r-- | debian/patches/blacklist_libkpartsplugin.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/blacklist_libkpartsplugin.patch b/debian/patches/blacklist_libkpartsplugin.patch deleted file mode 100644 index 1508042..0000000 --- a/debian/patches/blacklist_libkpartsplugin.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a322d1b1ba39bb83a2ffd41c4dc0c00de5bd77e0 Mon Sep 17 00:00:00 2001 -From: Sune Vuorela <sune@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 - |