diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2011-12-13 20:41:14 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2011-12-13 20:41:14 +0000 |
| commit | f8b007a1f09aec39141052c709b99e403b849adb (patch) | |
| tree | 23f683215d847ff7751e055b570127feee4a339c /www/chromium/files/patch-chrome__nacl.gypi | |
| parent | Document Opera multiple vulnerabilities. (diff) | |
Update to 16.0.912.63
- enhancements to Sync
- ability to create multiple profiles on a single instance
Obtained from: Chromium Chruetertee development repository
Security: http://www.vuxml.org/freebsd/68ac6266-25c3-11e1-b63a-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-chrome__nacl.gypi')
| -rw-r--r-- | www/chromium/files/patch-chrome__nacl.gypi | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/www/chromium/files/patch-chrome__nacl.gypi b/www/chromium/files/patch-chrome__nacl.gypi index 7d2ee172a349..07da0980dcbf 100644 --- a/www/chromium/files/patch-chrome__nacl.gypi +++ b/www/chromium/files/patch-chrome__nacl.gypi @@ -1,22 +1,22 @@ ---- chrome/nacl.gypi.orig 2011-10-10 21:43:36.427755838 +0300 -+++ chrome/nacl.gypi 2011-10-10 21:47:51.837729515 +0300 -@@ -103,8 +103,8 @@ +--- chrome/nacl.gypi.orig 2011-11-01 10:43:23.000000000 +0200 ++++ chrome/nacl.gypi 2011-11-19 19:26:48.000000000 +0200 +@@ -102,8 +102,8 @@ + ], + }, ], - }, - ], -- }], -- ['OS!="win" and target_arch=="ia32"', { -+ }], # Disable nacl on freebsd for now. -+ ['OS!="win" and OS!="freebsd" and target_arch=="ia32"', { - # Linux-x86-32 and OSX need only the x86-32 IRT. - 'actions': [ - { -@@ -120,7 +120,7 @@ - }, - ], - }], -- ['OS!="win" and target_arch=="x64"', { -+ ['OS!="win" and OS!="freebsd" and target_arch=="x64"', { - # Linux-x86-64 needs only the x86-64 IRT. - 'actions': [ - { +- }], +- ['OS!="win" and target_arch=="ia32"', { ++ }], # Disable nacl on freebsd for now. ++ ['OS!="win" and OS!="freebsd" and target_arch=="ia32"', { + # Linux-x86-32 and OSX need only the x86-32 IRT. + 'actions': [ + { +@@ -119,7 +119,7 @@ + }, + ], + }], +- ['OS!="win" and target_arch=="x64"', { ++ ['OS!="win" and OS!="freebsd" and target_arch=="x64"', { + # Linux-x86-64 needs only the x86-64 IRT. + 'actions': [ + { |