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 24389138334 for ; Wed, 20 Jun 2018 21:46:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07E7AE0955; Wed, 20 Jun 2018 21:46:45 +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 C8F9CE0955 for ; Wed, 20 Jun 2018 21:46:44 +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 43B05335C8A for ; Wed, 20 Jun 2018 21:46:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D45792AD for ; Wed, 20 Jun 2018 21:46:41 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1529531195.007b95a88ae9fb283ac8855e885f619671718f0e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/files/chromium-disable_xml_catalogs.patch X-VCS-Directories: www-client/chromium/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 007b95a88ae9fb283ac8855e885f619671718f0e X-VCS-Branch: master Date: Wed, 20 Jun 2018 21:46:41 +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: 2bae276a-9532-4df6-869c-a64d4e8578f4 X-Archives-Hash: 85a1549e0cf25ccbe029001f579ae3d2 commit: 007b95a88ae9fb283ac8855e885f619671718f0e Author: Mike Gilbert gentoo org> AuthorDate: Wed Jun 20 15:33:19 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Jun 20 21:46:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007b95a8 www-client/chromium: update patch .../chromium/files/chromium-disable_xml_catalogs.patch | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/www-client/chromium/files/chromium-disable_xml_catalogs.patch b/www-client/chromium/files/chromium-disable_xml_catalogs.patch index 7aff36c782a..9f57ed2261c 100644 --- a/www-client/chromium/files/chromium-disable_xml_catalogs.patch +++ b/www-client/chromium/files/chromium-disable_xml_catalogs.patch @@ -11,18 +11,7 @@ #include #include -@@ -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")) -@@ -648,6 +648,9 @@ +@@ -648,6 +652,9 @@ static void InitializeLibXMLIfNecessary() { if (did_init) return;