[arch-commits] Commit in chromium/trunk (3 files)

[Evangelos Foutras]

    Date: Thursday, June 21, 2018 @ 06:29:13
  Author: foutrelis
Revision: 327396

Update patch that disables XML catalogs

Added:
  chromium/trunk/blink-disable-XML-catalogs-at-runtime.patch
Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/chromium-disable_xml_catalogs.patch

---------------------------------------------+
 PKGBUILD                                    |    8 ++--
 blink-disable-XML-catalogs-at-runtime.patch |   47 ++++++++++++++++++++++++++
 chromium-disable_xml_catalogs.patch         |   34 ------------------
 3 files changed, 52 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-21 06:26:45 UTC (rev 327395)
+++ PKGBUILD	2018-06-21 06:29:13 UTC (rev 327396)
@@ -26,17 +26,17 @@
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
         remove-dependency-on-ffmpeg-internals-for-start-time.patch
         x11-fix-mixup-between-DIP-pixel-coordinates.patch
+        blink-disable-XML-catalogs-at-runtime.patch
         chromium-ffmpeg-r1.patch
         chromium-widevine-r2.patch
-        chromium-disable_xml_catalogs.patch
         chromium-skia-harmony.patch)
 sha256sums=('5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             '2cc80f5ed8a9b42495a0f3ab3c1bae026b9081972269a1b6d407331d33f7d257'
             'e2c2754536243a60fa70541bbd4121715eccd83caa8f1fb1873bd994cd81f871'
+            '98a5c41cf9687c52ee380d2b683c95387334c76254479c347bdb733646dab815'
             'aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde'
             '02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15'
-            'f9d191e89ed9b2b2641bbbb370ea0a11868409a13cad181f7b63f6007de002a1'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -87,6 +87,9 @@
   # https://crbug.com/707721
   patch -Np1 -i ../x11-fix-mixup-between-DIP-pixel-coordinates.patch
 
+  # https://crbug.com/736026
+  patch -Np1 -i ../blink-disable-XML-catalogs-at-runtime.patch
+
   # https://crbug.com/skia/6663#c10
   patch -Np4 -i ../chromium-skia-harmony.patch
 
@@ -93,7 +96,6 @@
   # Fixes from Gentoo
   patch -Np1 -i ../chromium-ffmpeg-r1.patch
   patch -Np1 -i ../chromium-widevine-r2.patch
-  patch -Np1 -i ../chromium-disable_xml_catalogs.patch
 
   # Remove compiler flags not supported by our system clang
   sed -i \

Added: blink-disable-XML-catalogs-at-runtime.patch
===================================================================
--- blink-disable-XML-catalogs-at-runtime.patch	                        (rev 0)
+++ blink-disable-XML-catalogs-at-runtime.patch	2018-06-21 06:29:13 UTC (rev 327396)
@@ -0,0 +1,47 @@
+From 8f0c8c8d9bce12c70ce9acb4a7474cd15c9be65b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster at gmail.com>
+Date: Wed, 20 Jun 2018 20:37:46 +0000
+Subject: [PATCH] blink: disable XML catalogs at runtime
+
+Chromium may optionally be built against libxml installed on the system.
+The system libxml commonly has XML catalog support enabled. Disable it
+by calling xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE).
+
+Bug: https://bugs.gentoo.org/653078
+Change-Id: I069f6dcecf81168f9d31eb0efe2519197ec8e779
+Reviewed-on: https://chromium-review.googlesource.com/1103710
+Reviewed-by: Daniel Cheng <dcheng at chromium.org>
+Commit-Queue: Scott Graham <scottmg at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#568998}
+---
+ .../blink/renderer/core/xml/parser/xml_document_parser.cc  | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
+index 9744de383d9a..d0539f61e4b5 100644
+--- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
++++ b/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>
+@@ -648,6 +652,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);
+-- 
+2.17.1
+

Deleted: chromium-disable_xml_catalogs.patch
===================================================================
--- chromium-disable_xml_catalogs.patch	2018-06-21 06:26:45 UTC (rev 327395)
+++ chromium-disable_xml_catalogs.patch	2018-06-21 06:29:13 UTC (rev 327396)
@@ -1,34 +0,0 @@
---- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-+++ b/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>
-@@ -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 @@
-   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);