Update to 65.0.3311.3

- Disable Vulkan build due error in upstream https://crbug.com/799620
- Cleanup
- Add system freetype/fontconfig again

4 files changed, 28 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fe27cc509ee..ff8fe148dba7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Dec 17 15:15:21 UTC 2017
+# Sun Jan  7 04:15:51 UTC 2018
 pkgbase = chromium-dev
 	pkgdesc = The open-source project behind Google Chrome (Dev Channel)
-	pkgver = 65.0.3294.5
+	pkgver = 65.0.3311.3
 	pkgrel = 1
 	url = http://www.chromium.org
 	install = chromium-dev.install
@@ -22,6 +22,8 @@ pkgbase = chromium-dev
 	makedepends = hwids
 	makedepends = nodejs
 	makedepends = wget
+	makedepends = atk
+	makedepends = at-spi2-atk
 	makedepends = ncurses5-compat-libs
 	depends = libxslt
 	depends = libxss
@@ -46,19 +48,19 @@ pkgbase = chromium-dev
 	optdepends = libva-mesa-driver: HW video acceleration for Nouveau, R600 and RadeonSI users
 	optdepends = libva-intel-driver: HW video acceleration for Intel G45 and HD users
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3294.5.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3311.3.tar.xz
 	source = git+https://github.com/foutrelis/chromium-launcher.git
 	source = chromium-dev.svg
 	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch
-	source = chromium-gcc5-r5.patch
+	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-clang-r2.patch
 	source = chromium-intel-vaapi_r16.diff.patch
 	source = chromium-widevine-r1.patch
 	source = chromium-exclude_unwind_tables_r2.patch.patch
-	sha256sums = 559ff8577fbd81e91ca2db32db2568bc96af24d0696f04fbb86118816af24c5b
+	sha256sums = 14dfc4e1797e49f21056869385e4acd769613499bf58ad19cbb09d98f40aeeac
 	sha256sums = SKIP
 	sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1
 	sha256sums = fa3f703d599051135c5be24b81dfcb23190bb282db73121337ac76bc9638e8a5
-	sha256sums = 3d0d306e24b5b0c91358127a578c8a7ade8cef3eb15a769739b07a282f068de4
+	sha256sums = 4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3
 	sha256sums = c32d71237cf9dca71c35ec54431749c837eb3a7b7dae2fb3fc88beafefa1ca97
 	sha256sums = 0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880
 	sha256sums = 9478f1ec1a3c53425306cf41c2d0555c215a4f106955d9d6adfff38044530ce8
diff --git a/.gitignore b/.gitignore
index f93d9413692b..3b78a67c532c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,5 @@
 !chromium-dev.install
 !chromium-dev.svg
 !chromium-widevine-r1.patch
-!chromium-gcc5-r5.patch
 !chromium-intel-vaapi_r16.diff.patch
 !chromium-exclude_unwind_tables_r2.patch.patch
diff --git a/PKGBUILD b/PKGBUILD
index fbc85d6fbc14..b8dbb592f59e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _use_wayland=0   # Build Wayland NOTE: extremely experimental and don't work at
 ## -- Package and components information -- ##
 ##############################################
 pkgname=chromium-dev
-pkgver=65.0.3294.5
+pkgver=65.0.3311.3
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
 arch=('x86_64')
@@ -59,6 +59,8 @@ makedepends=(
              'hwids'
              'nodejs'
              'wget'
+             'atk'
+             'at-spi2-atk'
              )
 optdepends=(
             'pepper-flash: PPAPI Flash Player'
@@ -77,8 +79,8 @@ 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'
-        'chromium-gcc5-r5.patch'
-        # Misc Patches
+        'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-clang-r2.patch'
+         # Misc Patches
 #         'chromium-intel-vaapi_r15.diff.base64::https://chromium-review.googlesource.com/changes/532294/revisions/15/patch?download'
         'chromium-intel-vaapi_r16.diff.patch'
         # Patch from crbug (chromium bugtracker) or Arch chromium package
@@ -92,7 +94,7 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/
             'dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1'
             # Patch form Gentoo
             'fa3f703d599051135c5be24b81dfcb23190bb282db73121337ac76bc9638e8a5'
-            '3d0d306e24b5b0c91358127a578c8a7ade8cef3eb15a769739b07a282f068de4'
+            '4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3'
             # Misc Patches
 #             'cb4933db92b669696201b2866ec9b4942466a849b94b13463d8331284d09a2d1'
             'c32d71237cf9dca71c35ec54431749c837eb3a7b7dae2fb3fc88beafefa1ca97'
@@ -291,7 +293,6 @@ _flags=(
         "google_default_client_secret=\"${_google_default_client_secret}\""
         'fieldtrial_testing_like_official_build=false'
         'use_gtk3=true'
-        'use_gconf=false'
         "use_gio=false"
         "use_gnome_keyring=${_gnome_keyring}"
         'link_pulseaudio=true'
@@ -303,6 +304,7 @@ _flags=(
         "enable_nacl=${_nacl}"
         "enable_nacl_nonsfi=${_nacl}"
         'use_custom_libcxx=false'
+        'use_lld=false' # https://bugs.gentoo.org/641556
         )
 
 if [ "$_wayland" = "1" ]; then
@@ -330,7 +332,8 @@ optdepends+=(
 _use_system=(
              'ffmpeg'
              'flac'
-#              'freetype'    # https://bugs.chromium.org/p/pdfium/issues/detail?id=733
+             'fontconfig'
+             'freetype'
 #              'harfbuzz-ng' # freetype and harfbuzz needs update at same time, or both or none. disable due freetype bug. link avobe
 #              'icu'         # https://crbug.com/678661
              'libdrm'
@@ -406,9 +409,7 @@ prepare() {
   msg2 "Patching the sources"
   # Patch sources from Gentoo.
   patch -p1 -i "${srcdir}/chromium-FORTIFY_SOURCE-r2.patch"
-
-  # Fix build with gcc 7(?)
-  patch -p1 -i "${srcdir}/chromium-gcc5-r5.patch"
+  patch -p1 -i "${srcdir}/chromium-clang-r2.patch"
 
   # Pats to chromium dev's about why always they forget add/remove missing build rules
   # Done this time :D
@@ -429,6 +430,9 @@ prepare() {
     sed 's|/x86_64-linux-gnu||' -i gpu/vulkan/BUILD.gn
   fi
 
+  # fix vulkan build https://crbug.com/799620
+  sed 's|is_win \|\| (is_linux && use_x11 && !is_chromeos)|false|g' -i third_party/angle/gni/angle.gni
+
   # Apply VAAPI patch
   # base64 -d "${srcdir}/chromium-intel-vaapi_r15.diff.base64" | patch -p1 -i -
   #patch -p1 -i "${srcdir}/chromium-intel-vaapi_r16.diff.patch"
@@ -540,7 +544,7 @@ build() {
   out/Release/gn gen out/Release -v --args="${_flags[*]}" --script-executable=/usr/bin/python2
 
   # Build all with ninja.
-  LC_ALL=C ninja -C out/Release -v pdf chrome chrome_sandbox chromedriver widevinecdmadapter clearkeycdm
+  LC_ALL=C ninja -C out/Release -v pdf chrome chrome_sandbox chromedriver widevinecdmadapter clear_key_cdm
 }
 
 package() {
@@ -577,12 +581,12 @@ package() {
          'libclearkeycdm.so'
          'libEGL.so'
          'libGLESv2.so'
-         'libVkLayer_core_validation.so'
-         'libVkLayer_object_tracker.so'
-         'libVkLayer_parameter_validation.so'
-         'libVkLayer_swapchain.so'
-         'libVkLayer_threading.so'
-         'libVkLayer_unique_objects.so'
+#          'libVkLayer_core_validation.so'
+#          'libVkLayer_object_tracker.so'
+#          'libVkLayer_parameter_validation.so'
+#          'libVkLayer_swapchain.so'
+#          'libVkLayer_threading.so'
+#          'libVkLayer_unique_objects.so'
          'libwidevinecdmadapter.so'
          'swiftshader/libEGL.so'
          'swiftshader/libGLESv2.so'
diff --git a/chromium-gcc5-r5.patch b/chromium-gcc5-r5.patch
deleted file mode 100644
index ffa5d05b8a21..000000000000
--- a/chromium-gcc5-r5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
-           allocation_length_(0),
-           data_(data),
-           data_length_(0),
--          kind_(AllocationKind::kNormal),
-+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
-           deleter_(deleter) {}
-     DataHandle(void* allocation_base,
-                size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
-              reinterpret_cast<uintptr_t>(allocation_base_) +
-                  allocation_length_);
-       switch (kind_) {
--        case AllocationKind::kNormal:
-+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
-           DCHECK(deleter_);
-           deleter_(data_);
-           return;
--        case AllocationKind::kReservation:
-+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
-           ReleaseReservedMemory(allocation_base_, allocation_length_);
-           return;
-       }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig	2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
- 
- #include "modules/audio_processing/aec3/aec_state.h"
- 
--#include <math.h>
-+#include <cmath>
- 
- #include <numeric>
- #include <vector>
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
-   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
--    return mailbox.name;
-+    return base::make_span(mailbox.name);
-   }
-   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {
-   static base::span<const float> matrix(const cc::FilterOperation& operation) {
-     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
-       return base::span<const float>();
--    return operation.matrix();
-+    return base::make_span(operation.matrix());
-   }
- 
-   static base::span<const gfx::Rect> shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
-   static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
-     const viz::TextureDrawQuad* quad =
-         viz::TextureDrawQuad::MaterialCast(&input);
--    return quad->vertex_opacity;
-+    return base::make_span(quad->vertex_opacity);
-   }
-
-   static bool y_flipped(const viz::DrawQuad& input) {
-