svn commit: r490040 - in branches/2019Q1/www/chromium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Sat Jan 12 10:18:46 UTC 2019
Author: cpm
Date: Sat Jan 12 10:18:43 2019
New Revision: 490040
URL: https://svnweb.freebsd.org/changeset/ports/490040
Log:
MFH: r490035
- Fix debug build
- Add missing patch in r489897
- Drop unnecessary patch
- Bump PORTREVISION
Approved by: ports-secteam (miwi)
Added:
branches/2019Q1/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc
- copied unchanged from r490035, head/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc
Deleted:
branches/2019Q1/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc
Modified:
branches/2019Q1/www/chromium/Makefile
branches/2019Q1/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
branches/2019Q1/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc
branches/2019Q1/www/chromium/pkg-plist
Directory Properties:
branches/2019Q1/ (props changed)
Modified: branches/2019Q1/www/chromium/Makefile
==============================================================================
--- branches/2019Q1/www/chromium/Makefile Sat Jan 12 09:52:54 2019 (r490039)
+++ branches/2019Q1/www/chromium/Makefile Sat Jan 12 10:18:43 2019 (r490040)
@@ -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
Modified: branches/2019Q1/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
==============================================================================
--- branches/2019Q1/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc Sat Jan 12 09:52:54 2019 (r490039)
+++ branches/2019Q1/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc Sat Jan 12 10:18:43 2019 (r490040)
@@ -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;
Copied: branches/2019Q1/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc (from r490035, head/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q1/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc Sat Jan 12 10:18:43 2019 (r490040, copy of r490035, head/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();
Modified: branches/2019Q1/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc
==============================================================================
--- branches/2019Q1/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc Sat Jan 12 09:52:54 2019 (r490039)
+++ branches/2019Q1/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc Sat Jan 12 10:18:43 2019 (r490040)
@@ -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);
Modified: branches/2019Q1/www/chromium/pkg-plist
==============================================================================
--- branches/2019Q1/www/chromium/pkg-plist Sat Jan 12 09:52:54 2019 (r490039)
+++ branches/2019Q1/www/chromium/pkg-plist Sat Jan 12 10:18:43 2019 (r490040)
@@ -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
More information about the svn-ports-all
mailing list