diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-13 10:39:29 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 14:28:04 +0100 |
commit | 33237bd32f13fbabb7be248a1d46323c89edf57c (patch) | |
tree | f7fc1ea3202a9544f85d157335fd7ce03e1bc80b /patches/chromium | |
parent | 324706a5fe9fbfd5aeaef54387dd4b08159a92a0 (diff) |
Update the 3rdparty submodule
Also add the matching patch files.
Change-Id: I7c9e2ace4070cb1bcbe43286e9d1ad207b389eb6
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/chromium')
-rw-r--r-- | patches/chromium/0016-Blacklist-the-skypebuttons-plugin.patch | 32 | ||||
-rw-r--r-- | patches/chromium/0017-Remove-the-Running-without-renderer-sandbox-error-me.patch | 26 |
2 files changed, 58 insertions, 0 deletions
diff --git a/patches/chromium/0016-Blacklist-the-skypebuttons-plugin.patch b/patches/chromium/0016-Blacklist-the-skypebuttons-plugin.patch new file mode 100644 index 000000000..7807eef0d --- /dev/null +++ b/patches/chromium/0016-Blacklist-the-skypebuttons-plugin.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +Date: Wed, 27 Nov 2013 13:31:28 +0100 +Subject: Blacklist the skypebuttons plugin + +Even though plugins are disabled it happens that the libraries are +loaded and cause a crash since skypebuttons pulls Qt4 with it on +Linux and creates a dynamic linking error conflicting with Qt5 +symbols. + +Add the plugin library name to the blacklist to avoid it being +loaded altogether. +We have a similar fix in QtWebKit doing the same thing. + +Change-Id: I6706d45d1f19252d3b60af7b97c0a3a729dfe8b7 +Reviewed-by: Andras Becsi <andras.becsi@digia.com> +--- + content/common/plugin_list_posix.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/content/common/plugin_list_posix.cc b/content/common/plugin_list_posix.cc +index 3e1353be..7c04485 100644 +--- a/content/common/plugin_list_posix.cc ++++ b/content/common/plugin_list_posix.cc +@@ -151,6 +151,7 @@ bool IsUndesirablePlugin(const WebPluginInfo& info) { + // http://code.google.com/p/chromium/issues/detail?id=38229 + bool IsBlacklistedPlugin(const base::FilePath& path) { + const char* kBlackListedPlugins[] = { ++ "skypebuttons.so", // Crash on dlopen since it uses Qt4 + "nppdf.so", // Adobe PDF + }; + std::string filename = path.BaseName().value(); diff --git a/patches/chromium/0017-Remove-the-Running-without-renderer-sandbox-error-me.patch b/patches/chromium/0017-Remove-the-Running-without-renderer-sandbox-error-me.patch new file mode 100644 index 000000000..810c64fe5 --- /dev/null +++ b/patches/chromium/0017-Remove-the-Running-without-renderer-sandbox-error-me.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +Date: Thu, 30 Jan 2014 18:09:32 +0100 +Subject: Remove the Running without renderer sandbox error message + +We are currently not planing to enable the sandbox and the error +pollutes the auto tests output. + +Change-Id: Idd2e7eeea8f890f55dd6b6d513a7a43890e7d5b4 +Reviewed-by: Andras Becsi <andras.becsi@digia.com> +--- + content/renderer/renderer_main.cc | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc +index 2d298a6..1c33cf3 100644 +--- a/content/renderer/renderer_main.cc ++++ b/content/renderer/renderer_main.cc +@@ -224,7 +224,6 @@ int RendererMain(const MainFunctionParams& parameters) { + if (!no_sandbox) { + run_loop = platform.EnableSandbox(); + } else { +- LOG(ERROR) << "Running without renderer sandbox"; + #ifndef NDEBUG + // For convenience, we print the stack trace for crashes. We can't get + // symbols when the sandbox is enabled, so only try when the sandbox is |