- Use HTTPS-URL in MASTER_SITES

- Fix build warning: multiple rules generate base/callback_helpers.o
- Remove CPE information as it is not documented for iridium browser
- Remove Chromium API key since services are not used anyway
- Apply patches from r440072
- Bump PORTREVISION

Reported by:	Fabian Keil <freebsd-listen@fabiankeil.de> via email

13 files changed, 97 insertions, 45 deletions

diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 9b7227b6c02a..495f10978d48 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	iridium
 PORTVERSION=	58.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	http://downloads.iridiumbrowser.de/source/
+MASTER_SITES=	https://downloads.iridiumbrowser.de/source/
 PKGNAMESUFFIX=	-browser
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
@@ -64,8 +64,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 USES=		compiler bison cpe desktop-file-utils execinfo jpeg \
 		ninja perl5 pkgconfig python:2,build shebangfix tar:xz
 
-CPE_VENDOR=	google
-CPE_PRODUCT=	chrome
 USE_PERL5=	build
 USE_XORG=	scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xproto xrandr xrender xscrnsaver xtst
@@ -99,14 +97,6 @@ GN_ARGS+=	is_clang=true \
 # use_system_icu use_system_harfbuzz use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild
 
-# FreeBSD Chromium Api Key
-# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-# Note: these are for FreeBSD use ONLY. For your own distribution,
-# please get your own set of keys.
-GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
-		google_default_client_id="996322985003.apps.googleusercontent.com" \
-		google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
-
 SUB_FILES=	iridium-browser.desktop iridium
 SUB_LIST+=	COMMENT="${COMMENT}"
 
@@ -228,7 +218,7 @@ do-configure:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-.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
diff --git a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc
new file mode 100644
index 000000000000..809ef024c745
--- /dev/null
+++ b/www/iridium/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();
diff --git a/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc b/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc
new file mode 100644
index 000000000000..63c55461db09
--- /dev/null
+++ b/www/iridium/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;
diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
index 1b121b49fe31..e1ec5184a20c 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -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" ]
    }
diff --git a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
index 6ec1bd998080..6c2ea783144c 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -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();
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 0f035ece4581..248120d25908 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -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>;
+   }
diff --git a/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn b/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn
new file mode 100644
index 000000000000..d721ddc239d9
--- /dev/null
+++ b/www/iridium/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) {
diff --git a/www/iridium/files/patch-components_filesystem_file__system__app.cc b/www/iridium/files/patch-components_filesystem_file__system__app.cc
new file mode 100644
index 000000000000..87a2c07af344
--- /dev/null
+++ b/www/iridium/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,
diff --git a/www/iridium/files/patch-services_ui_BUILD.gn b/www/iridium/files/patch-services_ui_BUILD.gn
deleted file mode 100644
index 144b26e28ad9..000000000000
--- a/www/iridium/files/patch-services_ui_BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
---- services/ui/BUILD.gn.orig	2017-04-19 19:06:37 UTC
-+++ services/ui/BUILD.gn
-@@ -12,7 +12,6 @@ group("all") {
-   testonly = true
-   deps = [
-     ":ui",
--    "//services/ui/ime/test_ime_driver",
-     "//services/ui/test_wm",
-   ]
- }
-@@ -32,7 +31,6 @@ service("ui") {
-     ":resources_100",
-     ":resources_200",
-     ":resources_strings",
--    "//services/ui/ime/test_ime_driver",
-   ]
- }
- 
diff --git a/www/iridium/files/patch-services_ui_ime_BUILD.gn b/www/iridium/files/patch-services_ui_ime_BUILD.gn
deleted file mode 100644
index 6eb53422958d..000000000000
--- a/www/iridium/files/patch-services_ui_ime_BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
---- services/ui/ime/BUILD.gn.orig	2017-04-19 19:06:37 UTC
-+++ services/ui/ime/BUILD.gn
-@@ -51,7 +51,6 @@ service_test("mus_ime_unittests") {
-   data_deps = [
-     ":lib",
-     "//services/ui",
--    "//services/ui/ime/test_ime_driver",
-   ]
- }
- 
diff --git a/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py
index 35ce7170eee0..99badf266669 100644
--- a/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py
+++ b/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py
@@ -1,4 +1,4 @@
---- tools/gn/bootstrap/bootstrap.py.orig	2017-04-19 19:06:54 UTC
+--- tools/gn/bootstrap/bootstrap.py.orig	2017-04-24 14:40:24 UTC
 +++ tools/gn/bootstrap/bootstrap.py
 @@ -23,6 +23,7 @@ import os
  import shutil
@@ -19,7 +19,7 @@
  
  def check_call(cmd, **kwargs):
    logging.debug('Running: %s', ' '.join(cmd))
-@@ -624,6 +626,41 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -625,6 +627,40 @@ def write_gn_ninja(path, root_gen_dir, o
          'base/third_party/libevent/epoll.c',
      ])
  
@@ -36,7 +36,6 @@
 +    static_libraries['base']['sources'].extend([
 +        'base/allocator/allocator_shim.cc',
 +        'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
-+        'base/callback_helpers.cc',
 +        'base/memory/shared_memory_posix.cc',
 +        'base/nix/xdg_util.cc',
 +        'base/process/memory_stubs.cc',
diff --git a/www/iridium/files/patch-v8_src_wasm_wasm-result.h b/www/iridium/files/patch-v8_src_wasm_wasm-result.h
new file mode 100644
index 000000000000..e83a461c07a8
--- /dev/null
+++ b/www/iridium/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"
diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist
index bb9d93dbc471..edc9974de4dd 100644
--- a/www/iridium/pkg-plist
+++ b/www/iridium/pkg-plist
@@ -222,6 +222,7 @@ share/applications/iridium-browser.desktop
 %%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
 share/icons/hicolor/128x128/apps/iridium.png