aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2013-02-23 08:37:26 +0800
committerrene <rene@FreeBSD.org>2013-02-23 08:37:26 +0800
commit0a746310d967584238069d2dc54f4b198f934de0 (patch)
tree8fe8fd7f966c32da6022869b0f44c52ed6874d7e /www
parent15bb499f0c08fc350e95f517a918e4047e06cda9 (diff)
downloadfreebsd-ports-gnome-0a746310d967584238069d2dc54f4b198f934de0.tar.gz
freebsd-ports-gnome-0a746310d967584238069d2dc54f4b198f934de0.tar.zst
freebsd-ports-gnome-0a746310d967584238069d2dc54f4b198f934de0.zip
Update to 25.0.1364.97, some new features are:
- Improvements in managing and securing extensions - Better support for HTML5 time/date inputs - JavaScript Web Speech API support - Better WebGL error handling MathML is disabled in this release for security reasons. Submitted by: George Liaskos Security: http://www.vuxml.org/freebsd/dfd92cb2-7d48-11e2-ad48-00262d5ed8ee.html
Diffstat (limited to 'www')
-rw-r--r--www/chromium/Makefile6
-rw-r--r--www/chromium/distinfo4
-rw-r--r--www/chromium/files/patch-base__debug__stack_trace_posix.cc20
-rw-r--r--www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__system_info_storage_api.cc15
-rw-r--r--www/chromium/files/patch-chrome__browser__process_singleton.h46
-rw-r--r--www/chromium/files/patch-chrome__browser__web_resource__plugins_resource_service.cc11
-rw-r--r--www/chromium/files/patch-chrome__chrome_browser.gypi25
-rw-r--r--www/chromium/files/patch-chrome__chrome_browser_extensions.gypi15
-rw-r--r--www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc10
-rw-r--r--www/chromium/files/patch-content__renderer__render_process_impl.cc12
-rw-r--r--www/chromium/files/patch-media__audio__audio_low_latency_input_output_unittest.cc15
-rw-r--r--www/chromium/files/patch-media__audio__pulse__pulse_output.cc20
-rw-r--r--www/chromium/files/patch-media__audio__pulse__pulse_output.h11
-rw-r--r--www/chromium/files/patch-remoting__remoting.gyp20
-rw-r--r--www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h28
-rw-r--r--www/chromium/files/patch-third_party__libusb__libusb.gyp9
-rw-r--r--www/chromium/pkg-plist1
17 files changed, 153 insertions, 115 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 434e08232625..9db0e025081b 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -3,8 +3,7 @@
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
-DISTVERSION= 24.0.1312.57
-PORTREVISION= 2
+DISTVERSION= 25.0.1364.97
CATEGORIES= www
MASTER_SITES= http://download.goodking.org/downloads/ \
ftp://rene-ladan.nl/pub/distfiles/ \
@@ -35,7 +34,8 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
cups:${PORTSDIR}/print/cups-client \
event-1:${PORTSDIR}/devel/libevent \
vpx:${PORTSDIR}/multimedia/libvpx \
- gcrypt:${PORTSDIR}/security/libgcrypt
+ gcrypt:${PORTSDIR}/security/libgcrypt \
+ pci:${PORTSDIR}/devel/libpci
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
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 769cda4a4008..be44f5dec130 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chromium-courgette-redacted-24.0.1312.57.tar.xz) = e8873f3c4c1599e40cc5194b6ce7ec6138b40786071e08f212d0556bbb6c4beb
-SIZE (chromium-courgette-redacted-24.0.1312.57.tar.xz) = 150656176
+SHA256 (chromium-courgette-redacted-25.0.1364.97.tar.xz) = b00d5ff2868d6940d877545d9c36d65e0b91a9e5cfc41774338e0794c73c91de
+SIZE (chromium-courgette-redacted-25.0.1364.97.tar.xz) = 149526456
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 927ffe383553..679a54696ef1 100644
--- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc
+++ b/www/chromium/files/patch-base__debug__stack_trace_posix.cc
@@ -1,9 +1,19 @@
---- 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
+--- base/debug/stack_trace_posix.cc.orig 2013-02-05 10:02:11.000000000 +0200
++++ base/debug/stack_trace_posix.cc 2013-02-13 20:27:44.000000000 +0200
+@@ -14,6 +14,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#if defined(OS_FREEBSD)
++#include <ucontext.h>
++#endif
+
+ #include <ostream>
+
+@@ -326,9 +329,15 @@
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
- StackTrace::StackTrace() {
+#if defined(OS_FREEBSD)
+ // Disable backtrace for now, libexecinfo crashes in getframeaddr
+ // in release build / i386.
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__system_info_storage_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__system_info_storage_api.cc
new file mode 100644
index 000000000000..946fbc26d7ec
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__extensions__api__system_info_storage__system_info_storage_api.cc
@@ -0,0 +1,15 @@
+--- chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc.orig 2013-02-13 23:14:07.000000000 +0200
++++ chrome/browser/extensions/api/system_info_storage/system_info_storage_api.cc 2013-02-13 23:14:56.000000000 +0200
+@@ -14,9 +14,12 @@
+ }
+
+ bool SystemInfoStorageGetFunction::RunImpl() {
++// Not Implemented
++#if !defined(OS_BSD)
+ StorageInfoProvider::Get()->StartQueryInfo(
+ base::Bind(&SystemInfoStorageGetFunction::OnGetStorageInfoCompleted,
+ this));
++#endif
+ return true;
+ }
+
diff --git a/www/chromium/files/patch-chrome__browser__process_singleton.h b/www/chromium/files/patch-chrome__browser__process_singleton.h
index aeb995c9385c..a4cdd071eddd 100644
--- a/www/chromium/files/patch-chrome__browser__process_singleton.h
+++ b/www/chromium/files/patch-chrome__browser__process_singleton.h
@@ -1,39 +1,51 @@
---- 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)
+--- chrome/browser/process_singleton.h.orig 2012-12-20 10:02:17.000000000 +0200
++++ chrome/browser/process_singleton.h 2013-01-06 21:27:17.000000000 +0200
+@@ -24,9 +24,9 @@
+ #include "base/threading/non_thread_safe.h"
+ #include "ui/gfx/native_widget_types.h"
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/scoped_temp_dir.h"
+ #include "base/files/scoped_temp_dir.h"
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
class CommandLine;
- class FilePath;
-@@ -84,7 +84,7 @@
- NotifyResult NotifyOtherProcessOrCreate(
- const NotificationCallback& notification_callback);
+
+@@ -114,9 +114,9 @@
+ LRESULT WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ static void DisablePromptForTesting();
+-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ protected:
+ // Notify another process, if available.
+@@ -125,7 +125,7 @@
+ // On Windows, Create() has to be called before this.
+ NotifyResult NotifyOtherProcess();
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
// 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,
-@@ -97,7 +97,7 @@
+@@ -138,7 +138,7 @@
void OverrideCurrentPidForTesting(base::ProcessId pid);
- void OverrideKillCallbackForTesting(const base::Callback<void(int)>& callback);
- static void DisablePromptForTesting();
+ void OverrideKillCallbackForTesting(
+ const base::Callback<void(int)>& callback);
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
- #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 window_; // The HWND_MESSAGE window.
+ private:
+ typedef std::pair<CommandLine::StringVector, FilePath> DelayedStartupMessage;
+@@ -164,7 +164,7 @@
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
HANDLE lock_file_;
+ FilePath user_data_dir_;
-#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__web_resource__plugins_resource_service.cc b/www/chromium/files/patch-chrome__browser__web_resource__plugins_resource_service.cc
new file mode 100644
index 000000000000..c1abd2826500
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__web_resource__plugins_resource_service.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/web_resource/plugins_resource_service.cc.orig 2013-01-03 16:15:04.489512557 +0200
++++ chrome/browser/web_resource/plugins_resource_service.cc 2013-01-03 16:16:48.346512702 +0200
+@@ -31,7 +31,7 @@
+ std::string filename;
+ #if defined(OS_WIN)
+ filename = "plugins_win.json";
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ filename = "plugins_linux.json";
+ #elif defined(OS_MACOSX)
+ filename = "plugins_mac.json";
diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi
index 4af4dd1903a4..be1d489ae02a 100644
--- a/www/chromium/files/patch-chrome__chrome_browser.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser.gypi
@@ -1,19 +1,20 @@
---- chrome/chrome_browser.gypi.orig 2012-11-27 10:02:39.000000000 +0200
-+++ chrome/chrome_browser.gypi 2012-11-29 22:30:15.798669580 +0200
-@@ -2633,6 +2633,18 @@
+--- chrome/chrome_browser.gypi.orig 2013-02-05 10:03:06.000000000 +0200
++++ chrome/chrome_browser.gypi 2013-02-13 22:38:19.000000000 +0200
+@@ -2781,6 +2781,19 @@
['exclude', '^browser/usb/'],
],
}],
+ ['os_bsd==1', {
-+ 'sources!': [
-+ 'browser/chrome_browser_main_linux.cc',
-+ 'browser/chrome_browser_main_linux.h',
-+ 'browser/media_gallery/mtp_device_delegate_impl_linux.cc',
-+ 'browser/media_gallery/mtp_device_delegate_impl_linux.h',
-+ 'browser/system_monitor/media_transfer_protocol_device_observer_linux.cc',
-+ 'browser/system_monitor/media_transfer_protocol_device_observer_linux.h',
-+ 'browser/system_monitor/removable_device_notifications_linux.cc',
-+ 'browser/system_monitor/removable_device_notifications_linux.h',
++ 'sources/': [
++ ['exclude', '^browser/chrome_browser_main_linux.cc'],
++ ['exclude', '^browser/chrome_browser_main_linux.h'],
++ ['exclude', '^browser/media_gallery/linux/'],
++ ['exclude', '^browser/system_monitor/media_transfer_protocol_device_observer_linux.cc'],
++ ['exclude', '^browser/system_monitor/media_transfer_protocol_device_observer_linux.h'],
++ ['exclude', '^browser/system_monitor/removable_device_notifications_linux.cc'],
++ ['exclude', '^browser/system_monitor/removable_device_notifications_linux.h'],
++ ['exclude', '^browser/system_monitor/udev_util_linux.cc'],
++ ['exclude', '^browser/system_monitor/udev_util_linux.h'],
+ ],
+ }],
['OS=="mac"', {
diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
new file mode 100644
index 000000000000..ad0a784827c6
--- /dev/null
+++ b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
@@ -0,0 +1,15 @@
+--- chrome/chrome_browser_extensions.gypi.orig 2013-02-13 22:11:49.000000000 +0200
++++ chrome/chrome_browser_extensions.gypi 2013-02-13 23:10:09.000000000 +0200
+@@ -912,6 +912,12 @@
+ 'browser/extensions/platform_app_launcher.h',
+ ],
+ }],
++ ['os_bsd==1', {
++ 'sources!': [
++ 'browser/extensions/api/system_info_storage/storage_info_provider_linux.cc',
++ 'browser/extensions/api/system_info_storage/storage_info_provider_linux.h',
++ ],
++ }],
+ ],
+ },
+ {
diff --git a/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc b/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc
index c470fab06fab..8d3f64dee7e2 100644
--- a/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc
+++ b/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc
@@ -1,9 +1,9 @@
---- content/browser/gpu/gpu_blacklist.cc.orig 2012-04-29 20:49:40.000000000 +0300
-+++ content/browser/gpu/gpu_blacklist.cc 2012-04-29 20:49:54.000000000 +0300
-@@ -940,7 +940,7 @@
- return kOsChromeOS;
- #elif defined(OS_WIN)
+--- content/browser/gpu/gpu_blacklist.cc.orig 2012-12-20 10:01:26.000000000 +0200
++++ content/browser/gpu/gpu_blacklist.cc 2013-01-06 21:30:12.000000000 +0200
+@@ -1348,7 +1348,7 @@
return kOsWin;
+ #elif defined(OS_ANDROID)
+ return kOsAndroid;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return kOsLinux;
diff --git a/www/chromium/files/patch-content__renderer__render_process_impl.cc b/www/chromium/files/patch-content__renderer__render_process_impl.cc
index 7c868abda4ba..883faa3a9fc7 100644
--- a/www/chromium/files/patch-content__renderer__render_process_impl.cc
+++ b/www/chromium/files/patch-content__renderer__render_process_impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_process_impl.cc.orig 2012-11-14 04:01:35.000000000 +0200
-+++ content/renderer/render_process_impl.cc 2012-12-03 23:25:17.000000000 +0200
-@@ -87,7 +87,7 @@
+--- content/renderer/render_process_impl.cc.orig 2012-12-20 10:01:28.000000000 +0200
++++ content/renderer/render_process_impl.cc 2013-01-06 22:32:44.000000000 +0200
+@@ -89,7 +89,7 @@
bool RenderProcessImpl::InProcessPlugins() {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
@@ -9,7 +9,7 @@
// Plugin processes require a UI message loop, and the Linux message loop
// implementation only allows one UI loop per process.
if (command_line.HasSwitch(switches::kInProcessPlugins))
-@@ -112,7 +112,7 @@
+@@ -114,7 +114,7 @@
TransportDIB* RenderProcessImpl::CreateTransportDIB(size_t size) {
#if defined(OS_WIN) || defined(OS_LINUX) || \
@@ -18,10 +18,10 @@
// Windows and Linux create transport DIBs inside the renderer
return TransportDIB::Create(size, transport_dib_next_sequence_number_++);
#elif defined(OS_MACOSX)
-@@ -150,7 +150,7 @@
+@@ -152,7 +152,7 @@
int width = rect.width();
int height = rect.height();
- const size_t stride = skia::PlatformCanvas::StrideForWidth(rect.width());
+ const size_t stride = skia::PlatformCanvasStrideForWidth(rect.width());
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
const size_t max_size = base::SysInfo::MaxSharedMemorySize();
diff --git a/www/chromium/files/patch-media__audio__audio_low_latency_input_output_unittest.cc b/www/chromium/files/patch-media__audio__audio_low_latency_input_output_unittest.cc
index dc6ddebeffae..ee55bbe067b8 100644
--- a/www/chromium/files/patch-media__audio__audio_low_latency_input_output_unittest.cc
+++ b/www/chromium/files/patch-media__audio__audio_low_latency_input_output_unittest.cc
@@ -1,5 +1,5 @@
---- media/audio/audio_low_latency_input_output_unittest.cc.orig 2013-01-08 22:05:58.175309674 +0200
-+++ media/audio/audio_low_latency_input_output_unittest.cc 2013-01-08 22:06:40.328246386 +0200
+--- media/audio/audio_low_latency_input_output_unittest.cc.orig 2013-02-05 10:01:14.000000000 +0200
++++ media/audio/audio_low_latency_input_output_unittest.cc 2013-02-13 19:58:04.000000000 +0200
@@ -19,7 +19,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -9,7 +9,7 @@
#include "media/audio/linux/audio_manager_linux.h"
#elif defined(OS_MACOSX)
#include "media/audio/mac/audio_manager_mac.h"
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
namespace media {
@@ -18,12 +18,3 @@
typedef AudioManagerLinux AudioManagerAnyPlatform;
#elif defined(OS_MACOSX)
typedef AudioManagerMac AudioManagerAnyPlatform;
-@@ -338,7 +338,7 @@
- #if defined(OS_MACOSX)
- // 10ms buffer size works well for 44.1, 48, 96 and 192kHz.
- samples_per_packet_ = (sample_rate_ / 100);
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- // 10ms buffer size works well for 44.1, 48, 96 and 192kHz.
- samples_per_packet_ = (sample_rate_ / 100);
- #elif defined(OS_WIN)
diff --git a/www/chromium/files/patch-media__audio__pulse__pulse_output.cc b/www/chromium/files/patch-media__audio__pulse__pulse_output.cc
deleted file mode 100644
index 0dc2454d3dd4..000000000000
--- a/www/chromium/files/patch-media__audio__pulse__pulse_output.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/audio/pulse/pulse_output.cc.orig 2012-07-18 10:01:11.000000000 +0300
-+++ media/audio/pulse/pulse_output.cc 2012-07-25 21:23:04.000000000 +0300
-@@ -8,7 +8,7 @@
- #include "base/message_loop.h"
- #include "media/audio/audio_parameters.h"
- #include "media/audio/audio_util.h"
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #include "media/audio/linux/audio_manager_linux.h"
- #elif defined(OS_OPENBSD)
- #include "media/audio/openbsd/audio_manager_openbsd.h"
-@@ -372,7 +372,7 @@
- int 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.
diff --git a/www/chromium/files/patch-media__audio__pulse__pulse_output.h b/www/chromium/files/patch-media__audio__pulse__pulse_output.h
deleted file mode 100644
index bf26f491e24d..000000000000
--- a/www/chromium/files/patch-media__audio__pulse__pulse_output.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/audio/pulse/pulse_output.h.orig 2012-02-05 15:04:15.000000000 +0200
-+++ media/audio/pulse/pulse_output.h 2012-02-05 15:11:25.000000000 +0200
-@@ -31,7 +31,7 @@
- class SeekableBuffer;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- class AudioManagerLinux;
- typedef AudioManagerLinux AudioManagerPulse;
- #elif defined(OS_OPENBSD)
diff --git a/www/chromium/files/patch-remoting__remoting.gyp b/www/chromium/files/patch-remoting__remoting.gyp
new file mode 100644
index 000000000000..248bfbd13ed7
--- /dev/null
+++ b/www/chromium/files/patch-remoting__remoting.gyp
@@ -0,0 +1,20 @@
+--- remoting/remoting.gyp.orig 2013-02-13 20:16:24.000000000 +0200
++++ remoting/remoting.gyp 2013-02-13 23:31:43.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ 'conditions': [
+ # Remoting host is supported only on Windows, OSX and Linux.
+- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
++ ['OS=="win" or OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0)', {
+ 'enable_remoting_host': 1,
+ }, {
+ 'enable_remoting_host': 0,
+@@ -445,7 +445,7 @@
+ 'host/win/window_station_and_desktop.h',
+ ],
+ 'conditions': [
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lX11',
diff --git a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
index f85aa6746568..f4f2d9544538 100644
--- a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
+++ b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
@@ -1,21 +1,11 @@
---- testing/gtest/include/gtest/internal/gtest-port.h.orig 2011-09-15 00:02:57.000000000 +0300
-+++ testing/gtest/include/gtest/internal/gtest-port.h 2011-09-14 23:56:19.000000000 +0300
-@@ -229,6 +229,9 @@
- # ifdef ANDROID
- # define GTEST_OS_LINUX_ANDROID 1
- # endif // ANDROID
+--- testing/gtest/include/gtest/internal/gtest-port.h.orig 2012-12-20 10:02:55.000000000 +0200
++++ testing/gtest/include/gtest/internal/gtest-port.h 2013-01-06 22:58:55.000000000 +0200
+@@ -261,6 +261,8 @@
+ # define GTEST_OS_NACL 1
+ #elif defined __OpenBSD__
+ # define GTEST_OS_OPENBSD 1
+#elif defined __FreeBSD__
-+# define GTEST_OS_LINUX 1
+# define GTEST_OS_FREEBSD 1
- #elif defined __MVS__
- # define GTEST_OS_ZOS 1
- #elif defined(__sun) && defined(__SVR4)
-@@ -505,7 +508,7 @@
- #ifndef GTEST_HAS_CLONE
- // The user didn't tell us, so we need to figure it out.
-
--# if GTEST_OS_LINUX && !defined(__ia64__)
-+# if GTEST_OS_LINUX && !GTEST_OS_FREEBSD && !defined(__ia64__)
- # define GTEST_HAS_CLONE 1
- # else
- # define GTEST_HAS_CLONE 0
+ #elif defined __QNX__
+ # define GTEST_OS_QNX 1
+ #endif // __CYGWIN__
diff --git a/www/chromium/files/patch-third_party__libusb__libusb.gyp b/www/chromium/files/patch-third_party__libusb__libusb.gyp
index ce5e325768f5..1965efd44b86 100644
--- a/www/chromium/files/patch-third_party__libusb__libusb.gyp
+++ b/www/chromium/files/patch-third_party__libusb__libusb.gyp
@@ -1,6 +1,6 @@
---- third_party/libusb/libusb.gyp.orig 2012-08-27 06:35:03.000000000 +0300
-+++ third_party/libusb/libusb.gyp 2012-08-28 06:46:24.000000000 +0300
-@@ -10,23 +10,33 @@
+--- third_party/libusb/libusb.gyp.orig
++++ third_party/libusb/libusb.gyp
+@@ -10,23 +10,36 @@
{
'target_name': 'libusb',
'conditions': [
@@ -29,6 +29,9 @@
+ '-lusb',
+ ],
+ },
++ 'defines': [
++ 'LIBUSB_CALL=',
++ ],
+ }, {
+ 'cflags': [
+ '<!@(pkg-config --cflags libusb-1.0)',
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 25039705913c..e683c4b7b2ed 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -242,6 +242,7 @@ bin/chrome
%%DATADIR%%/resources/inspector/ScriptFormatterWorker.js
%%DATADIR%%/resources/inspector/scriptsPanel.css
%%DATADIR%%/resources/inspector/ScriptsPanel.js
+%%DATADIR%%/resources/inspector/spectrum.css
%%DATADIR%%/resources/inspector/splitView.css
%%DATADIR%%/resources/inspector/tabbedPane.css
%%DATADIR%%/resources/inspector/textEditor.css