chromium: update to 69.0.3497.100.

[ci skip]

srcpkgs/chromium/files/musl-patches/dont-assume-secure-getenv.patch

@@ -0,0 +1,15 @@
+--- third_party/angle/third_party/vulkan-loader/BUILD.gn	2018-09-11 
+21:11:45.000000000 +0200
++++ third_party/angle/third_party/vulkan-loader/BUILD.gn.orig	2018-09-15 
+13:20:11.933889339 +0200
+@@ -192,10 +192,6 @@
+   if (is_win) {
+     cflags = [ "/wd4201" ]
+   }
+-  if (is_linux) {
+-    # assume secure_getenv() is available
+-    defines += [ "HAVE_SECURE_GETENV" ]
+-  }
+ }
+ 
+ if (!is_android) {

srcpkgs/chromium/files/musl-patches/musl-crashpad.patch

@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
+

srcpkgs/chromium/files/musl-patches/musl-fixes.patch

@@ -152,8 +152,8 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
    if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
      // Include a stack trace on a fatal, unless a debugger is attached.
      base::debug::StackTrace trace;
---- ./third_party/WebKit/Source/platform/wtf/StackUtil.cpp.orig
+--- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
-+++ ./third_party/WebKit/Source/platform/wtf/StackUtil.cpp
++++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
 @@ -28,7 +28,7 @@
  // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
  // correctly for the main thread.
@@ -183,3 +183,21 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
    // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
    // res_init behaves the same way.
    memset(&_res, 0, sizeof(_res));
+--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc.orig	2018-09-16 00:54:49.995170492 +0200
++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc	2018-09-16 00:56:47.436161476 +0200
+@@ -25,7 +25,7 @@
+ #include "llvm/Support/raw_ostream.h"
+ #include <algorithm>
+ #include <string>
+-#if HAVE_EXECINFO_H
++#if HAVE_EXECINFO_H && defined(__GLIBC__)
+ # include <execinfo.h>         // For backtrace().
+ #endif
+ #if HAVE_SIGNAL_H
+@@ -52,6 +52,7 @@
+ #include <unwind.h>
+ #else
+ #undef HAVE__UNWIND_BACKTRACE
++#undef HAVE_BACKTRACE
+ #endif
+ #endif

srcpkgs/chromium/files/musl-patches/no-mallinfo.patch

@@ -1,14 +1,3 @@
---- content/child/content_child_helpers.cc.orig
-+++ content/child/content_child_helpers.cc
-@@ -24,7 +24,7 @@ namespace content {
- // though, this provides only a partial and misleading value.
- // Unfortunately some telemetry benchmark rely on it and these need to
- // be refactored before getting rid of this. See crbug.com/581365 .
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) && defined(__GLIBC__) || defined(OS_ANDROID)
- size_t GetMemoryUsageKB() {
-   struct mallinfo minfo = mallinfo();
-   uint64_t mem_usage =
 --- base/trace_event/malloc_dump_provider.cc.orig
 +++ base/trace_event/malloc_dump_provider.cc
 @@ -243,7 +243,7 @@
@@ -41,3 +30,15 @@ index 0eb5c1f..8af7799 100644
    // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
    return 0;
  #endif
+--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
+@@ -84,7 +84,7 @@
+ }
+ 
+ size_t Process::GetMallocUsage() {
+-#if defined(HAVE_MALLINFO)
++#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
+   struct mallinfo mi;
+   mi = ::mallinfo();
+   return mi.uordblks;
+

srcpkgs/chromium/files/musl-patches/resolver.patch

@@ -5,7 +5,7 @@
    NetworkChangeNotifier::AddConnectionTypeObserver(this);
    NetworkChangeNotifier::AddDNSObserver(this);
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
--    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+-    !defined(OS_ANDROID)
 +#if defined(__GLIBC__)
    EnsureDnsReloaderInit();
  #endif

srcpkgs/chromium/patches/chromium-clang-r2.patch

@@ -1,21 +0,0 @@
---- build/config/compiler/BUILD.gn
-+++ build/config/compiler/BUILD.gn
-@@ -422,18 +422,6 @@
-     cflags += [ "-fcolor-diagnostics" ]
-   }
- 
--  # TODO(hans): Remove this once Clang generates better optimized debug info by
--  # default. https://crbug.com/765793
--  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
--      target_os != "chromeos") {
--    cflags += [
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--    ]
--  }
--
-   # Print absolute paths in diagnostics. There is no precedent for doing this
-   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
-   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.

srcpkgs/chromium/patches/chromium-gcc-r1.patch

@@ -1,14 +0,0 @@
-diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
-index 99f230ce7e9a..de2415d402f5 100644
---- base/numerics/safe_math_shared_impl.h
-+++ base/numerics/safe_math_shared_impl.h
-@@ -21,8 +21,7 @@
- #if !defined(__native_client__) &&                         \
-     ((defined(__clang__) &&                                \
-       ((__clang_major__ > 3) ||                            \
--       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
--     (defined(__GNUC__) && __GNUC__ >= 5))
-+       (__clang_major__ == 3 && __clang_minor__ >= 4))))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else

srcpkgs/chromium/patches/chromium-skia-harmony.patch

@@ -1,77 +0,0 @@
---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2017-10-10 17:42:06.956950985 +0200
-+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp	2017-10-10 17:46:05.824187787 +0200
-@@ -99,8 +99,6 @@
-     FreeTypeLibrary()
-         : fGetVarDesignCoordinates(nullptr)
-         , fLibrary(nullptr)
--        , fIsLCDSupported(false)
--        , fLCDExtra(0)
-     {
-         if (FT_New_Library(&gFTMemory, &fLibrary)) {
-             return;
-@@ -147,12 +145,7 @@
-         }
- #endif
- 
--        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
--        // The default has changed over time, so this doesn't mean the same thing to all users.
--        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
--            fIsLCDSupported = true;
--            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
--        }
-+        FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
-     }
-     ~FreeTypeLibrary() {
-         if (fLibrary) {
-@@ -161,8 +153,6 @@
-     }
- 
-     FT_Library library() { return fLibrary; }
--    bool isLCDSupported() { return fIsLCDSupported; }
--    int lcdExtra() { return fLCDExtra; }
- 
-     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
-     // Prior to this there was no way to get the coordinates out of the FT_Face.
-@@ -173,8 +163,6 @@
- 
- private:
-     FT_Library fLibrary;
--    bool fIsLCDSupported;
--    int fLCDExtra;
- 
-     // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
-     // The following platforms provide FreeType of at least 2.4.0.
-@@ -704,17 +692,6 @@
-         rec->fTextSize = SkIntToScalar(1 << 14);
-     }
- 
--    if (isLCD(*rec)) {
--        // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
--        SkAutoMutexAcquire ama(gFTMutex);
--        ref_ft_library();
--        if (!gFTLibrary->isLCDSupported()) {
--            // If the runtime Freetype library doesn't support LCD, disable it here.
--            rec->fMaskFormat = SkMask::kA8_Format;
--        }
--        unref_ft_library();
--    }
--
-     SkPaint::Hinting h = rec->getHinting();
-     if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
-         // collapse full->normal hinting if we're not doing LCD
-@@ -1115,11 +1092,11 @@
- void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
-     if (isLCD(fRec)) {
-         if (fLCDIsVert) {
--            glyph->fHeight += gFTLibrary->lcdExtra();
--            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
-+            glyph->fHeight += 2;
-+            glyph->fTop -= 1;
-         } else {
--            glyph->fWidth += gFTLibrary->lcdExtra();
--            glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
-+            glyph->fWidth += 2;
-+            glyph->fLeft -= 1;
-         }
-     }
- }

srcpkgs/chromium/patches/chromium-swiftshader-default-visibility.patch

@@ -0,0 +1,20 @@
+Source: Ubuntu
+Upstream: No
+https://bazaar.launchpad.net/~chromium-team/chromium-browser/cosmic-dev/view/1454/debian/patches/swiftshader-default-visibility.patch
+
+Description: partially revert https://swiftshader.googlesource.com/SwiftShader.git/+/c4972610c38bcf8478016572a92843f165d9bfb4
+ to fix a build failure on cosmic/amd64 (which has binutils 2.31).
+Bug-Ubuntu: https://launchpad.net/bugs/1784397
+Author: Olivier Tilloy <olivier.tilloy@canonical.com>
+
+--- third_party/swiftshader/src/OpenGL/libGLESv2/BUILD.gn
++++ third_party/swiftshader/src/OpenGL/libGLESv2/BUILD.gn
+@@ -55,7 +55,7 @@ config("swiftshader_libGLESv2_private_co
+       cflags += [ "-fvisibility=protected" ]
+       defines += [ "GL_APICALL=__attribute__((no_sanitize(\"function\")))" ]
+     } else {
+-      defines += [ "GL_APICALL=__attribute__((visibility(\"protected\"))) __attribute__((no_sanitize(\"function\")))" ]
++      defines += [ "GL_APICALL=__attribute__((visibility(\"default\"))) __attribute__((no_sanitize(\"function\")))" ]
+     }
+   }
+ }

srcpkgs/chromium/patches/chromium-webrtc-r0.patch

@@ -1,3 +1,6 @@
+Upstream: Yes, https://webrtc-review.googlesource.com/9384
+Reason: Fixes musl builds of webrtc
+
 From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Fri, 13 Oct 2017 15:49:32 +0200
@@ -13,11 +16,7 @@ Reviewed-by: Tommi <tommi@webrtc.org>
 Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
 Cr-Commit-Position: refs/heads/master@{#20292}
 ---
- p2p/base/port.cc | 2 ++
- 1 file changed, 2 insertions(+)
 
-diff --git a/p2p/base/port.cc b/p2p/base/port.cc
-index a1b478d11..81aa0aadb 100644
 --- third_party/webrtc/p2p/base/port.cc
 +++ third_party/webrtc/p2p/base/port.cc
 @@ -10,6 +10,8 @@

srcpkgs/chromium/patches/chromium-widevine-assertion.patch

@@ -0,0 +1,19 @@
+Source: Gentoo 
+Upstream: No
+Reason: Set widevine as available on linux
+
+description: indicate that widevine continues to be supported on linux
+author: Gregory M. Turner
+origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/www-client/chromium/files?id=09b804516320eee06930303870cd68008aac8a8a
+
+--- third_party/widevine/cdm/BUILD.gn.old
++++ third_party/widevine/cdm/BUILD.gn
+@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widevine.gni")
+ # Internal Cast builds set enable_widevine=true to bring in Widevine support.
+ # TODO(xhwang): Support component updated CDM on other platforms and remove this
+ # assert.
+-assert(!enable_widevine || is_win || is_mac || is_chromecast,
++assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
+        "Component updated CDM only supported on Windows and Mac for now.")
+ 
+ widevine_arch = current_cpu

srcpkgs/chromium/patches/chromium-widevine-revision.patch

@@ -0,0 +1,17 @@
+Source: Debian
+Upstream: No
+Reason: Set widevine version as undefined
+
+description: set widevine version as undefined
+author: Michael Gilbert <mgilbert@debian.org>
+
+--- third_party/widevine/cdm/stub/widevine_cdm_version.h
++++ third_party/widevine/cdm/stub/widevine_cdm_version.h
+@@ -10,6 +10,7 @@
+ 
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
+ 
++#define WIDEVINE_CDM_VERSION_STRING "undefined"
+ #define WIDEVINE_CDM_AVAILABLE
+ 
+ #endif  // WIDEVINE_CDM_VERSION_H_

srcpkgs/chromium/patches/chromium-widevine.patch

@@ -1,9 +0,0 @@
---- third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-14 01:05:17.000000000 +0200
-+++ third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-21 19:18:51.287978456 +0200
-@@ -12,4 +12,6 @@
- 
- #define WIDEVINE_CDM_AVAILABLE
- 
-+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
-+
- #endif  // WIDEVINE_CDM_VERSION_H_

srcpkgs/chromium/patches/ffmpeg-i686.patch

@@ -1,15 +1,16 @@
 --- third_party/ffmpeg/BUILD.gn.orig
 +++ third_party/ffmpeg/BUILD.gn
-@@ -247,11 +247,7 @@
+@@ -239,11 +239,7 @@ target(link_target_type, "ffmpeg_internal") {
-     # On POSIX x86, sanitizers will fail to compiler the H264 CABAC code due to
+   # Windows builds can't compile without EBP because we can't omit frame
-     # insufficient registers unless we disable EBP usage. crbug.com/786760
+   # pointers like we do on posix.
-     if (target_cpu == "x86") {
+   if (target_cpu == "x86") {
--      if (using_sanitizer) {
+-    if (using_sanitizer || is_win) {
--        defines += [ "HAVE_EBP_AVAILABLE=0" ]
+-      defines += [ "HAVE_EBP_AVAILABLE=0" ]
--      } else {
+-    } else {
--        defines += [ "HAVE_EBP_AVAILABLE=1" ]
+-      defines += [ "HAVE_EBP_AVAILABLE=1" ]
--      }
+-    }
-+      defines += [ "HAVE_EBP_AVAILABLE=0" ]
++    defines += [ "HAVE_EBP_AVAILABLE=0" ]
-     }
+   }
  
-     if (!is_clang) {
+   if (is_posix || is_fuchsia) {
+

srcpkgs/chromium/patches/gn_bootstrap.patch

@@ -1,77 +0,0 @@
---- tools/gn/bootstrap/bootstrap.py.orig
-+++ tools/gn/bootstrap/bootstrap.py
-@@ -184,7 +184,7 @@
-       {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'})
- 
-   write_buildflag_header_manually(root_gen_dir, 'base/allocator/buildflags.h',
--      {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
-+      {'USE_ALLOCATOR_SHIM': 'false' })
- 
-   write_buildflag_header_manually(root_gen_dir,
-                                   'base/debug/debugging_buildflags.h',
-@@ -438,8 +438,6 @@
-       'base/third_party/superfasthash/superfasthash.c',
-   ])
-   static_libraries['base']['sources'].extend([
--      'base/allocator/allocator_check.cc',
--      'base/allocator/allocator_extension.cc',
-       'base/at_exit.cc',
-       'base/base_paths.cc',
-       'base/base_switches.cc',
-@@ -641,26 +639,6 @@
-         'base/time/time_conversion_posix.cc',
-         'base/trace_event/heap_profiler_allocation_register_posix.cc',
-     ])
--    static_libraries['libevent'] = {
--        'sources': [
--            'base/third_party/libevent/buffer.c',
--            'base/third_party/libevent/evbuffer.c',
--            'base/third_party/libevent/evdns.c',
--            'base/third_party/libevent/event.c',
--            'base/third_party/libevent/event_tagging.c',
--            'base/third_party/libevent/evrpc.c',
--            'base/third_party/libevent/evutil.c',
--            'base/third_party/libevent/http.c',
--            'base/third_party/libevent/log.c',
--            'base/third_party/libevent/poll.c',
--            'base/third_party/libevent/select.c',
--            'base/third_party/libevent/signal.c',
--            'base/third_party/libevent/strlcpy.c',
--        ],
--        'tool': 'cc',
--        'include_dirs': [],
--        'cflags': cflags + ['-DHAVE_CONFIG_H'],
--    }
- 
-   if is_linux or is_aix:
-     static_libraries['xdg_user_dirs'] = {
-@@ -767,17 +745,7 @@
-               '-D_LIBCXXABI_NO_EXCEPTIONS',
-           ]
-       }
--      static_libraries['base']['sources'].extend([
--        'base/allocator/allocator_shim.cc',
--        'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
--      ])
--      libs.extend(['-lrt', '-latomic'])
--      static_libraries['libevent']['include_dirs'].extend([
--          os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
--      ])
--      static_libraries['libevent']['sources'].extend([
--         'base/third_party/libevent/epoll.c',
--      ])
-+      libs.extend(['-lrt', '-levent'])
-     else:
-       ldflags.extend(['-pthread'])
-       libs.extend(['-lrt'])
---- base/message_loop/message_pump_libevent.cc.orig
-+++ base/message_loop/message_pump_libevent.cc
-@@ -14,7 +14,7 @@
- #include "base/files/file_util.h"
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
--#include "base/third_party/libevent/event.h"
-+#include "event.h"
- #include "base/time/time.h"
- #include "base/trace_event/trace_event.h"
- #include "build/build_config.h"

srcpkgs/chromium/patches/last-commit-position.patch

@@ -1,26 +0,0 @@
---- tools/gn/gn_main.cc.orig	2015-11-12 11:49:56.260549036 +0000
-+++ tools/gn/gn_main.cc	2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
-
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
-
- namespace {
-
---- tools/gn/BUILD.gn.orig	2015-11-12 11:50:43.513524769 +0000
-+++ tools/gn/BUILD.gn	2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
-
-   deps = [
-     ":gn_lib",
--    ":last_commit_position",
-     "//base",
-     "//build/config/sanitizers:deps",
-   ]

srcpkgs/chromium/patches/no-execinfo.patch

@@ -70,8 +70,8 @@
  void StackTrace::OutputToStream(std::ostream* os) const {
    StreamBacktraceOutputHandler handler(os);
    ProcessBacktrace(trace_, count_, &handler);
---- third_party/WebKit/Source/platform/wtf/Assertions.cpp.orig	2017-09-11 12:27:06.948854813 +0000
+--- third_party/blink/renderer/platform/wtf/assertions.cc.orig	2017-09-11 12:27:06.948854813 +0000
-+++ third_party/WebKit/Source/platform/wtf/Assertions.cpp	2017-09-11 12:29:34.639862433 +0000
++++ third_party/blink/renderer/platform/wtf/assertions.cc	2017-09-11 12:29:34.639862433 +0000
 @@ -56,7 +56,7 @@
  #include <windows.h>
  #endif

srcpkgs/chromium/patches/no-secure_getenv.patch

@@ -1,16 +0,0 @@
-misdetected on musl...
-
---- third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c.orig	2017-07-25 19:06:31.000000000 +0000
-+++ third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c	2017-07-27 16:20:54.721755713 +0000
-@@ -214,9 +214,9 @@
-     // the inst pointer to get rid of compiler warnings.
-     (void)inst;
- 
--#ifdef HAVE_SECURE_GETENV
-+#if defined(HAVE_SECURE_GETENV) && defined(__GLIBC__)
-     return secure_getenv(name);
--#elif defined(HAVE___SECURE_GETENV)
-+#elif defined(HAVE___SECURE_GETENV) && defined(__GLIBC__)
-     return __secure_getenv(name);
- #else
- #pragma message("Warning:  Falling back to non-secure getenv for environmental lookups!  Consider" \

srcpkgs/chromium/patches/swiftshader.patch

@@ -1,86 +0,0 @@
-diff --git a/third_party/swiftshader/src/Common/Socket.cpp b/third_party/swiftshader/src/Common/Socket.cpp
-index a19f574..3e6655d 100644
---- third_party/swiftshader/src/Common/Socket.cpp
-+++ swiftshader/src/Common/Socket.cpp
-@@ -17,6 +17,7 @@
- #if defined(_WIN32)
- 	#include <ws2tcpip.h>
- #else
-+	#include <sys/select.h>
- 	#include <unistd.h>
- 	#include <netdb.h>
- 	#include <netinet/in.h>
-diff --git a/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h b/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
-index 509bc26..6522713 100644
---- third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
-+++ swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
-@@ -125,7 +125,7 @@
- #define HAVE_ERROR_T 1
- 
- /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H 1
-+/* #undef HAVE_EXECINFO_H */
- 
- /* Define to 1 if you have the <fcntl.h> header file. */
- #define HAVE_FCNTL_H 1
-@@ -240,10 +240,10 @@
- /* #undef HAVE_MACH_O_DYLD_H */
- 
- /* Define if mallinfo() is available on this platform. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
- 
- /* Define to 1 if you have the <malloc.h> header file. */
--#define HAVE_MALLOC_H 1
-+/* #undef HAVE_MALLOC_H */
- 
- /* Define to 1 if you have the <malloc/malloc.h> header file. */
- /* #undef HAVE_MALLOC_MALLOC_H */
-diff --git a/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp b/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
-index bd68083..f703e13 100644
---- third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
-+++ swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
-@@ -160,7 +160,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
- // On linux we have a weird situation. The stderr/out/in symbols are both
- // macros and global variables because of standards requirements. So, we
- // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first.
--#if defined(__linux__) && !defined(__ANDROID__)
-+#if defined(__GLIBC__)
-   {
-     EXPLICIT_SYMBOL(stderr);
-     EXPLICIT_SYMBOL(stdout);
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index e14edbd..8d7e41e 100644
---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -14,7 +14,7 @@
- #define ENABLE_CRASH_OVERRIDES 1
- 
- /* Define to 1 if you have the `backtrace' function. */
--#define HAVE_BACKTRACE 1
-+/* #undef  HAVE_BACKTRACE */
- 
- /* Define to 1 if you have the <CrashReporterClient.h> header file. */
- /* #undef HAVE_CRASHREPORTERCLIENT_H */
-@@ -55,7 +55,7 @@
- #define HAVE_ERRNO_H 1
- 
- /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H 1
-+/* #undef HAVE_EXECINFO_H */
- 
- /* Define to 1 if you have the <fcntl.h> header file. */
- #define HAVE_FCNTL_H 1
-@@ -130,10 +130,10 @@
- /* #undef HAVE_MALLCTL */
- 
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
- 
- /* Define to 1 if you have the <malloc.h> header file. */
--#define HAVE_MALLOC_H 1
-+/* #undef HAVE_MALLOC_H */
- 
- /* Define to 1 if you have the <malloc/malloc.h> header file. */
- /* #undef HAVE_MALLOC_MALLOC_H */

srcpkgs/chromium/patches/unset-madv_free.patch

@@ -1,14 +0,0 @@
---- base/allocator/partition_allocator/page_allocator.cc.orig
-+++ base/allocator/partition_allocator/page_allocator.cc
-@@ -17,6 +17,11 @@
- #include <errno.h>
- #include <sys/mman.h>
- 
-+#if defined(OS_LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but it breaks the sandbox.
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif

srcpkgs/chromium/template

@@ -1,23 +1,21 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=66.0.3359.170
+version=69.0.3497.100
-revision=2
+revision=1
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
-homepage="http://www.chromium.org/"
+homepage="https://www.chromium.org/"
-license="BSD"
+license="BSD-3-Clause"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=864da6649d19387698e3a89321042193708b2d9f56b3a778fb552166374871de
+checksum=e3391560e73e25fb4afc3f2dd5616607e2dbfc58aa88251a2c5d6b7096fe9e35
 
 only_for_archs="i686 x86_64 x86_64-musl"
 lib32disabled=yes
 nodebug=yes
 nopie=yes  # contains tools that are not PIE, enables PIE itself
 
-build_options="nacl clang"
+build_options="clang"
-build_options_default="clang"
-desc_option_nacl="Enable NaCL support"
 desc_option_clang="Use clang to build"
 
 hostmakedepends="$(vopt_if clang clang) yasm python pkg-config perl gperf bison ninja nodejs hwids
@@ -30,14 +28,9 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
  libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
  libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
  minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
- re2-devel fontconfig-devel freetype-devel harfbuzz-devel opus-devel"
+ re2-devel fontconfig-devel freetype-devel harfbuzz-devel opus-devel
+ ffmpeg-devel"
 depends="libexif hwids desktop-file-utils hicolor-icon-theme"
-nostrip_files="$(vopt_if nacl 'nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe')"
-
-# nacl currently makes problems with GN
-if [ -n "$build_option_nacl" ]; then
-	broken=yes
-fi
 
 post_extract() {
 	case "${XBPS_TARGET_MACHINE}" in
@@ -69,7 +62,7 @@ do_configure() {
 	local system="" bootstrap_conf="" conf=""
 	export -n CFLAGS CXXFLAGS LDFLAGS
 
-	if [ -n "$build_option_clang" ]; then
+	if [ "$build_option_clang" ]; then
 		export CC=clang
 		export CXX=clang++
 	fi
@@ -80,6 +73,7 @@ do_configure() {
 	# TODO: use_system_libusb (http://crbug.com/266149).
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
 	# XXX xtraeme: broken currently
 	# use_system_protobuf
 	# use_system_v8=1
@@ -87,19 +81,21 @@ do_configure() {
 	# use_system_libvpx=1
 	# bzip2 jsoncpp minizip xdg_utils speex
 	system="
+		ffmpeg
 		flac
 		fontconfig
-		freetype
 		harfbuzz-ng
-		opus
+		libdrm
-		re2
 		libevent
 		libjpeg
 		libpng
 		libxml
 		libxslt
+		opus
+		re2
 		snappy
-		yasm"
+		yasm
+	"
 
 	# TODO: is this still broken?
 	[ -z "$CROSS_BUILD" ] && system+=" libwebp"
@@ -121,37 +117,21 @@ do_configure() {
 
 	python2 third_party/libaddressinput/chromium/tools/update-strings.py
 
-	# bootstrap NaCL toolchain
-	if [ -n "$build_option_nacl" ] && [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		# XXX xtraeme: fix gcc{,-c++}-multilib instead.
-		ldconfig &>/dev/null
-		# Download NaCL toolchains
-		python2 nbuild/download_acl_toolchains.py \
-			--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract
-		# donwload clang
-		python2 tools/clang/scripts/update.py
-		ln -s /usr/lib/libncursesw.so.6 third_party/llvm-build/Release+Asserts/lib/libtinfo.so.5
-	fi
-
-	# bootstrap GN
 	bootstrap_conf="is_clang=$(vopt_if clang true false)"
-	bootstrap_conf+='
+
-		treat_warnings_as_errors=false
+	bootstrap_conf+=' treat_warnings_as_errors=false binutils_path="/usr/bin"'
-		binutils_path="/usr/bin"
+	bootstrap_conf+=' gold_path="/usr/bin/ld.gold" use_sysroot=false'
-		gold_path="/usr/bin/ld.gold"
+	bootstrap_conf+=' use_allocator="none" use_allocator_shim=false'
-		use_sysroot=false
-		use_allocator="none"
-		use_allocator_shim=false'
 
 	# XXX: gold broken with musl
 	case "${XBPS_TARGET_MACHINE}" in
-	*-musl) bootstrap_conf+=' use_gold=false' ;;
+		*-musl) bootstrap_conf+=' use_gold=false' ;;
-	*) bootstrap_conf+=' use_gold=true' ;;
+		*) bootstrap_conf+=' use_gold=true' ;;
 	esac
 
 	AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \
-		python2 tools/gn/bootstrap/bootstrap.py -s -v --no-clean \
+		python2 tools/gn/bootstrap/bootstrap.py -v \
-			--gn-gen-args "${bootstrap_conf//	/ }"
+			--gn-gen-args "${bootstrap_conf}"
 
 	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 	# Note: These are for Void Linux use ONLY.
@@ -161,13 +141,7 @@ do_configure() {
 		google_default_client_secret="_ozIx2D-DKm_se_2NPwV4l5b"'
 
 
-	if [ "$build_option_nacl" ] && [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	conf+=' enable_nacl=false enable_nacl_nonsfi=false'
-		# Disable glibc Native Client toolchain.
-		conf+=' is_nacl_glibc=false'
-		conf+=' enable_nacl=true enable_nacl_nonsfi=true'
-	else
-		conf+=' enable_nacl=false enable_nacl_nonsfi=false'
-	fi
 
 	conf+=" is_clang=$(vopt_if clang true false)"
 	conf+=' is_debug=false
@@ -184,11 +158,7 @@ do_configure() {
 		use_sysroot=false
 		use_system_harfbuzz=true
 		enable_widevine=true
-		enable_hangout_services_extension=true
+		enable_hangout_services_extension=true'
-		enable_swiftshader=false' # needs clang?
-
-	# TODO: is this still broken?
-	[ "$CROSS_BUILD" ] && conf+=' enable_webrtc=false'
 
 	# Use explicit library dependencies instead of dlopen.
 	# GN only has "link_pulseaudio", the other options used before are not available atm
@@ -247,11 +217,6 @@ do_install() {
 	vinstall out/Release/chromedriver 755 usr/lib/${pkgname} chromedriver
 	vinstall out/Release/chrome_sandbox 4755 usr/lib/${pkgname} chrome-sandbox
 
-	if [ "$build_option_nacl" ] && [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		cp out/Release/nacl_helper{,_bootstrap} ${DESTDIR}/usr/lib/chromium
-		cp out/Release/nacl_irt_x86_64.nexe ${DESTDIR}/usr/lib/chromium
-	fi
-
 	cp out/Release/{*.pak,*.bin} ${DESTDIR}/usr/lib/chromium
 	cp -a out/Release/locales ${DESTDIR}/usr/lib/chromium