update to the next stable release (13.0.782.112)

www/chromium/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.63 2011/07/26 20:47:55 robert Exp $
+# $OpenBSD: Makefile,v 1.64 2011/08/16 08:17:44 robert Exp $
 
 ONLY_FOR_ARCHS=		i386 amd64
 
 COMMENT=		Chromium browser
 
-V=			12.0.742.122
+V=			13.0.782.112
 DISTNAME=		chromium-${V}
 
 CATEGORIES=		www

www/chromium/distinfo

@@ -1,5 +1,5 @@
-MD5 (chromium-12.0.742.122.tar.bz2) = 9jvws1XPojow2OH9xGnRTg==
-RMD160 (chromium-12.0.742.122.tar.bz2) = wafz0Vpu0h8P+2Oj3fj3IUNAyfs=
-SHA1 (chromium-12.0.742.122.tar.bz2) = mXqAlb7uT6B3QZk5UqJYET1umwo=
-SHA256 (chromium-12.0.742.122.tar.bz2) = WrphSj+fwjeRQLMneLcEKNgmzwKSjBqSxVyhBWwg1Oo=
-SIZE (chromium-12.0.742.122.tar.bz2) = 151394282
+MD5 (chromium-13.0.782.112.tar.bz2) = oN3MtlsAdUGdCJCHqd54XA==
+RMD160 (chromium-13.0.782.112.tar.bz2) = RpmjUqEj/FhWN01Y50r4UW2/14g=
+SHA1 (chromium-13.0.782.112.tar.bz2) = TQvYyXpUTzF3Sd+burCdU9HPE9Y=
+SHA256 (chromium-13.0.782.112.tar.bz2) = +xugnqpbM6XQZ086Df9mZUL4TzVFYT3Npb2P7DtStu0=
+SIZE (chromium-13.0.782.112.tar.bz2) = 155326379

www/chromium/patches/patch-app_app_base_gypi

@@ -1,16 +1,7 @@
-$OpenBSD: patch-app_app_base_gypi,v 1.4 2011/06/08 20:36:56 robert Exp $
---- app/app_base.gypi.orig	Wed Jun  8 10:08:26 2011
-+++ app/app_base.gypi	Wed Jun  8 10:08:45 2011
-@@ -268,7 +268,7 @@
-             ['exclude', '^win/*'],
-           ],
-         }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
-           'sources!': [
-             '../ui/base/keycodes/keyboard_code_conversion_mac.mm',
-             '../ui/base/keycodes/keyboard_code_conversion_mac.h',
-@@ -281,7 +281,6 @@
+$OpenBSD: patch-app_app_base_gypi,v 1.5 2011/08/16 08:17:44 robert Exp $
+--- app/app_base.gypi.orig	Tue Aug  2 20:12:53 2011
++++ app/app_base.gypi	Tue Aug  2 20:13:39 2011
+@@ -227,7 +227,6 @@
              'link_settings': {
                'libraries': [
                  '-lX11',

www/chromium/patches/patch-base_base_gyp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_base_gyp,v 1.5 2011/06/08 20:36:56 robert Exp $
---- base/base.gyp.orig	Mon Jun  6 11:11:47 2011
-+++ base/base.gyp	Wed Jun  8 09:58:35 2011
-@@ -272,6 +272,13 @@
+$OpenBSD: patch-base_base_gyp,v 1.6 2011/08/16 08:17:44 robert Exp $
+--- base/base.gyp.orig	Wed Jul 27 10:01:28 2011
++++ base/base.gyp	Tue Aug  2 20:12:17 2011
+@@ -293,6 +293,13 @@
            ],
          }],
        ],

www/chromium/patches/patch-base_base_gypi

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_base_gypi,v 1.6 2011/06/08 20:36:56 robert Exp $
---- base/base.gypi.orig	Mon Jun  6 11:11:47 2011
-+++ base/base.gypi	Wed Jun  8 16:55:48 2011
-@@ -192,6 +192,7 @@
+$OpenBSD: patch-base_base_gypi,v 1.7 2011/08/16 08:17:44 robert Exp $
+--- base/base.gypi.orig	Tue Aug  2 20:13:45 2011
++++ base/base.gypi	Tue Aug  2 20:15:07 2011
+@@ -191,6 +191,7 @@
            'process_util.h',
            'process_util_linux.cc',
            'process_util_mac.mm',
@@ -9,12 +9,12 @@ $OpenBSD: patch-base_base_gypi,v 1.6 2011/06/08 20:36:56 robert Exp $
            'process_util_posix.cc',
            'process_util_win.cc',
            'process_win.cc',
-@@ -363,12 +364,11 @@
+@@ -371,12 +372,11 @@
                  'message_pump_glib_x.cc',
                ],
            }],
 -          [ 'OS != "linux"', {
-+          [ 'OS != "linux" or OS != "openbsd"', {
++          [ 'OS != "linux" and OS !="openbsd"', {
                'sources!': [
                  # Not automatically excluded by the *linux.cc rules.
                  'gtk_util.cc',
@@ -23,20 +23,7 @@ $OpenBSD: patch-base_base_gypi,v 1.6 2011/06/08 20:36:56 robert Exp $
                ],
              },
            ],
-@@ -408,10 +408,10 @@
-           },],
-           ['OS=="freebsd" or OS=="openbsd"', {
-             'sources!': [
--              'base/files/file_path_watcher_linux.cc',
-+              'files/file_path_watcher_linux.cc',
-             ],
-             'sources': [
--              'base/files/file_path_watcher_stub.cc',
-+              'files/file_path_watcher_stub.cc',
-             ],
-           }],
-         ],
-@@ -481,6 +481,12 @@
+@@ -491,6 +491,12 @@
              ],
          }],
          [ 'OS == "freebsd" or OS == "openbsd"', {

www/chromium/patches/patch-base_debug_trace_event_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-base_debug_trace_event_cc,v 1.1 2011/03/15 11:38:05 robert Exp $
---- base/debug/trace_event.cc.orig	Mon Mar 14 14:02:18 2011
-+++ base/debug/trace_event.cc	Mon Mar 14 14:03:00 2011
-@@ -74,7 +74,7 @@ void TraceLog::Trace(const std::string& name,
-   TimeTicks tick = TimeTicks::Now();
- #endif
-   TimeDelta delta = tick - trace_start_time_;
--  int64 usec = delta.InMicroseconds();
-+  int64_t usec = delta.InMicroseconds();
-   std::string msg =
-     StringPrintf("{'pid':'0x%lx', 'tid':'0x%lx', 'type':'%s', "
-                  "'name':'%s', 'id':'%p', 'extra':'%s', 'file':'%s', "

www/chromium/patches/patch-base_file_util_posix_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_file_util_posix_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- base/file_util_posix.cc.orig	Mon Jun  6 11:11:47 2011
-+++ base/file_util_posix.cc	Wed Jun  8 09:58:35 2011
-@@ -822,7 +822,11 @@ bool GetTempDir(FilePath* path) {
+$OpenBSD: patch-base_file_util_posix_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
+--- base/file_util_posix.cc.orig	Wed Jul 27 10:01:28 2011
++++ base/file_util_posix.cc	Tue Aug  2 20:12:17 2011
+@@ -844,7 +844,11 @@ bool GetTempDir(FilePath* path) {
  }
  
  bool GetShmemTempDir(FilePath* path) {

www/chromium/patches/patch-base_i18n_number_formatting_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_i18n_number_formatting_cc,v 1.3 2011/03/15 11:38:05 robert Exp $
---- base/i18n/number_formatting.cc.orig	Mon Mar 14 11:01:54 2011
-+++ base/i18n/number_formatting.cc	Mon Mar 14 11:02:02 2011
-@@ -35,7 +35,7 @@ struct NumberFormatWrapper {
+$OpenBSD: patch-base_i18n_number_formatting_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
+--- base/i18n/number_formatting.cc.orig	Wed Jul 27 10:01:28 2011
++++ base/i18n/number_formatting.cc	Tue Aug  2 20:12:17 2011
+@@ -36,7 +36,7 @@ struct NumberFormatWrapper {
  
  static LazyInstance<NumberFormatWrapper> g_number_format(LINKER_INITIALIZED);
  

www/chromium/patches/patch-base_process_util_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_process_util_h,v 1.6 2011/06/08 20:36:56 robert Exp $
---- base/process_util.h.orig	Mon Jun  6 11:11:47 2011
-+++ base/process_util.h	Wed Jun  8 09:58:35 2011
+$OpenBSD: patch-base_process_util_h,v 1.7 2011/08/16 08:17:44 robert Exp $
+--- base/process_util.h.orig	Wed Jul 27 10:01:28 2011
++++ base/process_util.h	Tue Aug  2 20:12:17 2011
 @@ -14,14 +14,16 @@
  #if defined(OS_WIN)
  #include <windows.h>
@@ -19,7 +19,7 @@ $OpenBSD: patch-base_process_util_h,v 1.6 2011/06/08 20:36:56 robert Exp $
  #elif defined(OS_POSIX)
  #include <dirent.h>
  #include <limits.h>
-@@ -445,7 +447,7 @@ class BASE_API ProcessIterator {
+@@ -447,7 +449,7 @@ class BASE_API ProcessIterator {
  #if defined(OS_WIN)
    HANDLE snapshot_;
    bool started_iteration_;

www/chromium/patches/patch-base_shared_memory_posix_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_shared_memory_posix_cc,v 1.2 2011/04/29 13:18:01 robert Exp $
---- base/shared_memory_posix.cc.orig	Tue Apr 26 10:01:34 2011
-+++ base/shared_memory_posix.cc	Thu Apr 28 11:17:49 2011
-@@ -150,7 +150,7 @@ bool SharedMemory::CreateNamed(const std::string& name
+$OpenBSD: patch-base_shared_memory_posix_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- base/shared_memory_posix.cc.orig	Wed Jul 27 10:01:28 2011
++++ base/shared_memory_posix.cc	Tue Aug  2 20:12:17 2011
+@@ -154,7 +154,7 @@ bool SharedMemory::CreateNamed(const std::string& name
      created_size_ = size;
    }
    if (fp == NULL) {

www/chromium/patches/patch-build_common_gypi

@@ -1,16 +1,16 @@
-$OpenBSD: patch-build_common_gypi,v 1.8 2011/06/15 19:41:02 robert Exp $
---- build/common.gypi.orig	Mon Jun  6 11:11:46 2011
-+++ build/common.gypi	Wed Jun  8 09:58:35 2011
-@@ -95,7 +95,7 @@
+$OpenBSD: patch-build_common_gypi,v 1.9 2011/08/16 08:17:44 robert Exp $
+--- build/common.gypi.orig	Tue Aug  2 20:15:36 2011
++++ build/common.gypi	Wed Aug  3 09:30:30 2011
+@@ -98,7 +98,7 @@
        'file_manager_extension%': 0,
  
        # Python version.
--      'python_ver%': '2.5',
-+      'python_ver%': '${MODPY_VERSION}',
+-      'python_ver%': '2.6',
++      'python_ver%': '2.7',
  
        # Set ARM-v7 compilation flags
        'armv7%': 0,
-@@ -316,7 +316,7 @@
+@@ -354,7 +354,7 @@
      'linux_strip_reliability_tests%': 0,
  
      # Enable TCMalloc.
@@ -19,7 +19,7 @@ $OpenBSD: patch-build_common_gypi,v 1.8 2011/06/15 19:41:02 robert Exp $
  
      # Disable TCMalloc's debugallocation.
      'linux_use_debugallocation%': 0,
-@@ -337,7 +337,7 @@
+@@ -377,7 +377,7 @@
  
      # Used to disable Native Client at compile time, for platforms where it
      # isn't supported
@@ -28,7 +28,7 @@ $OpenBSD: patch-build_common_gypi,v 1.8 2011/06/15 19:41:02 robert Exp $
  
      # Set Thumb compilation flags.
      'arm_thumb%': 0,
-@@ -405,7 +405,7 @@
+@@ -445,7 +445,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.
@@ -37,16 +37,7 @@ $OpenBSD: patch-build_common_gypi,v 1.8 2011/06/15 19:41:02 robert Exp $
          'conditions': [
            ['branding=="Chrome"', {
              'linux_breakpad%': 1,
-@@ -478,7 +478,7 @@
-         ],
-       }],
- 
--      ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
-+      ['OS=="mac" or OS=="openbsd" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
-         'use_cups%': 1,
-       }, {
-         'use_cups%': 0,
-@@ -779,7 +779,7 @@
+@@ -850,7 +850,7 @@
                ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'],
              ],
            }],

www/chromium/patches/patch-build_features_override_gypi

@@ -1,12 +1,12 @@
-$OpenBSD: patch-build_features_override_gypi,v 1.4 2011/06/08 20:36:56 robert Exp $
---- build/features_override.gypi.orig	Mon Jun  6 11:11:46 2011
-+++ build/features_override.gypi	Wed Jun  8 09:58:35 2011
-@@ -86,7 +86,7 @@
-     'enable_svg%': '<(enable_svg)',
-     'enable_touch_events%': '<(enable_touch_events)',
-     'conditions': [
--      ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing==1', {
-+      ['(OS=="win" or OS=="linux" or OS=="mac" or OS=="openbsd") and use_accelerated_compositing==1', {
+$OpenBSD: patch-build_features_override_gypi,v 1.5 2011/08/16 08:17:44 robert Exp $
+--- build/features_override.gypi.orig	Tue Aug  2 20:16:35 2011
++++ build/features_override.gypi	Tue Aug  2 20:17:11 2011
+@@ -110,7 +110,7 @@
+       # TODO(crogers): For the moment Windows is only enabled for
+       # Google-branded build, since the FFmpeg DLLs need to be re-built
+       # for chromium.
+-      ['OS=="mac" or OS=="linux" or (OS=="win" and branding=="Chrome")', {
++      ['OS=="mac" or OS=="linux" or OS=="openbsd" or (OS=="win" and branding=="Chrome")', {
          'feature_defines': [
-           'WTF_USE_ACCELERATED_COMPOSITING=1',
-           'ENABLE_3D_RENDERING=1',
+           'ENABLE_WEB_AUDIO=1',
+         ],

www/chromium/patches/patch-build_linux_system_gyp

@@ -1,7 +1,21 @@
-$OpenBSD: patch-build_linux_system_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $
---- build/linux/system.gyp.orig	Fri Mar 11 10:01:31 2011
-+++ build/linux/system.gyp	Mon Mar 14 10:55:37 2011
-@@ -312,7 +312,6 @@
+$OpenBSD: patch-build_linux_system_gyp,v 1.4 2011/08/16 08:17:44 robert Exp $
+--- build/linux/system.gyp.orig	Wed Jul 27 10:01:27 2011
++++ build/linux/system.gyp	Wed Aug  3 15:16:21 2011
+@@ -242,13 +242,6 @@
+             'libraries': [
+               '<!@(<(pkg-config) --libs-only-l gio-2.0)',
+             ],
+-            'conditions': [
+-              ['linux_link_gsettings==0', {
+-                'libraries': [
+-                  '-ldl',
+-                ],
+-              }],
+-            ],
+           },
+       }]]
+     },
+@@ -370,7 +363,6 @@
              }, {
                'link_settings': {
                  'libraries': [

www/chromium/patches/patch-chrome_app_generated_resources_grd

@@ -1,39 +0,0 @@
-$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.5 2011/07/19 19:20:20 naddy Exp $
---- chrome/app/generated_resources.grd.orig	Fri Jun 24 02:01:46 2011
-+++ chrome/app/generated_resources.grd	Tue Jul 19 08:15:14 2011
-@@ -1000,7 +1000,7 @@ Other platform defines such as use_titlecase are decla
-           Preferences...
-         </message>
-       </if>
--      <if expr="os == 'linux2'">
-+      <if expr="os == 'linux2' or os.find('bsd') != -1">
-         <message name="IDS_PREFERENCES" desc="The text label of the Preferences menu item.">
-           Preferences
-         </message>
-@@ -7129,7 +7129,7 @@ Keep your key file in a safe place. You will need it t
-         </message>
-       </if>
- 
--      <if expr="os == 'darwin' or (os =='linux2' and not pp_ifdef('chromeos'))">
-+      <if expr="os == 'darwin' or ((os =='linux2' or os.find('bsd') != -1) and not pp_ifdef('chromeos'))">
-         <message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog.">
-           Autofill Preferences
-         </message>
-@@ -9421,7 +9421,7 @@ Keep your key file in a safe place. You will need it t
-       </if> <!-- os == 'darwin' -->
- 
-       <!-- Linux Global Menubar Menus -->
--      <if expr="os == 'linux2'">
-+      <if expr="os == 'linux2' or os.find('bsd') != -1">
-         <!-- Unity and some other GNOME configurations now have a permanent,
-              Mac-like menu bar that lives outside the window at the top of the
-              screen. The following strings should be in Linux style, not Mac
-@@ -12114,7 +12114,7 @@ Keep your key file in a safe place. You will need it t
-       Import bookmarks now...
-     </message>
- 
--    <if expr="os == 'linux2' or os == 'openbsd4' or os=='freebsd6'">
-+    <if expr="os == 'linux2' or os.find('openbsd') != -1 or os=='freebsd6'">
-       <!-- Linux proxy configuration fallback help -->
-       <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE" desc="Title of HTML page shown on systems where system proxy configuration is unsupported.">
-         Proxy Configuration Help

www/chromium/patches/patch-chrome_browser_about_flags_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/about_flags.cc.orig	Mon Jun  6 11:12:10 2011
-+++ chrome/browser/about_flags.cc	Wed Jun  8 09:58:35 2011
-@@ -533,7 +533,7 @@ int GetCurrentPlatform() {
+$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.5 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/about_flags.cc.orig	Wed Jul 27 10:01:52 2011
++++ chrome/browser/about_flags.cc	Tue Aug  2 20:12:17 2011
+@@ -581,7 +581,7 @@ int GetCurrentPlatform() {
    return kOsWin;
  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
    return kOsCrOS;

www/chromium/patches/patch-chrome_browser_browser_about_handler_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/browser_about_handler.cc.orig	Mon Jun  6 11:12:10 2011
-+++ chrome/browser/browser_about_handler.cc	Wed Jun  8 09:58:35 2011
+$OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.5 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/browser_about_handler.cc.orig	Wed Jul 27 10:01:52 2011
++++ chrome/browser/browser_about_handler.cc	Tue Aug  2 20:12:17 2011
 @@ -73,7 +73,7 @@
  #include "chrome/browser/chromeos/login/wizard_controller.h"
  #include "chrome/browser/chromeos/version_loader.h"
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.4 2011/06/08 20:36:5
  #include "content/browser/zygote_host_linux.h"
  #endif
  
-@@ -129,7 +129,7 @@ const char kNetInternalsPath[] = "net-internals";
+@@ -130,7 +130,7 @@ const char kNetInternalsPath[] = "net-internals";
  const char kPluginsPath[] = "plugins";
  const char kSyncInternalsPath[] = "sync-internals";
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.4 2011/06/08 20:36:5
  const char kLinuxProxyConfigPath[] = "linux-proxy-config";
  const char kSandboxPath[] = "sandbox";
  #endif
-@@ -165,7 +165,7 @@ const char *kAllAboutPaths[] = {
+@@ -167,7 +167,7 @@ const char *kAllAboutPaths[] = {
    kTcmallocPath,
    kTermsPath,
    kVersionPath,
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.4 2011/06/08 20:36:5
    kSandboxPath,
  #endif
  #if defined(OS_CHROMEOS)
-@@ -826,7 +826,7 @@ std::string AboutStats(const std::string& query) {
+@@ -833,7 +833,7 @@ std::string AboutStats(const std::string& query) {
    return data;
  }
  
@@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.4 2011/06/08 20:36:5
  std::string AboutLinuxProxyConfig() {
    std::string data;
    data.append("<!DOCTYPE HTML>\n");
-@@ -1059,7 +1059,7 @@ void AboutSource::StartDataRequest(const std::string& 
+@@ -1094,7 +1094,7 @@ void AboutSource::StartDataRequest(const std::string& 
      response = ResourceBundle::GetSharedInstance().GetRawDataResource(
          IDR_TERMS_HTML).as_string();
  #endif

www/chromium/patches/patch-chrome_browser_browser_main_posix_cc

@@ -1,15 +1,6 @@
-$OpenBSD: patch-chrome_browser_browser_main_posix_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/browser_main_posix.cc.orig	Wed Jun  8 10:19:46 2011
-+++ chrome/browser/browser_main_posix.cc	Wed Jun  8 17:17:36 2011
-@@ -21,7 +21,7 @@
- #include "chrome/common/chrome_switches.h"
- #include "content/browser/browser_thread.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
- #include "chrome/browser/printing/print_dialog_gtk.h"
- #endif
- 
+$OpenBSD: patch-chrome_browser_browser_main_posix_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/browser_main_posix.cc.orig	Tue Aug  2 20:20:23 2011
++++ chrome/browser/browser_main_posix.cc	Tue Aug  2 20:20:57 2011
 @@ -216,7 +216,7 @@ void BrowserMainPartsPosix::PreEarlyInitialization() {
    if (!fd_limit_string.empty()) {
      base::StringToInt(fd_limit_string, &fd_limit);
@@ -19,12 +10,3 @@ $OpenBSD: patch-chrome_browser_browser_main_posix_cc,v 1.2 2011/06/08 20:36:56 r
    // We use quite a few file descriptors for our IPC, and the default limit on
    // the Mac is low (256), so bump it up if there is no explicit override.
    if (fd_limit == 0) {
-@@ -255,7 +255,7 @@ void BrowserMainPartsPosix::PostMainMessageLoopStart()
-     }
-   }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
-   printing::PrintingContextCairo::SetCreatePrintDialogFunction(
-       &PrintDialogGtk::CreatePrintDialog);
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)

www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc

@@ -0,0 +1,21 @@
+$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.1 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/chrome_content_browser_client.cc.orig	Wed Aug  3 19:12:00 2011
++++ chrome/browser/chrome_content_browser_client.cc	Wed Aug  3 19:12:20 2011
+@@ -48,7 +48,7 @@
+ #include "net/base/cookie_monster.h"
+ #include "net/base/cookie_options.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
+ #include "base/linux_util.h"
+ #include "chrome/browser/crash_handler_host_linux.h"
+ #endif
+@@ -323,7 +323,7 @@ void ChromeContentBrowserClient::RevealFolderInOS(cons
+ #endif
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
+ int ChromeContentBrowserClient::GetCrashSignalFD(
+     const std::string& process_type) {
+   if (process_type == switches::kRendererProcess)

www/chromium/patches/patch-chrome_browser_history_in_memory_url_index_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_history_in_memory_url_index_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/history/in_memory_url_index.cc.orig	Mon Jun  6 11:12:10 2011
-+++ chrome/browser/history/in_memory_url_index.cc	Wed Jun  8 09:58:35 2011
-@@ -1020,8 +1020,8 @@ bool InMemoryURLIndex::RestoreWordIDHistoryMap(
+$OpenBSD: patch-chrome_browser_history_in_memory_url_index_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/history/in_memory_url_index.cc.orig	Wed Jul 27 10:01:51 2011
++++ chrome/browser/history/in_memory_url_index.cc	Tue Aug  2 20:12:17 2011
+@@ -1065,8 +1065,8 @@ bool InMemoryURLIndex::RestoreWordIDHistoryMap(
        return false;
      WordID word_id = iter->word_id();
      HistoryIDSet history_id_set;

www/chromium/patches/patch-chrome_browser_memory_details_cc

@@ -1,30 +0,0 @@
-$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/memory_details.cc.orig	Mon Jun  6 11:12:10 2011
-+++ chrome/browser/memory_details.cc	Wed Jun  8 09:58:35 2011
-@@ -25,7 +25,7 @@
- #include "grit/generated_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "content/browser/zygote_host_linux.h"
- #include "content/browser/renderer_host/render_sandbox_host_linux.h"
- #endif
-@@ -109,7 +109,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() {
- void MemoryDetails::CollectChildInfoOnUIThread() {
-   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   const pid_t zygote_pid = ZygoteHost::GetInstance()->pid();
-   const pid_t sandbox_helper_pid = RenderSandboxHostLinux::GetInstance()->pid();
- #endif
-@@ -235,7 +235,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
-       }
-     }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-     if (process.pid == zygote_pid) {
-       process.type = ChildProcessInfo::ZYGOTE_PROCESS;
-     } else if (process.pid == sandbox_helper_pid) {

www/chromium/patches/patch-chrome_browser_memory_purger_cc

@@ -1,12 +1,12 @@
-$OpenBSD: patch-chrome_browser_memory_purger_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/memory_purger.cc.orig	Mon Jun  6 11:12:10 2011
-+++ chrome/browser/memory_purger.cc	Wed Jun  8 09:58:35 2011
-@@ -134,7 +134,7 @@ void MemoryPurger::PurgeBrowser() {
+$OpenBSD: patch-chrome_browser_memory_purger_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/memory_purger.cc.orig	Tue Aug  2 20:21:35 2011
++++ chrome/browser/memory_purger.cc	Tue Aug  2 20:21:59 2011
+@@ -135,7 +135,7 @@ void MemoryPurger::PurgeBrowser() {
    // * Purge AppCache memory.  Not yet implemented sufficiently.
    // * Browser-side DatabaseTracker.  Not implemented sufficiently.
  
--#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
-+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_OPENBSD)) && defined(USE_TCMALLOC)
+-#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
++#if !defined(OS_MACOSX) && !defined(OS_OPENBSD) && defined(USE_TCMALLOC)
    // Tell tcmalloc to release any free pages it's still holding.
    //
    // TODO(pkasting): A lot of the above calls kick off actions on other threads.

www/chromium/patches/patch-chrome_browser_net_connection_tester_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_net_connection_tester_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/net/connection_tester.cc.orig	Mon Jun  6 11:12:07 2011
-+++ chrome/browser/net/connection_tester.cc	Wed Jun  8 09:58:36 2011
-@@ -199,7 +199,7 @@ class ExperimentURLRequestContext : public net::URLReq
+$OpenBSD: patch-chrome_browser_net_connection_tester_cc,v 1.5 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/net/connection_tester.cc.orig	Wed Jul 27 10:01:48 2011
++++ chrome/browser/net/connection_tester.cc	Tue Aug  2 20:12:17 2011
+@@ -208,7 +208,7 @@ class ExperimentURLRequestContext : public net::URLReq
    // Otherwise returns a network error code.
    int CreateSystemProxyConfigService(
        scoped_ptr<net::ProxyConfigService>* config_service) {

www/chromium/patches/patch-chrome_browser_notifications_balloon_collection_impl_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_notifications_balloon_collection_impl_h,v 1.2 2011/03/15 11:38:05 robert Exp $
---- chrome/browser/notifications/balloon_collection_impl.h.orig	Fri Mar 11 10:01:43 2011
-+++ chrome/browser/notifications/balloon_collection_impl.h	Mon Mar 14 10:55:37 2011
-@@ -57,7 +57,7 @@ class BalloonCollectionImpl : public BalloonCollection
-   virtual void WillProcessMessage(const MSG& event) {}
-   virtual void DidProcessMessage(const MSG& event);
- #endif
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
-   virtual void WillProcessEvent(GdkEvent* event) {}
-   virtual void DidProcessEvent(GdkEvent* event);
- #endif

www/chromium/patches/patch-chrome_browser_process_singleton_linux_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_browser_process_singleton_linux_cc,v 1.4 2011/03/16 10:52:46 robert Exp $
---- chrome/browser/process_singleton_linux.cc.orig	Fri Mar 11 10:01:43 2011
-+++ chrome/browser/process_singleton_linux.cc	Wed Mar 16 10:25:55 2011
+$OpenBSD: patch-chrome_browser_process_singleton_linux_cc,v 1.5 2011/08/16 08:17:44 robert Exp $
+--- chrome/browser/process_singleton_linux.cc.orig	Wed Jul 27 10:01:52 2011
++++ chrome/browser/process_singleton_linux.cc	Tue Aug  2 20:12:17 2011
 @@ -55,6 +55,13 @@
  #include <set>
  #include <string>
@@ -15,7 +15,7 @@ $OpenBSD: patch-chrome_browser_process_singleton_linux_cc,v 1.4 2011/03/16 10:52
  #include "base/base_paths.h"
  #include "base/basictypes.h"
  #include "base/command_line.h"
-@@ -314,10 +321,42 @@ void DisplayProfileInUseError(const std::string& lock_
+@@ -315,10 +322,42 @@ void DisplayProfileInUseError(const std::string& lock_
  }
  
  bool IsChromeProcess(pid_t pid) {

www/chromium/patches/patch-chrome_browser_shell_integration_unittest_cc

@@ -1,20 +0,0 @@
-$OpenBSD: patch-chrome_browser_shell_integration_unittest_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/shell_integration_unittest.cc.orig	Mon Jun  6 11:12:10 2011
-+++ chrome/browser/shell_integration_unittest.cc	Wed Jun  8 09:58:36 2011
-@@ -22,13 +22,13 @@
- 
- #if defined(OS_WIN)
- #include "chrome/installer/util/browser_distribution.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "base/environment.h"
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
- 
- #define FPL FILE_PATH_LITERAL
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- namespace {
- 
- // Provides mock environment variables values based on a stored map.

www/chromium/patches/patch-chrome_browser_task_manager_task_manager_resource_providers_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_task_manager_task_manager_resource_providers_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/task_manager/task_manager_resource_providers.cc.orig	Mon Jun  6 11:12:07 2011
-+++ chrome/browser/task_manager/task_manager_resource_providers.cc	Wed Jun  8 09:58:36 2011
-@@ -1498,7 +1498,7 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserP
-       default_icon_ = IconUtil::CreateSkBitmapFromHICON(icon, icon_size);
-     }
-   }
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-   if (!default_icon_) {
-     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-     default_icon_ = rb.GetBitmapNamed(IDR_PRODUCT_LOGO_16);

www/chromium/patches/patch-chrome_browser_ui_browser_cc

@@ -1,48 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/browser.cc.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/browser.cc	Wed Jun  8 09:58:36 2011
-@@ -291,7 +291,7 @@ Browser::~Browser() {
- 
-   BrowserList::RemoveBrowser(this);
- 
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_OPENBSD)
-   if (!BrowserList::HasBrowserWithProfile(profile_)) {
-     // We're the last browser window with this profile. We need to nuke the
-     // TabRestoreService, which will start the shutdown of the
-@@ -846,7 +846,7 @@ string16 Browser::GetWindowTitleForCurrentTab() const 
-   // On Mac or ChromeOS, we don't want to suffix the page title with
-   // the application name.
-   return title;
--#elif defined(OS_WIN) || defined(OS_LINUX)
-+#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_OPENBSD)
-   int string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT;
-   // Don't append the app name to window titles on app frames and app popups
-   if (type_ & TYPE_APP)
-@@ -1532,7 +1532,7 @@ void Browser::ToggleFullscreenMode() {
-   window_->SetFullscreen(!window_->IsFullscreen());
-   // On Linux, setting fullscreen mode is an async call to the X server, which
-   // may or may not support fullscreen mode.
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_OPENBSD)
-   UpdateCommandsForFullscreenMode(window_->IsFullscreen());
- #endif
- }
-@@ -1798,7 +1798,7 @@ void Browser::OpenFile() {
- 
- void Browser::OpenCreateShortcutsDialog() {
-   UserMetrics::RecordAction(UserMetricsAction("CreateShortcut"), profile_);
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_OPENBSD)
-   TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper();
-   DCHECK(current_tab &&
-       web_app::IsValidUrl(current_tab->tab_contents()->GetURL())) <<
-@@ -2608,7 +2608,7 @@ void Browser::DuplicateContentsAt(int index) {
- }
- 
- void Browser::CloseFrameAfterDragSession() {
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_OPENBSD)
-   // This is scheduled to run after we return to the message loop because
-   // otherwise the frame will think the drag session is still active and ignore
-   // the request.

www/chromium/patches/patch-chrome_browser_ui_browser_list_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_browser_list_cc,v 1.2 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/ui/browser_list.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/browser_list.cc	Thu Apr 28 11:17:49 2011
-@@ -444,7 +444,7 @@ void BrowserList::SessionEnding() {
-   // 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(ResultCodes::NORMAL_EXIT);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-   _exit(ResultCodes::NORMAL_EXIT);
- #else
-   NOTIMPLEMENTED();

www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc

@@ -1,30 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/toolbar/wrench_menu_model.cc	Wed Jun  8 09:58:36 2011
-@@ -38,7 +38,7 @@
- #include "ui/base/models/button_menu_item_model.h"
- #include "ui/base/resource/resource_bundle.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include <gtk/gtk.h>
- #include "chrome/browser/ui/gtk/gtk_util.h"
- #endif
-@@ -411,7 +411,7 @@ void WrenchMenuModel::Build() {
- #endif
- 
-   AddSeparator();
--#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
-+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(TOOLKIT_VIEWS))
-   // WARNING: Mac does not use the ButtonMenuItemModel, but instead defines the
-   // layout for this menu item in Toolbar.xib. It does, however, use the
-   // command_id value from AddButtonItem() to identify this special item.
-@@ -426,7 +426,7 @@ void WrenchMenuModel::Build() {
- #endif
- 
-   AddSeparator();
--#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
-+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(TOOLKIT_VIEWS))
-   // WARNING: See above comment.
-   zoom_menu_item_model_.reset(
-       new ui::ButtonMenuItemModel(IDS_ZOOM_MENU, this));

www/chromium/patches/patch-chrome_browser_ui_views_create_application_shortcut_view_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_create_application_shortcut_view_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/views/create_application_shortcut_view.cc.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/views/create_application_shortcut_view.cc	Wed Jun  8 09:58:36 2011
-@@ -259,7 +259,7 @@ void CreateApplicationShortcutView::InitControls() {
-         UTF16ToWide(l10n_util::GetStringUTF16(
-             IDS_CREATE_SHORTCUTS_QUICK_LAUNCH_BAR_CHKBOX)),
-       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInQuickLaunchBar));
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-   menu_check_box_ = AddCheckbox(
-       UTF16ToWide(l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_MENU_CHKBOX)),
-       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInAppsMenu));

www/chromium/patches/patch-chrome_browser_ui_views_dropdown_bar_host_cc

@@ -1,21 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_dropdown_bar_host_cc,v 1.2 2011/03/15 11:38:05 robert Exp $
---- chrome/browser/ui/views/dropdown_bar_host.cc.orig	Mon Mar 14 11:38:09 2011
-+++ chrome/browser/ui/views/dropdown_bar_host.cc	Mon Mar 14 11:38:18 2011
-@@ -19,7 +19,7 @@
- 
- #if defined(OS_WIN)
- #include "base/win/scoped_gdi_object.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "ui/base/gtk/scoped_handle_gtk.h"
- #endif
- 
-@@ -27,7 +27,7 @@ namespace {
- 
- #if defined(OS_WIN)
- typedef base::win::ScopedRegion ScopedPlatformRegion;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- typedef ui::ScopedRegion ScopedPlatformRegion;
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_extensions_extension_popup_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_extensions_extension_popup_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/views/extensions/extension_popup.cc.orig	Wed Jun  8 10:23:27 2011
-+++ chrome/browser/ui/views/extensions/extension_popup.cc	Wed Jun  8 10:23:42 2011
-@@ -23,7 +23,7 @@
- #include "views/widget/root_view.h"
- #include "views/window/window.h"
- 
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_extensions_extension_view_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_extensions_extension_view_cc,v 1.1 2011/02/08 09:43:02 espie Exp $
---- chrome/browser/ui/views/extensions/extension_view.cc.orig	Fri Jan 21 10:20:24 2011
-+++ chrome/browser/ui/views/extensions/extension_view.cc	Sun Jan 23 23:27:32 2011
-@@ -14,7 +14,7 @@
- #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
- #elif defined(TOUCH_UI)
- #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_frame_app_panel_browser_frame_view_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_frame_app_panel_browser_frame_view_cc,v 1.2 2011/03/15 11:38:05 robert Exp $
---- chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc.orig	Fri Mar 11 10:01:41 2011
-+++ chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc	Mon Mar 14 10:55:37 2011
-@@ -22,7 +22,7 @@
- #include "views/window/window.h"
- #include "views/window/window_resources.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "views/window/hit_test.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_layout_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_layout_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/ui/views/frame/browser_view_layout.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/views/frame/browser_view_layout.cc	Thu Apr 28 11:17:49 2011
-@@ -23,7 +23,7 @@
- #include "views/controls/single_split_view.h"
- #include "views/window/window.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "views/window/hit_test.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	Wed Jun  8 09:58:36 2011
-@@ -30,7 +30,7 @@
- #include "views/window/window_resources.h"
- #include "views/window/window_shape.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "views/window/hit_test.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_location_bar_location_bar_view_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_location_bar_location_bar_view_cc,v 1.2 2011/03/15 11:38:05 robert Exp $
---- chrome/browser/ui/views/location_bar/location_bar_view.cc.orig	Fri Mar 11 10:01:41 2011
-+++ chrome/browser/ui/views/location_bar/location_bar_view.cc	Mon Mar 14 10:55:37 2011
-@@ -4,7 +4,7 @@
- 
- #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
- 
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_location_bar_location_bar_view_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_location_bar_location_bar_view_h,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/views/location_bar/location_bar_view.h.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/views/location_bar/location_bar_view.h	Wed Jun  8 09:58:36 2011
-@@ -25,7 +25,7 @@
- 
- #if defined(OS_WIN)
- #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon_view_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_notifications_balloon_view_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/views/notifications/balloon_view.cc.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/views/notifications/balloon_view.cc	Wed Jun  8 09:58:36 2011
-@@ -38,7 +38,7 @@
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
- #endif
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon_view_host_cc

@@ -1,30 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_notifications_balloon_view_host_cc,v 1.1 2011/02/08 09:43:02 espie Exp $
---- chrome/browser/ui/views/notifications/balloon_view_host.cc.orig	Fri Jan 21 10:20:24 2011
-+++ chrome/browser/ui/views/notifications/balloon_view_host.cc	Sun Jan 23 23:27:32 2011
-@@ -10,7 +10,7 @@
- #if defined(OS_WIN)
- #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #if defined(TOUCH_UI)
- #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
- #else
-@@ -21,7 +21,7 @@
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
- #endif
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
- 
-@@ -74,7 +74,7 @@ void BalloonViewHost::InitRenderWidgetHostView() {
-   HWND hwnd = view_win->Create(parent_native_view_);
-   view_win->ShowWindow(SW_SHOW);
-   native_host_->Attach(hwnd);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- #if defined(TOUCH_UI)
-   RenderWidgetHostViewViews* view_views =
-       static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_);

www/chromium/patches/patch-chrome_browser_ui_views_tabs_dragged_tab_view_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_tabs_dragged_tab_view_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/views/tabs/dragged_tab_view.cc.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/views/tabs/dragged_tab_view.cc	Wed Jun  8 09:58:36 2011
-@@ -12,7 +12,7 @@
- 
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig	Mon Jun  6 11:12:09 2011
-+++ chrome/browser/ui/views/tabs/tab_strip.cc	Wed Jun  8 09:58:36 2011
-@@ -32,7 +32,7 @@
- #if defined(OS_WIN)
- #include "views/widget/monitor_win.h"
- #include "views/widget/widget_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_h,v 1.1 2011/02/08 09:43:02 espie Exp $
---- chrome/browser/ui/views/tabs/tab_strip.h.orig	Fri Jan 21 10:20:24 2011
-+++ chrome/browser/ui/views/tabs/tab_strip.h	Sun Jan 23 23:27:33 2011
-@@ -19,7 +19,7 @@ class Tab;
- 
- namespace views {
- class ImageView;
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- class WidgetGtk;
- #elif defined(OS_WIN)
- class WidgetWin;

www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc

@@ -1,24 +0,0 @@
-$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/browser/web_applications/web_app.cc.orig	Mon Jun  6 11:12:06 2011
-+++ chrome/browser/web_applications/web_app.cc	Wed Jun  8 09:58:36 2011
-@@ -23,9 +23,9 @@
- #include "chrome/common/url_constants.h"
- #include "content/browser/browser_thread.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "base/environment.h"
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
- 
- #if defined(OS_WIN)
- #include "ui/gfx/icon_util.h"
-@@ -221,7 +221,7 @@ void CreateShortcutTask::Run() {
- bool CreateShortcutTask::CreateShortcut() {
-   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   scoped_ptr<base::Environment> env(base::Environment::Create());
- 
-   std::string shortcut_template;

www/chromium/patches/patch-chrome_chrome_browser_gypi

@@ -1,16 +1,7 @@
-$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.6 2011/06/08 20:36:56 robert Exp $
---- chrome/chrome_browser.gypi.orig	Mon Jun  6 11:12:14 2011
-+++ chrome/chrome_browser.gypi	Wed Jun  8 09:58:36 2011
-@@ -3522,7 +3522,7 @@
-             ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
-           ],
-         }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
-           'dependencies': [
-             '../build/linux/system.gyp:dbus-glib',
-             '../build/linux/system.gyp:gconf',
-@@ -3534,8 +3534,7 @@
+$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.7 2011/08/16 08:17:44 robert Exp $
+--- chrome/chrome_browser.gypi.orig	Tue Aug  2 20:28:46 2011
++++ chrome/chrome_browser.gypi	Tue Aug  2 20:29:37 2011
+@@ -3681,8 +3681,7 @@
            ],
            'link_settings': {
              'libraries': [
@@ -20,12 +11,3 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.6 2011/06/08 20:36:56 robert Exp
              ],
            },
            'sources!': [
-@@ -4174,7 +4173,7 @@
-               ],
-             }],
-             # GTK build only
--            ['OS=="linux" and toolkit_views==0', {
-+            ['(OS=="linux" or OS=="openbsd") and toolkit_views==0', {
-               'sources/': [
-                 ['include', '^browser/printing/print_dialog_gtk.cc'],
-                 ['include', '^browser/printing/print_dialog_gtk.h'],

www/chromium/patches/patch-chrome_chrome_gyp

@@ -1,44 +1,15 @@
-$OpenBSD: patch-chrome_chrome_gyp,v 1.6 2011/06/08 20:36:56 robert Exp $
---- chrome/chrome.gyp.orig	Wed Jun  8 10:24:19 2011
-+++ chrome/chrome.gyp	Wed Jun  8 10:25:59 2011
-@@ -72,6 +72,10 @@
-           }],
-         ],
-       },],
-+      ['OS=="openbsd" or OS=="openbsd"', {
-+        'platform_locale_settings_grd':
-+            'app/resources/locale_settings_linux.grd',
-+      },],
-       ['OS=="mac"', {
-         'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
-         'nacl_defines': [
-@@ -419,7 +423,7 @@
-         '..',
-       ],
-       'conditions': [
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
-           'dependencies': [
+$OpenBSD: patch-chrome_chrome_gyp,v 1.7 2011/08/16 08:17:44 robert Exp $
+--- chrome/chrome.gyp.orig	Tue Aug  2 20:29:43 2011
++++ chrome/chrome.gyp	Wed Aug  3 11:13:06 2011
+@@ -473,6 +473,11 @@
              '../build/linux/system.gyp:gtk',
            ],
-@@ -769,7 +773,7 @@
-             'service/cloud_print/print_system_win.cc',
-           ],
          }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
-           'dependencies': [
-             '../build/linux/system.gyp:gtk',
-           ],
-@@ -798,6 +802,11 @@
-                 ],
-               },
-             }],
-+          ],
-+        }],
 +        ['OS=="openbsd"', {
 +          'include_dirs': [
 +            '/usr/local/include',
-           ],
-         }],
-         ['remoting==1', {
++          ],
++        }],
+       ],
+     },
+     {

www/chromium/patches/patch-chrome_chrome_renderer_gypi

@@ -1,18 +0,0 @@
-$OpenBSD: patch-chrome_chrome_renderer_gypi,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/chrome_renderer.gypi.orig	Mon Jun  6 11:12:14 2011
-+++ chrome/chrome_renderer.gypi	Wed Jun  8 09:58:36 2011
-@@ -198,6 +198,14 @@
-           ],
-         }],
-         ['OS=="openbsd" or OS=="freebsd"', {
-+          'conditions': [
-+            [ 'linux_use_tcmalloc==1', {
-+                'dependencies': [
-+                  '../base/allocator/allocator.gyp:allocator',
-+                ],
-+              },
-+            ],
-+          ],
-           'dependencies': [
-             '../build/linux/system.gyp:gtk',
-           ],

www/chromium/patches/patch-chrome_common_chrome_paths_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/common/chrome_paths.cc.orig	Mon Jun  6 11:12:12 2011
-+++ chrome/common/chrome_paths.cc	Wed Jun  8 09:58:36 2011
-@@ -172,7 +172,7 @@ bool PathProvider(int key, FilePath* result) {
-       cur = cur.Append(FILE_PATH_LITERAL("inspector"));
-       break;
-     case chrome::DIR_APP_DICTIONARIES:
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_POSIX)
-       // We can't write into the EXE dir on Linux, so keep dictionaries
-       // alongside the safe browsing database in the user data dir.
-       // And we don't want to write into the bundle on the Mac, so push

www/chromium/patches/patch-chrome_common_chrome_switches_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/common/chrome_switches.cc.orig	Mon Jun  6 11:12:12 2011
-+++ chrome/common/chrome_switches.cc	Wed Jun  8 09:58:36 2011
-@@ -1045,7 +1045,7 @@ const char kForceStubLibcros[]              = "force-s
- const char kEnableAdvancedFileSystem[]      = "enable-advanced-fs";
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- // Specify the amount the trackpad should scroll by.
- const char kScrollPixels[]                  = "scroll-pixels";
- #endif

www/chromium/patches/patch-chrome_common_chrome_switches_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/common/chrome_switches.h.orig	Mon Jun  6 11:12:12 2011
-+++ chrome/common/chrome_switches.h	Wed Jun  8 09:58:36 2011
-@@ -294,7 +294,7 @@ extern const char kCompressSystemFeedback[];
- extern const char kSkipChromeOSComponents[];
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- extern const char kScrollPixels[];
- #endif
- 

www/chromium/patches/patch-chrome_common_service_process_util_posix_h

@@ -1,21 +0,0 @@
-$OpenBSD: patch-chrome_common_service_process_util_posix_h,v 1.2 2011/06/08 20:36:56 robert Exp $
---- chrome/common/service_process_util_posix.h.orig	Mon Jun  6 11:12:12 2011
-+++ chrome/common/service_process_util_posix.h	Wed Jun  8 09:58:36 2011
-@@ -14,7 +14,7 @@
- #include "base/message_loop.h"
- #include "base/message_pump_libevent.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "chrome/common/multi_process_lock.h"
- MultiProcessLock* TakeServiceRunningLock(bool waiting);
- #endif  // OS_LINUX
-@@ -72,7 +72,7 @@ struct ServiceProcessState::StateData
-   base::mac::ScopedCFTypeRef<CFDictionaryRef> launchd_conf_;
-   base::files::FilePathWatcher executable_watcher_;
- #endif  // OS_MACOSX
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   scoped_ptr<MultiProcessLock> initializing_lock_;
-   scoped_ptr<MultiProcessLock> running_lock_;
- #endif  // OS_LINUX

www/chromium/patches/patch-chrome_default_plugin_default_plugin_gyp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-chrome_default_plugin_default_plugin_gyp,v 1.3 2011/06/08 20:36:56 robert Exp $
---- chrome/default_plugin/default_plugin.gyp.orig	Mon Jun  6 11:12:13 2011
-+++ chrome/default_plugin/default_plugin.gyp	Wed Jun  8 09:58:36 2011
-@@ -50,7 +50,7 @@
-               'plugin_install_job_monitor.h',
-             ],
-          }],
--         ['OS=="linux"', {
-+         ['OS=="linux" or OS=="openbsd"', {
-             'dependencies': [
-               '<(DEPTH)/build/linux/system.gyp:gtk',
-             ],

www/chromium/patches/patch-chrome_test_automation_automation_proxy_uitest_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_test_automation_automation_proxy_uitest_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/test/automation/automation_proxy_uitest.cc.orig	Mon Jun  6 11:11:59 2011
-+++ chrome/test/automation/automation_proxy_uitest.cc	Wed Jun  8 09:58:36 2011
-@@ -1377,7 +1377,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MAYBE_UserGestur
+$OpenBSD: patch-chrome_test_automation_automation_proxy_uitest_cc,v 1.6 2011/08/16 08:17:44 robert Exp $
+--- chrome/test/automation/automation_proxy_uitest.cc.orig	Wed Jul 27 10:01:40 2011
++++ chrome/test/automation/automation_proxy_uitest.cc	Tue Aug  2 20:12:17 2011
+@@ -1382,7 +1382,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MAYBE_UserGestur
  #endif  // defined(OS_WIN)
  
  // TODO(port): Need to port autocomplete_edit_proxy.* first.
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_test_automation_automation_proxy_uitest_cc,v 1.5 2011/06/
  TEST_F(AutomationProxyTest, AutocompleteGetSetText) {
    scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
    ASSERT_TRUE(browser.get());
-@@ -1421,7 +1421,7 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy)
+@@ -1426,7 +1426,7 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy)
    EXPECT_EQ(text_to_set2, actual_text2);
  }
  

www/chromium/patches/patch-chrome_test_page_cycler_page_cycler_test_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_test_page_cycler_page_cycler_test_cc,v 1.3 2011/03/15 11:38:05 robert Exp $
---- chrome/test/page_cycler/page_cycler_test.cc.orig	Fri Mar 11 10:01:55 2011
-+++ chrome/test/page_cycler/page_cycler_test.cc	Mon Mar 14 10:55:37 2011
-@@ -318,7 +318,7 @@ class PageCyclerReferenceTest : public PageCyclerTest 
+$OpenBSD: patch-chrome_test_page_cycler_page_cycler_test_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
+--- chrome/test/page_cycler/page_cycler_test.cc.orig	Wed Jul 27 10:01:40 2011
++++ chrome/test/page_cycler/page_cycler_test.cc	Tue Aug  2 20:12:17 2011
+@@ -266,7 +266,7 @@ class PageCyclerReferenceTest : public PageCyclerTest 
      dir = dir.AppendASCII("reference_build");
  #if defined(OS_WIN)
      dir = dir.AppendASCII("chrome");

www/chromium/patches/patch-chrome_test_testing_browser_process_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_test_testing_browser_process_h,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/test/testing_browser_process.h.orig	Mon Jun  6 11:12:00 2011
-+++ chrome/test/testing_browser_process.h	Wed Jun  8 09:58:36 2011
-@@ -50,7 +50,7 @@ class TestingBrowserProcess : public BrowserProcess {
+$OpenBSD: patch-chrome_test_testing_browser_process_h,v 1.6 2011/08/16 08:17:44 robert Exp $
+--- chrome/test/testing_browser_process.h.orig	Wed Jul 27 10:01:40 2011
++++ chrome/test/testing_browser_process.h	Tue Aug  2 20:12:17 2011
+@@ -54,7 +54,7 @@ class TestingBrowserProcess : public BrowserProcess {
  
    virtual IOThread* io_thread();
  

www/chromium/patches/patch-chrome_test_ui_test_utils_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_test_ui_test_utils_cc,v 1.5 2011/06/08 20:36:56 robert Exp $
---- chrome/test/ui_test_utils.cc.orig	Mon Jun  6 11:12:00 2011
-+++ chrome/test/ui_test_utils.cc	Wed Jun  8 09:58:36 2011
-@@ -379,7 +379,7 @@ void RunMessageLoop() {
+$OpenBSD: patch-chrome_test_ui_test_utils_cc,v 1.6 2011/08/16 08:17:44 robert Exp $
+--- chrome/test/ui_test_utils.cc.orig	Wed Jul 27 10:01:40 2011
++++ chrome/test/ui_test_utils.cc	Tue Aug  2 20:12:17 2011
+@@ -289,7 +289,7 @@ void RunMessageLoop() {
  #if defined(TOOLKIT_VIEWS)
    views::AcceleratorHandler handler;
    loop->Run(&handler);

www/chromium/patches/patch-chrome_test_ui_ui_layout_test_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_test_ui_ui_layout_test_cc,v 1.2 2011/02/08 09:43:02 espie Exp $
---- chrome/test/ui/ui_layout_test.cc.orig	Fri Jan 21 10:20:39 2011
-+++ chrome/test/ui/ui_layout_test.cc	Sun Jan 23 23:27:34 2011
-@@ -19,7 +19,7 @@
+$OpenBSD: patch-chrome_test_ui_ui_layout_test_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- chrome/test/ui/ui_layout_test.cc.orig	Wed Jul 27 10:01:40 2011
++++ chrome/test/ui/ui_layout_test.cc	Tue Aug  2 20:12:17 2011
+@@ -20,7 +20,7 @@
  static const char kPlatformName[] = "chromium-win";
  #elif defined(OS_MACOSX)
  static const char kPlatformName[] = "chromium-mac";

www/chromium/patches/patch-chrome_test_ui_ui_test_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_test_ui_ui_test_cc,v 1.4 2011/06/08 20:36:56 robert Exp $
---- chrome/test/ui/ui_test.cc.orig	Mon Jun  6 11:12:00 2011
-+++ chrome/test/ui/ui_test.cc	Wed Jun  8 09:58:36 2011
-@@ -67,7 +67,7 @@ const wchar_t UITestBase::kFailedNoCrashService[] =
+$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[] =
      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).";

www/chromium/patches/patch-chrome_tools_build_linux_sed_sh

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_tools_build_linux_sed_sh,v 1.2 2011/02/08 09:43:02 espie Exp $
---- chrome/tools/build/linux/sed.sh.orig	Fri Jan 21 10:20:26 2011
-+++ chrome/tools/build/linux/sed.sh	Sun Jan 23 23:27:34 2011
+$OpenBSD: patch-chrome_tools_build_linux_sed_sh,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- chrome/tools/build/linux/sed.sh.orig	Wed Jul 27 10:01:55 2011
++++ chrome/tools/build/linux/sed.sh	Tue Aug  2 20:12:17 2011
 @@ -1,4 +1,4 @@
--#!/bin/bash
+-#!/bin/sh
 +#!/usr/bin/env bash
  
- # Copyright (c) 2009 The Chromium Authors. All rights reserved.
+ # Copyright (c) 2011 The Chromium Authors. All rights reserved.
  # Use of this source code is governed by a BSD-style license that can be

www/chromium/patches/patch-content_browser_browser_child_process_host_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-content_browser_browser_child_process_host_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- content/browser/browser_child_process_host.cc.orig	Mon Jun  6 11:11:28 2011
-+++ content/browser/browser_child_process_host.cc	Wed Jun  8 09:58:36 2011
-@@ -27,7 +27,7 @@
- #include "content/common/process_watcher.h"
- #include "content/common/result_codes.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "base/linux_util.h"
- #endif  // OS_LINUX
- 

www/chromium/patches/patch-content_browser_child_process_launcher_cc

@@ -1,108 +0,0 @@
-$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- content/browser/child_process_launcher.cc.orig	Wed Jun  8 12:16:03 2011
-+++ content/browser/child_process_launcher.cc	Wed Jun  8 18:19:53 2011
-@@ -20,7 +20,7 @@
- #if defined(OS_WIN)
- #include "base/file_path.h"
- #include "chrome/common/sandbox_policy.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "base/memory/singleton.h"
- #include "chrome/browser/crash_handler_host_linux.h"
- #include "content/browser/zygote_host_linux.h"
-@@ -45,7 +45,7 @@ class ChildProcessLauncher::Context
-       : client_(NULL),
-         client_thread_id_(BrowserThread::UI),
-         starting_(true)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-         , zygote_(false)
- #endif
-         {
-@@ -110,7 +110,7 @@ class ChildProcessLauncher::Context
-     handle = sandbox::StartProcessWithAccess(cmd_line, exposed_dir);
- #elif defined(OS_POSIX)
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-     // On Linux, we need to add some extra file descriptors for crash handling.
-     std::string process_type =
-         cmd_line->GetSwitchValueASCII(switches::kProcessType);
-@@ -151,7 +151,7 @@ class ChildProcessLauncher::Context
-           ipcfd,
-           kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-       if (crash_signal_fd >= 0) {
-         fds_to_map.push_back(std::make_pair(
-             crash_signal_fd,
-@@ -200,20 +200,20 @@ class ChildProcessLauncher::Context
-         NewRunnableMethod(
-             this,
-             &ChildProcessLauncher::Context::Notify,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-             use_zygote,
- #endif
-             handle));
-   }
- 
-   void Notify(
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-       bool zygote,
- #endif
-       base::ProcessHandle handle) {
-     starting_ = false;
-     process_.set_handle(handle);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-     zygote_ = zygote;
- #endif
-     if (client_) {
-@@ -233,7 +233,7 @@ class ChildProcessLauncher::Context
-         BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
-         NewRunnableFunction(
-             &ChildProcessLauncher::Context::TerminateInternal,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-             zygote_,
- #endif
-             process_.handle()));
-@@ -246,7 +246,7 @@ class ChildProcessLauncher::Context
-   }
- 
-   static void TerminateInternal(
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-       bool zygote,
- #endif
-       base::ProcessHandle handle) {
-@@ -256,7 +256,7 @@ class ChildProcessLauncher::Context
-     process.Terminate(ResultCodes::NORMAL_EXIT);
-     // On POSIX, we must additionally reap the child.
- #if defined(OS_POSIX)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-     if (zygote) {
-       // If the renderer was created via a zygote, we have to proxy the reaping
-       // through the zygote process.
-@@ -275,7 +275,7 @@ class ChildProcessLauncher::Context
-   base::Process process_;
-   bool starting_;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   bool zygote_;
- #endif
- };
-@@ -321,7 +321,7 @@ base::TerminationStatus ChildProcessLauncher::GetChild
-     int* exit_code) {
-   base::TerminationStatus status;
-   base::ProcessHandle handle = context_->process_.handle();
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   if (context_->zygote_) {
-     status = ZygoteHost::GetInstance()->GetTerminationStatus(handle, exit_code);
-   } else

www/chromium/patches/patch-content_browser_renderer_host_browser_render_process_host_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_browser_renderer_host_browser_render_process_host_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/browser/renderer_host/browser_render_process_host.cc.orig	Mon Jun  6 11:11:28 2011
-+++ content/browser/renderer_host/browser_render_process_host.cc	Wed Jun  8 10:21:22 2011
-@@ -921,7 +921,7 @@ TransportDIB* BrowserRenderProcessHost::MapTransportDI
+$OpenBSD: patch-content_browser_renderer_host_browser_render_process_host_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/browser/renderer_host/browser_render_process_host.cc.orig	Wed Jul 27 10:01:08 2011
++++ content/browser/renderer_host/browser_render_process_host.cc	Tue Aug  2 20:12:17 2011
+@@ -715,7 +715,7 @@ TransportDIB* BrowserRenderProcessHost::MapTransportDI
    HANDLE section = chrome::GetSectionFromProcess(
        dib_id.handle, GetHandle(), false /* read write */);
    return TransportDIB::Map(section);

www/chromium/patches/patch-content_browser_renderer_host_mock_render_process_host_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_browser_renderer_host_mock_render_process_host_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- content/browser/renderer_host/mock_render_process_host.cc.orig	Thu Apr 28 11:27:05 2011
-+++ content/browser/renderer_host/mock_render_process_host.cc	Thu Apr 28 11:27:14 2011
-@@ -106,7 +106,7 @@ TransportDIB* MockRenderProcessHost::GetTransportDIB(T
+$OpenBSD: patch-content_browser_renderer_host_mock_render_process_host_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/browser/renderer_host/mock_render_process_host.cc.orig	Wed Jul 27 10:01:08 2011
++++ content/browser/renderer_host/mock_render_process_host.cc	Tue Aug  2 20:12:17 2011
+@@ -99,7 +99,7 @@ TransportDIB* MockRenderProcessHost::GetTransportDIB(T
    DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(),
                    &duped, 0, TRUE, DUPLICATE_SAME_ACCESS);
    transport_dib_ = TransportDIB::Map(duped);

www/chromium/patches/patch-content_browser_renderer_host_render_message_filter_cc

@@ -1,17 +1,17 @@
-$OpenBSD: patch-content_browser_renderer_host_render_message_filter_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- content/browser/renderer_host/render_message_filter.cc.orig	Wed Jun  8 12:17:34 2011
-+++ content/browser/renderer_host/render_message_filter.cc	Wed Jun  8 15:45:53 2011
-@@ -365,7 +365,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC:
+$OpenBSD: patch-content_browser_renderer_host_render_message_filter_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- content/browser/renderer_host/render_message_filter.cc.orig	Tue Aug  2 20:34:28 2011
++++ content/browser/renderer_host/render_message_filter.cc	Tue Aug  2 20:34:57 2011
+@@ -360,7 +360,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC:
+                         OnCheckNotificationPermission)
      IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateSharedMemoryBuffer,
                          OnAllocateSharedMemoryBuffer)
-     IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL)
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_OPENBSD)
      IPC_MESSAGE_HANDLER(ViewHostMsg_AllocTransportDIB, OnAllocTransportDIB)
      IPC_MESSAGE_HANDLER(ViewHostMsg_FreeTransportDIB, OnFreeTransportDIB)
  #endif
-@@ -740,7 +740,7 @@ ChromeURLRequestContext* RenderMessageFilter::GetReque
-       context_getter->GetURLRequestContext());
+@@ -647,7 +647,7 @@ net::URLRequestContext* RenderMessageFilter::GetReques
+   return context_getter->GetURLRequestContext();
  }
  
 -#if defined(OS_MACOSX)

www/chromium/patches/patch-content_browser_renderer_host_render_sandbox_host_linux_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-content_browser_renderer_host_render_sandbox_host_linux_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- content/browser/renderer_host/render_sandbox_host_linux.cc.orig	Thu Apr 28 11:28:33 2011
-+++ content/browser/renderer_host/render_sandbox_host_linux.cc	Thu Apr 28 11:29:21 2011
+$OpenBSD: patch-content_browser_renderer_host_render_sandbox_host_linux_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/browser/renderer_host/render_sandbox_host_linux.cc.orig	Tue Aug  2 20:35:04 2011
++++ content/browser/renderer_host/render_sandbox_host_linux.cc	Tue Aug  2 20:35:27 2011
 @@ -335,7 +335,7 @@ class SandboxIPCProcess  {
        return;
      }
@@ -10,16 +10,3 @@ $OpenBSD: patch-content_browser_renderer_host_render_sandbox_host_linux_cc,v 1.1
      if (!pickle.ReadUInt64(&iter, &inode))
        return;
  
-@@ -665,7 +665,12 @@ void RenderSandboxHostLinux::Init(const std::string& s
-   // inherit some sockets. With PF_UNIX+SOCK_DGRAM, it can call sendmsg to send
-   // a datagram to any (abstract) socket on the same system. With
-   // SOCK_SEQPACKET, this is prevented.
-+#if defined(OS_OPENBSD)
-+  if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) != 0)
-+    CHECK(socketpair(AF_UNIX, SOCK_DGRAM, 0, fds) == 0);
-+#else
-   CHECK(socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
-+#endif
- 
-   renderer_socket_ = fds[0];
-   const int browser_socket = fds[1];

www/chromium/patches/patch-content_browser_renderer_host_render_widget_helper_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-content_browser_renderer_host_render_widget_helper_h,v 1.1 2011/04/29 13:18:01 robert Exp $
---- content/browser/renderer_host/render_widget_helper.h.orig	Thu Apr 28 11:30:04 2011
-+++ content/browser/renderer_host/render_widget_helper.h	Thu Apr 28 11:30:17 2011
+$OpenBSD: patch-content_browser_renderer_host_render_widget_helper_h,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/browser/renderer_host/render_widget_helper.h.orig	Wed Jul 27 10:01:08 2011
++++ content/browser/renderer_host/render_widget_helper.h	Tue Aug  2 20:12:17 2011
 @@ -112,7 +112,7 @@ class RenderWidgetHelper
                          const base::TimeDelta& max_delay,
                          IPC::Message* msg);
@@ -21,7 +21,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_widget_helper_h,v 1.1 2011/
    // browser, and it is the caller's repsonsibility to call
 @@ -184,7 +184,7 @@ class RenderWidgetHelper
    // Called on the IO thread to resume a cross-site response.
-   void OnCrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
+   void OnCrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
  
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_OPENBSD)

www/chromium/patches/patch-content_browser_tab_contents_tab_contents_cc

@@ -1,21 +0,0 @@
-$OpenBSD: patch-content_browser_tab_contents_tab_contents_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- content/browser/tab_contents/tab_contents.cc.orig	Mon Jun  6 11:11:27 2011
-+++ content/browser/tab_contents/tab_contents.cc	Wed Jun  8 09:58:36 2011
-@@ -289,7 +289,7 @@ TabContents::TabContents(Profile* profile,
- 
-   registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,
-                  NotificationService::AllSources());
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
-   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
-                  NotificationService::AllSources());
- #endif
-@@ -2471,7 +2471,7 @@ void TabContents::Observe(NotificationType type,
-       break;
-     }
- 
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
-     case NotificationType::BROWSER_THEME_CHANGED: {
-       renderer_preferences_util::UpdateFromSystemSettings(
-           &renderer_preferences_, profile());

www/chromium/patches/patch-content_browser_zygote_host_linux_cc

@@ -1,69 +1,24 @@
-$OpenBSD: patch-content_browser_zygote_host_linux_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- content/browser/zygote_host_linux.cc.orig	Mon Jun  6 11:11:28 2011
-+++ content/browser/zygote_host_linux.cc	Wed Jun  8 18:13:20 2011
-@@ -61,7 +61,12 @@ ZygoteHost::ZygoteHost()
- }
+$OpenBSD: patch-content_browser_zygote_host_linux_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- content/browser/zygote_host_linux.cc.orig	Wed Aug  3 12:02:53 2011
++++ content/browser/zygote_host_linux.cc	Wed Aug  3 12:04:23 2011
+@@ -301,7 +301,9 @@ void ZygoteHost::AdjustRendererOOMScore(base::ProcessH
+     std::vector<std::string> adj_oom_score_cmdline;
  
- ZygoteHost::~ZygoteHost() {
-+  Pickle pickle;
-   if (init_)
-+#if defined(OS_OPENBSD)
-+    pickle.WriteInt(kCmdEnd);
-+    HANDLE_EINTR(write(control_fd_, pickle.data(), pickle.size()));
+     adj_oom_score_cmdline.push_back(sandbox_binary_);
++#if !defined(OS_OPENBSD)
+     adj_oom_score_cmdline.push_back(base::kAdjustOOMScoreSwitch);
 +#endif
-     close(control_fd_);
- }
- 
-@@ -81,7 +86,12 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) 
-   cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess);
- 
-   int fds[2];
-+#if defined(OS_OPENBSD)
-+  if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) != 0)
-+    CHECK(socketpair(PF_UNIX, SOCK_DGRAM, 0, fds) == 0);
-+#else
-   CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
-+#endif
-   base::file_handle_mapping_vector fds_to_map;
-   fds_to_map.push_back(std::make_pair(fds[1], 3));
- 
-@@ -153,6 +163,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) 
-     // We need to look for it.
-     // But first, wait for the zygote to tell us it's running.
-     // The sending code is in chrome/browser/zygote_main_linux.cc.
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-     std::vector<int> fds_vec;
-     const int kExpectedLength = sizeof(kZygoteMagic);
-     char buf[kExpectedLength];
-@@ -184,6 +195,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) 
-       ProcessWatcher::EnsureProcessGetsReaped(process);
+     adj_oom_score_cmdline.push_back(base::Int64ToString(pid));
+     adj_oom_score_cmdline.push_back(base::IntToString(score));
+     CommandLine adj_oom_score_cmd(adj_oom_score_cmdline);
+@@ -310,8 +312,10 @@ void ZygoteHost::AdjustRendererOOMScore(base::ProcessH
+       ProcessWatcher::EnsureProcessGetsReaped(sandbox_helper_process);
      }
-   } else {
-+#endif
-     // Not using the SUID sandbox.
-     pid_ = process;
-   }
-@@ -250,12 +262,15 @@ pid_t ZygoteHost::ForkRenderer(
-       return base::kNullProcessHandle;
-   }
- 
-+#if defined(OS_LINUX)
-   const int kRendererScore = 5;
-   AdjustRendererOOMScore(pid, kRendererScore);
-+#endif
- 
-   return pid;
- }
- 
-+#if defined(OS_LINUX)
- void ZygoteHost::AdjustRendererOOMScore(base::ProcessHandle pid, int score) {
-   // 1) You can't change the oom_adj of a non-dumpable process (EPERM) unless
-   //    you're root. Because of this, we can't set the oom_adj from the browser
-@@ -307,6 +322,7 @@ void ZygoteHost::AdjustRendererOOMScore(base::ProcessH
+   } else if (!using_suid_sandbox_) {
++#if !defined(OS_OPENBSD)
+     if (!base::AdjustOOMScore(pid, score))
        PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
++#endif
    }
  }
-+#endif
  
- void ZygoteHost::EnsureProcessTerminated(pid_t process) {
-   DCHECK(init_);

www/chromium/patches/patch-content_browser_zygote_main_linux_cc

@@ -1,27 +1,8 @@
-$OpenBSD: patch-content_browser_zygote_main_linux_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- content/browser/zygote_main_linux.cc.orig	Mon Jun  6 11:11:28 2011
-+++ content/browser/zygote_main_linux.cc	Wed Jun  8 09:58:36 2011
-@@ -2,12 +2,18 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include "build/build_config.h"
-+
- #include <dlfcn.h>
- #include <fcntl.h>
- #include <pthread.h>
-+#if defined(OS_OPENBSD)
-+#include <signal.h>
-+#else
- #include <sys/epoll.h>
- #include <sys/prctl.h>
- #include <sys/signal.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -53,7 +59,7 @@
- #include "unicode/timezone.h"
+$OpenBSD: patch-content_browser_zygote_main_linux_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- content/browser/zygote_main_linux.cc.orig	Wed Aug  3 12:04:51 2011
++++ content/browser/zygote_main_linux.cc	Wed Aug  3 12:06:57 2011
+@@ -58,7 +58,7 @@
+ #endif
  
  #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \
 -    !defined(__clang__)
@@ -29,19 +10,7 @@ $OpenBSD: patch-content_browser_zygote_main_linux_cc,v 1.2 2011/06/08 20:36:56 r
  // 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
-@@ -176,6 +182,11 @@ class Zygote {
-         case ZygoteHost::kCmdGetSandboxStatus:
-           HandleGetSandboxStatus(fd, pickle, iter);
-           return false;
-+#if defined(OS_OPENBSD)
-+        case ZygoteHost::kCmdEnd:
-+          _exit(0);
-+          return false;
-+#endif
-         default:
-           NOTREACHED();
-           break;
-@@ -663,6 +674,7 @@ static bool EnterSandbox() {
+@@ -668,6 +668,7 @@ static bool EnterSandbox() {
      SkiaFontConfigSetImplementation(
          new FontConfigIPC(kMagicSandboxIPCDescriptor));
  
@@ -49,7 +18,7 @@ $OpenBSD: patch-content_browser_zygote_main_linux_cc,v 1.2 2011/06/08 20:36:56 r
      // 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
-@@ -688,6 +700,7 @@ static bool EnterSandbox() {
+@@ -693,6 +694,7 @@ static bool EnterSandbox() {
          return false;
        }
      }

www/chromium/patches/patch-content_common_common_param_traits_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_common_common_param_traits_h,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/common/common_param_traits.h.orig	Wed Jun  8 12:38:24 2011
-+++ content/common/common_param_traits.h	Wed Jun  8 15:23:37 2011
-@@ -187,7 +187,7 @@ struct ParamTraits<TransportDIB::Id> {
+$OpenBSD: patch-content_common_common_param_traits_h,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/common/common_param_traits.h.orig	Wed Jul 27 10:01:09 2011
++++ content/common/common_param_traits.h	Tue Aug  2 20:12:17 2011
+@@ -195,7 +195,7 @@ struct ParamTraits<TransportDIB::Id> {
  };
  #endif
  

www/chromium/patches/patch-content_common_gpu_x_util_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-content_common_gpu_x_util_h,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/common/gpu/x_util.h.orig	Wed Jun  8 10:30:44 2011
-+++ content/common/gpu/x_util.h	Wed Jun  8 10:30:51 2011
-@@ -12,7 +12,7 @@
- #include "build/build_config.h"
- #include "content/common/gpu/gpu_config.h"
- 
--#if defined(OS_LINUX)
-+#if defined(USE_X11)
- 
- // Forward declares ------------------------------------------------------------
- //

www/chromium/patches/patch-content_common_native_web_keyboard_event_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-content_common_native_web_keyboard_event_h,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/common/native_web_keyboard_event.h.orig	Mon Jun  6 11:11:28 2011
-+++ content/common/native_web_keyboard_event.h	Wed Jun  8 10:26:52 2011
-@@ -86,7 +86,7 @@ struct NativeWebKeyboardEvent : public WebKit::WebKeyb
-   // Currently, it's only used by Linux and Mac ports.
-   bool skip_in_browser;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   // True if the key event matches an edit command. In order to ensure the edit
-   // command always work in web page, the browser should not pre-handle this key
-   // event as a reserved accelerator. See http://crbug.com/54573

www/chromium/patches/patch-content_common_view_messages_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_common_view_messages_h,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/common/view_messages.h.orig	Wed Jun  8 10:30:17 2011
-+++ content/common/view_messages.h	Wed Jun  8 10:30:30 2011
-@@ -1783,7 +1783,7 @@ IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_AllocateShared
+$OpenBSD: patch-content_common_view_messages_h,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/common/view_messages.h.orig	Wed Jul 27 10:01:09 2011
++++ content/common/view_messages.h	Tue Aug  2 20:12:17 2011
+@@ -1773,7 +1773,7 @@ IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_AllocateShared
  IPC_MESSAGE_CONTROL1(ViewHostMsg_SuddenTerminationChanged,
                       bool /* enabled */)
  

www/chromium/patches/patch-content_content_browser_gypi

@@ -1,25 +1,12 @@
-$OpenBSD: patch-content_content_browser_gypi,v 1.2 2011/06/08 20:36:56 robert Exp $
---- content/content_browser.gypi.orig	Mon Jun  6 11:11:28 2011
-+++ content/content_browser.gypi	Wed Jun  8 09:58:36 2011
-@@ -348,7 +348,7 @@
-         ['OS=="win"', {
-           'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442',
-         }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
-           'dependencies': [
-             '../build/linux/system.gyp:dbus-glib',
-             # For FcLangSetAdd call in render_sandbox_host_linux.cc
-@@ -362,6 +362,12 @@
-             # TODO(mattm): Cert manager stuff is really !USE_NSS.
-             'browser/certificate_manager_model.cc',
-             'browser/certificate_manager_model.h',
-+          ],
-+        }],
-+        ['OS=="openbsd"', {
-+          'sources!': [
-+            'browser/geolocation/gateway_data_provider_linux.cc',
-+            'browser/geolocation/gateway_data_provider_linux.h',
-           ],
-         }],
-         ['OS=="linux" and chromeos==1', {
+$OpenBSD: patch-content_content_browser_gypi,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- content/content_browser.gypi.orig	Tue Aug  2 20:38:23 2011
++++ content/content_browser.gypi	Wed Aug  3 11:58:41 2011
+@@ -87,8 +87,6 @@
+         'browser/geolocation/empty_device_data_provider.h',
+         'browser/geolocation/gateway_data_provider_common.cc',
+         'browser/geolocation/gateway_data_provider_common.h',
+-        'browser/geolocation/gateway_data_provider_linux.cc',
+-        'browser/geolocation/gateway_data_provider_linux.h',
+         'browser/geolocation/gateway_data_provider_win.cc',
+         'browser/geolocation/gateway_data_provider_win.h',
+         'browser/geolocation/geolocation_dispatcher_host.cc',

www/chromium/patches/patch-content_plugin_plugin_thread_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-content_plugin_plugin_thread_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/plugin/plugin_thread.cc.orig	Wed Jun  8 10:31:33 2011
-+++ content/plugin/plugin_thread.cc	Wed Jun  8 10:31:59 2011
-@@ -49,7 +49,7 @@ PluginThread::PluginThread()
-           switches::kPluginPath);
- 
-   lazy_tls.Pointer()->Set(this);
--#if defined(OS_LINUX)
-+#if defined(LINUX) || defined(OPENBSD)
-   {
-     // XEmbed plugins assume they are hosted in a Gtk application, so we need
-     // to initialize Gtk in the plugin process.

www/chromium/patches/patch-content_plugin_webplugin_proxy_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_plugin_webplugin_proxy_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/plugin/webplugin_proxy.cc.orig	Wed Jun  8 10:33:06 2011
-+++ content/plugin/webplugin_proxy.cc	Wed Jun  8 10:33:14 2011
-@@ -400,7 +400,7 @@ void WebPluginProxy::UpdateGeometry(
+$OpenBSD: patch-content_plugin_webplugin_proxy_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/plugin/webplugin_proxy.cc.orig	Wed Jul 27 10:01:09 2011
++++ content/plugin/webplugin_proxy.cc	Tue Aug  2 20:12:17 2011
+@@ -409,7 +409,7 @@ void WebPluginProxy::UpdateGeometry(
      const TransportDIB::Handle& windowless_buffer,
      const TransportDIB::Handle& background_buffer,
      bool transparent

www/chromium/patches/patch-content_plugin_webplugin_proxy_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_plugin_webplugin_proxy_h,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/plugin/webplugin_proxy.h.orig	Wed Jun  8 10:33:28 2011
-+++ content/plugin/webplugin_proxy.h	Wed Jun  8 10:33:41 2011
-@@ -112,7 +112,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin
+$OpenBSD: patch-content_plugin_webplugin_proxy_h,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/plugin/webplugin_proxy.h.orig	Wed Jul 27 10:01:09 2011
++++ content/plugin/webplugin_proxy.h	Tue Aug  2 20:12:17 2011
+@@ -113,7 +113,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin
                        const TransportDIB::Handle& windowless_buffer,
                        const TransportDIB::Handle& background_buffer,
                        bool transparent

www/chromium/patches/patch-content_renderer_pepper_plugin_delegate_impl_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_renderer_pepper_plugin_delegate_impl_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/pepper_plugin_delegate_impl.cc.orig	Wed Jun  8 10:34:09 2011
-+++ content/renderer/pepper_plugin_delegate_impl.cc	Wed Jun  8 10:34:29 2011
-@@ -112,7 +112,7 @@ class PlatformImage2DImpl
+$OpenBSD: patch-content_renderer_pepper_plugin_delegate_impl_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/renderer/pepper_plugin_delegate_impl.cc.orig	Wed Jul 27 10:01:09 2011
++++ content/renderer/pepper_plugin_delegate_impl.cc	Tue Aug  2 20:12:17 2011
+@@ -116,7 +116,7 @@ class PlatformImage2DImpl
          dib_(dib) {
    }
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_pepper_plugin_delegate_impl_cc,v 1.1 2011/06/08
    // On Mac, we have to tell the browser to free the transport DIB.
    virtual ~PlatformImage2DImpl() {
      if (dib_.get()) {
-@@ -130,7 +130,7 @@ class PlatformImage2DImpl
+@@ -134,7 +134,7 @@ class PlatformImage2DImpl
      *byte_count = dib_->size();
  #if defined(OS_WIN)
      return reinterpret_cast<intptr_t>(dib_->handle());
@@ -19,7 +19,7 @@ $OpenBSD: patch-content_renderer_pepper_plugin_delegate_impl_cc,v 1.1 2011/06/08
      return static_cast<intptr_t>(dib_->handle().fd);
  #elif defined(OS_LINUX)
      return static_cast<intptr_t>(dib_->handle());
-@@ -758,7 +758,7 @@ PepperPluginDelegateImpl::CreateImage2D(int width, int
+@@ -774,7 +774,7 @@ PepperPluginDelegateImpl::CreateImage2D(int width, int
    uint32 buffer_size = width * height * 4;
  
    // Allocate the transport DIB and the PlatformCanvas pointing to it.

www/chromium/patches/patch-content_renderer_render_process_impl_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_renderer_render_process_impl_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/render_process_impl.cc.orig	Wed Jun  8 10:35:21 2011
-+++ content/renderer/render_process_impl.cc	Wed Jun  8 10:36:00 2011
-@@ -128,7 +128,7 @@ TransportDIB* RenderProcessImpl::CreateTransportDIB(si
+$OpenBSD: patch-content_renderer_render_process_impl_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/renderer/render_process_impl.cc.orig	Wed Jul 27 10:01:09 2011
++++ content/renderer/render_process_impl.cc	Tue Aug  2 20:12:17 2011
+@@ -124,7 +124,7 @@ TransportDIB* RenderProcessImpl::CreateTransportDIB(si
  #if defined(OS_WIN) || defined(OS_LINUX)
    // Windows and Linux create transport DIBs inside the renderer
    return TransportDIB::Create(size, transport_dib_next_sequence_number_++);
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_render_process_impl_cc,v 1.1 2011/06/08 20:36:5
    // Mac creates transport DIBs in the browser, so we need to do a sync IPC to
    // get one.  The TransportDIB is cached in the browser.
    TransportDIB::Handle handle;
-@@ -145,7 +145,7 @@ void RenderProcessImpl::FreeTransportDIB(TransportDIB*
+@@ -141,7 +141,7 @@ void RenderProcessImpl::FreeTransportDIB(TransportDIB*
    if (!dib)
      return;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-content_renderer_render_process_impl_cc,v 1.1 2011/06/08 20:36:5
    // On Mac we need to tell the browser that it can drop a reference to the
    // shared memory.
    IPC::Message* msg = new ViewHostMsg_FreeTransportDIB(dib->id());
-@@ -163,7 +163,7 @@ skia::PlatformCanvas* RenderProcessImpl::GetDrawingCan
+@@ -159,7 +159,7 @@ skia::PlatformCanvas* RenderProcessImpl::GetDrawingCan
    int width = rect.width();
    int height = rect.height();
    const size_t stride = skia::PlatformCanvas::StrideForWidth(rect.width());

www/chromium/patches/patch-content_renderer_render_view_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-content_renderer_render_view_h,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/render_view.h.orig	Wed Jun  8 10:36:38 2011
-+++ content/renderer/render_view.h	Wed Jun  8 10:36:49 2011
-@@ -883,7 +883,7 @@ class RenderView : public RenderWidget,
-   // periodic timer so we don't send too many messages.
-   void SyncNavigationState();
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   void UpdateFontRenderingFromRendererPrefs();
- #else
-   void UpdateFontRenderingFromRendererPrefs() {}

www/chromium/patches/patch-content_renderer_render_widget_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_renderer_render_widget_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/render_widget.cc.orig	Wed Jun  8 12:09:55 2011
-+++ content/renderer/render_widget.cc	Wed Jun  8 12:10:02 2011
-@@ -912,7 +912,7 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB
+$OpenBSD: patch-content_renderer_render_widget_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/renderer/render_widget.cc.orig	Wed Jul 27 10:01:09 2011
++++ content/renderer/render_widget.cc	Tue Aug  2 20:12:17 2011
+@@ -1110,7 +1110,7 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB
        // Close our unused handle.
  #if defined(OS_WIN)
        ::CloseHandle(dib_handle);

www/chromium/patches/patch-content_renderer_renderer_glue_cc

@@ -1,16 +1,16 @@
-$OpenBSD: patch-content_renderer_renderer_glue_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/renderer_glue.cc.orig	Wed Jun  8 12:10:26 2011
-+++ content/renderer/renderer_glue.cc	Wed Jun  8 12:10:40 2011
+$OpenBSD: patch-content_renderer_renderer_glue_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/renderer/renderer_glue.cc.orig	Tue Aug  2 20:39:21 2011
++++ content/renderer/renderer_glue.cc	Tue Aug  2 20:39:37 2011
 @@ -34,7 +34,7 @@
  #include "webkit/glue/webkit_glue.h"
  #include "webkit/glue/websocketstreamhandle_bridge.h"
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include "content/renderer/renderer_sandbox_support_linux.h"
+ #include "content/common/child_process_sandbox_support_linux.h"
  #endif
  
-@@ -259,7 +259,7 @@ void EnableSpdy(bool enable) {
+@@ -255,7 +255,7 @@ void EnableSpdy(bool enable) {
    RenderThread::current()->EnableSpdy(enable);
  }
  
@@ -18,4 +18,4 @@ $OpenBSD: patch-content_renderer_renderer_glue_cc,v 1.1 2011/06/08 20:36:56 robe
 +#if defined(OS_LINUX) || defined(OS_OPENBSD)
  int MatchFontWithFallback(const std::string& face, bool bold,
                            bool italic, int charset) {
-   return renderer_sandbox_support::MatchFontWithFallback(
+   return child_process_sandbox_support::MatchFontWithFallback(

www/chromium/patches/patch-content_renderer_renderer_main_cc

@@ -1,21 +0,0 @@
-$OpenBSD: patch-content_renderer_renderer_main_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/renderer_main.cc.orig	Wed Jun  8 12:10:51 2011
-+++ content/renderer/renderer_main.cc	Wed Jun  8 12:11:06 2011
-@@ -205,7 +205,7 @@ int RendererMain(const MainFunctionParams& parameters)
-   PepperPluginRegistry::GetInstance();
- 
-   {
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_OPENBSD)
-     // TODO(markus): Check if it is OK to unconditionally move this
-     // instruction down.
-     RenderProcessImpl render_process;
-@@ -217,7 +217,7 @@ int RendererMain(const MainFunctionParams& parameters)
-     } else {
-       LOG(ERROR) << "Running without renderer sandbox";
-     }
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-     RenderProcessImpl render_process;
-     render_process.set_main_thread(new RenderThread());
- #endif

www/chromium/patches/patch-content_renderer_renderer_webkitclient_impl_cc

@@ -1,30 +0,0 @@
-$OpenBSD: patch-content_renderer_renderer_webkitclient_impl_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/renderer_webkitclient_impl.cc.orig	Mon Jun  6 11:11:28 2011
-+++ content/renderer/renderer_webkitclient_impl.cc	Wed Jun  8 12:11:52 2011
-@@ -58,7 +58,7 @@
- #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h"
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include <string>
- #include <map>
- 
-@@ -116,7 +116,7 @@ class RendererWebKitClientImpl::SandboxSupport
-   virtual bool ensureFontLoaded(HFONT);
- #elif defined(OS_MACOSX)
-   virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-   virtual WebKit::WebString getFontFamilyForCharacters(
-       const WebKit::WebUChar* characters,
-       size_t numCharacters,
-@@ -435,7 +435,7 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureF
-   return RenderThread::current()->Send(new ViewHostMsg_PreCacheFont(logfont));
- }
- 
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD)
- 
- WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
-     const WebKit::WebUChar* characters,

www/chromium/patches/patch-content_renderer_webplugin_delegate_proxy_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- content/renderer/webplugin_delegate_proxy.cc.orig	Wed Jun  8 10:27:33 2011
-+++ content/renderer/webplugin_delegate_proxy.cc	Wed Jun  8 10:28:45 2011
-@@ -155,7 +155,7 @@ class ResourceClientProxy : public webkit::npapi::WebP
+$OpenBSD: patch-content_renderer_webplugin_delegate_proxy_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- content/renderer/webplugin_delegate_proxy.cc.orig	Wed Jul 27 10:01:09 2011
++++ content/renderer/webplugin_delegate_proxy.cc	Tue Aug  2 20:12:17 2011
+@@ -157,7 +157,7 @@ class ResourceClientProxy : public webkit::npapi::WebP
    bool multibyte_response_expected_;
  };
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/06/08 20
  static void ReleaseTransportDIB(TransportDIB* dib) {
    if (dib) {
      IPC::Message* message = new ViewHostMsg_FreeTransportDIB(dib->id());
-@@ -181,7 +181,7 @@ WebPluginDelegateProxy::WebPluginDelegateProxy(
+@@ -183,7 +183,7 @@ WebPluginDelegateProxy::WebPluginDelegateProxy(
  }
  
  WebPluginDelegateProxy::~WebPluginDelegateProxy() {
@@ -19,7 +19,7 @@ $OpenBSD: patch-content_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/06/08 20
    // Ask the browser to release old TransportDIB objects for which no
    // PluginHostMsg_UpdateGeometry_ACK was ever received from the plugin
    // process.
-@@ -533,7 +533,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx:
+@@ -542,7 +542,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx:
        bitmaps_changed = true;
  
        bool needs_background_store = transparent_;
@@ -28,7 +28,7 @@ $OpenBSD: patch-content_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/06/08 20
        // We don't support transparency under QuickDraw, and CoreGraphics
        // preserves transparency information (and does the compositing itself)
        // so plugins don't need access to the page background.
-@@ -605,7 +605,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx:
+@@ -614,7 +614,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx:
  }
  
  void WebPluginDelegateProxy::ResetWindowlessBitmaps() {
@@ -37,7 +37,7 @@ $OpenBSD: patch-content_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/06/08 20
    DCHECK(!background_store_.get());
    // The Mac TransportDIB implementation uses base::SharedMemory, which
    // cannot be disposed of if an in-flight UpdateGeometry message refers to
-@@ -666,12 +666,12 @@ bool WebPluginDelegateProxy::CreateSharedBitmap(
+@@ -675,12 +675,12 @@ bool WebPluginDelegateProxy::CreateSharedBitmap(
      scoped_ptr<TransportDIB>* memory,
      scoped_ptr<skia::PlatformCanvas>* canvas) {
    const size_t size = BitmapSizeForPluginRect(plugin_rect_);

www/chromium/patches/patch-crypto_nss_util_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-crypto_nss_util_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
---- crypto/nss_util.cc.orig	Wed Jun  8 10:16:52 2011
-+++ crypto/nss_util.cc	Wed Jun  8 10:17:40 2011
+$OpenBSD: patch-crypto_nss_util_cc,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- crypto/nss_util.cc.orig	Wed Jul 27 10:01:09 2011
++++ crypto/nss_util.cc	Tue Aug  2 20:12:17 2011
 @@ -16,6 +16,9 @@
  #if defined(OS_LINUX)
  #include <linux/nfs_fs.h>
@@ -34,4 +34,4 @@ $OpenBSD: patch-crypto_nss_util_cc,v 1.1 2011/06/08 20:36:56 robert Exp $
 +#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
  }
  
- // A helper class that acquires the SECMOD list read lock while the
+ PK11SlotInfo* FindSlotWithTokenName(const std::string& token_name) {

www/chromium/patches/patch-gpu_demos_demos_gyp

@@ -1,30 +0,0 @@
-$OpenBSD: patch-gpu_demos_demos_gyp,v 1.3 2011/06/08 20:36:56 robert Exp $
---- gpu/demos/demos.gyp.orig	Mon Jun  6 11:11:26 2011
-+++ gpu/demos/demos.gyp	Wed Jun  8 09:58:36 2011
-@@ -14,7 +14,7 @@
-       # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1"
-       # compiles everything with -fPIC. Disable pepper demos on linux/x64
-       # unless linux_fpic is 1.
--      ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
-+      ['(OS=="linux" or OS=="openbsd") and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
-         'enable_pepper_demos%': 0,
-       }, {
-         'enable_pepper_demos%': 1,
-@@ -51,7 +51,7 @@
-         'framework/window.h',
-       ],
-       'conditions': [
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
-           'dependencies': ['../../build/linux/system.gyp:gtk'],
-         }],
-       ],
-@@ -106,7 +106,7 @@
-           ],
-         },
-         'conditions': [
--          ['OS=="linux"', {
-+          ['OS=="linux" or OS=="openbsd"', {
-             # -gstabs, used in the official builds, causes an ICE. Remove it.
-             'cflags!': ['-gstabs'],
-           }],

www/chromium/patches/patch-gpu_demos_framework_main_exe_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-gpu_demos_framework_main_exe_cc,v 1.2 2011/06/08 20:36:56 robert Exp $
---- gpu/demos/framework/main_exe.cc.orig	Mon Jun  6 11:11:26 2011
-+++ gpu/demos/framework/main_exe.cc	Wed Jun  8 09:58:36 2011
+$OpenBSD: patch-gpu_demos_framework_main_exe_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- gpu/demos/framework/main_exe.cc.orig	Wed Jul 27 10:01:07 2011
++++ gpu/demos/framework/main_exe.cc	Tue Aug  2 20:12:18 2011
 @@ -8,9 +8,9 @@
  #include "gpu/demos/framework/window.h"
- #include "ui/gfx/gl/gl_context.h"
+ #include "ui/gfx/gl/gl_surface.h"
  
 -#if defined(OS_LINUX)
 +#if defined(TOOLKIT_USES_GTK)

www/chromium/patches/patch-gpu_gpu_gyp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-gpu_gpu_gyp,v 1.5 2011/06/08 20:36:56 robert Exp $
---- gpu/gpu.gyp.orig	Mon Jun  6 11:11:26 2011
-+++ gpu/gpu.gyp	Wed Jun  8 09:58:36 2011
-@@ -238,7 +238,7 @@
-         'command_buffer/service/texture_manager.cc',
-       ],
-       'conditions': [
--        ['OS == "linux"', {
-+        ['OS == "linux" or OS=="openbsd"', {
-           'dependencies': [
-             '../build/linux/system.gyp:gtk',
-           ],

www/chromium/patches/patch-ipc_ipc_channel_posix_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-ipc_ipc_channel_posix_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
---- ipc/ipc_channel_posix.cc.orig	Mon Jun  6 11:11:47 2011
-+++ ipc/ipc_channel_posix.cc	Wed Jun  8 13:48:07 2011
+$OpenBSD: patch-ipc_ipc_channel_posix_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
+--- ipc/ipc_channel_posix.cc.orig	Wed Jul 27 10:01:28 2011
++++ ipc/ipc_channel_posix.cc	Tue Aug  2 20:12:18 2011
 @@ -10,6 +10,7 @@
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -18,7 +18,7 @@ $OpenBSD: patch-ipc_ipc_channel_posix_cc,v 1.3 2011/06/08 20:36:56 robert Exp $
    // On OS X if sendmsg() is trying to send fds between processes and there
    // isn't enough room in the output buffer to send the fd structure over
    // atomically then EMSGSIZE is returned.
-@@ -927,7 +928,7 @@ bool Channel::ChannelImpl::HasAcceptedConnection() con
+@@ -926,7 +927,7 @@ bool Channel::ChannelImpl::HasAcceptedConnection() con
  
  bool Channel::ChannelImpl::GetClientEuid(uid_t* client_euid) const {
    DCHECK(HasAcceptedConnection());

www/chromium/patches/patch-ipc_ipc_gyp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-ipc_ipc_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $
---- ipc/ipc.gyp.orig	Fri Mar 11 10:01:33 2011
-+++ ipc/ipc.gyp	Mon Mar 14 10:55:37 2011
-@@ -63,7 +63,7 @@
-             '../build/linux/system.gyp:gtk',
-           ],
-         }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
-           'conditions': [
-             ['linux_use_tcmalloc==1', {
-               'dependencies': [

www/chromium/patches/patch-media_filters_ffmpeg_glue_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-media_filters_ffmpeg_glue_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- media/filters/ffmpeg_glue.cc.orig	Tue Apr 26 10:01:05 2011
-+++ media/filters/ffmpeg_glue.cc	Thu Apr 28 19:03:53 2011
-@@ -44,7 +44,7 @@ static int WriteContext(URLContext* h, unsigned char* 
+$OpenBSD: patch-media_filters_ffmpeg_glue_cc,v 1.4 2011/08/16 08:17:44 robert Exp $
+--- media/filters/ffmpeg_glue.cc.orig	Wed Jul 27 10:01:04 2011
++++ media/filters/ffmpeg_glue.cc	Tue Aug  2 20:12:18 2011
+@@ -45,7 +45,7 @@ static int WriteContext(URLContext* h, unsigned char* 
    return AVERROR_IO;
  }
  

www/chromium/patches/patch-media_media_gyp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-media_media_gyp,v 1.6 2011/06/08 20:36:56 robert Exp $
---- media/media.gyp.orig	Mon Jun  6 11:11:24 2011
-+++ media/media.gyp	Wed Jun  8 09:58:36 2011
-@@ -55,6 +55,8 @@
+$OpenBSD: patch-media_media_gyp,v 1.7 2011/08/16 08:17:44 robert Exp $
+--- media/media.gyp.orig	Wed Jul 27 10:01:05 2011
++++ media/media.gyp	Wed Aug  3 15:21:57 2011
+@@ -56,6 +56,8 @@
          'audio/linux/alsa_util.h',
          'audio/linux/alsa_wrapper.cc',
          'audio/linux/alsa_wrapper.h',
@@ -10,7 +10,7 @@ $OpenBSD: patch-media_media_gyp,v 1.6 2011/06/08 20:36:56 robert Exp $
          'audio/openbsd/audio_manager_openbsd.cc',
          'audio/openbsd/audio_manager_openbsd.h',
          'audio/mac/audio_input_mac.cc',
-@@ -193,6 +195,9 @@
+@@ -210,6 +212,9 @@
            'link_settings': {
              'libraries': [
                '-lasound',
@@ -20,7 +20,7 @@ $OpenBSD: patch-media_media_gyp,v 1.6 2011/06/08 20:36:56 robert Exp $
              ],
            },
          }],
-@@ -202,11 +207,14 @@
+@@ -219,11 +224,14 @@
                          ['exclude', '\\.mm?$' ] ],
            'link_settings': {
              'libraries': [
@@ -35,3 +35,19 @@ $OpenBSD: patch-media_media_gyp,v 1.6 2011/06/08 20:36:56 robert Exp $
              'audio/openbsd/audio_manager_openbsd.cc',
              'audio/openbsd/audio_manager_openbsd.h',
            ],
+@@ -669,7 +677,6 @@
+           ],
+           'libraries': [
+             '-lGL',
+-            '-ldl',
+           ],
+           'sources': [
+             'tools/tile_render_bench/tile_render_bench.cc',
+@@ -749,7 +756,6 @@
+           ],
+           'link_settings': {
+             'libraries': [
+-              '-ldl',
+               '-lX11',
+               '-lXrender',
+               '-lXext',

www/chromium/patches/patch-media_video_capture_linux_video_capture_device_linux_cc

@@ -0,0 +1,15 @@
+$OpenBSD: patch-media_video_capture_linux_video_capture_device_linux_cc,v 1.1 2011/08/16 08:17:44 robert Exp $
+--- media/video/capture/linux/video_capture_device_linux.cc.orig	Wed Aug  3 14:00:03 2011
++++ media/video/capture/linux/video_capture_device_linux.cc	Wed Aug  3 14:00:37 2011
+@@ -6,7 +6,11 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(OS_OPENBSD)
++#include <sys/videoio.h>
++#else
+ #include <linux/videodev2.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ 

www/chromium/patches/patch-native_client_build_common_gypi

@@ -1,7 +1,7 @@
-$OpenBSD: patch-native_client_build_common_gypi,v 1.4 2011/06/08 20:36:56 robert Exp $
---- native_client/build/common.gypi.orig	Mon Jun  6 11:13:06 2011
-+++ native_client/build/common.gypi	Wed Jun  8 09:58:36 2011
-@@ -359,7 +359,7 @@
+$OpenBSD: patch-native_client_build_common_gypi,v 1.5 2011/08/16 08:17:44 robert Exp $
+--- native_client/build/common.gypi.orig	Wed Jul 27 10:03:26 2011
++++ native_client/build/common.gypi	Tue Aug  2 20:12:19 2011
+@@ -371,7 +371,7 @@
      },
    },
    'conditions': [

www/chromium/patches/patch-native_client_src_shared_platform_platform_gyp

@@ -1,12 +1,12 @@
-$OpenBSD: patch-native_client_src_shared_platform_platform_gyp,v 1.2 2011/02/08 09:43:02 espie Exp $
---- native_client/src/shared/platform/platform.gyp.orig	Fri Jan 21 10:20:42 2011
-+++ native_client/src/shared/platform/platform.gyp	Sun Jan 23 23:27:35 2011
-@@ -60,7 +60,7 @@
-       'time.h',
+$OpenBSD: patch-native_client_src_shared_platform_platform_gyp,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- native_client/src/shared/platform/platform.gyp.orig	Wed Jul 27 10:03:20 2011
++++ native_client/src/shared/platform/platform.gyp	Tue Aug  2 20:12:19 2011
+@@ -36,7 +36,7 @@
+       'refcount_base.cc',
      ],
      'conditions': [
 -      ['OS=="linux"', {
 +      ['OS=="linux" or OS=="openbsd"', {
          'platform_sources': [
-           'linux/condition_variable.cc',
-           'linux/lock.cc',
+           'linux/condition_variable.c',
+           'linux/lock.c',

www/chromium/patches/patch-native_client_src_trusted_debug_stub_debug_stub_gyp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-native_client_src_trusted_debug_stub_debug_stub_gyp,v 1.1 2011/02/08 09:43:02 espie Exp $
---- native_client/src/trusted/debug_stub/debug_stub.gyp.orig	Fri Jan 21 10:20:44 2011
-+++ native_client/src/trusted/debug_stub/debug_stub.gyp	Sun Jan 23 23:27:35 2011
-@@ -16,7 +16,7 @@
+$OpenBSD: patch-native_client_src_trusted_debug_stub_debug_stub_gyp,v 1.2 2011/08/16 08:17:44 robert Exp $
+--- native_client/src/trusted/debug_stub/debug_stub.gyp.orig	Wed Jul 27 10:03:21 2011
++++ native_client/src/trusted/debug_stub/debug_stub.gyp	Tue Aug  2 20:12:19 2011
+@@ -17,7 +17,7 @@
        'transport_common.cc',
      ],
      'conditions': [
@@ -10,12 +10,12 @@ $OpenBSD: patch-native_client_src_trusted_debug_stub_debug_stub_gyp,v 1.1 2011/0
          'platform_sources': [
            'posix/debug_stub_posix.cc',
            'posix/mutex_impl.cc',
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
        'target_base': 'none',
      },
      'target_conditions': [
 -      ['OS=="linux" or OS=="mac"', {
 +      ['OS=="linux" or OS=="openbsd" or OS=="mac"', {
          'cflags': [
-           '-Wno-long-long',
+           '-fexceptions',
          ],

www/chromium/patches/patch-net_base_dns_reload_timer_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-net_base_dns_reload_timer_cc,v 1.1 2011/08/16 08:17:44 robert Exp $
+--- net/base/dns_reload_timer.cc.orig	Thu Aug  4 13:51:04 2011
++++ net/base/dns_reload_timer.cc	Thu Aug  4 13:51:18 2011
+@@ -4,7 +4,7 @@
+ 
+ #include "net/base/dns_reload_timer.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
+ #include "base/lazy_instance.h"
+ #include "base/threading/thread_local_storage.h"
+ #include "base/time.h"

www/chromium/patches/patch-net_base_dns_reload_timer_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-net_base_dns_reload_timer_h,v 1.1 2011/08/16 08:17:44 robert Exp $
+--- net/base/dns_reload_timer.h.orig	Thu Aug  4 13:51:26 2011
++++ net/base/dns_reload_timer.h	Thu Aug  4 13:51:32 2011
+@@ -8,7 +8,7 @@
+ 
+ #include "build/build_config.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
+ namespace net {
+ 
+ // DnsReloadTimerExpired tests the thread local DNS reload timer and, if it has

www/chromium/patches/patch-net_base_dnsrr_resolver_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-net_base_dnsrr_resolver_cc,v 1.2 2011/03/15 11:38:05 robert Exp $
---- net/base/dnsrr_resolver.cc.orig	Fri Mar 11 10:01:15 2011
-+++ net/base/dnsrr_resolver.cc	Mon Mar 14 10:55:37 2011
+$OpenBSD: patch-net_base_dnsrr_resolver_cc,v 1.3 2011/08/16 08:17:44 robert Exp $
+--- net/base/dnsrr_resolver.cc.orig	Wed Jul 27 10:01:11 2011
++++ net/base/dnsrr_resolver.cc	Thu Aug  4 13:50:43 2011
 @@ -4,6 +4,12 @@
  
  #include "net/base/dnsrr_resolver.h"
@@ -14,16 +14,35 @@ $OpenBSD: patch-net_base_dnsrr_resolver_cc,v 1.2 2011/03/15 11:38:05 robert Exp
  #if defined(OS_POSIX)
  #include <resolv.h>
  #endif
-@@ -185,10 +191,12 @@ class RRResolverWorker {
-     }
+@@ -186,7 +192,11 @@ class RRResolverWorker {
  
      bool r = true;
-+#if !defined(OS_OPENBSD)
      if ((_res.options & RES_INIT) == 0) {
++#if defined(OS_OPENBSD)
++      if (res_init() != 0)
++#else
        if (res_ninit(&_res) != 0)
++#endif
          r = false;
      }
-+#endif
  
-     if (r) {
+@@ -194,14 +204,18 @@ class RRResolverWorker {
        unsigned long saved_options = _res.options;
+       r = Do();
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
+       if (!r && DnsReloadTimerHasExpired()) {
+         // When there's no network connection, _res may not be initialized by
+         // getaddrinfo. Therefore, we call res_nclose only when there are ns
+         // entries.
++#if !defined(OS_OPENBSD)
+         if (_res.nscount > 0)
+           res_nclose(&_res);
+         if (res_ninit(&_res) == 0)
++#else
++        if (res_init() == 0)
++#endif
+           r = Do();
+       }
+ #endif