diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-08-23 20:37:16 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-08-23 20:37:16 +0000 |
| commit | 47e1e0949d21eefbd3a192e1ef9b6513d24b99ae (patch) | |
| tree | 7f3bc52d92d343d6b17499e64badb49612b1591a /www/chromium/files/patch-base_process_process__posix.cc | |
| parent | 848da09b6aa8c4c31b0135c50f8afa3bb341b183 (diff) | |
| download | ports-47e1e0949d21eefbd3a192e1ef9b6513d24b99ae.tar.gz ports-47e1e0949d21eefbd3a192e1ef9b6513d24b99ae.zip | |
www/chromium: update to 60.0.3112.101
- Update LICENSE
- Drop USE_GNOME=gtk20 dependency because chromium uses gtk3
- Use freetype2 bundled to avoid more issues related to the freetype library
- Fix typo in the comment of pre-configure section
- Update comment in SNDIO section
Changelog: https://chromium.googlesource.com/chromium/src/+log/59.0.3071.115..60.0.3112.101?pretty=fuller&n=10000
MFH: 2017Q3
Security: https://vuxml.freebsd.org/freebsd/7d138476-7710-11e7-88a1-e8e0b747a45a.html
Notes
Notes:
svn path=/head/; revision=448637
Diffstat (limited to 'www/chromium/files/patch-base_process_process__posix.cc')
| -rw-r--r-- | www/chromium/files/patch-base_process_process__posix.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc index 7ea5ddd20fc0..bf09d2565e93 100644 --- a/www/chromium/files/patch-base_process_process__posix.cc +++ b/www/chromium/files/patch-base_process_process__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_posix.cc.orig 2017-06-15 21:03:00.000000000 +0200 -+++ base/process/process_posix.cc 2017-06-19 15:25:27.760111000 +0200 -@@ -21,8 +21,18 @@ +--- base/process/process_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/process/process_posix.cc 2017-08-02 19:38:18.657740000 +0200 +@@ -22,8 +22,18 @@ #include <sys/event.h> #endif @@ -19,9 +19,9 @@ #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -184,13 +194,13 @@ - base::ProcessHandle parent_pid = base::GetParentProcessId(handle); +@@ -186,13 +196,13 @@ base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); + if (parent_pid != our_pid) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) @@ -36,26 +36,26 @@ } int status; -@@ -256,12 +266,16 @@ +@@ -258,12 +268,16 @@ return Process(handle); } --#if !defined(OS_LINUX) && !defined(OS_MACOSX) -+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { return false; } --#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) +-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) +#elif defined(OS_FREEBSD) +bool Process::CanBackgroundProcesses() { + return true; +} -+#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD) // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -@@ -369,15 +383,31 @@ +@@ -371,15 +385,31 @@ bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); @@ -85,5 +85,5 @@ + return result == 0; +#endif // !defined(OS_FREEBSD) } - #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) + #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) |