diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-18 22:44:20 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-20 16:30:49 +0200 |
| commit | 92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d (patch) | |
| tree | 73318eca1117cf4d9a2b432b04c263ad4e408443 | |
| parent | dev-qt: Drop Qt 5.11.0 (diff) | |
| download | qt-92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d.tar.gz qt-92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d.tar.bz2 qt-92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d.zip | |
dev-qt/qtwebengine: Try to fix libxml2 disable-xml-catalogs
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
Bug: https://bugs.gentoo.org/653078
Package-Manager: Portage-2.3.40, Repoman-2.3.9
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch | 46 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 4 |
2 files changed, 50 insertions, 0 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 new file mode 100644 index 00000000..8ac5b90b --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch @@ -0,0 +1,46 @@ +--- a/config.tests/xml2/xml2.cpp ++++ b/config.tests/xml2/xml2.cpp +@@ -27,9 +27,6 @@ + ****************************************************************************/ + + #include <libxml/xmlversion.h> +-#if defined(LIBXML_CATALOG_ENABLED) +-#error "libxml catalog enabled" +-#endif + #if !defined(LIBXML_ICU_ENABLED) + #error "libxml icu not enabled" + #endif +--- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp ++++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp +@@ -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> + #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 @@ + 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); diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild index b98972ea..150c23c4 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild @@ -79,6 +79,10 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " +PATCHES+=( + "${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078 +) + src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |