Update to 22.0.1229.79

Submitted by:	George Liaskos
Security:	http://www.vuxml.org/freebsd/5bae2ab4-0820-11e2-be5f-00262d5ed8ee.html

20 files changed, 188 insertions, 153 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 31cf3294a567..bed0f7de539a 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
-DISTVERSION=	21.0.1180.89
+DISTVERSION=	22.0.1229.79
 CATEGORIES=	www
 MASTER_SITES=	http://download.goodking.org/downloads/ \
 		ftp://rene-ladan.nl/pub/distfiles/ \
@@ -170,10 +170,6 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|linux|freebsd|" \
 		${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
 
-pre-configure:
-	@${CP} -R ${WRKSRC}/third_party/libvpx/source/config/linux \
-		${WRKSRC}/third_party/libvpx/source/config/freebsd
-
 do-configure:
 	cd ${WRKSRC} && \
 		GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \
@@ -185,8 +181,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/chrome.pak \
 		${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png \
 		${WRKSRC}/out/${BUILDTYPE}/resources.pak \
-		${WRKSRC}/out/${BUILDTYPE}/ui_resources_standard.pak \
-		${WRKSRC}/out/${BUILDTYPE}/theme_resources_standard.pak ${DATADIR}
+		${WRKSRC}/out/${BUILDTYPE}/content_resources.pak \
+		${WRKSRC}/out/${BUILDTYPE}/ui_resources_100_percent.pak \
+		${WRKSRC}/out/${BUILDTYPE}/theme_resources_100_percent.pak ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \
 		${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${DATADIR}
 .for f in chrome libffmpegsumo.so mksnapshot protoc
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 88d5d6dce7df..e2f5af663331 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chromium-courgette-redacted-21.0.1180.89.tar.xz) = ce3512015ba5d4e012a3706a8ca0380ad6360c58d8e01275dd2168b20205babc
-SIZE (chromium-courgette-redacted-21.0.1180.89.tar.xz) = 156190076
+SHA256 (chromium-courgette-redacted-22.0.1229.79.tar.xz) = bedf976f9ed5e2f3cd149fed7fa9b1cd7cecc5e40794eefe0a7c6143493febdd
+SIZE (chromium-courgette-redacted-22.0.1229.79.tar.xz) = 173072364
diff --git a/www/chromium/files/patch-base__debug__stack_trace_posix.cc b/www/chromium/files/patch-base__debug__stack_trace_posix.cc
index 8dc782f1ff4c..927ffe383553 100644
--- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc
+++ b/www/chromium/files/patch-base__debug__stack_trace_posix.cc
@@ -1,14 +1,18 @@
---- base/debug/stack_trace_posix.cc.orig	2012-06-11 23:22:13.000000000 +0300
-+++ base/debug/stack_trace_posix.cc	2012-06-12 00:09:38.000000000 +0300
-@@ -153,6 +153,11 @@
-     count_ = 0;
-     return;
-   }
-+#elif defined(OS_FREEBSD)
+--- base/debug/stack_trace_posix.cc.orig	2012-10-01 23:40:32.000000000 +0300
++++ base/debug/stack_trace_posix.cc	2012-10-01 23:41:09.000000000 +0300
+@@ -148,9 +148,15 @@
+ }  // namespace
+ 
+ StackTrace::StackTrace() {
++#if defined(OS_FREEBSD)
 +  // Disable backtrace for now, libexecinfo crashes in getframeaddr
 +  // in release build / i386.
 +  count_ = 0;
-+  return;
- #endif
++#else
    // Though the backtrace API man page does not list any possible negative
    // return values, we take no chance.
+   count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
++#endif
+ }
+ 
+ void StackTrace::PrintBacktrace() const {
diff --git a/www/chromium/files/patch-base__linux_util.cc b/www/chromium/files/patch-base__linux_util.cc
deleted file mode 100644
index dd34e0e0e295..000000000000
--- a/www/chromium/files/patch-base__linux_util.cc
+++ /dev/null
@@ -1,33 +0,0 @@
---- base/linux_util.cc.orig	2011-03-21 20:43:02.797111222 +0200
-+++ base/linux_util.cc	2011-03-21 20:44:28.268111587 +0200
-@@ -133,12 +133,14 @@
- char g_linux_distro[kDistroSize] =
- #if defined(OS_CHROMEOS)
-     "CrOS";
-+#elif defined(OS_FREEBSD)
-+    "FreeBSD";
- #else  // if defined(OS_LINUX)
-     "Unknown";
- #endif
- 
- std::string GetLinuxDistro() {
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_FREEBSD)
-   return g_linux_distro;
- #elif defined(OS_LINUX)
-   LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();
-@@ -194,6 +196,7 @@
-   return true;
- }
- 
-+#if defined(OS_LINUX)
- bool FindProcessHoldingSocket(pid_t* pid_out, ino_t socket_inode) {
-   DCHECK(pid_out);
-   bool already_found = false;
-@@ -293,5 +296,5 @@
-   }
-   return -1;
- }
--
-+#endif // if defined(OS_LINUX)
- }  // namespace base
diff --git a/www/chromium/files/patch-chrome__browser__process_singleton.h b/www/chromium/files/patch-chrome__browser__process_singleton.h
index 303144606100..aeb995c9385c 100644
--- a/www/chromium/files/patch-chrome__browser__process_singleton.h
+++ b/www/chromium/files/patch-chrome__browser__process_singleton.h
@@ -1,6 +1,6 @@
---- chrome/browser/process_singleton.h.orig	2012-05-30 10:01:59.000000000 +0300
-+++ chrome/browser/process_singleton.h	2012-06-05 21:41:51.000000000 +0300
-@@ -29,9 +29,9 @@
+--- chrome/browser/process_singleton.h.orig	2012-09-25 16:02:18.000000000 +0300
++++ chrome/browser/process_singleton.h	2012-09-29 15:03:27.000000000 +0300
+@@ -28,9 +28,9 @@
  #include "base/file_path.h"
  #endif  // defined(OS_POSIX)
  
@@ -12,7 +12,7 @@
  
  class CommandLine;
  class FilePath;
-@@ -85,7 +85,7 @@
+@@ -84,7 +84,7 @@
    NotifyResult NotifyOtherProcessOrCreate(
        const NotificationCallback& notification_callback);
  
@@ -21,7 +21,7 @@
    // Exposed for testing.  We use a timeout on Linux, and in tests we want
    // this timeout to be short.
    NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line,
-@@ -98,7 +98,7 @@
+@@ -97,7 +97,7 @@
    void OverrideCurrentPidForTesting(base::ProcessId pid);
    void OverrideKillCallbackForTesting(const base::Callback<void(int)>& callback);
    static void DisablePromptForTesting();
@@ -31,9 +31,9 @@
  #if defined(OS_WIN) && !defined(USE_AURA)
    // Used in specific cases to let us know that there is an existing instance
 @@ -171,7 +171,7 @@
-   HWND remote_window_;  // The HWND_MESSAGE of another browser.
    HWND window_;  // The HWND_MESSAGE window.
    bool is_virtualized_;  // Stuck inside Microsoft Softricity VM environment.
+   HANDLE lock_file_;
 -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    // Return true if the given pid is one of our child processes.
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 063b23e289ad..6ff2ca333f3c 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-07-18 10:02:02.000000000 +0300
-+++ chrome/browser/ui/webui/about_ui.cc	2012-07-25 20:41:53.000000000 +0300
-@@ -72,7 +72,7 @@
- #include "webkit/glue/webkit_glue.h"
- #include "webkit/plugins/webplugininfo.h"
+--- chrome/ui/webui/about_ui.cc.orig	2012-09-25 16:02:14.000000000 +0300
++++ chrome/browser/ui/webui/about_ui.cc	2012-09-29 15:09:43.000000000 +0300
+@@ -74,7 +74,7 @@
+ #include "chrome/browser/ui/webui/theme_source.h"
+ #endif
  
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
  #include "content/public/browser/zygote_host_linux.h"
  #include "content/public/common/sandbox_linux.h"
  #endif
-@@ -1011,7 +1011,7 @@
+@@ -924,7 +924,7 @@
    return data;
  }
  
@@ -18,16 +18,16 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -1406,7 +1406,7 @@
+@@ -1325,7 +1325,7 @@
+   } else if (host == chrome::kChromeUIDNSHost) {
+     AboutDnsHandler::Start(this, request_id);
      return;
-   } else if (host == chrome::kChromeUIHistogramsHost) {
-     response = AboutHistograms(path);
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    } else if (host == chrome::kChromeUILinuxProxyConfigHost) {
      response = AboutLinuxProxyConfig();
  #endif
-@@ -1422,7 +1422,7 @@
+@@ -1341,7 +1341,7 @@
      response = ResourceBundle::GetSharedInstance().GetRawDataResource(
          IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string();
  #endif
diff --git a/www/chromium/files/patch-content__browser__zygote_host_impl_linux.cc b/www/chromium/files/patch-content__browser__zygote_host__zygote_host_impl_linux.cc
index ca40dc1aefda..12c39290f6a8 100644
--- a/www/chromium/files/patch-content__browser__zygote_host_impl_linux.cc
+++ b/www/chromium/files/patch-content__browser__zygote_host__zygote_host_impl_linux.cc
@@ -1,5 +1,5 @@
---- 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
+--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2012-05-09 10:01:22.000000000 +0300
++++ content/browser/zygote_host/zygote_host_impl_linux.cc	2012-05-20 02:32:55.863105935 +0300
 @@ -92,7 +92,7 @@
    cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess);
  
diff --git a/www/chromium/files/patch-content__common__sandbox_seccomp_bpf_linux.cc b/www/chromium/files/patch-content__common__sandbox_seccomp_bpf_linux.cc
new file mode 100644
index 000000000000..6171a2b8292f
--- /dev/null
+++ b/www/chromium/files/patch-content__common__sandbox_seccomp_bpf_linux.cc
@@ -0,0 +1,31 @@
+--- content/common/sandbox_seccomp_bpf_linux.cc.orig	2012-10-02 00:12:55.000000000 +0300
++++ content/common/sandbox_seccomp_bpf_linux.cc	2012-10-02 00:13:01.000000000 +0300
+@@ -2,15 +2,15 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+-#include <asm/unistd.h>
++//#include <asm/unistd.h>
+ #include <dlfcn.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <linux/audit.h>
+-#include <linux/filter.h>
++//include <linux/audit.h>
++//#include <linux/filter.h>
+ #include <signal.h>
+ #include <string.h>
+-#include <sys/prctl.h>
++//#include <sys/prctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <ucontext.h>
+@@ -25,7 +25,7 @@
+ #include "content/public/common/content_switches.h"
+ 
+ // These are the only architectures supported for now.
+-#if defined(__i386__) || defined(__x86_64__)
++#if (defined(__i386__) || defined(__x86_64__)) && !defined(OS_FREEBSD)
+ #define SECCOMP_BPF_SANDBOX
+ #endif
+ 
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..7350cda0593c
--- /dev/null
+++ b/www/chromium/files/patch-content__content_browser.gypi
@@ -0,0 +1,16 @@
+--- content/content_browser.gypi.orig	2012-10-01 20:09:41.000000000 +0300
++++ content/content_browser.gypi	2012-10-01 20:20:01.000000000 +0300
+@@ -950,9 +950,12 @@
+       ],
+     }],
+     ['os_bsd==1', {
+-      'sources/': [
++      'sources/': [        
++        ['exclude', '^browser/device_monitor_linux\\.cc$'],
++        ['exclude', '^browser/download/file_metadata_linux\\.cc$'],
+         ['exclude', '^browser/gamepad/platform_data_fetcher_linux\\.cc$'],
+         ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'],
++        ['exclude', '^browser/udev_linux\\.cc$'],
+       ],
+     }],
+     ['use_aura==1', {
diff --git a/www/chromium/files/patch-content__content_gpu.gypi b/www/chromium/files/patch-content__content_gpu.gypi
new file mode 100644
index 000000000000..995bbfa5151f
--- /dev/null
+++ b/www/chromium/files/patch-content__content_gpu.gypi
@@ -0,0 +1,11 @@
+--- content/content_gpu.gypi.orig	2012-10-01 20:45:02.000000000 +0300
++++ content/content_gpu.gypi	2012-10-01 20:45:37.000000000 +0300
+@@ -95,7 +95,7 @@
+         '../third_party/amd/amd_videocard_info_win.cc',
+       ],
+     }],
+-    ['OS=="linux"', {
++    ['OS=="linux" or OS=="freebsd"', {
+       'dependencies': [
+         '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
+       ],
diff --git a/www/chromium/files/patch-content__renderer__render_view_impl.h b/www/chromium/files/patch-content__renderer__render_view_impl.h
index 0d65ef86b66c..a7072f52bc45 100644
--- a/www/chromium/files/patch-content__renderer__render_view_impl.h
+++ b/www/chromium/files/patch-content__renderer__render_view_impl.h
@@ -1,6 +1,6 @@
---- content/renderer/render_view_impl.h.orig	2012-07-18 10:01:27.000000000 +0300
-+++ content/renderer/render_view_impl.h	2012-07-25 21:21:32.000000000 +0300
-@@ -341,12 +341,12 @@
+--- content/renderer/render_view_impl.h.orig	2012-09-25 16:01:33.000000000 +0300
++++ content/renderer/render_view_impl.h	2012-09-29 17:42:16.000000000 +0300
+@@ -344,12 +344,12 @@
    void SimulateImeConfirmComposition(const string16& text,
                                       const ui::Range& replacement_range);
  
@@ -15,16 +15,16 @@
    // Starts plugin IME.
    void StartPluginIme();
  
-@@ -788,7 +788,7 @@
-   FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, UpdateTargetURLWithInvalidURL);
+@@ -799,7 +799,7 @@
    FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest,
                             GetCompositionCharacterBoundsTest);
+   FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavigationHttpPost);
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_FREEBSD)
    FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
  #endif
    FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune);
-@@ -1258,7 +1258,7 @@
+@@ -1271,7 +1271,7 @@
    bool cached_has_main_frame_horizontal_scrollbar_;
    bool cached_has_main_frame_vertical_scrollbar_;
  
diff --git a/www/chromium/files/patch-content__zygote__zygote_main_linux.cc b/www/chromium/files/patch-content__zygote__zygote_main_linux.cc
index e158c5210a7b..c6c114c9dfec 100644
--- a/www/chromium/files/patch-content__zygote__zygote_main_linux.cc
+++ b/www/chromium/files/patch-content__zygote__zygote_main_linux.cc
@@ -1,6 +1,6 @@
---- content/zygote/zygote_main_linux.cc.orig	2012-08-28 07:17:58.000000000 +0300
-+++ content/zygote/zygote_main_linux.cc	2012-08-28 07:57:49.000000000 +0300
-@@ -45,6 +45,9 @@
+--- content/zygote/zygote_main_linux.cc.orig	2012-09-25 16:01:30.000000000 +0300
++++ content/zygote/zygote_main_linux.cc	2012-10-01 21:22:30.000000000 +0300
+@@ -46,6 +46,9 @@
  #include <sys/signal.h>
  #else
  #include <signal.h>
@@ -10,37 +10,7 @@
  #endif
  
  namespace content {
-@@ -153,7 +156,7 @@
- static LocaltimeRFunction g_libc_localtime64_r;
- 
- // http://crbug.com/123263, see below.
--#if !defined(ADDRESS_SANITIZER)
-+#if !defined(ADDRESS_SANITIZER) && !defined(OS_BSD)
- static pthread_once_t g_libc_file_io_funcs_guard = PTHREAD_ONCE_INIT;
- static FopenFunction g_libc_fopen;
- static FopenFunction g_libc_fopen64;
-@@ -269,7 +272,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>(
-@@ -280,9 +283,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;
-   }
- 
-@@ -462,6 +465,11 @@
+@@ -324,6 +327,11 @@
      CHECK(HANDLE_EINTR(send(sync_fds[1], "C", 1, MSG_NOSIGNAL)) == 1);
      (void) HANDLE_EINTR(close(sync_fds[1]));
  
@@ -52,7 +22,7 @@
      for (;;) {
        // Loop until we have reaped our one natural child
        siginfo_t reaped_child_info;
-@@ -480,6 +488,7 @@
+@@ -342,6 +350,7 @@
          _exit(exit_code);
        }
      }
@@ -60,7 +30,7 @@
    } else {
      // The child needs to wait for the parent to close kZygoteIdFd to avoid a
      // race condition
-@@ -573,7 +582,7 @@
+@@ -395,7 +404,7 @@
        *has_started_new_init = true;
      }
  
@@ -69,3 +39,14 @@
      // 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
+@@ -448,8 +457,10 @@
+                 ZygoteForkDelegate* forkdelegate) {
+ #if !defined(CHROMIUM_SELINUX)
+   g_am_zygote_or_renderer = true;
++#if !defined(OS_BSD)
+   sandbox::InitLibcUrandomOverrides();
+ #endif
++#endif
+ 
+   LinuxSandbox* linux_sandbox = LinuxSandbox::GetInstance();
+   // This will pre-initialize the various sandboxes that need it.
diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp
index 6fc5be208ed5..a1b1e4b92108 100644
--- a/www/chromium/files/patch-net__net.gyp
+++ b/www/chromium/files/patch-net__net.gyp
@@ -1,7 +1,10 @@
---- net/net.gyp.orig	2012-01-30 23:30:30.000000000 +0200
-+++ net/net.gyp	2012-01-30 23:30:57.000000000 +0200
-@@ -853,7 +853,7 @@
+--- net/net.gyp.orig	2012-09-25 16:01:38.000000000 +0300
++++ net/net.gyp	2012-10-01 20:04:49.000000000 +0300
+@@ -943,9 +943,10 @@
+               }],
+               ['os_bsd==1', {
                  'sources!': [
++                  'base/address_tracker_linux.cc',
                    'base/network_change_notifier_linux.cc',
                    'base/network_change_notifier_netlink_linux.cc',
 -                  'proxy/proxy_config_service_linux.cc',
diff --git a/www/chromium/files/patch-remoting__remoting.gyp b/www/chromium/files/patch-remoting__remoting.gyp
deleted file mode 100644
index 7455d2b5e06f..000000000000
--- a/www/chromium/files/patch-remoting__remoting.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-sandbox__sandbox.gyp b/www/chromium/files/patch-sandbox__sandbox.gyp
new file mode 100644
index 000000000000..fe76c85f5c01
--- /dev/null
+++ b/www/chromium/files/patch-sandbox__sandbox.gyp
@@ -0,0 +1,17 @@
+--- sandbox/sandbox.gyp.orig	2012-10-01 21:30:17.000000000 +0300
++++ sandbox/sandbox.gyp	2012-10-01 21:30:25.000000000 +0300
+@@ -12,12 +12,12 @@
+         'win/sandbox_win.gypi',
+       ],
+     }],
+-    [ 'OS=="linux"', {
++    [ 'OS=="linux" or OS=="freebsd"', {
+       'includes': [
+         'linux/sandbox_linux.gypi',
+       ],
+     }],
+-    [ 'OS!="win" and OS!="mac" and OS!="linux"', {
++    [ 'OS!="win" and OS!="mac" and OS!="linux" and OS!="freebsd"', {
+       # We need a 'default' to accomodate the "sandbox" target, for instance
+       # on Android.
+       'targets': [
diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
new file mode 100644
index 000000000000..710923602a65
--- /dev/null
+++ b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
@@ -0,0 +1,12 @@
+--- third_party/libXNVCtrl/libXNVCtrl.gyp.orig	2012-10-02 20:32:18.000000000 +0300
++++ third_party/libXNVCtrl/libXNVCtrl.gyp	2012-10-02 20:32:24.000000000 +0300
+@@ -13,6 +13,9 @@
+         'NVCtrlLib.h',
+         'nv_control.h',
+       ],
++      'include_dirs': [
++        '<(prefix_dir)/include',
++      ],
+     },
+   ],
+ }
diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
index 990ad19b7013..0d0bf30b361c 100644
--- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
+++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
@@ -1,21 +1,21 @@
---- third_party/libjpeg_turbo/libjpeg.gyp.orig	2012-07-18 10:03:15.000000000 +0300
-+++ third_party/libjpeg_turbo/libjpeg.gyp	2012-07-25 21:54:51.000000000 +0300
-@@ -225,7 +225,7 @@
+--- third_party/libjpeg_turbo/libjpeg.gyp.orig	2012-09-25 16:03:33.000000000 +0300
++++ third_party/libjpeg_turbo/libjpeg.gyp	2012-09-29 18:07:42.000000000 +0300
+@@ -231,7 +231,7 @@
+             ],
+           },
+         }],
+-        [ 'OS=="linux" or (OS=="android" and target_arch!="arm")', {
++        [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', {
+           'conditions': [
+             [ 'use_system_yasm==0', {
+               'dependencies': [
+@@ -262,6 +262,9 @@
                  ],
-               },
-             }],
--            [ 'OS=="linux" or (OS=="android" and target_arch!="arm")', {
-+            [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', {
-               'conditions': [
-                 [ 'use_system_yasm==0', {
-                   'dependencies': [
-@@ -296,6 +296,9 @@
-             'defines': [
-               'USE_SYSTEM_LIBJPEG',
+               }],
              ],
 +            'include_dirs': [
 +              '<(prefix_dir)/include',
 +            ],
            },
-           'link_settings': {
-             'libraries': [
+         }],
+       ],
diff --git a/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh b/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh
new file mode 100644
index 000000000000..97158d10acf1
--- /dev/null
+++ b/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh
@@ -0,0 +1,8 @@
+--- third_party/libvpx/obj_int_extract.sh.orig	2012-09-30 00:09:37.000000000 +0300
++++ third_party/libvpx/obj_int_extract.sh	2012-09-30 00:22:26.000000000 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/bash -e
++#!/usr/bin/env bash
+ #
+ # Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
new file mode 100644
index 000000000000..3a261e0819c9
--- /dev/null
+++ b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
@@ -0,0 +1,8 @@
+--- third_party/libvpx/unpack_lib_posix.sh.orig	2012-09-29 23:59:44.000000000 +0300
++++ third_party/libvpx/unpack_lib_posix.sh	2012-09-30 00:02:38.000000000 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/bash -e
++#!/usr/bin/env bash
+ #
+ # Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 07d3a3c6cfa2..a98c3e5dc302 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -2,6 +2,7 @@ bin/chrome
 %%DATADIR%%/chrome
 %%DATADIR%%/chrome-wrapper
 %%DATADIR%%/chrome.pak
+%%DATADIR%%/content_resources.pak
 %%DATADIR%%/libffmpegsumo.so
 %%DATADIR%%/locales/am.pak
 %%DATADIR%%/locales/ar.pak
@@ -167,17 +168,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/spinnerInactiveSelected.gif
 %%DATADIR%%/resources/inspector/Images/splitviewDimple.png
 %%DATADIR%%/resources/inspector/Images/splitviewDividerBackground.png
-%%DATADIR%%/resources/inspector/Images/statusbarBackground.png
-%%DATADIR%%/resources/inspector/Images/statusbarBackgroundChromium.png
-%%DATADIR%%/resources/inspector/Images/statusbarBottomBackground.png
-%%DATADIR%%/resources/inspector/Images/statusbarBottomBackgroundChromium.png
 %%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png
-%%DATADIR%%/resources/inspector/Images/statusbarButtons.png
-%%DATADIR%%/resources/inspector/Images/statusbarButtonsChromium.png
-%%DATADIR%%/resources/inspector/Images/statusbarMenuButton.png
-%%DATADIR%%/resources/inspector/Images/statusbarMenuButtonChromium.png
-%%DATADIR%%/resources/inspector/Images/statusbarMenuButtonSelected.png
-%%DATADIR%%/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
 %%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png
 %%DATADIR%%/resources/inspector/Images/statusbarResizerVertical.png
 %%DATADIR%%/resources/inspector/Images/successGreenDot.png
@@ -236,10 +227,10 @@ bin/chrome
 %%DATADIR%%/resources/inspector/splitView.css
 %%DATADIR%%/resources/inspector/tabbedPane.css
 %%DATADIR%%/resources/inspector/textPrompt.css
-%%DATADIR%%/resources/inspector/textViewer.css
+%%DATADIR%%/resources/inspector/textEditor.css
 %%DATADIR%%/resources/inspector/timelinePanel.css
-%%DATADIR%%/theme_resources_standard.pak
-%%DATADIR%%/ui_resources_standard.pak
+%%DATADIR%%/theme_resources_100_percent.pak
+%%DATADIR%%/ui_resources_100_percent.pak
 %%DATADIR%%/xdg-settings
 @dirrm %%DATADIR%%/locales
 @dirrm %%DATADIR%%/resources/inspector/Images