- Apply r440680 to iridium

9 files changed, 135 insertions, 1 deletions

diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 495f109..a6d3044 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	iridium
 PORTVERSION=	58.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://downloads.iridiumbrowser.de/source/
 PKGNAMESUFFIX=	-browser
diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc
new file mode 100644
index 0000000..a3195d1
--- /dev/null
+++ b/www/iridium/files/patch-chrome_app_chrome__main.cc
@@ -0,0 +1,19 @@
+--- chrome/app/chrome_main.cc.orig	2017-05-09 19:02:41 UTC
++++ chrome/app/chrome_main.cc
+@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar
+   ALLOW_UNUSED_LOCAL(command_line);
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   if (command_line->HasSwitch(switches::kHeadless)) {
+ #if defined(OS_MACOSX)
+     SetUpBundleOverrides();
+ #endif
+     return headless::HeadlessShellMain(argc, argv);
+   }
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ 
+ #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+   version_info::Channel channel = chrome::GetChannel();
diff --git a/www/iridium/files/patch-chrome_chrome__paks.gni b/www/iridium/files/patch-chrome_chrome__paks.gni
new file mode 100644
index 0000000..849ca49
--- /dev/null
+++ b/www/iridium/files/patch-chrome_chrome__paks.gni
@@ -0,0 +1,11 @@
+--- chrome/chrome_paks.gni.orig	2017-05-09 19:02:43 UTC
++++ chrome/chrome_paks.gni
+@@ -157,7 +157,7 @@ template("chrome_extra_paks") {
+         "//ui/file_manager:resources",
+       ]
+     }
+-    if (is_linux) {
++    if (is_linux || is_bsd) {
+       sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ]
+       deps += [ "//headless:resources" ]
+     }
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
new file mode 100644
index 0000000..90db873
--- /dev/null
+++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
@@ -0,0 +1,20 @@
+--- headless/lib/browser/headless_content_browser_client.cc.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/browser/headless_content_browser_client.cc
+@@ -171,7 +171,7 @@ void HeadlessContentBrowserClient::GetQu
+       callback);
+ }
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+     const base::CommandLine& command_line,
+     int child_process_id,
+@@ -182,7 +182,7 @@ void HeadlessContentBrowserClient::GetAd
+     mappings->Share(kCrashDumpSignal, crash_signal_fd);
+ #endif  // defined(HEADLESS_USE_BREAKPAD)
+ }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+ void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches(
+     base::CommandLine* command_line,
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
new file mode 100644
index 0000000..de0fc68
--- /dev/null
+++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
@@ -0,0 +1,11 @@
+--- headless/lib/browser/headless_content_browser_client.h.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/browser/headless_content_browser_client.h
+@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : pub
+       content::BrowserContext* context,
+       content::StoragePartition* partition,
+       const storage::OptionalQuotaSettingsCallback& callback) override;
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+   void GetAdditionalMappedFilesForChildProcess(
+       const base::CommandLine& command_line,
+       int child_process_id,
diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
new file mode 100644
index 0000000..5466bfb
--- /dev/null
+++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -0,0 +1,38 @@
+--- headless/lib/headless_content_main_delegate.cc.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/headless_content_main_delegate.cc
+@@ -147,7 +147,7 @@ void HeadlessContentMainDelegate::InitCr
+   g_headless_crash_client.Pointer()->set_crash_dumps_dir(
+       browser_->options()->crash_dumps_dir);
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+   if (!browser_->options()->enable_crash_reporter) {
+     DCHECK(!breakpad::IsCrashReporterEnabled());
+     return;
+@@ -156,7 +156,7 @@ void HeadlessContentMainDelegate::InitCr
+   if (process_type != switches::kZygoteProcess)
+     breakpad::InitCrashReporter(process_type);
+ #endif  // defined(HEADLESS_USE_BREAKPAD)
+-#endif  // !defined(OS_MACOSX)
++#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
+ }
+ 
+ void HeadlessContentMainDelegate::PreSandboxStartup() {
+@@ -170,7 +170,7 @@ void HeadlessContentMainDelegate::PreSan
+   if (command_line.HasSwitch(switches::kEnableLogging))
+     InitLogging(command_line);
+ #endif
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+   InitCrashReporter(command_line);
+ #endif
+   InitializeResourceBundle();
+@@ -202,7 +202,7 @@ int HeadlessContentMainDelegate::RunProc
+   return 0;
+ }
+ 
+-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ void HeadlessContentMainDelegate::ZygoteForked() {
+   const base::CommandLine& command_line(
+       *base::CommandLine::ForCurrentProcess());
diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h
new file mode 100644
index 0000000..26af4d1
--- /dev/null
+++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h
@@ -0,0 +1,11 @@
+--- headless/lib/headless_content_main_delegate.h.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/headless_content_main_delegate.h
+@@ -39,7 +39,7 @@ class HeadlessContentMainDelegate : publ
+ 
+   HeadlessBrowserImpl* browser() const { return browser_.get(); }
+ 
+-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   void ZygoteForked() override;
+ #endif
+ 
diff --git a/www/iridium/files/patch-headless_lib_headless__macros.h b/www/iridium/files/patch-headless_lib_headless__macros.h
new file mode 100644
index 0000000..6692a04
--- /dev/null
+++ b/www/iridium/files/patch-headless_lib_headless__macros.h
@@ -0,0 +1,13 @@
+--- headless/lib/headless_macros.h.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/headless_macros.h
+@@ -5,8 +5,8 @@
+ #ifndef HEADLESS_LIB_HEADLESS_MACROS_H_
+ #define HEADLESS_LIB_HEADLESS_MACROS_H_
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #define HEADLESS_USE_BREAKPAD
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+ #endif  // HEADLESS_LIB_HEADLESS_MACROS_H_
diff --git a/www/iridium/files/patch-remoting_host_host__details.cc b/www/iridium/files/patch-remoting_host_host__details.cc
new file mode 100644
index 0000000..1088d08
--- /dev/null
+++ b/www/iridium/files/patch-remoting_host_host__details.cc
@@ -0,0 +1,11 @@
+--- remoting/host/host_details.cc.orig	2017-05-09 19:02:49 UTC
++++ remoting/host/host_details.cc
+@@ -26,6 +26,8 @@ std::string GetHostOperatingSystemName()
+   return "Linux";
+ #elif defined(OS_ANDROID)
+   return "Android";
++#elif defined(OS_BSD)
++  return "BSD";
+ #else
+ #error "Unsupported host OS"
+ #endif