mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
www-client/chromium: disable xml catalogs
Bug: https://bugs.gentoo.org/653078 Package-Manager: Portage-2.3.40_p14, Repoman-2.3.9_p246
This commit is contained in:
@@ -138,6 +138,7 @@ PATCHES=(
|
||||
"${FILESDIR}/chromium-stdint.patch"
|
||||
"${FILESDIR}/chromium-ffmpeg-r1.patch"
|
||||
"${FILESDIR}/chromium-libwebp-shim-r0.patch"
|
||||
"${FILESDIR}/chromium-disable_xml_catalogs.patch"
|
||||
)
|
||||
|
||||
pre_build_checks() {
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
--- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
|
||||
+++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
|
||||
@@ -28,6 +28,10 @@
|
||||
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/parserInternals.h>
|
||||
+#include <libxml/xmlversion.h>
|
||||
+#if defined(LIBXML_CATALOG_ENABLED)
|
||||
+#include <libxml/catalog.h>
|
||||
+#endif
|
||||
#include <libxslt/xslt.h>
|
||||
|
||||
#include <memory>
|
||||
@@ -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"))
|
||||
@@ -648,6 +648,9 @@
|
||||
if (did_init)
|
||||
return;
|
||||
|
||||
+#if defined(LIBXML_CATALOG_ENABLED)
|
||||
+ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
|
||||
+#endif
|
||||
xmlInitParser();
|
||||
xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
|
||||
xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
|
||||
Reference in New Issue
Block a user