Update to 63.0.3213.3

1 files changed, 19 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7f9e006bc105..d21e4f273e86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ _debug_mode=0    # Build in debug mode.
 ## -- Package and components information -- ##
 ##############################################
 pkgname=chromium-dev
-pkgver=62.0.3198.0
+pkgver=63.0.3213.3
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
 arch=('i686' 'x86_64')
@@ -34,6 +34,7 @@ depends=(
          'snappy'
          'xdg-utils'
          'libcups'
+         'libxml2'
          'harfbuzz-icu'
 #          'protobuf'
 #          'libevent'
@@ -75,11 +76,10 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv
         'chromium-dev.svg'
         # Patch form Gentoo
         'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch'
-        'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gn-bootstrap-r17.patch'
         'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gcc5-r2.patch'
         # Misc Patches
         'minizip.patch'
-        'chromium-intel-vaapi_r2.patch' # Orig: https://chromium-review.googlesource.com/changes/532294/revisions/53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4/patch?download
+        'chromium-intel-vaapi_r14.patch.base64::https://chromium-review.googlesource.com/changes/532294/revisions/d60511c973e432b97d9929dcfbd77c9af25dbd51/patch?download'
         'https://raw.githubusercontent.com/sjnewbury/gentoo-playground/master/www-client/chromium/files/chromium-intel-vaapi-fix.patch'
         'https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/master/debian/patches/specify-max-resolution.patch'
         # Patch from crbug (chromium bugtracker) or Arch chromium package
@@ -87,6 +87,8 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv
         'chromium-gcc-r1.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-gcc-r1.patch?h=packages/chromium'
         'chromium-blink-gcc7-r2.patch' # https://bugs.chromium.org/p/chromium/issues/detail?id=614289
         'chromium-widevine-r1.patch'
+        'c++17.patch::https://github.com/google/crc32c/commit/d0f929a5db87cb34d03afb0d8e8bfc95b8f786e3.patch'
+        'chromium-gn-bootstrap-r18.patch.base64::https://chromium-review.googlesource.com/changes/667107/revisions/a6c6d28e705b834664c2ea6688b89c2c106204ae/patch?download'
         )
 sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
             "$(curl -sL https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
@@ -94,18 +96,19 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/
             'dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1'
             # Patch form Gentoo
             'fa3f703d599051135c5be24b81dfcb23190bb282db73121337ac76bc9638e8a5'
-            'd81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b'
             'd44b90fc7313afaa6d6f77cde72c0e9a5e4a1cc792216cbca2ed45c39658c472'
             # Misc Patches
             '95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840'
-            '1c18149f776b38349060491fd626122e66638affa07111f3fc2f4974b4124e99'
+            '1974fb5891b6a620113e9527026faa5af771042841ef7b8016ef74e0eaabc926'
             'a688de2b3a7183ebf9eb25108b0d28a8c6228cc71c8e3519062a51224f5b3488'
-            '69958012fa3af965ce15a5d108e912e18acdb7c577ed6b53ec179624dfc4d1e3'
+            '46eb584fc844e62a3e7bde19ac449698616c9373b23962b6d98e814ab73fe9c0'
             # Patch from crbug (chromium bugtracker) or Arch chromium package
             '6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8'
             '11cffe305dd49027c91638261463871e9ecb0ecc6ecc02bfa37b203c5960ab58'
             'fab4c65e2802e709a32d059784182be5a89bc3ca862a7e27810714ea7b86f868'
             '0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880'
+            '35435e8dae76737baafecdc76d74a1c97281c4179e416556e033a06a31468e6d'
+            '08a5678998a96679a02fcc1b9473e98b4563aa57b3eaa7b444ed2941ab6acd7d'
             )
 options=('!strip')
 install=chromium-dev.install
@@ -180,6 +183,7 @@ _keeplibs=(
            'third_party/angle/src/third_party/compiler'
            'third_party/angle/src/third_party/libXNVCtrl'
            'third_party/angle/src/third_party/trace_event'
+           'third_party/blink'
            'third_party/boringssl'
            'third_party/brotli'
            'third_party/cacheinvalidation'
@@ -196,6 +200,7 @@ _keeplibs=(
            'third_party/ced'
            'third_party/cld_2'
            'third_party/cld_3'
+           'third_party/crc32c'
            'third_party/cros_system_api'
            'third_party/devscripts'
            'third_party/dom_distiller_js'
@@ -225,7 +230,7 @@ _keeplibs=(
            'third_party/libvpx'
            'third_party/libvpx/source/libvpx/third_party/x86inc'
            'third_party/libwebm'
-           'third_party/libxml'
+           'third_party/libxml/chromium'
            'third_party/libyuv'
            'third_party/lss'
            'third_party/lzma_sdk'
@@ -345,7 +350,7 @@ _use_system=(
 #             'libsrtp'    # https://bugs.gentoo.org/459932
 #             'libvpx'     # Needs update
              'libwebp'
-#             'libxml'     # https://bugs.gentoo.org/616818
+             'libxml'
              'libxslt'
              'openh264'
              'opus'
@@ -394,14 +399,17 @@ prepare() {
   msg2 "Patching the sources"
   # Patch sources from Gentoo.
   patch -p1 -i "${srcdir}/chromium-FORTIFY_SOURCE-r2.patch"
-  patch -p1 -i "${srcdir}/chromium-gn-bootstrap-r17.patch"
+  base64 -d "${srcdir}/chromium-gn-bootstrap-r18.patch.base64" | patch -p1 -i -
   patch -p1 -i "${srcdir}/chromium-gcc5-r2.patch"
 
   # Misc Patches:
   patch -p1 -i "${srcdir}/minizip.patch"
+  patch -d third_party/crc32c/src -p1 -i "${srcdir}/c++17.patch"
 
   # Apply VAAPI patch
-  patch -p1 -i "${srcdir}/chromium-intel-vaapi_r2.patch" # base64 -d "${srcdir}/chromium-intel-vaapi.base64" | patch -p1 -i -
+  base64 -d "${srcdir}/chromium-intel-vaapi_r14.patch.base64" > chromium-intel-vaapi_r14.patch
+  sed '39,50d' -i chromium-intel-vaapi_r14.patch
+  patch -Np1 -i chromium-intel-vaapi_r14.patch
   patch -p1 -i "${srcdir}/chromium-intel-vaapi-fix.patch"
   patch -p1 -i "${srcdir}/specify-max-resolution.patch"
   sed 's|chromium-browser|chromium-dev|' -i media/gpu/vaapi_wrapper.h
@@ -495,7 +503,7 @@ prepare() {
       _flags+=(
                'is_clang=true'
                'clang_use_chrome_plugins=true'
-      )
+              )
       _clang_path="${srcdir}/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin"
       _c_compiler="${_clang_path}/clang"
       _cpp_compiler="${_clang_path}/clang++"