svn commit: r440082 - in branches/2017Q2/www/chromium: . files

Carlos J. Puga Medina cpm at FreeBSD.org
Thu May 4 03:25:16 UTC 2017


Author: cpm
Date: Thu May  4 03:25:13 2017
New Revision: 440082
URL: https://svnweb.freebsd.org/changeset/ports/440082

Log:
  MFH: r440072
  
  www/chromium: update to 58.0.3029.96
  
  Security:	https://vuxml.freebsd.org/freebsd/92e345d0-304d-11e7-8359-e8e0b747a45a.html
  
  Approved by:	ports-secteam (miwi)

Added:
  branches/2017Q2/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
     - copied unchanged from r440072, head/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
  branches/2017Q2/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc
     - copied unchanged from r440072, head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc
  branches/2017Q2/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn
     - copied unchanged from r440072, head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn
  branches/2017Q2/www/chromium/files/patch-components_filesystem_file__system__app.cc
     - copied unchanged from r440072, head/www/chromium/files/patch-components_filesystem_file__system__app.cc
  branches/2017Q2/www/chromium/files/patch-v8_src_wasm_wasm-result.h
     - copied unchanged from r440072, head/www/chromium/files/patch-v8_src_wasm_wasm-result.h
Deleted:
  branches/2017Q2/www/chromium/files/patch-services_ui_BUILD.gn
  branches/2017Q2/www/chromium/files/patch-services_ui_ime_BUILD.gn
Modified:
  branches/2017Q2/www/chromium/Makefile
  branches/2017Q2/www/chromium/distinfo
  branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
  branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
  branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
  branches/2017Q2/www/chromium/pkg-plist
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/www/chromium/Makefile
==============================================================================
--- branches/2017Q2/www/chromium/Makefile	Thu May  4 03:00:36 2017	(r440081)
+++ branches/2017Q2/www/chromium/Makefile	Thu May  4 03:25:13 2017	(r440082)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	58.0.3029.81
+PORTVERSION=	58.0.3029.96
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -244,7 +244,7 @@ test regression-test: build
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.for t in font_service ui
+.for t in font_service test_ime_driver ui
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \
 		${STAGEDIR}${DATADIR}
 .endfor

Modified: branches/2017Q2/www/chromium/distinfo
==============================================================================
--- branches/2017Q2/www/chromium/distinfo	Thu May  4 03:00:36 2017	(r440081)
+++ branches/2017Q2/www/chromium/distinfo	Thu May  4 03:25:13 2017	(r440082)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1492682402
-SHA256 (chromium-58.0.3029.81.tar.xz) = 5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb
-SIZE (chromium-58.0.3029.81.tar.xz) = 509252204
-SHA256 (chromium-58.0.3029.81-testdata.tar.xz) = 8fa8d18c5ccfa8cbb067c4d88a0b8ed0dfd52b5d784c2cf48b91d1cb3a2fb264
-SIZE (chromium-58.0.3029.81-testdata.tar.xz) = 124158512
+TIMESTAMP = 1493784258
+SHA256 (chromium-58.0.3029.96.tar.xz) = 5d38fd7ad3b58bd09da8ff05f12354e94c2ad1bb203527a632b72cc3ff4a5181
+SIZE (chromium-58.0.3029.96.tar.xz) = 518160320
+SHA256 (chromium-58.0.3029.96-testdata.tar.xz) = 2451cfe8f25f578dbce3b85a00589e4609958db969ad4421f89e780751bf067b
+SIZE (chromium-58.0.3029.96-testdata.tar.xz) = 124156492

Copied: branches/2017Q2/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc (from r440072, head/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc	Thu May  4 03:25:13 2017	(r440082, copy of r440072, head/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc)
@@ -0,0 +1,11 @@
+--- chrome/browser/after_startup_task_utils.cc.orig	2017-05-02 19:02:47 UTC
++++ chrome/browser/after_startup_task_utils.cc
+@@ -93,7 +93,7 @@ void QueueTask(std::unique_ptr<AfterStar
+ 
+ void SetBrowserStartupIsComplete() {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+   // CurrentProcessInfo::CreationTime() is not available on all platforms.
+   const base::Time process_creation_time =
+       base::CurrentProcessInfo::CreationTime();

Copied: branches/2017Q2/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc (from r440072, head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc	Thu May  4 03:25:13 2017	(r440082, copy of r440072, head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc)
@@ -0,0 +1,20 @@
+--- chrome/browser/download/download_status_updater.cc.orig	2017-05-02 19:02:47 UTC
++++ chrome/browser/download/download_status_updater.cc
+@@ -13,7 +13,7 @@
+ #include "base/memory/ptr_util.h"
+ #include "build/build_config.h"
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+ 
+@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUp
+ #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN))
+ void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
+     content::DownloadItem* download) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   const views::LinuxUI* linux_ui = views::LinuxUI::instance();
+   if (linux_ui) {
+     float progress = 0;

Modified: branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
==============================================================================
--- branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn	Thu May  4 03:00:36 2017	(r440081)
+++ branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn	Thu May  4 03:25:13 2017	(r440082)
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/BUILD.gn.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2017-05-02 19:02:47 UTC
 +++ chrome/browser/extensions/BUILD.gn
 @@ -1040,7 +1040,7 @@ static_library("extensions") {
      sources -= [ "global_shortcut_listener_ozone.cc" ]
@@ -9,6 +9,15 @@
      deps += [ "//build/linux:fontconfig" ]
  
      if (use_dbus) {
+@@ -1100,7 +1100,7 @@ static_library("extensions") {
+     ]
+   }
+ 
+-  if (is_win || (is_linux && !is_chromeos)) {
++  if (is_win || ((is_linux || is_bsd) && !is_chromeos)) {
+     sources += [
+       "api/input_ime/input_ime_api.cc",
+       "api/input_ime/input_ime_api.h",
 @@ -1133,6 +1133,12 @@ static_library("extensions") {
      defines += [ "ENABLE_HOTWORDING" ]
    }

Modified: branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
==============================================================================
--- branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc	Thu May  4 03:00:36 2017	(r440081)
+++ branches/2017Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc	Thu May  4 03:25:13 2017	(r440082)
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2017-05-02 19:02:47 UTC
 +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
 @@ -63,7 +63,7 @@
  #include "chrome/browser/chromeos/extensions/media_player_api.h"
@@ -14,7 +14,7 @@
    extensions::InputImeAPI::GetFactoryInstance();
    extensions::InputMethodAPI::GetFactoryInstance();
 -#elif defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_LINUX) || defined(OS_WIN) && !defined(OS_BSD)
++#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
    extensions::InputImeAPI::GetFactoryInstance();
  #endif
    extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();

Modified: branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
==============================================================================
--- branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc	Thu May  4 03:00:36 2017	(r440081)
+++ branches/2017Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc	Thu May  4 03:25:13 2017	(r440082)
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2017-05-02 19:02:48 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 @@ -290,7 +290,7 @@ bool IsAboutUI(const GURL& url) {
  #if !defined(OS_ANDROID)
@@ -9,3 +9,12 @@
            || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost ||
            url.host_piece() == chrome::kChromeUISandboxHost
  #endif
+@@ -567,7 +567,7 @@ WebUIFactoryFunction GetWebUIFactoryFunc
+   if (url.host_piece() == chrome::kChromeUINaClHost)
+     return &NewWebUI<NaClUI>;
+ #endif
+-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) {
+     return &NewWebUI<ConstrainedWebDialogUI>;
+   }

Copied: branches/2017Q2/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn (from r440072, head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn	Thu May  4 03:25:13 2017	(r440082, copy of r440072, head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn)
@@ -0,0 +1,11 @@
+--- chrome/common/extensions/api/BUILD.gn.orig	2017-05-02 19:02:48 UTC
++++ chrome/common/extensions/api/BUILD.gn
+@@ -116,7 +116,7 @@ if (is_chromeos) {
+     "wallpaper.json",
+     "wallpaper_private.json",
+   ]
+-} else if (is_linux || is_win) {
++} else if (is_linux || is_bsd || is_win) {
+   schema_sources += [ "input_ime.json" ]
+ }
+ if (enable_service_discovery) {

Copied: branches/2017Q2/www/chromium/files/patch-components_filesystem_file__system__app.cc (from r440072, head/www/chromium/files/patch-components_filesystem_file__system__app.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-components_filesystem_file__system__app.cc	Thu May  4 03:25:13 2017	(r440082, copy of r440072, head/www/chromium/files/patch-components_filesystem_file__system__app.cc)
@@ -0,0 +1,20 @@
+--- components/filesystem/file_system_app.cc.orig	2017-05-02 19:02:50 UTC
++++ components/filesystem/file_system_app.cc
+@@ -23,7 +23,7 @@
+ #elif defined(OS_ANDROID)
+ #include "base/base_paths_android.h"
+ #include "base/path_service.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/environment.h"
+ #include "base/nix/xdg_util.h"
+ #elif defined(OS_MACOSX)
+@@ -75,7 +75,7 @@ base::FilePath FileSystemApp::GetUserDat
+     CHECK(PathService::Get(base::DIR_APP_DATA, &path));
+ #elif defined(OS_ANDROID)
+     CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &path));
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+     std::unique_ptr<base::Environment> env(base::Environment::Create());
+     path = base::nix::GetXDGDirectory(env.get(),
+                                       base::nix::kXdgConfigHomeEnvVar,

Copied: branches/2017Q2/www/chromium/files/patch-v8_src_wasm_wasm-result.h (from r440072, head/www/chromium/files/patch-v8_src_wasm_wasm-result.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-v8_src_wasm_wasm-result.h	Thu May  4 03:25:13 2017	(r440082, copy of r440072, head/www/chromium/files/patch-v8_src_wasm_wasm-result.h)
@@ -0,0 +1,10 @@
+--- v8/src/wasm/wasm-result.h.orig	2017-05-02 19:04:10 UTC
++++ v8/src/wasm/wasm-result.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_WASM_RESULT_H_
+ #define V8_WASM_RESULT_H_
+ 
++#include <cstdarg>
+ #include <memory>
+ 
+ #include "src/base/compiler-specific.h"

Modified: branches/2017Q2/www/chromium/pkg-plist
==============================================================================
--- branches/2017Q2/www/chromium/pkg-plist	Thu May  4 03:00:36 2017	(r440081)
+++ branches/2017Q2/www/chromium/pkg-plist	Thu May  4 03:25:13 2017	(r440082)
@@ -223,6 +223,7 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/unit_test_runner.js
 %%DATADIR%%/resources/inspector/utility_shared_worker.js
 %%DATADIR%%/snapshot_blob.bin
+%%DATADIR%%/test_ime_driver.service
 %%DATADIR%%/ui.service
 %%DATADIR%%/views_mus_resources.pak
 %%DRIVER%%bin/chromedriver


More information about the svn-ports-all mailing list