summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome__browser__memory_details.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-08-14 21:48:32 +0000
committerRene Ladan <rene@FreeBSD.org>2014-08-14 21:48:32 +0000
commitabb2b41ec6e1423147f483a667c189ebdc908535 (patch)
treed388d9f9b91dda05ab0d7e300a11f3844d1dbc08 /www/chromium/files/patch-chrome__browser__memory_details.cc
parent- Fix escaping linker options at configure; this fixes build with SSP (diff)
- Update to 36.0.1985.143 and unforbid
- Use a lot of ports dependencies instead of bundled versions (idea from Gentoo Linux) - Make patches more compatible with OpenBSD - Add note about Python (only relevant for DIY builds) - Install more icons into PREFIX/share/icons/hicolor/XxY/apps/ - Mute mkdir in installation - Install mksnapshot binary - Do not install bundled protoc binary Obtained from: Gentoo, OpenBSD, various contributors in freebsd-chromium@ MFH: 2014Q3 Security: http://www.vuxml.org/freebsd/df7754c0-2294-11e4-b505-000c6e25e3e9.html
Diffstat (limited to 'www/chromium/files/patch-chrome__browser__memory_details.cc')
-rw-r--r--www/chromium/files/patch-chrome__browser__memory_details.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc
index 9c241af1ee8b..717588a987ca 100644
--- a/www/chromium/files/patch-chrome__browser__memory_details.cc
+++ b/www/chromium/files/patch-chrome__browser__memory_details.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/memory_details.cc.orig 2014-04-30 22:42:17.000000000 +0200
-+++ ./chrome/browser/memory_details.cc 2014-05-04 14:38:46.000000000 +0200
+--- ./chrome/browser/memory_details.cc.orig 2014-08-12 21:01:47.000000000 +0200
++++ ./chrome/browser/memory_details.cc 2014-08-13 09:56:56.000000000 +0200
@@ -32,7 +32,7 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -9,7 +9,7 @@
#include "content/public/browser/zygote_host_linux.h"
#endif
-@@ -204,7 +204,7 @@
+@@ -202,7 +202,7 @@
void MemoryDetails::CollectChildInfoOnUIThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -18,7 +18,7 @@
const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
const pid_t sandbox_helper_pid =
content::ZygoteHost::GetInstance()->GetSandboxHelperPid();
-@@ -345,7 +345,7 @@
+@@ -336,7 +336,7 @@
}
}