6 files changed, 74 insertions, 33 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 062f1e9f2739..196fb8aacd97 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	71.0.3578.98
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	www
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts
diff --git a/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc b/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
index e0c500be24ea..1cf9663e1e6f 100644
--- a/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
+++ b/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
@@ -1,11 +1,58 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig	2018-03-03 20:54:40.697792000 +0100
-+++ content/gpu/gpu_sandbox_hook_linux.cc	2018-03-03 20:54:56.999743000 +0100
-@@ -95,7 +95,7 @@
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig	2018-12-12 22:56:07.000000000 +0100
++++ content/gpu/gpu_sandbox_hook_linux.cc	2019-01-11 16:30:27.925996000 +0100
+@@ -95,8 +95,9 @@
+     "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
  #endif
- }
- 
+
 -constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
 +constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
- 
+
++#if !defined(OS_BSD)
  void AddV4L2GpuWhitelist(
      std::vector<BrokerFilePermission>* permissions,
+     const service_manager::SandboxSeccompBPF::Options& options) {
+@@ -265,8 +266,10 @@
+   AddStandardGpuWhiteList(&permissions);
+   return permissions;
+ }
++#endif
+
+ void LoadArmGpuLibraries() {
++#if !defined(OS_BSD)
+   // Preload the Mali library.
+   if (UseChromecastSandboxWhitelist()) {
+     for (const char* path : kWhitelistedChromecastPaths) {
+@@ -281,6 +284,7 @@
+     // Preload the Tegra V4L2 (video decode acceleration) library.
+     dlopen(kLibTegraPath, dlopen_flag);
+   }
++#endif
+ }
+
+ bool LoadAmdGpuLibraries() {
+@@ -336,6 +340,7 @@
+   return true;
+ }
+
++#if !defined(OS_BSD)
+ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
+     const service_manager::SandboxLinux::Options& options) {
+   sandbox::syscall_broker::BrokerCommandSet command_set;
+@@ -356,13 +361,17 @@
+   service_manager::SetProcessTitleFromCommandLine(nullptr);
+   return true;
+ }
++#endif
+
+ }  // namespace
+
+ bool GpuProcessPreSandboxHook(service_manager::SandboxLinux::Options options) {
++  NOTIMPLEMENTED();
++#if !defined(OS_BSD)
+   service_manager::SandboxLinux::GetInstance()->StartBrokerProcess(
+       CommandSetForGPU(options), FilePermissionsForGpu(options),
+       base::BindOnce(BrokerProcessPreSandboxHook), options);
++#endif
+
+   if (!LoadLibrariesForGpu(options))
+     return false;
diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc
deleted file mode 100644
index 50781b4c63ac..000000000000
--- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig	2017-06-05 19:03:07 UTC
-+++ extensions/browser/api/networking_private/networking_private_event_router_factory.cc
-@@ -13,6 +13,7 @@
- 
- namespace extensions {
- 
-+#if !defined(OS_BSD)
- // static
- NetworkingPrivateEventRouter*
- NetworkingPrivateEventRouterFactory::GetForProfile(
-@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory::ServiceIsCre
- bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const {
-   return true;
- }
-+#endif
- 
- }  // namespace extensions
diff --git a/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc b/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc
new file mode 100644
index 000000000000..f3290774b5e0
--- /dev/null
+++ b/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc
@@ -0,0 +1,11 @@
+--- extensions/browser/browser_context_keyed_service_factories.cc.orig	2019-01-11 19:03:59.864185000 +0100
++++ extensions/browser/browser_context_keyed_service_factories.cc	2019-01-11 19:04:22.204588000 +0100
+@@ -85,7 +85,7 @@
+ #if defined(OS_CHROMEOS)
+   NetworkingConfigServiceFactory::GetInstance();
+ #endif
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
+   NetworkingPrivateEventRouterFactory::GetInstance();
+ #endif
+   PowerAPI::GetFactoryInstance();
diff --git a/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc
index f62e016f188d..0243ddff4160 100644
--- a/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc
+++ b/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc
@@ -1,6 +1,6 @@
---- extensions/shell/app/shell_main_delegate.cc.orig	2019-01-09 22:03:40.116892000 +0100
-+++ extensions/shell/app/shell_main_delegate.cc	2019-01-09 22:04:39.261286000 +0100
-@@ -38,13 +38,13 @@
+--- extensions/shell/app/shell_main_delegate.cc.orig	2019-01-11 19:10:53.125547000 +0100
++++ extensions/shell/app/shell_main_delegate.cc	2019-01-11 19:11:57.764029000 +0100
+@@ -38,7 +38,7 @@
  
  #if defined(OS_WIN)
  #include "base/base_paths_win.h"
@@ -9,13 +9,15 @@
  #include "base/nix/xdg_util.h"
  #elif defined(OS_MACOSX)
  #include "base/base_paths_mac.h"
- #endif
+@@ -52,7 +52,7 @@
+ 
+ namespace {
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include "components/crash/content/app/breakpad_linux.h"         // nogncheck
- #include "components/crash/content/app/crash_reporter_client.h"  // nogncheck
- #include "extensions/shell/app/shell_crash_reporter_client.h"
+ extensions::ShellCrashReporterClient* GetCrashReporterClient() {
+   static base::NoDestructor<extensions::ShellCrashReporterClient> instance;
+   return instance.get();
 @@ -70,7 +70,7 @@
      return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);
  
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 572f6ccc7d39..dd30da5cc349 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -317,8 +317,6 @@ bin/chrome
 %%DATADIR%%/v8_context_snapshot.bin
 %%DATADIR%%/views_mus_resources.pak
 %%DEBUG%%%%DATADIR%%/character_data_generator
-%%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so
-%%DEBUG%%%%DATADIR%%/libtest_shared_library.so
 %%DEBUG%%%%DATADIR%%/libVkICD_mock_icd.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_object_tracker.so