From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 499A2138334 for ; Wed, 20 Jun 2018 15:29:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBAEAE0A10; Wed, 20 Jun 2018 15:29:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3A6EE0A10 for ; Wed, 20 Jun 2018 15:29:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 121EB335CDF for ; Wed, 20 Jun 2018 15:29:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4AD92E2 for ; Wed, 20 Jun 2018 15:29:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1529505049.92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d X-VCS-Branch: master Date: Wed, 20 Jun 2018 15:29:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7e42ec88-81c6-4e8a-9b1f-d227f5634e4a X-Archives-Hash: 4696217c076d58953f5f3dd3640355f2 commit: 92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 18 20:44:20 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 20 14:30:49 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=92acfdf5 dev-qt/qtwebengine: Try to fix libxml2 disable-xml-catalogs Thanks-to: Arfrever Frehtes Taifersar Arahesis gmail.com> Bug: https://bugs.gentoo.org/653078 Package-Manager: Portage-2.3.40, Repoman-2.3.9 ...webengine-5.11.1-libxml2-disable-catalogs.patch | 46 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 4 ++ 2 files changed, 50 insertions(+) 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 +-#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 + #include ++#include ++#if defined(LIBXML_CATALOG_ENABLED) ++#include ++#endif + #include + #include + #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" )