diff options
author | Rene Ladan <rene@FreeBSD.org> | 2013-05-14 21:10:15 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2013-05-14 21:10:15 +0000 |
commit | 217593e8de3b3015393d2afaade0aa1ccea49b7a (patch) | |
tree | ab81e2a78d66721e46b691bea9c0bea13db968b4 /www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc | |
parent | 27cdbbe186631d1ab66359f93dcaf2e1e99dc840 (diff) | |
download | ports-217593e8de3b3015393d2afaade0aa1ccea49b7a.tar.gz ports-217593e8de3b3015393d2afaade0aa1ccea49b7a.zip |
Update to 27.0.1453.81
Note that this is still a beta version, and that the sysctl
kern.ipc.shm_allow_removed must be set to 1 for correct operation.
Port changes:
- add dependency on accessibility/speech-dispatcher for libspeechd
- use internal libvpx
- update disk space requirements
- add pkg-message for the above sysctl
Submitted by: George Liaskos
Security: http://vuxml.org/freebsd/bdd48858-9656-11e2-a9a8-00262d5ed8ee.html
Notes
Notes:
svn path=/head/; revision=318200
Diffstat (limited to 'www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc')
-rw-r--r-- | www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc index 8a4261fb13d0..531e60a7609a 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2012-10-31 21:02:22.000000000 +0200 -+++ chrome/browser/ui/webui/about_ui.cc 2012-11-07 15:58:46.000000000 +0200 -@@ -928,7 +928,7 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2013-02-28 10:15:18.000000000 +0200 ++++ chrome/browser/ui/webui/about_ui.cc 2013-03-06 20:47:33.000000000 +0200 +@@ -740,7 +740,7 @@ return data; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -944,6 +944,7 @@ +@@ -756,6 +756,7 @@ return data; } @@ -17,20 +17,20 @@ void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append("<tr><td>"); -@@ -1005,6 +1006,7 @@ +@@ -818,6 +819,7 @@ return data; } #endif +#endif - std::string AboutVersionStaticContent(const std::string& query) { - return ResourceBundle::GetSharedInstance().GetRawDataResource( -@@ -1396,7 +1398,7 @@ - } else if (host == chrome::kChromeUIDNSHost) { - AboutDnsHandler::Start(this, request_id); + // AboutMemoryHandler ---------------------------------------------------------- + +@@ -986,7 +988,7 @@ + } else if (source_name_ == chrome::kChromeUIDNSHost) { + AboutDnsHandler::Start(profile(), callback); return; -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - } else if (host == chrome::kChromeUILinuxProxyConfigHost) { + } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif |