From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1038814-garchives=archives.gentoo.org@lists.gentoo.org>
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 B3DB5138334
for <garchives@archives.gentoo.org>; Wed, 25 Jul 2018 19:22:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0BAD8E07D9;
Wed, 25 Jul 2018 19:22:23 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 B7C5BE07D9
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Jul 2018 19:22:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 A36C4335CC0
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Jul 2018 19:22:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 15D44365
for <gentoo-commits@lists.gentoo.org>; Wed, 25 Jul 2018 19:22:18 +0000 (UTC)
From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" <chiitoo@gentoo.org>
Message-ID: <1532546039.05eb9454e3e8d769bbb78cb93ede37204c0a0f0d.chiitoo@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.12.0-libxml2-disable-catalogs.patch dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/
X-VCS-Committer: chiitoo
X-VCS-Committer-Name: Jimi Huotari
X-VCS-Revision: 05eb9454e3e8d769bbb78cb93ede37204c0a0f0d
X-VCS-Branch: master
Date: Wed, 25 Jul 2018 19:22:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ac6aff99-2c1e-4bd9-a744-1dcfe0db8d3a
X-Archives-Hash: a3e0484123a5e67bdff8b26f72334686
commit: 05eb9454e3e8d769bbb78cb93ede37204c0a0f0d
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 21 18:48:05 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 19:13:59 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=05eb9454
dev-qt/qtwebengine: Update libxml2-disable-catalogs.patch for 5.9999.
Bug: https://bugs.gentoo.org/653078
...webengine-5.12.0-libxml2-disable-catalogs.patch | 35 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
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
)