diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2018-06-21 20:48:05 +0200 |
|---|---|---|
| committer |   Jimi Huotari <chiitoo@gentoo.org> | 2018-07-25 22:13:59 +0300 |
| commit | 05eb9454e3e8d769bbb78cb93ede37204c0a0f0d (patch) | |
| tree | 7208192fe0f2ce5d8481c587bc2839601f992b6a | |
| parent | dev-qt/qtwebengine: remove upstreamed FFmpeg patch (diff) | |
| download | qt-05eb9454e3e8d769bbb78cb93ede37204c0a0f0d.tar.gz qt-05eb9454e3e8d769bbb78cb93ede37204c0a0f0d.tar.bz2 qt-05eb9454e3e8d769bbb78cb93ede37204c0a0f0d.zip | |
dev-qt/qtwebengine: Update libxml2-disable-catalogs.patch for 5.9999.
Bug: https://bugs.gentoo.org/653078
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch | 35 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 |
2 files changed, 36 insertions, 1 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch new file mode 100644 index 00000000..6093b145 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch @@ -0,0 +1,35 @@ +--- 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/blink/renderer/core/xml/parser/xml_document_parser.cc ++++ b/src/3rdparty/chromium/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> +@@ -646,6 +650,9 @@ static void InitializeLibXMLIfNecessary() { + 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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 94340299..2a7c9515 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -80,7 +80,7 @@ DEPEND="${RDEPEND} " PATCHES+=( - "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078 + "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078 "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 ) |