Update to 67.0.3396.99

3 files changed, 61 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c03ceedbfa40..b3de84ad2730 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-vaapi
 	pkgdesc = Chromium compiled with VA-API support for Intel Graphics
-	pkgver = 67.0.3396.87
+	pkgver = 67.0.3396.99
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	install = chromium.install
@@ -38,6 +38,7 @@ pkgbase = chromium-vaapi
 	depends = icu
 	depends = opus
 	depends = minizip
+	depends = libxml2
 	depends = harfbuzz
 	depends = libxslt
 	depends = freetype2
@@ -52,18 +53,20 @@ pkgbase = chromium-vaapi
 	optdepends = libva-intel-driver: Needed to support VA-API for Intel graphics cards
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-67.0.3396.87.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-67.0.3396.99.tar.xz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
 	source = remove-dependency-on-ffmpeg-internals-for-start-time.patch
 	source = x11-fix-mixup-between-DIP-pixel-coordinates.patch
+	source = blink-disable-XML-catalogs-at-runtime.patch
 	source = chromium-ffmpeg-r1.patch
 	source = chromium-widevine-r2.patch
 	source = chromium-skia-harmony.patch
 	source = chromium-vaapi-r18.patch
-	sha256sums = 5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d
+	sha256sums = 452d6b9d8df6c88600aaeff3fad4c065574fd6dbee804e628b70e73a39c0a02a
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = 2cc80f5ed8a9b42495a0f3ab3c1bae026b9081972269a1b6d407331d33f7d257
 	sha256sums = e2c2754536243a60fa70541bbd4121715eccd83caa8f1fb1873bd994cd81f871
+	sha256sums = 98a5c41cf9687c52ee380d2b683c95387334c76254479c347bdb733646dab815
 	sha256sums = aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde
 	sha256sums = 02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15
 	sha256sums = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3
diff --git a/PKGBUILD b/PKGBUILD
index 7c6cfa57594b..ec49c363406a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=chromium-vaapi
-pkgver=67.0.3396.87
+pkgver=67.0.3396.99
 pkgrel=1
 _launcher_ver=6
 pkgdesc="Chromium compiled with VA-API support for Intel Graphics"
@@ -34,14 +34,16 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         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-skia-harmony.patch
         chromium-vaapi-r18.patch)
-sha256sums=('5d27a72f0cb8247343034f63fdd9747ff388c05b9fceb541668dd04fb372db1d'
+sha256sums=('452d6b9d8df6c88600aaeff3fad4c065574fd6dbee804e628b70e73a39c0a02a'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             '2cc80f5ed8a9b42495a0f3ab3c1bae026b9081972269a1b6d407331d33f7d257'
             'e2c2754536243a60fa70541bbd4121715eccd83caa8f1fb1873bd994cd81f871'
+            '98a5c41cf9687c52ee380d2b683c95387334c76254479c347bdb733646dab815'
             'aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde'
             '02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
@@ -61,7 +63,7 @@ declare -gA _system_libs=(
   #[libpng]=libpng            # https://crbug.com/752403#c10
   #[libvpx]=libvpx            # needs unreleased libvpx
   [libwebp]=libwebp
-  #[libxml]=libxml2           # https://crbug.com/736026
+  [libxml]=libxml2
   [libxslt]=libxslt
   [opus]=opus
   [re2]=re2
@@ -95,6 +97,9 @@ prepare() {
   # 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
 
diff --git a/blink-disable-XML-catalogs-at-runtime.patch b/blink-disable-XML-catalogs-at-runtime.patch
new file mode 100644
index 000000000000..ec2361e2603a
--- /dev/null
+++ b/blink-disable-XML-catalogs-at-runtime.patch
@@ -0,0 +1,47 @@
+From 8f0c8c8d9bce12c70ce9acb4a7474cd15c9be65b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@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@chromium.org>
+Commit-Queue: Scott Graham <scottmg@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
+