commit: 02166c221b4f60cafef3e1b3499de924ad583a25 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Fri Aug 24 22:54:00 2018 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Fri Aug 24 22:54:48 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=02166c22
dev-qt/qtwebengine: update libxml catalogs patches The Chromium part has been upstreamed, and is no longer needed in 5.11.2 nor in 5.12. Package-Manager: Portage-2.3.48, Repoman-2.3.10 ...webengine-5.11.1-libxml2-disable-catalogs.patch | 35 ---------------------- ...webengine-5.11.2-libxml2-disable-catalogs.patch | 12 ++++++++ ...webengine-5.12.0-libxml2-disable-catalogs.patch | 35 ---------------------- dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +- 6 files changed, 15 insertions(+), 73 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 deleted file mode 100644 index 7e0efcf3..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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" -@@ -646,6 +650,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/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch new file mode 100644 index 00000000..5fd14b0d --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch @@ -0,0 +1,12 @@ +--- 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 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 deleted file mode 100644 index 6093b145..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild index 32fb11c5..c3b6285f 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild @@ -79,7 +79,7 @@ DEPEND="${RDEPEND} " PATCHES+=( - "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078 + "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078 "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild index 91c3f9fb..7c793ad2 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild @@ -78,7 +78,7 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES+=( "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" ) # bug 653078 +PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078 src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 91c3f9fb..7c793ad2 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -78,7 +78,7 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES+=( "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" ) # bug 653078 +PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078 src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )