Date: Fri, 12 May 2017 12:49:48 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440681 - in head/www/iridium: . files Message-ID: <201705121249.v4CCnmmR024460@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Fri May 12 12:49:48 2017 New Revision: 440681 URL: https://svnweb.freebsd.org/changeset/ports/440681 Log: - Apply r440680 to iridium Added: head/www/iridium/files/patch-chrome_app_chrome__main.cc (contents, props changed) head/www/iridium/files/patch-chrome_chrome__paks.gni (contents, props changed) head/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc (contents, props changed) head/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h (contents, props changed) head/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc (contents, props changed) head/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h (contents, props changed) head/www/iridium/files/patch-headless_lib_headless__macros.h (contents, props changed) head/www/iridium/files/patch-remoting_host_host__details.cc (contents, props changed) Modified: head/www/iridium/Makefile Modified: head/www/iridium/Makefile ============================================================================== --- head/www/iridium/Makefile Fri May 12 12:45:42 2017 (r440680) +++ head/www/iridium/Makefile Fri May 12 12:49:48 2017 (r440681) @@ -3,7 +3,7 @@ PORTNAME= iridium PORTVERSION= 58.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser Added: head/www/iridium/files/patch-chrome_app_chrome__main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-chrome_app_chrome__main.cc Fri May 12 12:49:48 2017 (r440681) @@ -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(); Added: head/www/iridium/files/patch-chrome_chrome__paks.gni ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-chrome_chrome__paks.gni Fri May 12 12:49:48 2017 (r440681) @@ -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" ] + } Added: head/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc Fri May 12 12:49:48 2017 (r440681) @@ -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, Added: head/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h Fri May 12 12:49:48 2017 (r440681) @@ -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, Added: head/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc Fri May 12 12:49:48 2017 (r440681) @@ -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()); Added: head/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h Fri May 12 12:49:48 2017 (r440681) @@ -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 + Added: head/www/iridium/files/patch-headless_lib_headless__macros.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-headless_lib_headless__macros.h Fri May 12 12:49:48 2017 (r440681) @@ -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_ Added: head/www/iridium/files/patch-remoting_host_host__details.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-remoting_host_host__details.cc Fri May 12 12:49:48 2017 (r440681) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705121249.v4CCnmmR024460>