update to 18.0.1025.142; requires gcc 4.6 from now on

2012-04-03 13:59:35 +00:00 · 2012-04-03 13:59:35 +00:00 · c45244ce9c
commit c45244ce9c
parent 8e9250e196
29 changed files with 217 additions and 212 deletions
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.88 2012/03/24 07:36:43 robert Exp $
+# $OpenBSD: Makefile,v 1.89 2012/04/03 13:59:35 robert Exp $

 ONLY_FOR_ARCHS=		i386 amd64

 COMMENT=		Chromium browser

-V=			17.0.963.83
+V=			18.0.1025.142
 DISTNAME=		chromium-${V}

 CATEGORIES=		www
@ -24,21 +24,26 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	http://blade2k.humppa.hu/distfiles/ \
 		http://commondatastorage.googleapis.com/chromium-browser-official/

-MODULES=	lang/python
+MODULES=	gcc4 lang/python
+
+MODGCC4_ARCHS=	*
+MODGCC4_LANGS=	c++
+MODGCC4_VERSION=4.6
+
+MODPY_RUNDEP=	No

 WANTLIB += X11 Xext Xfixes Xrender Xss bz2 c cairo cups dbus-1 event
 WANTLIB += execinfo expat fontconfig freetype gconf-2 gcrypt gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB += jpeg m nspr4 nss3 nssutil3 pango-1.0 pangocairo-1.0
-WANTLIB += plc4 png pthread pthread-stubs smime3 speex stdc++
+WANTLIB += plc4 png pthread pthread-stubs smime3 speex estdc++
 WANTLIB += xml2 xslt

-MODPY_RUNDEP=	No
-
 RUN_DEPENDS=	devel/xdg-utils \
 		devel/desktop-file-utils \
 		x11/gtk+2,-cups \
 		x11/gnome/icon-theme \
+		x11/gnome/libgnome-keyring \
 		x11/gtk+2,-guic
 BUILD_DEPENDS=	archivers/bzip2 \
 		devel/gperf \
@ -50,7 +55,6 @@ LIB_DEPENDS=	devel/libexecinfo \
 		archivers/bzip2 \
 		security/nss \
 		devel/gconf2 \
-		x11/gnome/libgnome-keyring \
 		textproc/libxslt \
 		x11/gtk+2 \
 		audio/speex \
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@ -1,5 +1,5 @@
-MD5 (chromium-17.0.963.83.tar.bz2) = bctlz3ZdMwptA82n0Aypmw==
-RMD160 (chromium-17.0.963.83.tar.bz2) = GB8NUPCMAfhKw/NCrEt9hCzdYJ4=
-SHA1 (chromium-17.0.963.83.tar.bz2) = /4R/t/2E80L8kiY/41KmbOKS6io=
-SHA256 (chromium-17.0.963.83.tar.bz2) = +h9oTDYFtwJD4zepjEv24ifaJoywuOLr1CtvzLeY2T8=
-SIZE (chromium-17.0.963.83.tar.bz2) = 165957162
+MD5 (chromium-18.0.1025.142.tar.bz2) = G6GAnxkzZapO6NNgb237TQ==
+RMD160 (chromium-18.0.1025.142.tar.bz2) = XrpxulV5gshZ9wZ6BPXqe4lHnPY=
+SHA1 (chromium-18.0.1025.142.tar.bz2) = I0uxcP8/KXriPHD6LRVFXLq6h28=
+SHA256 (chromium-18.0.1025.142.tar.bz2) = kRpO4uMO1hfEFIyE3N39Gv+ksvwC3F6VrEpK/u2iSx0=
+SIZE (chromium-18.0.1025.142.tar.bz2) = 174644858
--- a/www/chromium/patches/patch-base_base_gyp
+++ b/www/chromium/patches/patch-base_base_gyp
@ -1,7 +1,7 @@
-$OpenBSD: patch-base_base_gyp,v 1.10 2012/02/17 10:19:50 robert Exp $
--- base/base.gyp.orig	Fri Jan 27 09:02:07 2012
-+++ base/base.gyp	Thu Feb  9 09:31:06 2012
-@@ -345,6 +345,13 @@
+$OpenBSD: patch-base_base_gyp,v 1.11 2012/04/03 13:59:35 robert Exp $
+--- base/base.gyp.orig	Tue Mar 27 03:02:03 2012
+++ base/base.gyp	Sun Apr  1 20:04:42 2012
+@@ -349,6 +349,13 @@
           ],
         }],
       ],
--- a/www/chromium/patches/patch-chrome_browser_extensions_process_map_cc
+++ b/www/chromium/patches/patch-chrome_browser_extensions_process_map_cc
@ -1,14 +0,0 @@
-$OpenBSD: patch-chrome_browser_extensions_process_map_cc,v 1.1 2012/02/17 10:19:50 robert Exp $
--- chrome/browser/extensions/process_map.cc.orig	Thu Feb  9 11:05:55 2012
-+++ chrome/browser/extensions/process_map.cc	Thu Feb  9 11:06:09 2012
-@@ -11,7 +11,9 @@ struct ProcessMap::Item {
-   Item() {
-   }
- 
-  explicit Item(const ProcessMap::Item& other)
-+  // Purposely implicit constructor needed on older gcc's. See:
-+  // http://codereview.chromium.org/8769022/
-+  Item(const ProcessMap::Item& other)
-       : extension_id(other.extension_id),
-         process_id(other.process_id),
-         site_instance_id(other.site_instance_id) {
--- a/www/chromium/patches/patch-chrome_browser_memory_details_cc
+++ b/www/chromium/patches/patch-chrome_browser_memory_details_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.7 2012/03/20 20:52:44 robert Exp $
--- chrome/browser/memory_details.cc.orig	Tue Mar 20 13:11:43 2012
-+++ chrome/browser/memory_details.cc	Tue Mar 20 13:12:29 2012
-@@ -29,7 +29,7 @@
+$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.8 2012/04/03 13:59:35 robert Exp $
+--- chrome/browser/memory_details.cc.orig	Tue Mar 27 03:02:19 2012
+++ chrome/browser/memory_details.cc	Sun Apr  1 20:04:42 2012
+@@ -32,7 +32,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.7 2012/03/20 20:52:44 rober
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host_linux.h"
 #endif
-@@ -150,7 +150,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() {
+@@ -156,7 +156,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() {
 void MemoryDetails::CollectChildInfoOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.7 2012/03/20 20:52:44 rober
   const pid_t zygote_pid = ZygoteHost::GetInstance()->pid();
   const pid_t sandbox_helper_pid = RenderSandboxHostLinux::GetInstance()->pid();
 #endif
-@@ -298,7 +298,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+@@ -304,7 +304,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
       }
     }
 
--- a/www/chromium/patches/patch-chrome_browser_memory_details_linux_cc
+++ b/www/chromium/patches/patch-chrome_browser_memory_details_linux_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_memory_details_linux_cc,v 1.1 2012/03/20 20:52:44 robert Exp $
--- chrome/browser/memory_details_linux.cc.orig	Tue Mar 20 13:11:49 2012
-+++ chrome/browser/memory_details_linux.cc	Tue Mar 20 15:26:57 2012
-@@ -240,7 +240,7 @@ void MemoryDetails::CollectProcessData(
+$OpenBSD: patch-chrome_browser_memory_details_linux_cc,v 1.2 2012/04/03 13:59:35 robert Exp $
+--- chrome/browser/memory_details_linux.cc.orig	Tue Mar 27 03:02:19 2012
+++ chrome/browser/memory_details_linux.cc	Sun Apr  1 20:04:42 2012
+@@ -239,7 +239,7 @@ void MemoryDetails::CollectProcessData(
   }
 
   std::vector<pid_t> current_browser_processes;
--- a/www/chromium/patches/patch-chrome_browser_shell_integration_linux_cc
+++ b/www/chromium/patches/patch-chrome_browser_shell_integration_linux_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_shell_integration_linux_cc,v 1.6 2012/02/17 10:19:50 robert Exp $
--- chrome/browser/shell_integration_linux.cc.orig	Fri Jan 27 09:02:34 2012
-+++ chrome/browser/shell_integration_linux.cc	Thu Feb  9 09:31:06 2012
-@@ -124,6 +124,8 @@ void CreateShortcutOnDesktop(const FilePath& shortcut_
+$OpenBSD: patch-chrome_browser_shell_integration_linux_cc,v 1.7 2012/04/03 13:59:35 robert Exp $
+--- chrome/browser/shell_integration_linux.cc.orig	Tue Mar 27 03:02:19 2012
+++ chrome/browser/shell_integration_linux.cc	Sun Apr  1 20:04:43 2012
+@@ -123,6 +123,8 @@ void CreateShortcutOnDesktop(const FilePath& shortcut_
   if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
     return;
 
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_shell_integration_linux_cc,v 1.6 2012/02/17 10:19
   int desktop_fd = open(desktop_path.value().c_str(), O_RDONLY | O_DIRECTORY);
   if (desktop_fd < 0)
     return;
-@@ -152,6 +154,7 @@ void CreateShortcutOnDesktop(const FilePath& shortcut_
+@@ -151,6 +153,7 @@ void CreateShortcutOnDesktop(const FilePath& shortcut_
 
   if (HANDLE_EINTR(close(desktop_fd)) < 0)
     PLOG(ERROR) << "close";
--- a/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.1 2012/03/20 20:52:44 robert Exp $
--- chrome/browser/ui/webui/about_ui.cc.orig	Tue Mar 20 13:11:46 2012
-+++ chrome/browser/ui/webui/about_ui.cc	Tue Mar 20 13:13:22 2012
-@@ -81,7 +81,7 @@
+$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.2 2012/04/03 13:59:35 robert Exp $
+--- chrome/browser/ui/webui/about_ui.cc.orig	Tue Mar 27 03:02:15 2012
+++ chrome/browser/ui/webui/about_ui.cc	Sun Apr  1 20:04:43 2012
+@@ -83,7 +83,7 @@
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/oom_priority_manager.h"
 #include "content/browser/zygote_host_linux.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.1 2012/03/20 20:52:44 ro
 #include "content/browser/zygote_host_linux.h"
 #endif
 
-@@ -936,6 +936,7 @@ std::string AboutLinuxProxyConfig() {
+@@ -940,6 +940,7 @@ std::string AboutLinuxProxyConfig() {
   return data;
 }
 
@ -18,7 +18,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.1 2012/03/20 20:52:44 ro
 void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
                      bool good) {
   data->append("<tr><td>");
-@@ -992,6 +993,7 @@ std::string AboutSandbox() {
+@@ -996,6 +997,7 @@ std::string AboutSandbox() {
   return data;
 }
 #endif
@ -26,7 +26,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.1 2012/03/20 20:52:44 ro
 
 std::string AboutVersionStaticContent(const std::string& query) {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
-@@ -1322,7 +1324,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
+@@ -1334,7 +1336,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::st
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
         IDR_OS_CREDITS_HTML).as_string();
 #endif
--- a/www/chromium/patches/patch-chrome_chrome_gyp
+++ b/www/chromium/patches/patch-chrome_chrome_gyp
@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_chrome_gyp,v 1.11 2012/02/17 10:19:50 robert Exp $
--- chrome/chrome.gyp.orig	Fri Jan 27 09:03:02 2012
-+++ chrome/chrome.gyp	Thu Feb  9 09:31:06 2012
-@@ -129,7 +129,6 @@
+$OpenBSD: patch-chrome_chrome_gyp,v 1.12 2012/04/03 13:59:35 robert Exp $
+--- chrome/chrome.gyp.orig	Tue Mar 27 03:02:39 2012
+++ chrome/chrome.gyp	Sun Apr  1 20:04:43 2012
+@@ -141,7 +141,6 @@
     'chrome_renderer.gypi',
     'chrome_tests.gypi',
     'common_constants.gypi',
--- a/www/chromium/patches/patch-chrome_test_ui_ui_test_cc
+++ b/www/chromium/patches/patch-chrome_test_ui_ui_test_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_test_ui_ui_test_cc,v 1.5 2011/08/16 08:17:44 robert Exp $
--- chrome/test/ui/ui_test.cc.orig	Wed Jul 27 10:01:40 2011
-+++ chrome/test/ui/ui_test.cc	Tue Aug  2 20:12:17 2011
-@@ -66,7 +66,7 @@ const wchar_t UITestBase::kFailedNoCrashService[] =
+$OpenBSD: patch-chrome_test_ui_ui_test_cc,v 1.6 2012/04/03 13:59:35 robert Exp $
+--- chrome/test/ui/ui_test.cc.orig	Tue Mar 27 03:02:35 2012
+++ chrome/test/ui/ui_test.cc	Sun Apr  1 20:04:43 2012
+@@ -69,7 +69,7 @@ const wchar_t UITestBase::kFailedNoCrashService[] =
     L"NOTE: This test is expected to fail if crash_service.exe is not "
     L"running. Start it manually before running this test (see the build "
     L"output directory).";
--- a/www/chromium/patches/patch-content_app_content_main_cc
+++ b/www/chromium/patches/patch-content_app_content_main_cc
@ -1,6 +1,6 @@
-$OpenBSD: patch-content_app_content_main_cc,v 1.4 2012/03/20 20:52:44 robert Exp $
--- content/app/content_main.cc.orig	Tue Mar 20 15:27:41 2012
-+++ content/app/content_main.cc	Tue Mar 20 15:28:24 2012
+$OpenBSD: patch-content_app_content_main_cc,v 1.5 2012/04/03 13:59:35 robert Exp $
+--- content/app/content_main.cc.orig	Tue Mar 27 03:01:20 2012
+++ content/app/content_main.cc	Sun Apr  1 20:04:43 2012
@@ -68,7 +68,7 @@ extern int PpapiBrokerMain(const content::MainFunction
 extern int RendererMain(const content::MainFunctionParams&);
 extern int WorkerMain(const content::MainFunctionParams&);
@ -19,7 +19,7 @@ $OpenBSD: patch-content_app_content_main_cc,v 1.4 2012/03/20 20:52:44 robert Exp
 // On platforms that use the zygote, we have a special subset of
 // subprocesses that are launched via the zygote.  This function
 // fills in some process-launching bits around ZygoteMain().
-@@ -263,7 +263,7 @@ int RunNamedProcessTypeMain(
+@@ -264,7 +264,7 @@ int RunNamedProcessTypeMain(
       return kMainFunctions[i].function(main_function_params);
   }
 
--- a/www/chromium/patches/patch-content_browser_browser_main_loop_cc
+++ b/www/chromium/patches/patch-content_browser_browser_main_loop_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.1 2012/03/20 20:52:44 robert Exp $
--- content/browser/browser_main_loop.cc.orig	Tue Mar 20 12:51:42 2012
-+++ content/browser/browser_main_loop.cc	Tue Mar 20 12:56:04 2012
-@@ -51,7 +51,7 @@
+$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.2 2012/04/03 13:59:35 robert Exp $
+--- content/browser/browser_main_loop.cc.orig	Tue Mar 27 03:01:21 2012
+++ content/browser/browser_main_loop.cc	Sun Apr  1 20:04:43 2012
+@@ -56,7 +56,7 @@
 #include "ui/gfx/gtk_util.h"
 #endif
 
@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.1 2012/03/20 20:52:44 r
 #include <sys/stat.h>
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host_linux.h"
-@@ -59,7 +59,7 @@
+@@ -68,7 +68,7 @@
 
 namespace {
 
@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.1 2012/03/20 20:52:44 r
 void SetupSandbox(const CommandLine& parsed_command_line) {
   // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
   // code en masse out of chrome_main for now.
-@@ -165,7 +165,7 @@ class BrowserShutdownImpl {
+@@ -175,7 +175,7 @@ class BrowserShutdownImpl {
     // At this point the message loop is still running yet we've shut everything
     // down. If any messages are processed we'll likely crash. Exit now.
     ExitProcess(content::RESULT_CODE_NORMAL_EXIT);
@ -28,7 +28,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.1 2012/03/20 20:52:44 r
     _exit(content::RESULT_CODE_NORMAL_EXIT);
 #else
     NOTIMPLEMENTED();
-@@ -233,7 +233,7 @@ void BrowserMainLoop::EarlyInitialization() {
+@@ -252,7 +252,7 @@ void BrowserMainLoop::EarlyInitialization() {
   }
 #endif  // !defined(USE_OPENSSL)
 
--- a/www/chromium/patches/patch-content_common_set_process_title_cc
+++ b/www/chromium/patches/patch-content_common_set_process_title_cc
@ -1,13 +0,0 @@
-$OpenBSD: patch-content_common_set_process_title_cc,v 1.3 2012/02/17 10:19:51 robert Exp $
--- content/common/set_process_title.cc.orig	Fri Jan 27 09:01:22 2012
-+++ content/common/set_process_title.cc	Thu Feb  9 09:31:06 2012
-@@ -26,7 +26,8 @@
- #include "content/common/set_process_title_linux.h"
- #endif  // defined(OS_LINUX)
- 
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_SOLARIS)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_SOLARIS) && \
-+    defined(OS_OPENBSD)
- 
- void SetProcessTitleFromCommandLine(const char** main_argv) {
-   // Build a single string which consists of all the arguments separated
--- a/www/chromium/patches/patch-content_content_browser_gypi
+++ b/www/chromium/patches/patch-content_content_browser_gypi
@ -1,13 +1,13 @@
-$OpenBSD: patch-content_content_browser_gypi,v 1.8 2012/03/20 20:52:44 robert Exp $
--- content/content_browser.gypi.orig	Tue Mar 20 12:57:50 2012
-+++ content/content_browser.gypi	Tue Mar 20 12:57:59 2012
-@@ -636,9 +636,6 @@
-     'browser/worker_host/worker_service.cc',
-     'browser/worker_host/worker_service.h',
-     'browser/worker_host/worker_service_observer.h',
+$OpenBSD: patch-content_content_browser_gypi,v 1.9 2012/04/03 13:59:35 robert Exp $
+--- content/content_browser.gypi.orig	Sun Apr  1 20:05:38 2012
+++ content/content_browser.gypi	Sun Apr  1 20:05:43 2012
+@@ -668,9 +668,6 @@
+     'browser/worker_host/worker_process_host.h',
+     'browser/worker_host/worker_service_impl.cc',
+     'browser/worker_host/worker_service_impl.h',
 -    'browser/zygote_host_linux.cc',
 -    'browser/zygote_host_linux.h',
 -    'browser/zygote_main_linux.cc',
-   ],
-   'conditions': [
-     ['p2p_apis==1', {
+     '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources.h',
+     '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.cc',
+     '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.h',
--- a/www/chromium/patches/patch-content_content_renderer_gypi
+++ b/www/chromium/patches/patch-content_content_renderer_gypi
@ -0,0 +1,15 @@
+$OpenBSD: patch-content_content_renderer_gypi,v 1.1 2012/04/03 13:59:35 robert Exp $
+--- content/content_renderer.gypi.orig	Mon Apr  2 09:17:47 2012
+++ content/content_renderer.gypi	Mon Apr  2 09:27:48 2012
+@@ -284,11 +284,6 @@
+         'renderer/media/webrtc_audio_device_impl.cc',
+         'renderer/media/webrtc_audio_device_impl.h',
+       ],
+-    }, {
+-      'sources': [
+-        'renderer/media/media_stream_dependency_factory_stub.cc',
+-        'renderer/media/media_stream_impl_stub.cc',
+-      ],
+     }],
+     ['java_bridge==1', {
+       'defines': [
--- a/www/chromium/patches/patch-content_renderer_render_view_impl_cc
+++ b/www/chromium/patches/patch-content_renderer_render_view_impl_cc
@ -0,0 +1,19 @@
+$OpenBSD: patch-content_renderer_render_view_impl_cc,v 1.1 2012/04/03 13:59:35 robert Exp $
+--- content/renderer/render_view_impl.cc.orig	Mon Apr  2 10:59:45 2012
+++ content/renderer/render_view_impl.cc	Mon Apr  2 11:06:13 2012
+@@ -3088,6 +3088,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
+     p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
+ #endif
+ 
+#if defined(ENABLE_WEBRTC)
+   if (!media_stream_dispatcher_)
+     media_stream_dispatcher_ = new MediaStreamDispatcher(this);
+ 
+@@ -3099,6 +3100,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
+         RenderThreadImpl::current()->video_capture_impl_manager(),
+         factory);
+   }
+#endif
+ }
+ 
+ void RenderViewImpl::didChangeContentsSize(WebFrame* frame,
--- a/www/chromium/patches/patch-content_shell_shell_content_browser_client_cc
+++ b/www/chromium/patches/patch-content_shell_shell_content_browser_client_cc
@ -1,8 +1,8 @@
-$OpenBSD: patch-content_shell_shell_content_browser_client_cc,v 1.2 2012/02/17 10:19:51 robert Exp $
--- content/shell/shell_content_browser_client.cc.orig	Fri Jan 27 09:01:23 2012
-+++ content/shell/shell_content_browser_client.cc	Thu Feb  9 09:31:06 2012
-@@ -309,7 +309,7 @@ std::string ShellContentBrowserClient::GetDefaultDownl
-   return "download";
+$OpenBSD: patch-content_shell_shell_content_browser_client_cc,v 1.3 2012/04/03 13:59:35 robert Exp $
+--- content/shell/shell_content_browser_client.cc.orig	Tue Mar 27 03:01:22 2012
+++ content/shell/shell_content_browser_client.cc	Sun Apr  1 20:04:44 2012
+@@ -316,7 +316,7 @@ bool ShellContentBrowserClient::AllowSocketAPI(const G
+   return false;
 }
 
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
--- a/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_cc
+++ b/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_cc
@ -0,0 +1,67 @@
+$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_cc,v 1.9 2012/04/03 13:59:35 robert Exp $
+--- media/audio/openbsd/audio_manager_openbsd.cc.orig	Sun Apr  1 22:50:49 2012
+++ media/audio/openbsd/audio_manager_openbsd.cc	Sun Apr  1 22:56:04 2012
+@@ -51,20 +51,17 @@ AudioOutputStream* AudioManagerOpenBSD::MakeAudioOutpu
+     return FakeAudioOutputStream::MakeFakeStream(params);
+   }
+ 
+-  if (!initialized()) {
+-    return NULL;
+-  }
+-
+   // Don't allow opening more than |kMaxOutputStreams| streams.
+-  if (active_streams_.size() >= kMaxOutputStreams) {
+  if (active_output_stream_count_ >= kMaxOutputStreams) {
+     return NULL;
+   }
+ 
+-  AudioOutputStream* stream;
+ #if defined(USE_PULSEAUDIO)
+  AudioOutputStream* stream;
+   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) {
+     stream = new PulseAudioOutputStream(params, this);
+-    active_streams_.insert(stream);
+    ++active_output_stream_count_;
+    DCHECK(stream);
+     return stream;
+   }
+ #endif
+@@ -79,23 +76,12 @@ AudioInputStream* AudioManagerOpenBSD::MakeAudioInputS
+   return NULL;
+ }
+ 
+-AudioManagerOpenBSD::AudioManagerOpenBSD() {
+-}
+AudioManagerOpenBSD::AudioManagerOpenBSD() : active_output_stream_count_(0U) {}
+ 
+ AudioManagerOpenBSD::~AudioManagerOpenBSD() {
+-  // Make sure we stop the thread first. If we allow the default destructor to
+-  // destroy the members, we may destroy audio streams before stopping the
+-  // thread, resulting an unexpected behavior.
+-  // This way we make sure activities of the audio streams are all stopped
+-  // before we destroy them.
+-  audio_thread_.Stop();
+-
+-  // Free output dispatchers, closing all remaining open streams.
+-  output_dispatchers_.clear();
+-
+-  // Delete all the streams. Have to do it manually, we don't have ScopedSet<>,
+-  // and we are not using ScopedVector<> because search there is slow.
+-  STLDeleteElements(&active_streams_);
+  Shutdown();
+  // All the streams should have been deleted on the audio thread via Shutdown.
+  CHECK_EQ(active_output_stream_count_, 0U);
+ }
+ 
+ void AudioManagerOpenBSD::Init() {
+@@ -112,8 +98,9 @@ void AudioManagerOpenBSD::UnMuteAll() {
+ 
+ void AudioManagerOpenBSD::ReleaseOutputStream(AudioOutputStream* stream) {
+   if (stream) {
+-    active_streams_.erase(stream);
+     delete stream;
+    --active_output_stream_count_;
+    DCHECK_GE(active_output_stream_count_, 0U);
+   }
+ }
+ 
--- a/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_h
+++ b/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_h,v 1.9 2012/04/03 13:59:35 robert Exp $
+--- media/audio/openbsd/audio_manager_openbsd.h.orig	Sun Apr  1 22:57:39 2012
+++ media/audio/openbsd/audio_manager_openbsd.h	Sun Apr  1 22:57:49 2012
+@@ -34,7 +34,7 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioM
+   virtual ~AudioManagerOpenBSD();
+ 
+  private:
+-  std::set<AudioOutputStream*> active_streams_;
+  size_t active_output_stream_count_;
+ 
+   DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
+ };
--- a/www/chromium/patches/patch-third_party_WebKit_Source_JavaScriptCore_wtf_NumberOfCores_cpp
+++ b/www/chromium/patches/patch-third_party_WebKit_Source_JavaScriptCore_wtf_NumberOfCores_cpp
@ -0,0 +1,11 @@
+$OpenBSD: patch-third_party_WebKit_Source_JavaScriptCore_wtf_NumberOfCores_cpp,v 1.1 2012/04/03 13:59:35 robert Exp $
+--- third_party/WebKit/Source/JavaScriptCore/wtf/NumberOfCores.cpp.orig	Sun Apr  1 23:35:57 2012
+++ third_party/WebKit/Source/JavaScriptCore/wtf/NumberOfCores.cpp	Sun Apr  1 23:36:05 2012
+@@ -27,6 +27,7 @@
+ #include "NumberOfCores.h"
+ 
+ #if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
+#include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+ #elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
--- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp
+++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp
@ -1,39 +0,0 @@
-$OpenBSD: patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp,v 1.8 2012/02/17 10:19:51 robert Exp $
--- third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp.orig	Fri Jan 27 09:07:35 2012
-+++ third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp	Thu Feb  9 09:31:06 2012
-@@ -1095,7 +1095,7 @@
-             'include_dirs+++': ['../dom'],
-           },
-         }],
-        ['(OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-+        ['(OS=="linux" or OS=="win" or OS=="openbsd") and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-           'include_dirs': [
-             '<(chromium_src_dir)/third_party/fftw/api',
-           ],
-@@ -1308,7 +1308,7 @@
-             'include_dirs++': ['../dom'],
-           },
-         }],
-        ['(OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-+        ['(OS=="linux" or OS=="win" or OS=="openbsd") and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-           # This directory needs to be on the include path for multiple sub-targets of webcore.
-           'direct_dependent_settings': {
-             'include_dirs': [
-@@ -1316,7 +1316,7 @@
-             ],
-           },
-         }],
-        ['(OS=="mac" or OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
-+        ['(OS=="mac" or OS=="linux" or OS=="win" or OS=="openbsd") and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
-           # This directory needs to be on the include path for multiple sub-targets of webcore.
-           'direct_dependent_settings': {
-             'include_dirs': [
-@@ -1940,7 +1940,7 @@
-             'include_dirs+++': ['../dom'],
-           },
-         }],
-        ['OS=="linux" and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-+        ['(OS=="linux" or OS=="openbsd") and "WTF_USE_WEBAUDIO_FFTW=1" in feature_defines', {
-           # FIXME: (kbr) figure out how to make these dependencies
-           # work in a cross-platform way. Attempts to use
-           # "link_settings" and "libraries" in conjunction with the
--- a/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp
+++ b/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp
@ -1,27 +0,0 @@
-$OpenBSD: patch-third_party_libjingle_libjingle_gyp,v 1.3 2012/02/17 10:19:51 robert Exp $
--- third_party/libjingle/libjingle.gyp.orig	Thu Feb  9 10:25:47 2012
-+++ third_party/libjingle/libjingle.gyp	Thu Feb  9 10:30:00 2012
-@@ -94,6 +94,11 @@
-             'BSD',
-           ],
-         }],
-+        ['OS=="openbsd"', {
-+          'defines': [
-+            'OPENBSD',
-+          ],
-+        }],
-         ['no_libjingle_logging==1', {
-           'defines': [
-             'NO_LIBJINGLE_LOGGING',
-@@ -136,6 +141,11 @@
-       ['os_bsd==1', {
-         'defines': [
-           'BSD',
-+        ],
-+      }],
-+      ['OS=="openbsd"', {
-+        'defines': [
-+          'OPENBSD',
-         ],
-       }],
-     ],
--- a/www/chromium/patches/patch-third_party_libjingle_source_talk_base_ipaddress_cc
+++ b/www/chromium/patches/patch-third_party_libjingle_source_talk_base_ipaddress_cc
@ -1,11 +0,0 @@
-$OpenBSD: patch-third_party_libjingle_source_talk_base_ipaddress_cc,v 1.1 2012/02/17 10:19:51 robert Exp $
--- third_party/libjingle/source/talk/base/ipaddress.cc.orig	Thu Feb  9 10:14:22 2012
-+++ third_party/libjingle/source/talk/base/ipaddress.cc	Thu Feb  9 10:23:56 2012
-@@ -29,6 +29,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <arpa/inet.h>
- #include <netdb.h>
--- a/www/chromium/patches/patch-third_party_libjingle_source_talk_base_ipaddress_h
+++ b/www/chromium/patches/patch-third_party_libjingle_source_talk_base_ipaddress_h
@ -1,11 +0,0 @@
-$OpenBSD: patch-third_party_libjingle_source_talk_base_ipaddress_h,v 1.1 2012/02/17 10:19:51 robert Exp $
--- third_party/libjingle/source/talk/base/ipaddress.h.orig	Thu Feb  9 10:06:52 2012
-+++ third_party/libjingle/source/talk/base/ipaddress.h	Thu Feb  9 10:07:39 2012
-@@ -30,6 +30,7 @@
- 
- #ifdef POSIX
- #include <netinet/in.h>
-+#include <sys/socket.h>
- #include <arpa/inet.h>
- #include <netdb.h>
- #endif
--- a/www/chromium/patches/patch-third_party_libvpx_libvpx_gyp
+++ b/www/chromium/patches/patch-third_party_libvpx_libvpx_gyp
@ -1,12 +0,0 @@
-$OpenBSD: patch-third_party_libvpx_libvpx_gyp,v 1.6 2012/02/17 10:19:51 robert Exp $
--- third_party/libvpx/libvpx.gyp.orig	Thu Feb  9 09:46:11 2012
-+++ third_party/libvpx/libvpx.gyp	Thu Feb  9 09:46:34 2012
-@@ -13,7 +13,7 @@
-     ],
-   },
-   'conditions': [
-    [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm"', {
-+    [ '((os_posix==1 and OS!="android") or OS=="win") and target_arch!="arm"', {
-       'targets': [
-         {
-           # This libvpx target contains both encoder and decoder.
--- a/www/chromium/patches/patch-third_party_openssl_openssl_crypto_ui_ui_openssl_c
+++ b/www/chromium/patches/patch-third_party_openssl_openssl_crypto_ui_ui_openssl_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_openssl_openssl_crypto_ui_ui_openssl_c,v 1.2 2011/10/27 07:59:09 robert Exp $
--- third_party/openssl/openssl/crypto/ui/ui_openssl.c.orig	Fri Oct 21 10:33:27 2011
-+++ third_party/openssl/openssl/crypto/ui/ui_openssl.c	Wed Oct 26 13:37:47 2011
-@@ -215,6 +215,12 @@
+$OpenBSD: patch-third_party_openssl_openssl_crypto_ui_ui_openssl_c,v 1.3 2012/04/03 13:59:35 robert Exp $
+--- third_party/openssl/openssl/crypto/ui/ui_openssl.c.orig	Tue Mar 27 03:04:21 2012
+++ third_party/openssl/openssl/crypto/ui/ui_openssl.c	Sun Apr  1 20:04:45 2012
+@@ -214,6 +214,12 @@
 #undef SGTTY
 #endif
 
--- a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py
+++ b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py
@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.8 2012/02/17 10:19:51 robert Exp $
--- tools/gyp/pylib/gyp/generator/make.py.orig	Fri Jan 27 09:04:44 2012
-+++ tools/gyp/pylib/gyp/generator/make.py	Thu Feb  9 09:31:06 2012
-@@ -282,13 +282,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s
+$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.9 2012/04/03 13:59:35 robert Exp $
+--- tools/gyp/pylib/gyp/generator/make.py.orig	Tue Mar 27 03:04:33 2012
+++ tools/gyp/pylib/gyp/generator/make.py	Sun Apr  1 20:04:45 2012
+@@ -269,13 +269,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s
 # 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.
--- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc
+++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc
@ -1,7 +1,7 @@
-$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.8 2012/02/17 10:19:51 robert Exp $
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig	Fri Jan 27 09:01:10 2012
-+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc	Thu Feb  9 09:31:06 2012
-@@ -1308,7 +1308,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_
+$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.9 2012/04/03 13:59:35 robert Exp $
+--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig	Tue Mar 27 03:01:11 2012
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc	Sun Apr  1 20:04:46 2012
+@@ -1417,7 +1417,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_
 #endif  // defined(OS_WIN)
 
   bool ret = false;
--- a/www/chromium/pkg/PLIST
+++ b/www/chromium/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2012/02/17 10:19:51 robert Exp $
+@comment $OpenBSD: PLIST,v 1.16 2012/04/03 13:59:35 robert Exp $
 bin/chrome
 chrome/
@bin chrome/chrome
@ -37,6 +37,7 @@ chrome/locales/lt.pak
 chrome/locales/lv.pak
 chrome/locales/ml.pak
 chrome/locales/mr.pak
+chrome/locales/ms.pak
 chrome/locales/nb.pak
 chrome/locales/nl.pak
 chrome/locales/pl.pak
@ -92,6 +93,7 @@ chrome/resources/inspector/Images/disclosureTriangleSmallRightDown.png
 chrome/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png
 chrome/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png
 chrome/resources/inspector/Images/disclosureTriangleSmallRightWhite.png
+chrome/resources/inspector/Images/domain.png
 chrome/resources/inspector/Images/errorIcon.png
 chrome/resources/inspector/Images/errorMediumIcon.png
 chrome/resources/inspector/Images/errorRedDot.png
@ -221,6 +223,7 @@ chrome/resources/inspector/devTools.css
 chrome/resources/inspector/devtools.html
 chrome/resources/inspector/devtools_extension_api.js
 chrome/resources/inspector/elementsPanel.css
+chrome/resources/inspector/filteredItemSelectionDialog.css
 chrome/resources/inspector/heapProfiler.css
 chrome/resources/inspector/inspectorCommon.css
 chrome/resources/inspector/networkLogView.css
@ -231,6 +234,7 @@ chrome/resources/inspector/resourceView.css
 chrome/resources/inspector/resourcesPanel.css
 chrome/resources/inspector/scriptsPanel.css
 chrome/resources/inspector/splitView.css
+chrome/resources/inspector/tabbedPane.css
 chrome/resources/inspector/textPrompt.css
 chrome/resources/inspector/textViewer.css
 chrome/resources/inspector/timelinePanel.css