diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2018-06-21 05:47:51 +0200 |
---|---|---|
committer | Jimi Huotari <chiitoo@gentoo.org> | 2018-06-21 12:01:21 +0300 |
commit | 5969dd7c3f4c5cd099266aa57cbcd7e3d3c02b4d (patch) | |
tree | 09b356b4ff67b3466042e108e33c93bae97e66b7 /dev-qt/qtwebengine/files | |
parent | dev-qt/qtwebengine: Disable GPU when using nouveau (diff) | |
download | qt-5969dd7c3f4c5cd099266aa57cbcd7e3d3c02b4d.tar.gz qt-5969dd7c3f4c5cd099266aa57cbcd7e3d3c02b4d.tar.bz2 qt-5969dd7c3f4c5cd099266aa57cbcd7e3d3c02b4d.zip |
dev-qt/qtwebengine: Update libxml2-disable-catalogs.patch.
Update qtwebengine-5.11.1-libxml2-disable-catalogs.patch to version
accepted by Chromium upstream.
Bug: https://bugs.gentoo.org/653078
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch index 8ac5b90b..7e0efcf3 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch @@ -23,18 +23,7 @@ #include <libxslt/xslt.h> #include <memory> #include "core/css/StyleEngine.h" -@@ -538,10 +542,6 @@ - static bool ShouldAllowExternalLoad(const KURL& url) { - String url_string = url.GetString(); - -- // libxml should not be configured with catalogs enabled, so it -- // should not be asking to load default catalogs. -- CHECK(!IsLibxmlDefaultCatalogFile(url)); -- - // The most common DTD. There isn't much point in hammering www.w3c.org by - // requesting this URL for every XHTML document. - if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) -@@ -646,6 +646,9 @@ +@@ -646,6 +650,9 @@ if (did_init) return; |