diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2012-05-28 22:29:08 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2012-05-28 22:29:08 +0000 |
| commit | 3b94bb84806f74d78187a018ec3155a6bd6cb195 (patch) | |
| tree | e2842b0137a784e2bf8527a29936c01f051d31c3 /www | |
| parent | 3676146ac4ffb6a5006ea1c5682f740dee6ef6a2 (diff) | |
| download | ports-3b94bb84806f74d78187a018ec3155a6bd6cb195.tar.gz ports-3b94bb84806f74d78187a018ec3155a6bd6cb195.zip | |
Notes
Diffstat (limited to 'www')
36 files changed, 461 insertions, 447 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 0b60064196c7..f54ebe7db18f 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -7,7 +7,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 18.0.1025.168 +DISTVERSION= 19.0.1084.52 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ @@ -38,8 +38,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ nss3.1:${PORTSDIR}/security/nss \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ cups.2:${PORTSDIR}/print/cups-client \ - event-1.4:${PORTSDIR}/devel/libevent \ - tcmalloc.2:${PORTSDIR}/devel/google-perftools + event-1.4:${PORTSDIR}/devel/libevent RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \ @@ -67,6 +66,7 @@ GYP_DEFINES+= use_cups=1 \ use_system_ffmpeg=0 \ use_system_libevent=1 \ use_system_tcmalloc=1 \ + linux_use_tcmalloc=0 \ linux_use_heapchecker=0 \ disable_nacl=1 \ enable_webrtc=0 \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 4ca32a205b77..5f2fa56da38a 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,2 +1,2 @@ -SHA256 (chromium-courgette-redacted-18.0.1025.168.tar.xz) = b5da6c7d7d50cf82f65a06cadf57165babff19af685b88b4ef5aaf25dcaae05a -SIZE (chromium-courgette-redacted-18.0.1025.168.tar.xz) = 142218028 +SHA256 (chromium-courgette-redacted-19.0.1084.52.tar.xz) = 032cb366721f82ded6385fb4a12e678711d60aa3e3f67fa24e4aa5a1a615c270 +SIZE (chromium-courgette-redacted-19.0.1084.52.tar.xz) = 148691260 diff --git a/www/chromium/files/patch-base__allocator__allocator.gyp b/www/chromium/files/patch-base__allocator__allocator.gyp index 5c6a3bf493a3..77136ad6243c 100644 --- a/www/chromium/files/patch-base__allocator__allocator.gyp +++ b/www/chromium/files/patch-base__allocator__allocator.gyp @@ -1,12 +1,6 @@ ---- base/allocator/allocator.gyp.orig 2012-03-28 00:39:56.000000000 +0300 -+++ base/allocator/allocator.gyp 2012-03-28 00:41:11.709398120 +0300 -@@ -1,4 +1,4 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright (c) 2009 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -@@ -7,331 +7,203 @@ +--- base/allocator/allocator.gyp.orig 2012-05-20 01:26:46.857105914 +0300 ++++ base/allocator/allocator.gyp 2012-05-20 01:52:58.243106608 +0300 +@@ -7,353 +7,210 @@ 'jemalloc_dir': '../../third_party/jemalloc/chromium', 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', }, @@ -48,7 +42,7 @@ + 'type': 'none', + 'direct_dependent_settings': { 'defines': [ -- ['PERFTOOLS_DLL_DECL', ''] +- 'PERFTOOLS_DLL_DECL=', + 'USE_SYSTEM_TCMALLOC', + ], + }, @@ -73,7 +67,6 @@ - '<(tcmalloc_dir)/src/addressmap-inl.h', - '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', - '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h', -- '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h', - '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h', - '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h', - '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', @@ -87,6 +80,8 @@ - # We don't list dynamic_annotations.c since its copy is already - # present in the dynamic_annotations target. - '<(tcmalloc_dir)/src/base/dynamic_annotations.h', +- '<(tcmalloc_dir)/src/base/elf_mem_image.cc', +- '<(tcmalloc_dir)/src/base/elf_mem_image.h', - '<(tcmalloc_dir)/src/base/elfcore.h', - '<(tcmalloc_dir)/src/base/googleinit.h', - '<(tcmalloc_dir)/src/base/linux_syscall_support.h', @@ -121,15 +116,15 @@ - '<(tcmalloc_dir)/src/free_list.cc', - '<(tcmalloc_dir)/src/free_list.h', - '<(tcmalloc_dir)/src/getpc.h', -- '<(tcmalloc_dir)/src/google/heap-checker.h', -- '<(tcmalloc_dir)/src/google/heap-profiler.h', -- '<(tcmalloc_dir)/src/google/malloc_extension.h', -- '<(tcmalloc_dir)/src/google/malloc_extension_c.h', -- '<(tcmalloc_dir)/src/google/malloc_hook.h', -- '<(tcmalloc_dir)/src/google/malloc_hook_c.h', -- '<(tcmalloc_dir)/src/google/profiler.h', -- '<(tcmalloc_dir)/src/google/stacktrace.h', -- '<(tcmalloc_dir)/src/google/tcmalloc.h', +- '<(tcmalloc_dir)/src/gperftools/heap-checker.h', +- '<(tcmalloc_dir)/src/gperftools/heap-profiler.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_extension.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_extension_c.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_hook.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_hook_c.h', +- '<(tcmalloc_dir)/src/gperftools/profiler.h', +- '<(tcmalloc_dir)/src/gperftools/stacktrace.h', +- '<(tcmalloc_dir)/src/gperftools/tcmalloc.h', - '<(tcmalloc_dir)/src/heap-checker-bcad.cc', - '<(tcmalloc_dir)/src/heap-checker.cc', - '<(tcmalloc_dir)/src/heap-profile-table.cc', @@ -137,10 +132,17 @@ - '<(tcmalloc_dir)/src/heap-profiler.cc', - '<(tcmalloc_dir)/src/internal_logging.cc', - '<(tcmalloc_dir)/src/internal_logging.h', +- '<(tcmalloc_dir)/src/libc_override.h', +- '<(tcmalloc_dir)/src/libc_override_gcc_and_weak.h', +- '<(tcmalloc_dir)/src/libc_override_glibc.h', +- '<(tcmalloc_dir)/src/libc_override_osx.h', +- '<(tcmalloc_dir)/src/libc_override_redefine.h', - '<(tcmalloc_dir)/src/linked_list.h', - '<(tcmalloc_dir)/src/malloc_extension.cc', - '<(tcmalloc_dir)/src/malloc_hook-inl.h', - '<(tcmalloc_dir)/src/malloc_hook.cc', +- '<(tcmalloc_dir)/src/malloc_hook_mmap_freebsd.h', +- '<(tcmalloc_dir)/src/malloc_hook_mmap_linux.h', - '<(tcmalloc_dir)/src/maybe_threads.cc', - '<(tcmalloc_dir)/src/maybe_threads.h', - '<(tcmalloc_dir)/src/memfs_malloc.cc', @@ -165,6 +167,7 @@ - '<(tcmalloc_dir)/src/stack_trace_table.cc', - '<(tcmalloc_dir)/src/stack_trace_table.h', - '<(tcmalloc_dir)/src/stacktrace.cc', +- '<(tcmalloc_dir)/src/stacktrace_arm-inl.h', - '<(tcmalloc_dir)/src/stacktrace_config.h', - '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', - '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', @@ -172,7 +175,6 @@ - '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', - '<(tcmalloc_dir)/src/stacktrace_with_context.cc', - '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', -- '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', - '<(tcmalloc_dir)/src/static_vars.cc', - '<(tcmalloc_dir)/src/static_vars.h', - '<(tcmalloc_dir)/src/symbolize.cc', @@ -185,7 +187,7 @@ - '<(tcmalloc_dir)/src/thread_cache.h', - '<(tcmalloc_dir)/src/windows/config.h', - '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', -- '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', +- '<(tcmalloc_dir)/src/windows/gperftools/tcmalloc.h', - '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', - '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', - '<(tcmalloc_dir)/src/windows/mingw.h', @@ -230,6 +232,7 @@ - '<(tcmalloc_dir)/src/base/basictypes.h', - '<(tcmalloc_dir)/src/base/commandlineflags.h', - '<(tcmalloc_dir)/src/base/cycleclock.h', +- '<(tcmalloc_dir)/src/base/elf_mem_image.h', - '<(tcmalloc_dir)/src/base/elfcore.h', - '<(tcmalloc_dir)/src/base/googleinit.h', - '<(tcmalloc_dir)/src/base/linux_syscall_support.h', @@ -240,17 +243,27 @@ - '<(tcmalloc_dir)/src/base/stl_allocator.h', - '<(tcmalloc_dir)/src/base/thread_annotations.h', - '<(tcmalloc_dir)/src/getpc.h', -- '<(tcmalloc_dir)/src/google/heap-checker.h', -- '<(tcmalloc_dir)/src/google/heap-profiler.h', -- '<(tcmalloc_dir)/src/google/malloc_extension_c.h', -- '<(tcmalloc_dir)/src/google/malloc_hook.h', -- '<(tcmalloc_dir)/src/google/malloc_hook_c.h', -- '<(tcmalloc_dir)/src/google/profiler.h', -- '<(tcmalloc_dir)/src/google/stacktrace.h', +- '<(tcmalloc_dir)/src/gperftools/heap-checker.h', +- '<(tcmalloc_dir)/src/gperftools/heap-profiler.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_extension.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_extension_c.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_hook.h', +- '<(tcmalloc_dir)/src/gperftools/malloc_hook_c.h', +- '<(tcmalloc_dir)/src/gperftools/profiler.h', +- '<(tcmalloc_dir)/src/gperftools/stacktrace.h', +- '<(tcmalloc_dir)/src/gperftools/tcmalloc.h', +- '<(tcmalloc_dir)/src/libc_override.h', +- '<(tcmalloc_dir)/src/libc_override_gcc_and_weak.h', +- '<(tcmalloc_dir)/src/libc_override_glibc.h', +- '<(tcmalloc_dir)/src/libc_override_osx.h', +- '<(tcmalloc_dir)/src/libc_override_redefine.h', +- '<(tcmalloc_dir)/src/malloc_hook_mmap_freebsd.h', +- '<(tcmalloc_dir)/src/malloc_hook_mmap_linux.h', - '<(tcmalloc_dir)/src/memfs_malloc.cc', - '<(tcmalloc_dir)/src/packed-cache-inl.h', - '<(tcmalloc_dir)/src/page_heap_allocator.h', - '<(tcmalloc_dir)/src/pagemap.h', +- '<(tcmalloc_dir)/src/stacktrace_arm-inl.h', - '<(tcmalloc_dir)/src/stacktrace_config.h', - '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', - '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', @@ -258,10 +271,9 @@ - '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', - '<(tcmalloc_dir)/src/stacktrace_with_context.cc', - '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', -- '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', - '<(tcmalloc_dir)/src/tcmalloc_guard.h', - '<(tcmalloc_dir)/src/windows/config.h', -- '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', +- '<(tcmalloc_dir)/src/windows/gperftools/tcmalloc.h', - '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', - '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', - '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', @@ -301,7 +313,7 @@ - 'conditions': [ - ['OS=="win"', { - 'defines': [ -- ['PERFTOOLS_DLL_DECL', ''] +- 'PERFTOOLS_DLL_DECL=', - ], - 'dependencies': [ - 'libcmt', @@ -319,13 +331,12 @@ + }, 'include_dirs': [ - '<(tcmalloc_dir)/src/windows', -- ], -- 'sources!': [ + '.', + '<(tcmalloc_dir)/src/base', + '<(tcmalloc_dir)/src', + '../..', -+ ], + ], +- 'sources!': [ + 'direct_dependent_settings': { + 'configurations': { + 'Common_Base': { @@ -342,7 +353,7 @@ + 'conditions': [ + ['OS=="win"', { + 'defines': [ -+ ['PERFTOOLS_DLL_DECL', ''] ++ 'PERFTOOLS_DLL_DECL=', + ], + }], + ], @@ -353,13 +364,11 @@ + '<(tcmalloc_dir)/src/config.h', + '<(tcmalloc_dir)/src/config_linux.h', + '<(tcmalloc_dir)/src/config_win.h', -+ '<(tcmalloc_dir)/src/config_freebsd.h', + + # all tcmalloc native and forked files + '<(tcmalloc_dir)/src/addressmap-inl.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', + '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h', -+ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', @@ -373,6 +382,8 @@ + # We don't list dynamic_annotations.c since its copy is already + # present in the dynamic_annotations target. + '<(tcmalloc_dir)/src/base/dynamic_annotations.h', + '<(tcmalloc_dir)/src/base/elf_mem_image.cc', + '<(tcmalloc_dir)/src/base/elf_mem_image.h', + '<(tcmalloc_dir)/src/base/elfcore.h', + '<(tcmalloc_dir)/src/base/googleinit.h', + '<(tcmalloc_dir)/src/base/linux_syscall_support.h', @@ -419,26 +430,34 @@ + '<(tcmalloc_dir)/src/free_list.cc', + '<(tcmalloc_dir)/src/free_list.h', + '<(tcmalloc_dir)/src/getpc.h', -+ '<(tcmalloc_dir)/src/google/heap-checker.h', -+ '<(tcmalloc_dir)/src/google/heap-profiler.h', -+ '<(tcmalloc_dir)/src/google/malloc_extension.h', -+ '<(tcmalloc_dir)/src/google/malloc_extension_c.h', -+ '<(tcmalloc_dir)/src/google/malloc_hook.h', -+ '<(tcmalloc_dir)/src/google/malloc_hook_c.h', -+ '<(tcmalloc_dir)/src/google/profiler.h', -+ '<(tcmalloc_dir)/src/google/stacktrace.h', -+ '<(tcmalloc_dir)/src/google/tcmalloc.h', ++ '<(tcmalloc_dir)/src/gperftools/heap-checker.h', ++ '<(tcmalloc_dir)/src/gperftools/heap-profiler.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_extension.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_extension_c.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_hook.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_hook_c.h', ++ '<(tcmalloc_dir)/src/gperftools/profiler.h', ++ '<(tcmalloc_dir)/src/gperftools/stacktrace.h', ++ '<(tcmalloc_dir)/src/gperftools/tcmalloc.h', '<(tcmalloc_dir)/src/heap-checker-bcad.cc', '<(tcmalloc_dir)/src/heap-checker.cc', -+ '<(tcmalloc_dir)/src/heap-profile-table.cc', -+ '<(tcmalloc_dir)/src/heap-profile-table.h', - '<(tcmalloc_dir)/src/heap-profiler.cc', +- '<(tcmalloc_dir)/src/heap-profiler.cc', + '<(tcmalloc_dir)/src/heap-profile-table.cc', + '<(tcmalloc_dir)/src/heap-profile-table.h', ++ '<(tcmalloc_dir)/src/heap-profiler.cc', + '<(tcmalloc_dir)/src/internal_logging.cc', + '<(tcmalloc_dir)/src/internal_logging.h', ++ '<(tcmalloc_dir)/src/libc_override.h', ++ '<(tcmalloc_dir)/src/libc_override_gcc_and_weak.h', ++ '<(tcmalloc_dir)/src/libc_override_glibc.h', ++ '<(tcmalloc_dir)/src/libc_override_osx.h', ++ '<(tcmalloc_dir)/src/libc_override_redefine.h', + '<(tcmalloc_dir)/src/linked_list.h', + '<(tcmalloc_dir)/src/malloc_extension.cc', + '<(tcmalloc_dir)/src/malloc_hook-inl.h', + '<(tcmalloc_dir)/src/malloc_hook.cc', ++ '<(tcmalloc_dir)/src/malloc_hook_mmap_freebsd.h', ++ '<(tcmalloc_dir)/src/malloc_hook_mmap_linux.h', + '<(tcmalloc_dir)/src/maybe_threads.cc', + '<(tcmalloc_dir)/src/maybe_threads.h', + '<(tcmalloc_dir)/src/memfs_malloc.cc', @@ -472,6 +491,7 @@ + '<(tcmalloc_dir)/src/stack_trace_table.cc', + '<(tcmalloc_dir)/src/stack_trace_table.h', + '<(tcmalloc_dir)/src/stacktrace.cc', ++ '<(tcmalloc_dir)/src/stacktrace_arm-inl.h', + '<(tcmalloc_dir)/src/stacktrace_config.h', + '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', + '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', @@ -479,7 +499,6 @@ + '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', + '<(tcmalloc_dir)/src/stacktrace_with_context.cc', + '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', -+ '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', + '<(tcmalloc_dir)/src/static_vars.cc', + '<(tcmalloc_dir)/src/static_vars.h', + '<(tcmalloc_dir)/src/symbolize.cc', @@ -492,7 +511,7 @@ + '<(tcmalloc_dir)/src/thread_cache.h', + '<(tcmalloc_dir)/src/windows/config.h', + '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', -+ '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', ++ '<(tcmalloc_dir)/src/windows/gperftools/tcmalloc.h', + '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', + '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', + '<(tcmalloc_dir)/src/windows/mingw.h', @@ -514,7 +533,7 @@ # jemalloc files '<(jemalloc_dir)/jemalloc.c', '<(jemalloc_dir)/jemalloc.h', -@@ -339,87 +211,238 @@ +@@ -361,70 +218,235 @@ '<(jemalloc_dir)/qr.h', '<(jemalloc_dir)/rb.h', @@ -557,6 +576,19 @@ + # sources! means that these are not compiled directly. 'sources!': [ - '<(tcmalloc_dir)/src/debugallocation.cc', +- ], +- }], +- [ 'linux_keep_shadow_stacks==1', { +- 'sources': [ +- '<(tcmalloc_dir)/src/linux_shadow_stacks.cc', +- '<(tcmalloc_dir)/src/linux_shadow_stacks.h', +- '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h', +- ], +- 'cflags': [ +- '-finstrument-functions', +- ], +- 'defines': [ +- 'KEEP_SHADOW_STACKS', + # Included by allocator_shim.cc for maximal inlining. + 'generic_allocators.cc', + 'win_allocator.cc', @@ -573,6 +605,7 @@ + '<(tcmalloc_dir)/src/base/basictypes.h', + '<(tcmalloc_dir)/src/base/commandlineflags.h', + '<(tcmalloc_dir)/src/base/cycleclock.h', ++ '<(tcmalloc_dir)/src/base/elf_mem_image.h', + '<(tcmalloc_dir)/src/base/elfcore.h', + '<(tcmalloc_dir)/src/base/googleinit.h', + '<(tcmalloc_dir)/src/base/linux_syscall_support.h', @@ -583,17 +616,27 @@ + '<(tcmalloc_dir)/src/base/stl_allocator.h', + '<(tcmalloc_dir)/src/base/thread_annotations.h', + '<(tcmalloc_dir)/src/getpc.h', -+ '<(tcmalloc_dir)/src/google/heap-checker.h', -+ '<(tcmalloc_dir)/src/google/heap-profiler.h', -+ '<(tcmalloc_dir)/src/google/malloc_extension_c.h', -+ '<(tcmalloc_dir)/src/google/malloc_hook.h', -+ '<(tcmalloc_dir)/src/google/malloc_hook_c.h', -+ '<(tcmalloc_dir)/src/google/profiler.h', -+ '<(tcmalloc_dir)/src/google/stacktrace.h', ++ '<(tcmalloc_dir)/src/gperftools/heap-checker.h', ++ '<(tcmalloc_dir)/src/gperftools/heap-profiler.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_extension.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_extension_c.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_hook.h', ++ '<(tcmalloc_dir)/src/gperftools/malloc_hook_c.h', ++ '<(tcmalloc_dir)/src/gperftools/profiler.h', ++ '<(tcmalloc_dir)/src/gperftools/stacktrace.h', ++ '<(tcmalloc_dir)/src/gperftools/tcmalloc.h', ++ '<(tcmalloc_dir)/src/libc_override.h', ++ '<(tcmalloc_dir)/src/libc_override_gcc_and_weak.h', ++ '<(tcmalloc_dir)/src/libc_override_glibc.h', ++ '<(tcmalloc_dir)/src/libc_override_osx.h', ++ '<(tcmalloc_dir)/src/libc_override_redefine.h', ++ '<(tcmalloc_dir)/src/malloc_hook_mmap_freebsd.h', ++ '<(tcmalloc_dir)/src/malloc_hook_mmap_linux.h', + '<(tcmalloc_dir)/src/memfs_malloc.cc', + '<(tcmalloc_dir)/src/packed-cache-inl.h', + '<(tcmalloc_dir)/src/page_heap_allocator.h', + '<(tcmalloc_dir)/src/pagemap.h', ++ '<(tcmalloc_dir)/src/stacktrace_arm-inl.h', + '<(tcmalloc_dir)/src/stacktrace_config.h', + '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', + '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', @@ -601,10 +644,9 @@ + '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', + '<(tcmalloc_dir)/src/stacktrace_with_context.cc', + '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', -+ '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', + '<(tcmalloc_dir)/src/tcmalloc_guard.h', + '<(tcmalloc_dir)/src/windows/config.h', -+ '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', ++ '<(tcmalloc_dir)/src/windows/gperftools/tcmalloc.h', + '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', + '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', + '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', @@ -619,16 +661,17 @@ + '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', ], - }], -- [ 'linux_keep_shadow_stacks==1', { -- 'sources': [ -- '<(tcmalloc_dir)/src/linux_shadow_stacks.cc', -- '<(tcmalloc_dir)/src/linux_shadow_stacks.h', -- '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h', +- [ 'linux_use_heapchecker==0', { +- # Do not compile and link the heapchecker source. +- 'sources!': [ +- '<(tcmalloc_dir)/src/heap-checker-bcad.cc', +- '<(tcmalloc_dir)/src/heap-checker.cc', + 'dependencies': [ + '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', ], -- 'cflags': [ -- '-finstrument-functions', +- # Disable the heap checker in tcmalloc. +- 'defines': [ +- 'NO_HEAP_CHECK', + 'msvs_settings': { + # TODO(sgk): merge this with build/common.gypi settings + 'VCLibrarianTool': { @@ -652,7 +695,7 @@ + 'conditions': [ + ['OS=="win"', { + 'defines': [ -+ ['PERFTOOLS_DLL_DECL', ''] ++ 'PERFTOOLS_DLL_DECL=', + ], + 'dependencies': [ + 'libcmt', @@ -661,6 +704,8 @@ + '<(tcmalloc_dir)/src/windows', + ], + 'sources!': [ ++ '<(tcmalloc_dir)/src/base/elf_mem_image.cc', ++ '<(tcmalloc_dir)/src/base/elf_mem_image.h', + '<(tcmalloc_dir)/src/base/linuxthreads.cc', + '<(tcmalloc_dir)/src/base/linuxthreads.h', + '<(tcmalloc_dir)/src/base/vdso_support.cc', @@ -680,6 +725,8 @@ + '<(tcmalloc_dir)/src/heap-checker-bcad.cc', + '<(tcmalloc_dir)/src/heap-checker.cc', + '<(tcmalloc_dir)/src/heap-profiler.cc', ++ '<(tcmalloc_dir)/src/heap-profile-table.cc', ++ '<(tcmalloc_dir)/src/heap-profile-table.h', + '<(tcmalloc_dir)/src/memory_region_map.cc', + '<(tcmalloc_dir)/src/memory_region_map.h', + '<(tcmalloc_dir)/src/profiledata.cc', @@ -770,56 +817,11 @@ + ], + }], ], -- 'defines': [ -- 'KEEP_SHADOW_STACKS', -+ }, -+ { -+ 'target_name': 'allocator_unittests', -+ 'type': 'executable', -+ 'dependencies': [ -+ 'allocator', -+ '../../testing/gtest.gyp:gtest', - ], -- }], -- [ 'linux_use_heapchecker==0', { -- # Do not compile and link the heapchecker source. -- 'sources!': [ -- '<(tcmalloc_dir)/src/heap-checker-bcad.cc', -- '<(tcmalloc_dir)/src/heap-checker.cc', -+ 'include_dirs': [ -+ '.', -+ '<(tcmalloc_dir)/src/base', -+ '<(tcmalloc_dir)/src', -+ '../..', - ], -- # Disable the heap checker in tcmalloc. -- 'defines': [ -- 'NO_HEAP_CHECK', -+ 'sources': [ -+ 'allocator_unittests.cc', - ], - }], - ], - }, -- { -- 'target_name': 'allocator_unittests', -- 'type': 'executable', -- 'dependencies': [ -- 'allocator', -- '../../testing/gtest.gyp:gtest', -- ], -- 'include_dirs': [ -- '.', -- '<(tcmalloc_dir)/src/base', -- '<(tcmalloc_dir)/src', -- '../..', -- ], -- 'sources': [ -- 'allocator_unittests.cc', + }, ], -- }, -- ], - 'conditions': [ + }], ['OS=="win"', { diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc new file mode 100644 index 000000000000..6ed998892b95 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2012-05-19 23:45:48.797106216 +0300 ++++ chrome/browser/chrome_browser_main.cc 2012-05-19 23:45:56.878106198 +0300 +@@ -1298,7 +1298,7 @@ + // just changed it to include experiments. + child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) + // Set the product channel for crash reports. + child_process_logging::SetChannel( + chrome::VersionInfo::GetVersionStringModifier()); diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc new file mode 100644 index 000000000000..02469aa806cf --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc @@ -0,0 +1,16 @@ +--- chrome/browser/chrome_browser_main_posix.cc.orig 2012-05-26 01:03:17.150187321 +0300 ++++ chrome/browser/chrome_browser_main_posix.cc 2012-05-26 01:49:33.217175094 +0300 +@@ -237,7 +237,13 @@ + } else { + g_shutdown_pipe_read_fd = pipefd[0]; + g_shutdown_pipe_write_fd = pipefd[1]; ++#if defined(OS_FREEBSD) ++ // gliaskos: PTHREAD_STACK_MIN causes chromium to crash under FreeBSD, ++ // we request the default pthread stack size by specifying 0 here. ++ const size_t kShutdownDetectorThreadStackSize = 0; ++#else + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN; ++#endif + // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so + // if you change this, you'll probably need to change the suppression. + if (!base::PlatformThread::CreateNonJoinable( diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc index b0653e1b8b35..4cb6c8d5eb06 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc @@ -1,16 +1,7 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2012-01-18 11:12:43.000000000 +0200 -+++ chrome/browser/chrome_content_browser_client.cc 2012-01-29 15:16:06.000000000 +0200 -@@ -87,7 +87,7 @@ - #include "chrome/browser/chrome_browser_main_mac.h" - #elif defined(OS_CHROMEOS) - #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" --#elif defined(OS_LINUX) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "chrome/browser/chrome_browser_main_linux.h" - #elif defined(OS_POSIX) - #include "chrome/browser/chrome_browser_main_posix.h" -@@ -105,7 +105,7 @@ - #include "chrome/browser/chrome_browser_main_extra_parts_aura.h" +--- chrome/browser/chrome_content_browser_client.cc.orig 2012-04-25 10:02:36.000000000 +0300 ++++ chrome/browser/chrome_content_browser_client.cc 2012-04-29 20:18:40.000000000 +0300 +@@ -132,7 +132,7 @@ + #include "chrome/browser/chrome_browser_main_extra_parts_ash.h" #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) @@ -18,12 +9,3 @@ #include "base/linux_util.h" #include "chrome/browser/crash_handler_host_linux.h" #endif -@@ -264,7 +264,7 @@ - main_parts = new ChromeBrowserMainPartsMac(parameters); - #elif defined(OS_CHROMEOS) - main_parts = new ChromeBrowserMainPartsChromeos(parameters); --#elif defined(OS_LINUX) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) || defined(OS_BSD) - main_parts = new ChromeBrowserMainPartsLinux(parameters); - #elif defined(OS_POSIX) - main_parts = new ChromeBrowserMainPartsPosix(parameters); diff --git a/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc b/www/chromium/files/patch-chrome__browser__gpu_blacklist.cc index 61a7bad87f4c..fdb6c543ddf1 100644 --- a/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc +++ b/www/chromium/files/patch-chrome__browser__gpu_blacklist.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_blacklist.cc.orig 2012-02-01 21:23:10.000000000 +0200 -+++ content/browser/gpu/gpu_blacklist.cc 2012-02-01 21:23:18.000000000 +0200 -@@ -817,7 +817,7 @@ +--- chrome/browser/gpu_blacklist.cc.orig 2012-04-29 20:49:40.000000000 +0300 ++++ chrome/browser/gpu_blacklist.cc 2012-04-29 20:49:54.000000000 +0300 +@@ -940,7 +940,7 @@ return kOsChromeOS; #elif defined(OS_WIN) return kOsWin; diff --git a/www/chromium/files/patch-content__browser__gpu__gpu_blacklist_unittest.cc b/www/chromium/files/patch-chrome__browser__gpu_blacklist_unittest.cc index 8198de3e96bd..8f7b5d25cea1 100644 --- a/www/chromium/files/patch-content__browser__gpu__gpu_blacklist_unittest.cc +++ b/www/chromium/files/patch-chrome__browser__gpu_blacklist_unittest.cc @@ -1,5 +1,5 @@ ---- content/browser/gpu/gpu_blacklist_unittest.cc.orig 2012-02-01 21:51:33.000000000 +0200 -+++ content/browser/gpu/gpu_blacklist_unittest.cc 2012-02-01 21:52:45.000000000 +0200 +--- chrome/browser/gpu_blacklist_unittest.cc.orig 2012-02-01 21:51:33.000000000 +0200 ++++ chrome/browser/gpu_blacklist_unittest.cc 2012-02-01 21:52:45.000000000 +0200 @@ -191,7 +191,7 @@ EXPECT_EQ(flags.flags(), static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl)); 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 31cd2a46c9f4..e5c1dc89ffe2 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,15 +1,15 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2012-02-01 20:07:00.000000000 +0200 -+++ chrome/browser/ui/webui/about_ui.cc 2012-02-01 20:07:54.000000000 +0200 -@@ -81,7 +81,7 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2012-04-25 10:02:26.000000000 +0300 ++++ chrome/browser/ui/webui/about_ui.cc 2012-04-29 20:28:24.000000000 +0300 +@@ -82,7 +82,7 @@ #include "chrome/browser/chromeos/version_loader.h" #include "chrome/browser/oom_priority_manager.h" - #include "content/browser/zygote_host_linux.h" + #include "content/public/browser/zygote_host_linux.h" -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include "content/browser/zygote_host_linux.h" + #include "content/public/browser/zygote_host_linux.h" #endif -@@ -920,7 +920,7 @@ +@@ -1044,7 +1044,7 @@ return data; } @@ -18,7 +18,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -1306,7 +1306,7 @@ +@@ -1439,7 +1439,7 @@ return; } else if (host == chrome::kChromeUIHistogramsHost) { response = AboutHistograms(path); @@ -27,7 +27,7 @@ } else if (host == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -1322,7 +1322,7 @@ +@@ -1455,7 +1455,7 @@ response = ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_OS_CREDITS_HTML).as_string(); #endif diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc new file mode 100644 index 000000000000..c941fe48c376 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2012-05-19 23:59:57.030106018 +0300 ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2012-05-20 00:01:25.136350422 +0300 +@@ -322,7 +322,7 @@ + #if defined(USE_TCMALLOC) + || url.host() == chrome::kChromeUITCMallocHost + #endif +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + || url.host() == chrome::kChromeUILinuxProxyConfigHost + || url.host() == chrome::kChromeUISandboxHost + #endif diff --git a/www/chromium/files/patch-chrome__common__child_process_logging.h b/www/chromium/files/patch-chrome__common__child_process_logging.h index 2997f797bdf7..13b98eeeaf34 100644 --- a/www/chromium/files/patch-chrome__common__child_process_logging.h +++ b/www/chromium/files/patch-chrome__common__child_process_logging.h @@ -1,11 +1,11 @@ ---- chrome/common/child_process_logging.h.orig 2012-01-18 11:13:17.000000000 +0200 -+++ chrome/common/child_process_logging.h 2012-01-29 15:30:03.000000000 +0200 -@@ -33,7 +33,7 @@ +--- chrome/common/child_process_logging.h.orig 2012-04-25 10:02:56.000000000 +0300 ++++ chrome/common/child_process_logging.h 2012-04-29 20:33:00.000000000 +0300 +@@ -98,7 +98,7 @@ + // values in |command_line|. + void SetCommandLine(const CommandLine* command_line); - namespace child_process_logging { - --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) - // These are declared here so the crash reporter can access them directly in - // compromised context without going through the standard library. - extern char g_active_url[]; +-#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) + // Sets the product channel data to send along with crash reports to |channel|. + void SetChannel(const std::string& channel); + #endif diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc new file mode 100644 index 000000000000..45f63649d9c1 --- /dev/null +++ b/www/chromium/files/patch-chrome__common__chrome_paths.cc @@ -0,0 +1,16 @@ +--- chrome/common/chrome_paths.cc.orig 2012-05-23 04:50:48.000000000 +0300 ++++ chrome/common/chrome_paths.cc 2012-05-26 00:47:40.880289194 +0300 +@@ -334,10 +334,12 @@ + if (!file_util::PathExists(cur)) // We don't want to create this + return false; + break; +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) + case chrome::DIR_POLICY_FILES: { + #if defined(GOOGLE_CHROME_BUILD) + cur = FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); ++#elif defined(OS_BSD) ++ cur = FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); + #else + cur = FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); + #endif diff --git a/www/chromium/files/patch-content__app__content_main.cc b/www/chromium/files/patch-content__app__content_main.cc deleted file mode 100644 index 2e04b134dafe..000000000000 --- a/www/chromium/files/patch-content__app__content_main.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/app/content_main.cc.orig 2012-02-01 21:47:17.000000000 +0200 -+++ content/app/content_main.cc 2012-02-01 21:47:28.000000000 +0200 -@@ -316,7 +316,7 @@ - base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance(); - g_fds->Set(kPrimaryIPCChannel, - kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) - g_fds->Set(kCrashDumpSignal, - kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); - #endif diff --git a/www/chromium/files/patch-content__app__content_main_runner.cc b/www/chromium/files/patch-content__app__content_main_runner.cc new file mode 100644 index 000000000000..80946bc1ccf6 --- /dev/null +++ b/www/chromium/files/patch-content__app__content_main_runner.cc @@ -0,0 +1,11 @@ +--- content/app/content_main_runner.cc.orig 2012-04-29 20:37:46.000000000 +0300 ++++ content/app/content_main_runner.cc 2012-04-29 20:37:58.000000000 +0300 +@@ -353,7 +353,7 @@ + base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance(); + g_fds->Set(kPrimaryIPCChannel, + kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + g_fds->Set(kCrashDumpSignal, + kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); + #endif diff --git a/www/chromium/files/patch-content__browser__zygote_host_impl_linux.cc b/www/chromium/files/patch-content__browser__zygote_host_impl_linux.cc new file mode 100644 index 000000000000..ca40dc1aefda --- /dev/null +++ b/www/chromium/files/patch-content__browser__zygote_host_impl_linux.cc @@ -0,0 +1,42 @@ +--- content/browser/zygote_host_impl_linux.cc.orig 2012-05-09 10:01:22.000000000 +0300 ++++ content/browser/zygote_host_impl_linux.cc 2012-05-20 02:32:55.863105935 +0300 +@@ -92,7 +92,7 @@ + cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess); + + int fds[2]; +-#if defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(OS_BSD) + // The BSDs often don't support SOCK_SEQPACKET yet, so fall back to + // SOCK_DGRAM if necessary. + if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) != 0) +@@ -310,7 +310,7 @@ + return base::kNullProcessHandle; + } + +-#if !defined(OS_OPENBSD) ++#if !defined(OS_BSD) + // This is just a starting score for a renderer or extension (the + // only types of processes that will be started this way). It will + // get adjusted as time goes on. (This is the same value as +@@ -323,9 +323,9 @@ + return pid; + } + +-#if !defined(OS_OPENBSD) + void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid, + int score) { ++#if !defined(OS_BSD) + // 1) You can't change the oom_score_adj of a non-dumpable process + // (EPERM) unless you're root. Because of this, we can't set the + // oom_adj from the browser process. +@@ -390,8 +390,9 @@ + if (!base::AdjustOOMScore(pid, score)) + PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid; + } +-} + #endif ++} ++ + + void ZygoteHostImpl::EnsureProcessTerminated(pid_t process) { + DCHECK(init_); diff --git a/www/chromium/files/patch-content__browser__zygote_host_linux.cc b/www/chromium/files/patch-content__browser__zygote_host_linux.cc deleted file mode 100644 index 0eae94587359..000000000000 --- a/www/chromium/files/patch-content__browser__zygote_host_linux.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/zygote_host_linux.cc.orig 2012-01-18 11:11:40.000000000 +0200 -+++ content/browser/zygote_host_linux.cc 2012-01-29 16:31:59.000000000 +0200 -@@ -305,7 +305,7 @@ - return base::kNullProcessHandle; - } - --#if !defined(OS_OPENBSD) -+#if !defined(OS_BSD) - // This is just a starting score for a renderer or extension (the - // only types of processes that will be started this way). It will - // get adjusted as time goes on. (This is the same value as -@@ -318,7 +318,7 @@ - return pid; - } - --#if !defined(OS_OPENBSD) -+#if !defined(OS_BSD) - void ZygoteHost::AdjustRendererOOMScore(base::ProcessHandle pid, int score) { - // 1) You can't change the oom_score_adj of a non-dumpable process - // (EPERM) unless you're root. Because of this, we can't set the diff --git a/www/chromium/files/patch-content__browser__zygote_main_linux.cc b/www/chromium/files/patch-content__browser__zygote_main_linux.cc index 6510e774ca04..1623e4205201 100644 --- a/www/chromium/files/patch-content__browser__zygote_main_linux.cc +++ b/www/chromium/files/patch-content__browser__zygote_main_linux.cc @@ -1,19 +1,32 @@ ---- content/browser/zygote_main_linux.cc.orig 2011-10-07 11:31:44.000000000 +0300 -+++ content/browser/zygote_main_linux.cc 2011-10-08 22:11:46.609222627 +0300 -@@ -727,11 +727,16 @@ - // dumpable. - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - if (!command_line.HasSwitch(switches::kAllowSandboxDebugging)) { -+#if !defined(OS_FREEBSD) - prctl(PR_SET_DUMPABLE, 0, 0, 0, 0); - if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0)) { - LOG(ERROR) << "Failed to set non-dumpable flag"; - return false; - } -+#else -+ NOTIMPLEMENTED(); -+ return false; -+#endif - } - #if defined(SECCOMP_SANDBOX) - } else if (SeccompSandboxEnabled()) { +--- content/browser/zygote_main_linux.cc.orig 2012-05-09 10:01:22.000000000 +0300 ++++ content/browser/zygote_main_linux.cc 2012-05-20 00:36:19.660106416 +0300 +@@ -703,7 +703,7 @@ + // TODO(sergeyu): Currently this code doesn't work properly under ASAN + // - it crashes content_unittests. Make sure it works properly and + // enable it here. http://crbug.com/123263 +-#if !defined(ADDRESS_SANITIZER) ++#if !defined(ADDRESS_SANITIZER) && !defined(OS_BSD) + + static void InitLibcFileIOFunctions() { + g_libc_fopen = reinterpret_cast<FopenFunction>( +@@ -714,9 +714,9 @@ + if (!g_libc_fopen) { + LOG(FATAL) << "Failed to get fopen() from libc."; + } else if (!g_libc_fopen64) { +-#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) ++#if !defined(OS_BSD) + LOG(WARNING) << "Failed to get fopen64() from libc. Using fopen() instead."; +-#endif // !defined(OS_OPENBSD) && !defined(OS_FREEBSD) ++#endif // !defined(OS_BSD) + g_libc_fopen64 = g_libc_fopen; + } + +@@ -897,7 +897,7 @@ + SkiaFontConfigSetImplementation( + new FontConfigIPC(kMagicSandboxIPCDescriptor)); + +-#if !defined(OS_OPENBSD) ++#if !defined(OS_BSD) + // Previously, we required that the binary be non-readable. This causes the + // kernel to mark the process as non-dumpable at startup. The thinking was + // that, although we were putting the renderers into a PID namespace (with diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi new file mode 100644 index 000000000000..d9310b6bbb88 --- /dev/null +++ b/www/chromium/files/patch-content__content_browser.gypi @@ -0,0 +1,10 @@ +--- content/content_browser.gypi.orig 2012-04-29 23:50:13.000000000 +0300 ++++ content/content_browser.gypi 2012-04-29 23:49:20.000000000 +0300 +@@ -839,6 +839,7 @@ + }], + ['os_bsd==1', { + 'sources/': [ ++ ['exclude', '^browser/media_device_notifications_linux\\.cc$'], + ['exclude', '^browser/gamepad/platform_data_fetcher_linux\\.cc$'], + ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'], + ], diff --git a/www/chromium/files/patch-content__renderer__media__media_stream_dependency_factory_stub.cc b/www/chromium/files/patch-content__renderer__media__media_stream_dependency_factory_stub.cc deleted file mode 100644 index e51a81ed864d..000000000000 --- a/www/chromium/files/patch-content__renderer__media__media_stream_dependency_factory_stub.cc +++ /dev/null @@ -1,60 +0,0 @@ ---- content/renderer/media/media_stream_dependency_factory_stub.cc.orig 2012-04-01 01:08:09.000000000 +0300 -+++ content/renderer/media/media_stream_dependency_factory_stub.cc 2012-04-01 01:09:34.000000000 +0300 -@@ -8,34 +8,40 @@ - - MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {} - --cricket::WebRtcMediaEngine* --MediaStreamDependencyFactory::CreateWebRtcMediaEngine() { -- return NULL; --} -- - bool MediaStreamDependencyFactory::CreatePeerConnectionFactory( -- cricket::MediaEngineInterface* media_engine, -- talk_base::Thread* worker_thread) { -+ talk_base::Thread* worker_thread, -+ talk_base::Thread* signaling_thread, -+ content::P2PSocketDispatcher* socket_dispatcher, -+ talk_base::NetworkManager* network_manager, -+ talk_base::PacketSocketFactory* socket_factory) { - return false; - } - --void MediaStreamDependencyFactory::DeletePeerConnectionFactory() { --} -+void MediaStreamDependencyFactory::ReleasePeerConnectionFactory() {} - - bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() { - return false; - } - --cricket::PortAllocator* MediaStreamDependencyFactory::CreatePortAllocator( -- content::P2PSocketDispatcher* socket_dispatcher, -- talk_base::NetworkManager* network_manager, -- talk_base::PacketSocketFactory* socket_factory, -- const webkit_glue::P2PTransport::Config& config) { -+talk_base::scoped_refptr<webrtc::PeerConnectionInterface> -+ MediaStreamDependencyFactory::CreatePeerConnection(const std::string& config, -+ webrtc::PeerConnectionObserver* observer) { -+ return NULL; -+} -+ -+talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> -+ MediaStreamDependencyFactory::CreateLocalMediaStream(const std::string& label) { -+ return NULL; -+} -+ -+talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> -+ MediaStreamDependencyFactory::CreateLocalVideoTrack(const std::string& label, -+ cricket::VideoCapturer* video_device) { - return NULL; - } - --webrtc::PeerConnection* MediaStreamDependencyFactory::CreatePeerConnection( -- cricket::PortAllocator* port_allocator, -- talk_base::Thread* signaling_thread) { -+talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface> -+ MediaStreamDependencyFactory::CreateLocalAudioTrack(const std::string& label, -+ webrtc::AudioDeviceModule* audio_device) { - return NULL; - } diff --git a/www/chromium/files/patch-content__renderer__media__media_stream_impl_stub.cc b/www/chromium/files/patch-content__renderer__media__media_stream_impl_stub.cc deleted file mode 100644 index 47efade88f19..000000000000 --- a/www/chromium/files/patch-content__renderer__media__media_stream_impl_stub.cc +++ /dev/null @@ -1,46 +0,0 @@ ---- content/renderer/media/media_stream_impl_stub.cc.orig 2012-04-01 01:08:49.000000000 +0300 -+++ content/renderer/media/media_stream_impl_stub.cc 2012-04-01 01:09:17.000000000 +0300 -@@ -16,7 +16,6 @@ - MediaStreamDependencyFactory* dependency_factory) - : dependency_factory_(dependency_factory), - media_stream_dispatcher_(media_stream_dispatcher), -- media_engine_(NULL), - p2p_socket_dispatcher_(p2p_socket_dispatcher), - network_manager_(NULL), - vc_manager_(vc_manager), -@@ -24,14 +23,11 @@ - message_loop_proxy_(base::MessageLoopProxy::current()), - signaling_thread_(NULL), - worker_thread_(NULL), -- chrome_worker_thread_("Chrome_libJingle_WorkerThread"), -- vcm_created_(false) { -+ chrome_worker_thread_("Chrome_libJingle_WorkerThread") { - } - - MediaStreamImpl::~MediaStreamImpl() { - DCHECK(!peer_connection_handler_); -- if (dependency_factory_.get()) -- dependency_factory_->DeletePeerConnectionFactory(); - } - - WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler( -@@ -42,10 +38,6 @@ - void MediaStreamImpl::ClosePeerConnection() { - } - --bool MediaStreamImpl::SetVideoCaptureModule(const std::string& label) { -- return false; --} -- - void MediaStreamImpl::requestUserMedia( - const WebKit::WebUserMediaRequest& user_media_request, - const WebKit::WebVector<WebKit::WebMediaStreamSource>& -@@ -96,3 +88,8 @@ - - void MediaStreamImpl::OnDeviceOpenFailed(int request_id) { - } -+ -+webrtc::MediaStreamTrackInterface* MediaStreamImpl::GetLocalMediaStreamTrack( -+ const std::string& label) { -+ return NULL; -+} diff --git a/www/chromium/files/patch-content__renderer__pepper__pepper_platform_image_2d_impl.cc b/www/chromium/files/patch-content__renderer__pepper__pepper_platform_image_2d_impl.cc new file mode 100644 index 000000000000..8f42cdaf55b5 --- /dev/null +++ b/www/chromium/files/patch-content__renderer__pepper__pepper_platform_image_2d_impl.cc @@ -0,0 +1,29 @@ +--- content/renderer/pepper/pepper_platform_image_2d_impl.cc.orig 2012-04-25 10:01:32.000000000 +0300 ++++ content/renderer/pepper/pepper_platform_image_2d_impl.cc 2012-04-29 21:32:59.000000000 +0300 +@@ -19,7 +19,7 @@ + + // On Mac, we have to tell the browser to free the transport DIB. + PepperPlatformImage2DImpl::~PepperPlatformImage2DImpl() { +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + if (dib_.get()) { + RenderThreadImpl::current()->Send( + new ViewHostMsg_FreeTransportDIB(dib_->id())); +@@ -33,7 +33,7 @@ + uint32 buffer_size = width * height * 4; + + // Allocate the transport DIB and the PlatformCanvas pointing to it. +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_FREEBSD) + // On the Mac, shared memory has to be created in the browser in order to + // work in the sandbox. Do this by sending a message to the browser + // requesting a TransportDIB (see also +@@ -70,7 +70,7 @@ + *byte_count = dib_->size(); + #if defined(OS_WIN) + return reinterpret_cast<intptr_t>(dib_->handle()); +-#elif defined(OS_MACOSX) || defined(OS_ANDROID) ++#elif defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_FREEBSD) + return static_cast<intptr_t>(dib_->handle().fd); + #elif defined(OS_POSIX) + return static_cast<intptr_t>(dib_->handle()); diff --git a/www/chromium/files/patch-content__renderer__pepper_plugin_delegate_impl.cc b/www/chromium/files/patch-content__renderer__pepper_plugin_delegate_impl.cc deleted file mode 100644 index aaa3789e5ef2..000000000000 --- a/www/chromium/files/patch-content__renderer__pepper_plugin_delegate_impl.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- content/renderer/pepper_plugin_delegate_impl.cc.orig 2012-02-21 10:34:09.000000000 +0200 -+++ content/renderer/pepper_plugin_delegate_impl.cc 2012-02-27 18:05:36.000000000 +0200 -@@ -124,7 +124,7 @@ - dib_(dib) { - } - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_FREEBSD) - // On Mac, we have to tell the browser to free the transport DIB. - virtual ~PlatformImage2DImpl() { - if (dib_.get()) { -@@ -142,7 +142,7 @@ - *byte_count = dib_->size(); - #if defined(OS_WIN) - return reinterpret_cast<intptr_t>(dib_->handle()); --#elif defined(OS_MACOSX) || defined(OS_ANDROID) -+#elif defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_FREEBSD) - return static_cast<intptr_t>(dib_->handle().fd); - #elif defined(OS_POSIX) - return static_cast<intptr_t>(dib_->handle()); -@@ -1208,7 +1208,7 @@ - uint32 buffer_size = width * height * 4; - - // Allocate the transport DIB and the PlatformCanvas pointing to it. --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_FREEBSD) - // On the Mac, shared memory has to be created in the browser in order to - // work in the sandbox. Do this by sending a message to the browser - // requesting a TransportDIB (see also diff --git a/www/chromium/files/patch-content__browser__renderer_host__mock_render_process_host.cc b/www/chromium/files/patch-content__test__mock_render_process_host.cc index e5de334d4a2e..fdc433b69d48 100644 --- a/www/chromium/files/patch-content__browser__renderer_host__mock_render_process_host.cc +++ b/www/chromium/files/patch-content__test__mock_render_process_host.cc @@ -1,5 +1,5 @@ ---- content/browser/renderer_host/mock_render_process_host.cc.orig 2010-12-16 02:11:57.000000000 +0100 -+++ content/browser/renderer_host/mock_render_process_host.cc 2010-12-20 20:15:08.000000000 +0100 +--- content/test/mock_render_process_host.cc.orig 2010-12-16 02:11:57.000000000 +0100 ++++ content/test/mock_render_process_host.cc 2010-12-20 20:15:08.000000000 +0100 @@ -106,7 +106,7 @@ DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(), &duped, 0, TRUE, DUPLICATE_SAME_ACCESS); diff --git a/www/chromium/files/patch-media__audio__pulse__pulse_output.cc b/www/chromium/files/patch-media__audio__pulse__pulse_output.cc index 6e20f6056399..3325843b86ea 100644 --- a/www/chromium/files/patch-media__audio__pulse__pulse_output.cc +++ b/www/chromium/files/patch-media__audio__pulse__pulse_output.cc @@ -1,5 +1,5 @@ ---- media/audio/pulse/pulse_output.cc.orig 2012-02-05 15:13:12.000000000 +0200 -+++ media/audio/pulse/pulse_output.cc 2012-02-05 15:13:41.000000000 +0200 +--- media/audio/pulse/pulse_output.cc.orig 2012-05-09 09:01:10.000000000 +0200 ++++ media/audio/pulse/pulse_output.cc 2012-05-20 11:49:26.000000000 +0200 @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "media/audio/audio_parameters.h" @@ -18,6 +18,28 @@ stream->write_callback_handled_ = true; +@@ -136,16 +136,16 @@ + + PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params, + AudioManagerPulse* manager) +- : channel_layout_(params.channel_layout), ++ : channel_layout_(params.channel_layout()), + channel_count_(ChannelLayoutToChannelCount(channel_layout_)), +- sample_format_(BitsToPASampleFormat(params.bits_per_sample)), +- sample_rate_(params.sample_rate), +- bytes_per_frame_(params.channels * params.bits_per_sample / 8), ++ sample_format_(BitsToPASampleFormat(params.bits_per_sample())), ++ sample_rate_(params.sample_rate()), ++ bytes_per_frame_(params.channels() * params.bits_per_sample() / 8), + manager_(manager), + pa_context_(NULL), + pa_mainloop_(NULL), + playback_handle_(NULL), +- packet_size_(params.GetPacketSize()), ++ packet_size_(params.GetBytesPerBuffer()), + frames_per_packet_(packet_size_ / bytes_per_frame_), + client_buffer_(NULL), + volume_(1.0f), @@ -153,7 +153,7 @@ write_callback_handled_(false), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), @@ -54,6 +76,15 @@ if (stream_stopped_) return; +@@ -370,7 +370,7 @@ + size_t chunk_size; + + // Stop writing if there is no more data available. +- if (!client_buffer_->GetCurrentChunk(&chunk, &chunk_size)) ++ if (!client_buffer_->GetCurrentChunk(&chunk, (int*) &chunk_size)) + break; + + // Write data to stream. @@ -382,7 +382,7 @@ } diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp index 897b0ce85ae9..df91f70a8039 100644 --- a/www/chromium/files/patch-media__media.gyp +++ b/www/chromium/files/patch-media__media.gyp @@ -1,6 +1,15 @@ ---- media/media.gyp.orig 2012-01-18 11:11:21.000000000 +0200 -+++ media/media.gyp 2012-01-29 19:28:14.000000000 +0200 -@@ -804,7 +804,7 @@ +--- media/media.gyp.orig 2012-04-25 10:01:21.000000000 +0300 ++++ media/media.gyp 2012-04-30 00:26:41.000000000 +0300 +@@ -341,7 +341,7 @@ + 'audio/openbsd/audio_manager_openbsd.h', + ], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'variables': { + 'conditions': [ + ['sysroot!=""', { +@@ -858,7 +858,7 @@ }, ], }], diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc index 078e3d40b39a..32c4d33b34b6 100644 --- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc +++ b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc @@ -1,5 +1,5 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2011-07-01 00:30:51.106692749 +0300 -+++ net/proxy/proxy_config_service_linux.cc 2011-07-01 01:15:28.391693775 +0300 +--- net/proxy/proxy_config_service_linux.cc.orig 2012-04-25 10:01:34.000000000 +0300 ++++ net/proxy/proxy_config_service_linux.cc 2012-04-29 21:37:33.000000000 +0300 @@ -18,7 +18,13 @@ #include <limits.h> #include <stdio.h> @@ -14,7 +14,7 @@ #include <unistd.h> #include <map> -@@ -861,9 +867,10 @@ +@@ -907,9 +913,10 @@ public base::MessagePumpLibevent::Watcher { public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) @@ -28,7 +28,7 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; -@@ -926,9 +933,14 @@ +@@ -972,9 +979,14 @@ // task is left pending on the file loop after the loop was quit, // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor @@ -44,7 +44,7 @@ DCHECK(inotify_fd_ < 0); } -@@ -937,18 +949,25 @@ +@@ -983,18 +995,25 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); @@ -70,7 +70,7 @@ file_loop_ = file_loop; // The initial read is done on the current thread, not |file_loop_|, // since we will need to have it for SetUpAndFetchInitialConfig(). -@@ -968,6 +987,18 @@ +@@ -1014,6 +1033,18 @@ bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) { DCHECK(inotify_fd_ >= 0); DCHECK(MessageLoop::current() == file_loop_); @@ -89,7 +89,7 @@ // We can't just watch the kioslaverc file directly, since KDE will write // a new copy of it and then rename it whenever settings are changed and // inotify watches inodes (so we'll be watching the old deleted file after -@@ -976,6 +1007,7 @@ +@@ -1022,6 +1053,7 @@ if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(), IN_MODIFY | IN_MOVED_TO) < 0) return false; @@ -97,9 +97,9 @@ notify_delegate_ = delegate; if (!file_loop_->WatchFileDescriptor(inotify_fd_, true, MessageLoopForIO::WATCH_READ, &inotify_watcher_, this)) -@@ -993,7 +1025,23 @@ +@@ -1039,7 +1071,23 @@ void OnFileCanReadWithoutBlocking(int fd) { - DCHECK(fd == inotify_fd_); + DCHECK_EQ(fd, inotify_fd_); DCHECK(MessageLoop::current() == file_loop_); +#if defined(OS_FREEBSD) + struct kevent ev; @@ -121,23 +121,24 @@ } void OnFileCanWriteWithoutBlocking(int fd) { NOTREACHED(); -@@ -1262,10 +1310,14 @@ +@@ -1317,10 +1365,14 @@ // from the inotify file descriptor and starts up a debounce timer if // an event for kioslaverc is seen. void OnChangeNotification() { -+ DCHECK(config_fd_ >= 0); - DCHECK(inotify_fd_ >= 0); - DCHECK(MessageLoop::current() == file_loop_); ++ DCHECK_GE(config_fd_, 0); + DCHECK_GE(inotify_fd_, 0); +- DCHECK(MessageLoop::current() == file_loop_); - char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; ++ DCHECK(MessageLoop::current() == file_loop_); bool kioslaverc_touched = false; -+#if defined(OS_FREEBSD) -+ kioslaverc_touched = true; -+#else ++ #if defined(OS_FREEBSD) ++ kioslaverc_touched = true; ++ #else + char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1302,6 +1354,7 @@ +@@ -1357,6 +1409,7 @@ inotify_fd_ = -1; } } @@ -145,7 +146,7 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1316,6 +1369,7 @@ +@@ -1371,6 +1424,7 @@ typedef std::map<StringListSetting, std::vector<std::string> > strings_map_type; diff --git a/www/chromium/files/patch-ppapi__proxy__ppb_image_data_proxy.cc b/www/chromium/files/patch-ppapi__proxy__ppb_image_data_proxy.cc index d6143a0557e6..ac06e2a35f39 100644 --- a/www/chromium/files/patch-ppapi__proxy__ppb_image_data_proxy.cc +++ b/www/chromium/files/patch-ppapi__proxy__ppb_image_data_proxy.cc @@ -1,15 +1,15 @@ ---- ppapi/proxy/ppb_image_data_proxy.cc.orig 2012-02-21 10:34:02.000000000 +0200 -+++ ppapi/proxy/ppb_image_data_proxy.cc 2012-02-27 18:16:23.000000000 +0200 -@@ -83,7 +83,7 @@ - +--- ppapi/proxy/ppb_image_data_proxy.cc.orig 2012-04-25 10:01:26.000000000 +0300 ++++ ppapi/proxy/ppb_image_data_proxy.cc 2012-04-29 21:40:17.000000000 +0300 +@@ -104,7 +104,7 @@ + ImageHandle ImageData::NullHandle() { #if defined(OS_WIN) - const ImageHandle ImageData::NullHandle = NULL; + return NULL; -#elif defined(OS_MACOSX) || defined(OS_ANDROID) +#elif defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_FREEBSD) - const ImageHandle ImageData::NullHandle = ImageHandle(); + return ImageHandle(); #else - const ImageHandle ImageData::NullHandle = 0; -@@ -92,7 +92,7 @@ + return 0; +@@ -114,7 +114,7 @@ ImageHandle ImageData::HandleFromInt(int32_t i) { #if defined(OS_WIN) return reinterpret_cast<ImageHandle>(i); diff --git a/www/chromium/files/patch-third_party__WebKit__Source__JavaScriptCore__wtf__NumberOfCores.cpp b/www/chromium/files/patch-third_party__WebKit__Source__JavaScriptCore__wtf__NumberOfCores.cpp deleted file mode 100644 index 65a1083395a2..000000000000 --- a/www/chromium/files/patch-third_party__WebKit__Source__JavaScriptCore__wtf__NumberOfCores.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/WebKit/Source/JavaScriptCore/wtf/NumberOfCores.cpp.orig 2012-03-31 03:21:08.000000000 +0300 -+++ third_party/WebKit/Source/JavaScriptCore/wtf/NumberOfCores.cpp 2012-03-31 03:21:30.000000000 +0300 -@@ -27,6 +27,7 @@ - #include "NumberOfCores.h" - - #if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD) -+#include <unistd.h> - #include <sys/sysctl.h> - #include <sys/types.h> - #elif OS(LINUX) || OS(AIX) || OS(SOLARIS) diff --git a/www/chromium/files/patch-third_party__WebKit__Source__WTF__wtf__NumberOfCores.cpp b/www/chromium/files/patch-third_party__WebKit__Source__WTF__wtf__NumberOfCores.cpp new file mode 100644 index 000000000000..a66be071fd78 --- /dev/null +++ b/www/chromium/files/patch-third_party__WebKit__Source__WTF__wtf__NumberOfCores.cpp @@ -0,0 +1,10 @@ +--- third_party/WebKit/Source/WTF/wtf/NumberOfCores.cpp.orig 2012-04-25 10:06:07.000000000 +0300 ++++ third_party/WebKit/Source/WTF/wtf/NumberOfCores.cpp 2012-04-29 21:45:39.000000000 +0300 +@@ -29,6 +29,7 @@ + #if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD) + // sys/types.h must come before sys/sysctl.h because the latter uses + // data types defined in the former. See sysctl(3) and style(9). ++#include <unistd.h> + #include <sys/types.h> + #include <sys/sysctl.h> + #elif OS(LINUX) || OS(AIX) || OS(SOLARIS) diff --git a/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h b/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h index 5bba2a78442c..d7b17bfc3d0d 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h +++ b/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h @@ -1,5 +1,5 @@ ---- third_party/WebKit/Source/WebCore/config.h.orig 2011-11-10 16:05:10.000000000 +0200 -+++ third_party/WebKit/Source/WebCore/config.h 2011-12-01 20:58:22.000000000 +0200 +--- third_party/WebKit/Source/WebCore/config.h.orig 2012-02-15 03:05:44.000000000 +0100 ++++ third_party/WebKit/Source/WebCore/config.h 2012-02-27 23:06:55.000000000 +0100 @@ -164,6 +164,14 @@ #define WTF_USE_NEW_THEME 1 #endif // PLATFORM(MAC) diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp deleted file mode 100644 index f7d36b57f480..000000000000 --- a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/ffmpeg/ffmpeg.gyp.orig 2011-10-07 11:34:35.000000000 +0300 -+++ third_party/ffmpeg/ffmpeg.gyp 2011-10-08 22:31:59.259508048 +0300 -@@ -508,6 +508,7 @@ - 'include_dirs': [ - 'config', - 'patched-ffmpeg', -+ '<(prefix_dir)/include', - ], - 'direct_dependent_settings': { - 'include_dirs': [ diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavcodec__pthread.c b/www/chromium/files/patch-third_party__ffmpeg__libavcodec__pthread.c new file mode 100644 index 000000000000..6411adc13d16 --- /dev/null +++ b/www/chromium/files/patch-third_party__ffmpeg__libavcodec__pthread.c @@ -0,0 +1,11 @@ +--- third_party/ffmpeg/libavcodec/pthread.c.orig 2012-05-20 02:54:35.986106782 +0300 ++++ third_party/ffmpeg/libavcodec/pthread.c 2012-05-20 02:54:42.671106234 +0300 +@@ -38,7 +38,7 @@ + #if HAVE_GETPROCESSAFFINITYMASK + #include <windows.h> + #endif +-#if HAVE_SYSCTL ++#if HAVE_SYSCTL && !defined(__FreeBSD__) + #if HAVE_SYS_PARAM_H + #include <sys/param.h> + #endif diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c new file mode 100644 index 000000000000..5f80ccb84108 --- /dev/null +++ b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c @@ -0,0 +1,11 @@ +--- third_party/ffmpeg/libavutil/mem.c.orig 2011-09-11 11:03:30.000000000 +0300 ++++ third_party/ffmpeg/libavutil/mem.c 2011-09-12 23:49:42.000000000 +0300 +@@ -31,7 +31,7 @@ + #include <limits.h> + #include <stdlib.h> + #include <string.h> +-#if HAVE_MALLOC_H ++#if HAVE_MALLOC_H && !defined(__FreeBSD__) + #include <malloc.h> + #endif + diff --git a/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg__libavutil__mem.c deleted file mode 100644 index 71fa3a38bb9c..000000000000 --- a/www/chromium/files/patch-third_party__ffmpeg__patched-ffmpeg__libavutil__mem.c +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/ffmpeg/patched-ffmpeg/libavutil/mem.c.orig 2011-09-11 11:03:30.000000000 +0300 -+++ third_party/ffmpeg/patched-ffmpeg/libavutil/mem.c 2011-09-12 23:49:42.000000000 +0300 -@@ -31,7 +31,7 @@ - #include <limits.h> - #include <stdlib.h> - #include <string.h> --#if HAVE_MALLOC_H -+#if HAVE_MALLOC_H && !defined(__FreeBSD__) - #include <malloc.h> - #endif - diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__timing.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__timing.cc deleted file mode 100644 index 78e22bf01ada..000000000000 --- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__timing.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/libjingle/source/talk/base/timing.cc.orig 2012-03-27 04:04:08.000000000 +0300 -+++ third_party/libjingle/source/talk/base/timing.cc 2012-03-31 03:18:25.000000000 +0300 -@@ -27,7 +27,7 @@ - - #include "talk/base/timing.h" - --#if defined(POSIX) -+#if defined(POSIX) && !defined(FREEBSD) - #define _POSIX_C_SOURCE 199506L - #endif - diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 6de15d3c6032..47684be00bd3 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -60,7 +60,15 @@ bin/chrome %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc %%DATADIR%%/resources.pak +%%DATADIR%%/resources/inspector/auditsPanel.css +%%DATADIR%%/resources/inspector/dataGrid.css +%%DATADIR%%/resources/inspector/devTools.css +%%DATADIR%%/resources/inspector/devtools.html %%DATADIR%%/resources/inspector/DevTools.js +%%DATADIR%%/resources/inspector/devtools_extension_api.js +%%DATADIR%%/resources/inspector/elementsPanel.css +%%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css +%%DATADIR%%/resources/inspector/heapProfiler.css %%DATADIR%%/resources/inspector/HeapSnapshotWorker.js %%DATADIR%%/resources/inspector/Images/applicationCache.png %%DATADIR%%/resources/inspector/Images/back.png @@ -101,15 +109,20 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/goArrow.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png +%%DATADIR%%/resources/inspector/Images/indexedDB.png +%%DATADIR%%/resources/inspector/Images/indexedDBIndex.png +%%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png %%DATADIR%%/resources/inspector/Images/localStorage.png +%%DATADIR%%/resources/inspector/Images/navigatorPinButton.png +%%DATADIR%%/resources/inspector/Images/navigatorShowHideButton.png %%DATADIR%%/resources/inspector/Images/paneAddButtons.png %%DATADIR%%/resources/inspector/Images/paneBottomGrow.png %%DATADIR%%/resources/inspector/Images/paneBottomGrowActive.png +%%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png +%%DATADIR%%/resources/inspector/Images/paneFilterButtons.png %%DATADIR%%/resources/inspector/Images/paneGrowHandleLine.png %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png %%DATADIR%%/resources/inspector/Images/paneSettingsButtons.png -%%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png -%%DATADIR%%/resources/inspector/Images/paneFilterButtons.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/popoverBackground.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png @@ -211,28 +224,21 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/warningMediumIcon.png %%DATADIR%%/resources/inspector/Images/warningOrangeDot.png %%DATADIR%%/resources/inspector/Images/warningsErrors.png -%%DATADIR%%/resources/inspector/ScriptFormatterWorker.js +%%DATADIR%%/resources/inspector/indexedDBViews.css +%%DATADIR%%/resources/inspector/inspectorCommon.css +%%DATADIR%%/resources/inspector/networkLogView.css +%%DATADIR%%/resources/inspector/networkPanel.css +%%DATADIR%%/resources/inspector/panelEnablerView.css +%%DATADIR%%/resources/inspector/profilesPanel.css %%DATADIR%%/resources/inspector/resourcesPanel.css -%%DATADIR%%/resources/inspector/heapProfiler.css -%%DATADIR%%/resources/inspector/elementsPanel.css -%%DATADIR%%/resources/inspector/textPrompt.css -%%DATADIR%%/resources/inspector/splitView.css %%DATADIR%%/resources/inspector/resourceView.css -%%DATADIR%%/resources/inspector/panelEnablerView.css -%%DATADIR%%/resources/inspector/networkPanel.css +%%DATADIR%%/resources/inspector/ScriptFormatterWorker.js +%%DATADIR%%/resources/inspector/scriptsPanel.css +%%DATADIR%%/resources/inspector/splitView.css +%%DATADIR%%/resources/inspector/tabbedPane.css +%%DATADIR%%/resources/inspector/textPrompt.css %%DATADIR%%/resources/inspector/textViewer.css -%%DATADIR%%/resources/inspector/profilesPanel.css -%%DATADIR%%/resources/inspector/auditsPanel.css %%DATADIR%%/resources/inspector/timelinePanel.css -%%DATADIR%%/resources/inspector/tabbedPane.css -%%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css -%%DATADIR%%/resources/inspector/scriptsPanel.css -%%DATADIR%%/resources/inspector/dataGrid.css -%%DATADIR%%/resources/inspector/inspectorCommon.css -%%DATADIR%%/resources/inspector/networkLogView.css -%%DATADIR%%/resources/inspector/devTools.css -%%DATADIR%%/resources/inspector/devtools.html -%%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/xdg-settings @dirrm %%DATADIR%%/locales @dirrm %%DATADIR%%/resources/inspector/Images |