diff options
Diffstat (limited to 'www/chromium')
34 files changed, 252 insertions, 326 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 5c0fa193d54a..ebe86fdfbfb1 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -7,8 +7,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 14.0.835.202 -PORTREVISION= 1 +DISTVERSION= 15.0.874.102 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ @@ -39,9 +38,6 @@ 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 \ - icuuc.48:${PORTSDIR}/devel/icu \ - icui18n.48:${PORTSDIR}/devel/icu \ - icudata.48:${PORTSDIR}/devel/icu \ event-1.4:${PORTSDIR}/devel/libevent \ vpx:${PORTSDIR}/multimedia/libvpx \ tcmalloc.2:${PORTSDIR}/devel/google-perftools @@ -67,7 +63,6 @@ ALL_TARGET= chrome # See build/common.gypi for all the available variables. GYP_DEFINES+= use_cups=1 \ - use_system_icu=1 \ use_system_vpx=1 \ use_system_yasm=1 \ use_system_libxml=1 \ @@ -84,6 +79,7 @@ GYP_DEFINES+= use_cups=1 \ OPTIONS= CODECS "Compile and enable patented codecs like H.264" on \ GCONF "Use GConf2 for preferences" on \ + PULSE "Enable Pulse Audio support" off \ CLANG "Compile Chromium with clang" off \ GCC45 "Compile Chromium with gcc 4.5+" off \ DEBUG "Compile with debug symbols and verbose output" off @@ -116,6 +112,13 @@ USE_GNOME+= gconf2 GYP_DEFINES+= use_gconf=0 .endif +.if defined(WITH_PULSEAUDIO) +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +GYP_DEFINES+= use_pulseaudio=1 +.else +GYP_DEFINES+= use_pulseaudio=0 +.endif + .if ! ${MACHINE_CPU:Msse2} GYP_DEFINES+= disable_sse2=1 .endif @@ -197,7 +200,7 @@ do-install: ${WRKSRC}/out/${BUILDTYPE}/resources.pak ${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \ ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${DATADIR} -.for f in chrome ffmpegsumo_nolink libffmpegsumo.so mksnapshot protoc +.for f in chrome libffmpegsumo.so mksnapshot protoc ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${DATADIR} .endfor cd ${WRKSRC}/out/${BUILDTYPE} && \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 930a60abb47c..8d165c43fea5 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,2 +1,2 @@ -SHA256 (chromium-courgette-redacted-14.0.835.202.tar.xz) = 45cfb4c45a30f5fc140c21099f4301bf4f46df364e767e352ca7dd8dbbdc488b -SIZE (chromium-courgette-redacted-14.0.835.202.tar.xz) = 124424472 +SHA256 (chromium-courgette-redacted-15.0.874.102.tar.xz) = 5334bb25b4682da9c680625558d86b11e004e43aeeea81db0ff5191b30ac172a +SIZE (chromium-courgette-redacted-15.0.874.102.tar.xz) = 120177844 diff --git a/www/chromium/files/extra-patch-base__base.gypi-freebsd b/www/chromium/files/extra-patch-base__base.gypi-freebsd index 850b5505b09b..9ee58a67d1a9 100644 --- a/www/chromium/files/extra-patch-base__base.gypi-freebsd +++ b/www/chromium/files/extra-patch-base__base.gypi-freebsd @@ -1,14 +1,14 @@ ---- base/base.gypi.orig 2011-06-28 22:44:26.635806924 +0300 -+++ base/base.gypi 2011-06-28 23:21:49.321810313 +0300 -@@ -94,6 +94,7 @@ +--- base/base.gypi.orig 2011-10-07 11:32:10.000000000 +0300 ++++ base/base.gypi 2011-10-08 21:38:52.007156128 +0300 +@@ -96,6 +96,7 @@ 'files/file_path_watcher_linux.cc', 'files/file_path_watcher_mac.cc', 'files/file_path_watcher_win.cc', + 'files/file_path_watcher_freebsd.cc', - 'fix_wp64.h', 'float_util.h', 'global_descriptors_posix.cc', -@@ -189,6 +190,7 @@ + 'global_descriptors_posix.h', +@@ -188,6 +189,7 @@ 'process_posix.cc', 'process_util.cc', 'process_util.h', @@ -16,9 +16,9 @@ 'process_util_linux.cc', 'process_util_mac.mm', 'process_util_posix.cc', -@@ -371,11 +373,9 @@ - 'message_pump_glib_x.cc', - ], +@@ -388,11 +390,9 @@ + }, { + 'sources!' : [ 'message_pump_gtk.cc', ], }], - [ 'OS != "linux"', { + [ 'OS != "linux" and OS != "freebsd"', { @@ -29,7 +29,7 @@ 'linux_util.cc', ], }, -@@ -413,7 +413,7 @@ +@@ -434,7 +434,7 @@ 'string16.cc', ], },], @@ -38,7 +38,7 @@ 'sources!': [ 'files/file_path_watcher_linux.cc', ], -@@ -491,6 +491,13 @@ +@@ -508,6 +508,13 @@ ], }], [ 'OS == "freebsd" or OS == "openbsd"', { diff --git a/www/chromium/files/patch-base__allocator__allocator.gyp b/www/chromium/files/patch-base__allocator__allocator.gyp index 13eeccbe079f..dee2f39ac278 100644 --- a/www/chromium/files/patch-base__allocator__allocator.gyp +++ b/www/chromium/files/patch-base__allocator__allocator.gyp @@ -94,7 +94,7 @@ - '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', - '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', - '<(tcmalloc_dir)/src/base/stl_allocator.h', -- '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h', +- '<(tcmalloc_dir)/src/base/synchronization_profiling.h', - '<(tcmalloc_dir)/src/base/sysinfo.cc', - '<(tcmalloc_dir)/src/base/sysinfo.h', - '<(tcmalloc_dir)/src/base/thread_annotations.h', diff --git a/www/chromium/files/patch-base__files__file_path_watcher_freebsd.cc b/www/chromium/files/patch-base__files__file_path_watcher_freebsd.cc index 8693ac0bf2ee..512e3a695c23 100644 --- a/www/chromium/files/patch-base__files__file_path_watcher_freebsd.cc +++ b/www/chromium/files/patch-base__files__file_path_watcher_freebsd.cc @@ -1,5 +1,5 @@ ---- /dev/null 2011-06-28 22:00:00.000000000 +0300 -+++ base/files/file_path_watcher_freebsd.cc 2011-06-28 22:03:34.898806831 +0300 +--- /dev/null 2011-10-09 00:44:00.000000000 +0300 ++++ base/files/file_path_watcher_freebsd.cc 2011-10-09 00:49:08.473941731 +0300 @@ -0,0 +1,473 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -410,7 +410,7 @@ + target_ = path; + + MessageLoop::current()->AddDestructionObserver(this); -+ io_message_loop_ = base::MessageLoopProxy::CreateForCurrentThread(); ++ io_message_loop_ = base::MessageLoopProxy::current(); + + kqueue_ = kqueue(); + if (kqueue_ == -1) { diff --git a/www/chromium/files/patch-base__process_util_freebsd.cc b/www/chromium/files/patch-base__process_util_freebsd.cc index cfdafe209846..6dd4127d396d 100644 --- a/www/chromium/files/patch-base__process_util_freebsd.cc +++ b/www/chromium/files/patch-base__process_util_freebsd.cc @@ -1,6 +1,6 @@ ---- /dev/null 2011-10-02 18:27:33.000000000 +0300 -+++ base/process_util_freebsd.cc 2011-10-02 18:26:22.000000000 +0300 -@@ -0,0 +1,320 @@ +--- base/process_util_freebsd.cc.orig 2011-10-08 23:30:09.938179749 +0300 ++++ base/process_util_freebsd.cc 2011-10-09 14:30:52.108006527 +0300 +@@ -0,0 +1,323 @@ +// 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. @@ -311,10 +311,13 @@ +} + +void EnableTerminationOnOutOfMemory() { -+ NOTIMPLEMENTED(); -+ return; ++ DLOG(WARNING) << "Not feasible."; +} + ++void EnableTerminationOnHeapCorruption() { ++ // Nothing to do. ++} ++ +bool AdjustOOMScore(ProcessId process, int score) { + NOTIMPLEMENTED(); + return false; diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index dcb9a55e5ab9..f9be724f3209 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,8 +1,8 @@ ---- build/common.gypi.orig 2011-09-14 11:01:28.000000000 +0300 -+++ build/common.gypi 2011-09-29 23:13:08.000000000 +0300 -@@ -303,6 +303,10 @@ - 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', - 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', +--- build/common.gypi.orig 2011-10-07 08:32:09.000000000 +0000 ++++ build/common.gypi 2011-10-10 19:06:38.844749713 +0000 +@@ -331,6 +331,10 @@ + # Whether to build for Wayland display server + 'use_wayland%': 0, + 'os_ver%': 0, + 'prefix_dir%': '/usr', @@ -11,7 +11,7 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -516,7 +520,7 @@ +@@ -551,7 +555,7 @@ # This is used to tweak build flags for gcc 4.4. 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', # Figure out the python architecture to decide if we build pyauto. @@ -20,8 +20,8 @@ 'conditions': [ ['branding=="Chrome"', { 'linux_breakpad%': 1, -@@ -956,7 +960,7 @@ - ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'], +@@ -1042,7 +1046,7 @@ + ['exclude', '(^|/)(wayland)_[^/]*\\.(h|cc)$'], ], }], - ['OS!="linux"', { @@ -29,7 +29,7 @@ 'sources/': [ ['exclude', '_linux(_unittest)?\\.(h|cc)$'], ['exclude', '(^|/)linux/'], -@@ -1536,6 +1540,20 @@ +@@ -1613,6 +1617,21 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], @@ -44,6 +44,7 @@ + ['gcc_version == 42', { + 'cflags!': [ + '-fno-signed-zeros', ++ '-Wno-unused-result', + ], + }], + ], diff --git a/www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc b/www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc deleted file mode 100644 index d1d9df3e7871..000000000000 --- a/www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- chrome/app/chrome_exe_main_gtk.cc.orig 2011-06-24 11:31:08.000000000 +0300 -+++ chrome/app/chrome_exe_main_gtk.cc 2011-06-26 17:42:52.610782235 +0300 -@@ -25,7 +25,9 @@ - - int main(int argc, const char** argv) { - base::EnableTerminationOnHeapCorruption(); -+#if !defined(OS_FREEBSD) - base::EnableTerminationOnOutOfMemory(); -+#endif - - // NOTE(willchan): One might ask why this call is done here rather than in - // process_util_linux.cc with the definition of 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 0afd0bfd3826..3992724cb99f 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,43 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2011-06-29 20:38:10.627569565 +0300 -+++ chrome/browser/chrome_content_browser_client.cc 2011-06-29 20:38:47.261569975 +0300 -@@ -48,7 +48,7 @@ - #include "net/base/cookie_monster.h" +--- chrome/browser/chrome_content_browser_client.cc.orig 2011-10-07 08:32:35.000000000 +0000 ++++ chrome/browser/chrome_content_browser_client.cc 2011-10-10 20:09:07.754749149 +0000 +@@ -71,7 +71,7 @@ #include "net/base/cookie_options.h" + #include "ui/base/resource/resource_bundle.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) #include "base/linux_util.h" + #include "chrome/browser/browser_main_gtk.h" #include "chrome/browser/crash_handler_host_linux.h" - #endif -@@ -323,7 +323,7 @@ - #endif +@@ -81,7 +81,7 @@ + #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h" + #elif defined(TOOLKIT_VIEWS) + #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" + #elif defined(OS_MACOSX) + #include "chrome/browser/tab_contents/tab_contents_view_mac.h" +@@ -129,7 +129,7 @@ + return new BrowserMainPartsMac(parameters); + #elif defined(OS_CHROMEOS) + return new BrowserMainPartsChromeos(parameters); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + return new BrowserMainPartsGtk(parameters); + #else + return NULL; +@@ -142,7 +142,7 @@ + return new TabContentsViewTouch(tab_contents); + #elif defined(TOOLKIT_VIEWS) + return new TabContentsViewViews(tab_contents); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + return new TabContentsViewGtk(tab_contents); + #elif defined(OS_MACOSX) + return tab_contents_view_mac::CreateTabContentsView(tab_contents); +@@ -771,7 +771,7 @@ + return g_browser_process->system_request_context(); } -#if defined(OS_LINUX) @@ -18,3 +45,12 @@ int ChromeContentBrowserClient::GetCrashSignalFD( const std::string& process_type) { if (process_type == switches::kRendererProcess) +@@ -794,7 +794,7 @@ + + return -1; + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_FREEBSD) + + #if defined(OS_WIN) + const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__print_preview_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__print_preview_handler.cc deleted file mode 100644 index dda4df939c87..000000000000 --- a/www/chromium/files/patch-chrome__browser__ui__webui__print_preview_handler.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/ui/webui/print_preview_handler.cc.orig 2011-09-30 03:01:50.000000000 -0500 -+++ chrome/browser/ui/webui/print_preview_handler.cc 2011-10-06 00:48:39.943195565 -0500 -@@ -46,6 +46,7 @@ - - #if defined(USE_CUPS) - #include <cups/cups.h> -+#include <cups/ppd.h> - - #include "base/file_util.h" - #endif diff --git a/www/chromium/files/patch-chrome__nacl.gypi b/www/chromium/files/patch-chrome__nacl.gypi new file mode 100644 index 000000000000..7d2ee172a349 --- /dev/null +++ b/www/chromium/files/patch-chrome__nacl.gypi @@ -0,0 +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 @@ + ], + }, + ], +- }], +- ['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': [ + { diff --git a/www/chromium/files/patch-chrome__test__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc index 4493056a2649..63a41a321300 100644 --- a/www/chromium/files/patch-chrome__test__in_process_browser_test.cc +++ b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc @@ -1,5 +1,5 @@ ---- chrome/test/in_process_browser_test.cc.orig 2011-09-14 00:41:45.000000000 +0300 -+++ chrome/test/in_process_browser_test.cc 2011-09-14 00:46:15.000000000 +0300 +--- chrome/test/base/in_process_browser_test.cc.orig 2011-09-14 00:41:45.000000000 +0300 ++++ chrome/test/base/in_process_browser_test.cc 2011-09-14 00:46:15.000000000 +0300 @@ -41,6 +41,10 @@ #include "net/test/test_server.h" #include "sandbox/src/dep.h" diff --git a/www/chromium/files/patch-chrome__test__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h index 77a2ab0e2e4d..a7ed54f24493 100644 --- a/www/chromium/files/patch-chrome__test__testing_browser_process.h +++ b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h @@ -1,5 +1,5 @@ ---- chrome/test/testing_browser_process.h.orig 2011-07-28 11:01:47.000000000 +0300 -+++ chrome/test/testing_browser_process.h 2011-09-06 22:56:31.000000000 +0300 +--- chrome/test/base/testing_browser_process.h.orig 2011-07-28 11:01:47.000000000 +0300 ++++ chrome/test/base/testing_browser_process.h 2011-09-06 22:56:31.000000000 +0300 @@ -104,7 +104,7 @@ virtual bool plugin_finder_disabled() const; virtual void CheckForInspectorFiles() {} diff --git a/www/chromium/files/patch-content__browser__zygote_host_linux.cc b/www/chromium/files/patch-content__browser__zygote_host_linux.cc index 20c71f7dda0f..83b2c1a15b50 100644 --- a/www/chromium/files/patch-content__browser__zygote_host_linux.cc +++ b/www/chromium/files/patch-content__browser__zygote_host_linux.cc @@ -1,12 +1,17 @@ ---- content/browser/zygote_host_linux.cc.orig 2011-10-02 18:12:41.000000000 +0300 -+++ content/browser/zygote_host_linux.cc 2011-10-02 18:11:51.000000000 +0300 -@@ -259,8 +259,10 @@ +--- content/browser/zygote_host_linux.cc.orig 2011-10-07 11:31:44.000000000 +0300 ++++ content/browser/zygote_host_linux.cc 2011-10-08 22:10:14.930730097 +0300 +@@ -271,6 +271,7 @@ return base::kNullProcessHandle; } +#if !defined(OS_FREEBSD) - const int kRendererScore = 5; - AdjustRendererOOMScore(pid, kRendererScore); + // 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 +@@ -278,6 +279,7 @@ + // that's not something we can include here.) + const int kLowestRendererOomScore = 300; + AdjustRendererOOMScore(pid, kLowestRendererOomScore); +#endif return pid; 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 32cde774d1a5..6510e774ca04 100644 --- a/www/chromium/files/patch-content__browser__zygote_main_linux.cc +++ b/www/chromium/files/patch-content__browser__zygote_main_linux.cc @@ -1,15 +1,6 @@ ---- content/browser/zygote_main_linux.cc.orig 2011-09-14 11:01:10.000000000 +0300 -+++ content/browser/zygote_main_linux.cc 2011-10-02 15:28:48.000000000 +0300 -@@ -57,7 +57,7 @@ - #endif - - #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \ -- !defined(__clang__) -+ !defined(__clang__) && !defined(OS_FREEBSD) - // The seccomp sandbox is enabled on all ia32 and x86-64 processor as long as - // we aren't using SELinux or clang. - #define SECCOMP_SANDBOX -@@ -720,11 +720,16 @@ +--- 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)) { @@ -24,5 +15,5 @@ + return false; +#endif } - } else if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableSeccompSandbox)) { + #if defined(SECCOMP_SANDBOX) + } else if (SeccompSandboxEnabled()) { diff --git a/www/chromium/files/patch-content__common__seccomp_sandbox.h b/www/chromium/files/patch-content__common__seccomp_sandbox.h new file mode 100644 index 000000000000..e96e28b7018d --- /dev/null +++ b/www/chromium/files/patch-content__common__seccomp_sandbox.h @@ -0,0 +1,12 @@ +--- content/common/seccomp_sandbox.h.orig 2011-10-10 20:30:54.487723398 +0000 ++++ content/common/seccomp_sandbox.h 2011-10-10 20:31:27.083734776 +0000 +@@ -18,7 +18,8 @@ + #include "content/common/content_switches.h" + + #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \ +- !defined(__clang__) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) ++ !defined(__clang__) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) && \ ++ !defined(OS_FREEBSD) + #define SECCOMP_SANDBOX + #include "seccompsandbox/sandbox.h" + #endif diff --git a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc deleted file mode 100644 index 345be5fa59be..000000000000 --- a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2011-03-20 22:02:04.353053389 +0200 -+++ content/renderer/renderer_main_platform_delegate_linux.cc 2011-03-20 22:02:04.476736985 +0200 -@@ -36,7 +36,7 @@ - // The seccomp sandbox is started in the renderer. - // http://code.google.com/p/seccompsandbox/ - #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \ -- !defined(__clang__) -+ !defined(__clang__) && !defined(OS_FREEBSD) - // N.b. SupportsSeccompSandbox() returns a cached result, as we already - // called it earlier in the zygote. Thus, it is OK for us to not pass in - // a file descriptor for "/proc". diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp new file mode 100644 index 000000000000..ccdfd9185f6e --- /dev/null +++ b/www/chromium/files/patch-media__media.gyp @@ -0,0 +1,11 @@ +--- media/media.gyp.orig 2011-10-10 20:58:23.652729836 +0000 ++++ media/media.gyp 2011-10-10 20:58:50.086730237 +0000 +@@ -248,7 +248,7 @@ + ], + }, + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'conditions': [ + ['use_pulseaudio == 1', { + 'link_settings': { diff --git a/www/chromium/files/patch-net__base__dns_reloader.cc b/www/chromium/files/patch-net__base__dns_reloader.cc new file mode 100644 index 000000000000..b28dbf814c83 --- /dev/null +++ b/www/chromium/files/patch-net__base__dns_reloader.cc @@ -0,0 +1,12 @@ +--- net/base/dns_reloader.cc.orig 2011-10-09 01:12:14.189268935 +0300 ++++ net/base/dns_reloader.cc 2011-10-09 01:32:07.358661959 +0300 +@@ -6,6 +6,9 @@ + + #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) + ++#if defined(OS_FREEBSD) ++#include <netinet/in.h> ++#endif + #include <resolv.h> + + #include "base/basictypes.h" diff --git a/www/chromium/files/patch-net__dns__dns_config_service_posix.h b/www/chromium/files/patch-net__dns__dns_config_service_posix.h new file mode 100644 index 000000000000..453e13168f5d --- /dev/null +++ b/www/chromium/files/patch-net__dns__dns_config_service_posix.h @@ -0,0 +1,14 @@ +--- net/dns/dns_config_service_posix.h.orig 2011-10-09 01:34:20.846923374 +0300 ++++ net/dns/dns_config_service_posix.h 2011-10-09 01:35:52.752414016 +0300 +@@ -6,6 +6,11 @@ + #define NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_ + #pragma once + ++#include "build/build_config.h" ++ ++#if defined(OS_FREEBSD) ++#include <netinet/in.h> ++#endif + #include <resolv.h> + + #include "base/compiler_specific.h" diff --git a/www/chromium/files/patch-remoting__remoting.gyp b/www/chromium/files/patch-remoting__remoting.gyp index eaf803408485..7455d2b5e06f 100644 --- a/www/chromium/files/patch-remoting__remoting.gyp +++ b/www/chromium/files/patch-remoting__remoting.gyp @@ -1,23 +1,11 @@ ---- remoting/remoting.gyp.orig 2011-09-07 02:04:45.000000000 +0300 -+++ remoting/remoting.gyp 2011-09-07 02:08:27.000000000 +0300 -@@ -53,6 +53,20 @@ - 'resources/linux/chromoting16.png', - ], - }], -+ ['OS=="freebsd" and target_arch=="x64"', { -+ 'name_suffix': '- FreeBSD - amd64', -+ 'remoting_it2me_os_files': [ -+ 'resources/linux/chromoting128.png', -+ 'resources/linux/chromoting16.png', -+ ], -+ }], -+ ['OS=="freebsd" and target_arch!="x64"', { -+ 'name_suffix': '- FreeBSD', -+ 'remoting_it2me_os_files': [ -+ 'resources/linux/chromoting128.png', -+ 'resources/linux/chromoting16.png', -+ ], -+ }], - ['OS=="win"', { - 'plugin_extension': 'dll', - 'plugin_prefix': '', +--- remoting/remoting.gyp.orig 2011-10-07 11:31:35.000000000 +0300 ++++ remoting/remoting.gyp 2011-10-09 14:43:52.277370445 +0300 +@@ -345,7 +345,7 @@ + '../ui/ui.gyp:ui', + '../net/net.gyp:net', + '../skia/skia.gyp:skia', +- '../third_party/libvpx/libvpx.gyp:libvpx', ++ '../third_party/libvpx/libvpx.gyp:libvpx_lib', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', + '../third_party/zlib/zlib.gyp:zlib', + '../media/media.gyp:yuv_convert', diff --git a/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc new file mode 100644 index 000000000000..be2cea3859fa --- /dev/null +++ b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc @@ -0,0 +1,11 @@ +--- skia/ext/vector_platform_device_skia.cc.orig 2011-10-09 00:19:19.935845255 +0300 ++++ skia/ext/vector_platform_device_skia.cc 2011-10-09 00:19:41.820724365 +0300 +@@ -88,7 +88,7 @@ + SkASSERT(false); + return NULL; + } +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + void VectorPlatformDeviceSkia::DrawToNativeContext( + PlatformSurface surface, int x, int y, const PlatformRect* src_rect) { + // Should never be called on Linux. diff --git a/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h new file mode 100644 index 000000000000..15fba9c89def --- /dev/null +++ b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h @@ -0,0 +1,11 @@ +--- skia/ext/vector_platform_device_skia.h.orig 2011-10-09 00:19:07.294915003 +0300 ++++ skia/ext/vector_platform_device_skia.h 2011-10-09 00:20:01.103617064 +0300 +@@ -40,7 +40,7 @@ + virtual void DrawToNativeContext(CGContext* context, int x, int y, + const CGRect* src_rect); + virtual CGContextRef GetBitmapContext(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + virtual void DrawToNativeContext(PlatformSurface surface, int x, int y, + const PlatformRect* src_rect); + #endif diff --git a/www/chromium/files/patch-third_party__WebKit__Source__WebCore__platform__UUID.cpp b/www/chromium/files/patch-third_party__WebKit__Source__WebCore__platform__UUID.cpp deleted file mode 100644 index a5a1d9f5b64e..000000000000 --- a/www/chromium/files/patch-third_party__WebKit__Source__WebCore__platform__UUID.cpp +++ /dev/null @@ -1,35 +0,0 @@ ---- ./third_party/WebKit/Source/WebCore/platform/UUID.cpp.orig 2011-01-25 10:33:42.000000000 +0100 -+++ ./third_party/WebKit/Source/WebCore/platform/UUID.cpp 2011-01-25 10:43:15.000000000 +0100 -@@ -41,6 +41,8 @@ - #include <objbase.h> - #elif OS(DARWIN) - #include <CoreFoundation/CoreFoundation.h> -+#elif OS(FREEBSD) -+#include <uuid.h> - #elif OS(LINUX) && !PLATFORM(CHROMIUM) - #include <stdio.h> - #elif OS(LINUX) && PLATFORM(CHROMIUM) -@@ -80,6 +82,23 @@ - String canonicalUuidStr = uuidStr.lower(); // make it lower. - ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired); - return canonicalUuidStr; -+#elif OS(FREEBSD) -+ uuid_t *store; -+ char *uuid; -+ store = (uuid_t*)malloc(sizeof(uuid_t)); -+ if (store == NULL) -+ return String(); -+ -+ if (uuidgen(store, 1) != 0) -+ return String(); -+ -+ uuid_to_string(store, &uuid, NULL); -+ String canonicalUuidStr = String(uuid).lower(); // make it lower -+ free(uuid); -+ free(store); -+ ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired); -+ return canonicalUuidStr; -+ - #elif OS(LINUX) && !PLATFORM(CHROMIUM) - // This does not work for the linux system that turns on sandbox. - FILE* fptr = fopen("/proc/sys/kernel/random/uuid", "r"); diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp index d6d97025d241..f7d36b57f480 100644 --- a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp +++ b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp @@ -1,25 +1,6 @@ ---- third_party/ffmpeg/ffmpeg.gyp.orig 2011-09-14 02:43:26.000000000 +0300 -+++ third_party/ffmpeg/ffmpeg.gyp 2011-09-14 03:03:08.000000000 +0300 -@@ -528,6 +528,9 @@ - 'libraries': [ - '-lvpx', - ], -+ 'ldflags': [ -+ '-L<(prefix_dir)/lib', -+ ], - }], - ], - }, -@@ -642,7 +645,7 @@ - }, { - # Using libvpx provided by the system. - 'include_dirs': [ -- '/usr/include/vpx', -+ '<(prefix_dir)/include', - ], - } - ], -@@ -941,6 +944,7 @@ +--- 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', diff --git a/www/chromium/files/patch-third_party__icu__icu.gyp b/www/chromium/files/patch-third_party__icu__icu.gyp deleted file mode 100644 index 959732e54bf6..000000000000 --- a/www/chromium/files/patch-third_party__icu__icu.gyp +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/icu/icu.gyp.orig 2011-09-09 23:54:57.000000000 +0300 -+++ third_party/icu/icu.gyp 2011-09-10 00:17:17.000000000 +0300 -@@ -517,6 +517,9 @@ - 'defines': [ - 'USE_SYSTEM_ICU', - ], -+ 'include_dirs': [ -+ '<!@(icu-config --prefix)/include', -+ ], - }, - 'link_settings': { - 'ldflags': [ diff --git a/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc b/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc new file mode 100644 index 000000000000..d8e8850da54e --- /dev/null +++ b/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc @@ -0,0 +1,12 @@ +--- third_party/leveldatabase/env_chromium.cc.orig 2011-10-09 00:31:40.173746519 +0300 ++++ third_party/leveldatabase/env_chromium.cc 2011-10-09 00:33:07.446263098 +0300 +@@ -30,7 +30,8 @@ + #include "base/win/win_util.h" + #endif + +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_ANDROID) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_ANDROID) \ ++ || defined(OS_FREEBSD) + // The following are glibc-specific + namespace { + diff --git a/www/chromium/files/patch-third_party__leveldb__util__env_chromium.cc b/www/chromium/files/patch-third_party__leveldb__util__env_chromium.cc deleted file mode 100644 index ed133b54ed1f..000000000000 --- a/www/chromium/files/patch-third_party__leveldb__util__env_chromium.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/leveldb/util/env_chromium.cc.orig 2011-06-27 01:35:45.210558183 +0300 -+++ third_party/leveldb/util/env_chromium.cc 2011-06-27 01:44:12.434784726 +0300 -@@ -29,7 +29,7 @@ - #include "base/win/win_util.h" - #endif - --#if defined(OS_MACOSX) || defined(OS_WIN) -+#if !defined(OS_LINUX) - // The following are glibc-specific - namespace { - -@@ -420,7 +420,7 @@ - #elif defined(OS_FREEBSD) || defined(OS_NACL) - // TODO(BSD): find a better thread ID - pthread_t tid = pthread_self(); -- memcpy(&thread_id, &tid, min(sizeof(r), sizeof(tid))); -+ memcpy(&thread_id, &tid, std::min(sizeof(thread_id), sizeof(tid))); - #endif - - // We try twice: the first time with a fixed-size stack allocated buffer, diff --git a/www/chromium/files/patch-third_party__libvpx__libvpx.gyp b/www/chromium/files/patch-third_party__libvpx__libvpx.gyp index 09e4285b8bbc..2ea73b11547e 100644 --- a/www/chromium/files/patch-third_party__libvpx__libvpx.gyp +++ b/www/chromium/files/patch-third_party__libvpx__libvpx.gyp @@ -1,24 +1,24 @@ ---- third_party/libvpx/libvpx.gyp.orig 2011-08-30 12:19:17.000000000 +0300 -+++ third_party/libvpx/libvpx.gyp 2011-09-08 02:22:17.000000000 +0300 -@@ -4,7 +4,7 @@ - { - 'variables': { +--- third_party/libvpx/libvpx.gyp.orig 2011-10-09 00:08:25.368469771 +0300 ++++ third_party/libvpx/libvpx.gyp 2011-10-10 21:41:31.622025374 +0300 +@@ -77,7 +77,7 @@ + 'source/libvpx/vpx_scale/generic/yv12extend.c', + ], 'conditions': [ - ['OS=="mac" or OS=="linux"', { + ['OS=="mac" or OS=="linux" or OS=="freebsd"', { 'asm_obj_extension': 'o', }], ['OS=="win"', { -@@ -13,7 +13,7 @@ +@@ -86,7 +86,7 @@ ], }, 'conditions': [ -- [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm" and target_arch!="arm-neon"', { -+ [ '(OS=="linux" or OS=="freebsd" or OS=="mac" or OS=="win") and target_arch!="arm" and target_arch!="arm-neon"', { +- [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm"', { ++ [ '(OS=="linux" or OS=="freebsd" or OS=="mac" or OS=="win") and target_arch!="arm"', { 'targets': [ { # This libvpx target contains both encoder and decoder. -@@ -25,7 +25,7 @@ +@@ -98,7 +98,7 @@ '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx', 'yasm_path': '<(PRODUCT_DIR)/yasm', 'conditions': [ @@ -27,7 +27,7 @@ 'yasm_flags': [ '-felf32', '-m', 'x86', -@@ -33,7 +33,7 @@ +@@ -106,7 +106,7 @@ '-I', 'source/libvpx', ], }], @@ -36,7 +36,7 @@ 'yasm_flags': [ '-felf64', '-m', 'amd64', -@@ -265,6 +265,11 @@ +@@ -482,6 +482,11 @@ 'libvpx_path': 'lib/linux/arm', }, }], diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py index cb984ad61ca0..1681def75d38 100644 --- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py +++ b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py @@ -1,6 +1,6 @@ ---- tools/gyp/pylib/gyp/generator/make.py.orig 2011-07-28 11:18:03.000000000 +0300 -+++ tools/gyp/pylib/gyp/generator/make.py 2011-09-07 01:20:36.000000000 +0300 -@@ -239,13 +239,13 @@ +--- tools/gyp/pylib/gyp/generator/make.py.orig 2011-10-07 11:51:41.000000000 +0300 ++++ tools/gyp/pylib/gyp/generator/make.py 2011-10-08 22:49:05.683824673 +0300 +@@ -249,13 +249,13 @@ # in gyp's make.py where ARFLAGS.host etc. is computed. # TODO(evan): move all cross-compilation logic to gyp-time so we don't need # to replicate this environment fallback in make as well. @@ -21,12 +21,3 @@ ARFLAGS.host := %(ARFLAGS.host)s # Define a dir function that can handle spaces. -@@ -365,7 +365,7 @@ - # so we can check their command lines. - # $? -- new prerequisites - # $| -- order-only dependencies --prereq_changed = $(filter-out $|,$?) -+prereq_changed = $(filter-out FORCE_DO_CMD $|,$?) - - # do_cmd: run a command via the above cmd_foo names, if necessary. - # Should always run for a given target to handle command-line changes. diff --git a/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp b/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp deleted file mode 100644 index d729fe70fdac..000000000000 --- a/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp +++ /dev/null @@ -1,32 +0,0 @@ ---- v8/src/extensions/experimental/experimental.gyp.orig 2011-09-14 11:19:51.000000000 +0300 -+++ v8/src/extensions/experimental/experimental.gyp 2011-09-26 02:10:36.000000000 +0300 -@@ -56,8 +56,14 @@ - 'number-format.h', - '<(SHARED_INTERMEDIATE_DIR)/i18n-js.cc', - ], -+ 'conditions': [ -+ ['use_system_icu == 0', { -+ 'include_dirs': [ -+ '<(icu_src_dir)/public/common', -+ ], -+ }], -+ ], - 'include_dirs': [ -- '<(icu_src_dir)/public/common', - # v8/ is root for all includes. - '../../..' - ], -@@ -71,6 +77,13 @@ - 'include_dirs': [ - '../../..' - ], -+ 'conditions': [ -+ ['OS == "freebsd"', { -+ 'include_dirs!': [ -+ '<(prefix_dir)/include', -+ ], -+ }], -+ ], - }, - }, - { diff --git a/www/chromium/files/patch-v8__src__extensions__experimental__number-format.cc b/www/chromium/files/patch-v8__src__extensions__experimental__number-format.cc deleted file mode 100644 index ae802b284882..000000000000 --- a/www/chromium/files/patch-v8__src__extensions__experimental__number-format.cc +++ /dev/null @@ -1,48 +0,0 @@ ---- v8/src/extensions/experimental/number-format.cc.orig 2011-08-30 12:19:09.000000000 +0300 -+++ v8/src/extensions/experimental/number-format.cc 2011-09-10 17:32:54.000000000 +0300 -@@ -36,6 +36,8 @@ - #include "unicode/numfmt.h" - #include "unicode/uchar.h" - #include "unicode/ucurr.h" -+#include "unicode/unum.h" -+#include "unicode/uversion.h" - - namespace v8 { - namespace internal { -@@ -231,6 +233,8 @@ - } - - // Generates ICU number format pattern from given skeleton. -+// TODO(cira): Remove once ICU includes equivalent method -+// (see http://bugs.icu-project.org/trac/ticket/8610). - static icu::DecimalFormat* CreateFormatterFromSkeleton( - const icu::Locale& icu_locale, - const icu::UnicodeString& skeleton, -@@ -251,6 +255,7 @@ - // Case of non-consecutive U+00A4 is taken care of in i18n.js. - int32_t end_index = skeleton.lastIndexOf(currency_symbol, index); - -+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 6) - icu::NumberFormat::EStyles style; - switch (end_index - index) { - case 0: -@@ -262,6 +267,19 @@ - default: - style = icu::NumberFormat::kPluralCurrencyStyle; - } -+#else // ICU version is 4.8 or above (we ignore versions below 4.0). -+ UNumberFormatStyle style; -+ switch (end_index - index) { -+ case 0: -+ style = UNUM_CURRENCY; -+ break; -+ case 1: -+ style = UNUM_CURRENCY_ISO; -+ break; -+ default: -+ style = UNUM_CURRENCY_PLURAL; -+ } -+#endif - - base_format = static_cast<icu::DecimalFormat*>( - icu::NumberFormat::createInstance(icu_locale, style, *status)); diff --git a/www/chromium/files/patch-views_native_types.h b/www/chromium/files/patch-views_native_types.h index 75c6f35534df..0308ce641c4a 100644 --- a/www/chromium/files/patch-views_native_types.h +++ b/www/chromium/files/patch-views_native_types.h @@ -1,5 +1,5 @@ ---- views/native_types.h.orig 2011-09-10 16:05:08.000000000 +0300 -+++ views/native_types.h 2011-09-10 16:05:37.000000000 +0300 +--- views/native_types.h.orig 2011-10-07 11:32:08.000000000 +0300 ++++ views/native_types.h 2011-10-08 22:57:20.811082782 +0300 @@ -8,7 +8,7 @@ #include "ui/gfx/native_widget_types.h" @@ -9,12 +9,12 @@ typedef union _GdkEvent GdkEvent; #endif #if defined(USE_X11) -@@ -32,7 +32,7 @@ - #if defined(OS_WIN) +@@ -44,7 +44,7 @@ + typedef aura::Event* NativeEvent; + #elif defined(OS_WIN) typedef MSG NativeEvent; - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - typedef GdkEvent* NativeEvent; - #endif - #if defined(USE_X11) +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_FREEBSD) + + #if defined(USE_WAYLAND) + typedef ui::WaylandEvent* NativeEvent; diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index bd9fbadc5e75..740af7fb6e31 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -2,7 +2,6 @@ bin/chrome %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome.pak -%%DATADIR%%/ffmpegsumo_nolink %%DATADIR%%/libffmpegsumo.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/ar.pak @@ -211,6 +210,9 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/warningOrangeDot.png %%DATADIR%%/resources/inspector/Images/warningsErrors.png %%DATADIR%%/resources/inspector/ScriptFormatterWorker.js +%%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%%/xdg-settings |