update to 54.0

www/iridium/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2016/08/25 20:00:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2016/10/27 18:30:40 robert Exp $
 
 USE_WXNEEDED=		Yes
 
@@ -7,18 +7,10 @@ DPB_PROPERTIES=		parallel
 
 COMMENT=		Iridium browser
 
-V=			51.1
+V=			54.0
 DISTNAME=		iridium-browser-${V}
 PKGNAME=		iridium-${V}
-REVISION=		2
-
-WRKDIST=		${WRKDIR}/${DISTNAME:S/rc1//}
-
-# The update from 43.4 to 43.5 is released as a patch
-# this time due to the size of the tarball.
-# XXX keep these lines for further releases
-#PATCHFILES+=		iridium-browser-44.0-rc1-final.diff
-#PATCH_DIST_STRIP=	-p1
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 
 CATEGORIES=		www
 
@@ -96,71 +88,49 @@ BUILDTYPE=	Debug
 BUILDTYPE=	Release
 .endif
 
+ALL_TARGET=	chrome
 TEST_TARGET=	base_unittests
 
 CONFIGURE_STYLE=none # prevent python MODULE from overriding do-build
-CONFIGURE_ENV=	CPPFLAGS="-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		GYP_GENERATORS=ninja
-
-ALL_TARGET=	chrome
 
 BUILDDIR=	${WRKSRC}/out/${BUILDTYPE}
 
-GYP_DEFS=	-Duse_system_bzip2=1 \
-		-Duse_system_libevent=1 \
-		-Duse_system_libjpeg=0 \
-		-Duse_system_libpng=1 \
-		-Duse_system_libusb=0 \
-		-Duse_system_libvpx=0 \
-		-Duse_system_libxml=1 \
-		-Duse_system_sqlite=0 \
-		-Duse_system_yasm=1 \
-		-Duse_system_zlib=0 \
-		-Duse_system_ssl=0 \
-		-Duse_system_icu=0 \
-		-Ddisable_nacl=1 \
-		-Dlinux_breakpad=0 \
-		-Duse_allocator=none \
-		-Dlinux_strip_binary=0 \
-		-Dlinux_use_heapchecker=0 \
-		-Denable_webrtc=0 \
-		-Denable_one_click_signin=1 \
-		-Duse_kerberos=0 \
-		-Duse_sndio=1 \
-		-Duse_aura=1 \
-		-Dclang=1 \
-		-Dclang_use_chrome_plugins=0 \
-		-Dwerror= \
-		-Dno_gc_sections=1 \
-		-Ddisable_fatal_linker_warnings=1 \
-		-Dv8_use_external_startup_data=0 \
-		-Dlibraries_for_target='-lestdc++' \
-		-DOS=openbsd
+# These libraries are used from the system and the build infrastructure
+# removes them from the bundled third_party directory and replaces them
+# with hooks to use them from the system.
+GN_SYSTEM_LIBS=	libevent \
+		libxml \
+		libxslt \
+		yasm
+
+GN_ARGS=	enable_nacl=false \
+		is_debug=false \
+		enable_webrtc=false \
+		enable_one_click_signin=true \
+		use_kerberos=false \
+		use_sndio=true \
+		use_cups=true \
+		is_clang=true \
+		use_sysroot=false \
+		treat_warnings_as_errors=false \
+		clang_use_chrome_plugins=false \
+		use_allocator=\"none\" \
+		extra_cppflags=\"-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include\" \
+		extra_ldflags=\"-L${LOCALBASE}/lib -L${X11BASE}/lib\"
 
 # Note: these keys are for OpenBSD use ONLY. For your own distribution,
 # please get your own set of keys. It's free!
-GYP_DEFS+=	-Dgoogle_api_key='AIzaSyA015yecfJyWi8UQpneQVrNzIKlxjv4MhI' \
-		-Dgoogle_default_client_id='451220141585.apps.googleusercontent.com' \
-		-Dgoogle_default_client_secret='nQcDyaBvDyCeDrsRqKIWSHJn' \
-		-Dffmpeg_branding=Chrome \
-		-Dproprietary_codecs=1
-
-.if ${MACHINE_ARCH} == "i386"
-CARCH=		i386
-.elif ${MACHINE_ARCH} == "amd64"
-CARCH=		x86_64
-.endif
-
-REL!=		uname -r
+GN_ARGS+=	google_api_key=\"AIzaSyA015yecfJyWi8UQpneQVrNzIKlxjv4MhI\" \
+		google_default_client_id=\"451220141585.apps.googleusercontent.com\" \
+		google_default_client_secret=\"nQcDyaBvDyCeDrsRqKIWSHJn\" \
+		ffmpeg_branding=\"Chrome\" \
+		proprietary_codecs=true
 
 .if ${FLAVOR:Mdebug}
-GYP_DEFS+=	-Dremove_webcore_debug_symbols=1
+GN_ARGS+=	remove_webcore_debug_symbols=true
 MAKE_ENV+=	V=1
 .endif
 
-MODPY_ADJ_FILES=build/linux/unbundle/replace_gyp_files.py
-
 pre-configure:
 	@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
 .for _arch in x64 ia32
@@ -170,29 +140,20 @@ pre-configure:
 	@mkdir -p ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd
 	@cp ${FILESDIR}/sndio_{out,in}put.{cc,h} ${WRKSRC}/media/audio/sndio
 	@cp ${FILESDIR}/audio_manager_openbsd.{cc,h} ${WRKSRC}/media/audio/openbsd
-	# XXX Create a missing html file to avoid a build failure (unused in the actual package)
-	@touch ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html
 
-# gyp_chromium generates all the Makefiles from gyp
+# Configuration consists of three steps:
+# 1. replace the specified bundled libraries with hooks to use the system libs
+# 2. bootstrap gn, the tool to generate ninja files
+# 3. run gn with the appropriate configuration arguments
 do-configure:
-	cd ${WRKSRC} && \
-		build/linux/unbundle/replace_gyp_files.py ${GYP_DEFS} && \
-		env -i ${CONFIGURE_ENV} ${MODPY_BIN} build/gyp_chromium \
-		${GYP_DEFS} "--depth=${WRKSRC}"
+	@cd ${WRKSRC} && env -i ${MAKE_ENV} build/linux/unbundle/replace_gn_files.py \
+		--system-libraries ${GN_SYSTEM_LIBS}
+	@cd ${WRKSRC}/tools/gn && env -i ${MAKE_ENV} ${MODPY_BIN} bootstrap/bootstrap.py \
+		--no-clean -s --gn-gen-args "${GN_ARGS}"
+	@cd ${WRKSRC} && env -i ${CONFIGURE_ENV} ${WRKSRC}/out/${BUILDTYPE}/gn \
+		gen --args="${GN_ARGS}" out/Release
 
 do-build:
-	# Build all the resources as the first step to avoid build failures
-	# due to internal dependency issues.
-	@cd ${WRKSRC}/out/${BUILDTYPE} && \
-	for _r in generate_version_info cloud_policy_proto net_interfaces suggestions \
-	cacheinvalidation cacheinvalidation_proto_cpp gfx_vector_icons \
-	data_reduction_proxy_proto cloud_policy_code_generate common_constants \
-	profile_reset_report_proto autofill_server_proto \
-	$$(ninja -t targets | grep -E '(bindings_mojom|mojo_bindings|resources): phony' | \
-		grep -v test | cut -d ':' -f1); do \
-		cd ${WRKSRC} && env -i ${MAKE_ENV} ninja \
-			-j ${MAKE_JOBS} -C out/${BUILDTYPE} $${_r}; \
-	done
 	@cd ${WRKSRC} && env -i ${MAKE_ENV} ninja \
 		-j ${MAKE_JOBS} -C out/${BUILDTYPE} ${ALL_TARGET}
 
@@ -205,14 +166,12 @@ do-install:
 	${INSTALL_DATA} ${BUILDDIR}/*.pak ${PREFIX}/iridium
 
 	${INSTALL_DATA_DIR} ${PREFIX}/iridium/locales
-	${INSTALL_DATA_DIR} ${PREFIX}/iridium/pseudo_locales
 	${INSTALL_DATA} ${BUILDDIR}/locales/* ${PREFIX}/iridium/locales
-	${INSTALL_DATA} ${BUILDDIR}/pseudo_locales/* ${PREFIX}/iridium/pseudo_locales
 	${INSTALL_DATA} ${BUILDDIR}/*.png ${PREFIX}/iridium
 	${INSTALL_DATA_DIR} ${PREFIX}/iridium/resources
 	@cp -Rp ${BUILDDIR}/resources/* ${PREFIX}/iridium/resources
 	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/iridium/resources
-.for f in protoc icudtl.dat mksnapshot
+.for f in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin
 	${INSTALL_DATA} ${BUILDDIR}/${f} ${PREFIX}/iridium
 .endfor
 .for s in 22 24 48 64 128 256

www/iridium/distinfo

@@ -1,2 +1,2 @@
-SHA256 (iridium-browser-51.1.tar.xz) = YUp81P4KW6V0lfx6+9QHwOXlnoiX2Yx4+W+Fnkyb+Ao=
-SIZE (iridium-browser-51.1.tar.xz) = 451315944
+SHA256 (iridium-browser-54.0.tar.xz) = D5O+66BiWReP3haUj3ErmXQIsUvQRxjHVjpUN0gRx04=
+SIZE (iridium-browser-54.0.tar.xz) = 546141012

www/iridium/files/audio_manager_openbsd.cc

@@ -4,6 +4,7 @@
 
 #include "media/audio/openbsd/audio_manager_openbsd.h"
 
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_output_dispatcher.h"
 #include "media/audio/sndio/sndio_input.h"
 #include "media/audio/sndio/sndio_output.h"
@@ -20,8 +21,7 @@ static const int kDefaultSampleRate = 48000;
 
 void AddDefaultDevice(AudioDeviceNames* device_names) {
   DCHECK(device_names->empty());
-  device_names->push_front(AudioDeviceName(AudioManager::GetDefaultDeviceName(),
-                                           AudioManagerBase::kDefaultDeviceId));
+  device_names->push_front(AudioDeviceName::CreateDefault());
 }
 
 bool AudioManagerOpenBSD::HasAudioOutputDevices() {
@@ -60,8 +60,13 @@ AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
       kDefaultSampleRate, 16, buffer_size);
 }
 
-AudioManagerOpenBSD::AudioManagerOpenBSD(AudioLogFactory* audio_log_factory)
-    : AudioManagerBase(audio_log_factory) {
+AudioManagerOpenBSD::AudioManagerOpenBSD(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+    AudioLogFactory* audio_log_factory)
+    : AudioManagerBase(std::move(task_runner),
+                       std::move(worker_task_runner),
+                       audio_log_factory) {
   DLOG(WARNING) << "AudioManagerOpenBSD";
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 }
@@ -71,27 +76,33 @@ AudioManagerOpenBSD::~AudioManagerOpenBSD() {
 }
 
 AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
-    const AudioParameters& params) {
+    const AudioParameters& params,
+    const LogCallback& log_callback) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return MakeOutputStream(params);
 }
 
 AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
     const AudioParameters& params,
-    const std::string& device_id) {
+    const std::string& device_id,
+    const LogCallback& log_callback) {
   DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   return MakeOutputStream(params);
 }
 
 AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
-    const AudioParameters& params, const std::string& device_id) {
+    const AudioParameters& params,
+    const std::string& device_id,
+    const LogCallback& log_callback) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return MakeInputStream(params);
 }
 
 AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
-    const AudioParameters& params, const std::string& device_id) {
+    const AudioParameters& params,
+    const std::string& device_id,
+    const LogCallback& log_callback) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   return MakeInputStream(params);
 }
@@ -127,7 +138,7 @@ AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
     const AudioParameters& params) {
   DLOG(WARNING) << "MakeInputStream";
   return new SndioAudioInputStream(this,
-             AudioManagerBase::kDefaultDeviceId, params);
+             AudioDeviceDescription::kDefaultDeviceId, params);
 }
 
 AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
@@ -136,11 +147,14 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
   return new SndioAudioOutputStream(params, this);
 }
 
-// TODO(xians): Merge AudioManagerOpenBSD with AudioManagerPulse;
-// static
-AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
+ScopedAudioManagerPtr CreateAudioManager(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+    AudioLogFactory* audio_log_factory) {
   DLOG(WARNING) << "CreateAudioManager";
-  return new AudioManagerOpenBSD(audio_log_factory);
+  return ScopedAudioManagerPtr(
+      new AudioManagerOpenBSD(std::move(task_runner),
+                              std::move(worker_task_runner),audio_log_factory));
 }
 
 }  // namespace media

www/iridium/files/audio_manager_openbsd.h

@@ -8,13 +8,17 @@
 #include <set>
 
 #include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
 #include "media/audio/audio_manager_base.h"
 
 namespace media {
 
 class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
  public:
-  AudioManagerOpenBSD(AudioLogFactory* audio_log_factory);
+  AudioManagerOpenBSD(
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+      AudioLogFactory* audio_log_factory);
 
   // Implementation of AudioManager.
   bool HasAudioOutputDevices() override;
@@ -27,14 +31,20 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
 
   // Implementation of AudioManagerBase.
   AudioOutputStream* MakeLinearOutputStream(
-      const AudioParameters& params) override;
+      const AudioParameters& params,
+      const LogCallback& log_callback) override;
   AudioOutputStream* MakeLowLatencyOutputStream(
       const AudioParameters& params,
-      const std::string& device_id) override;
+      const std::string& device_id,
+      const LogCallback& log_callback) override;
   AudioInputStream* MakeLinearInputStream(
-      const AudioParameters& params, const std::string& device_id) override;
+      const AudioParameters& params,
+      const std::string& device_id,
+      const LogCallback& log_callback) override;
   AudioInputStream* MakeLowLatencyInputStream(
-      const AudioParameters& params, const std::string& device_id) override;
+      const AudioParameters& params,
+      const std::string& device_id,
+      const LogCallback& log_callback) override;
 
  protected:
   ~AudioManagerOpenBSD() override;

www/iridium/files/sndio_input.h

@@ -11,12 +11,12 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "media/audio/agc_audio_stream.h"
 #include "media/audio/audio_io.h"
-#include "media/audio/audio_parameters.h"
+#include "media/audio/audio_device_description.h"
+#include "media/base/audio_parameters.h"
 
 namespace media {
 
@@ -89,9 +89,9 @@ class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
   AudioInputCallback* callback_;  // Valid during a recording session.
   base::TimeTicks next_read_time_;  // Scheduled time for next read callback.
   struct sio_hdl* device_handle_;  // Handle to the SNDIO PCM recording device.
-  scoped_ptr<uint8_t[]> audio_buffer_;  // Buffer used for reading audio data.
+  std::unique_ptr<uint8_t[]> audio_buffer_;  // Buffer used for reading audio data.
   bool read_callback_behind_schedule_;
-  scoped_ptr<AudioBus> audio_bus_;
+  std::unique_ptr<AudioBus> audio_bus_;
 
   int hw_delay_;
   int sndio_rec_bufsize_;

www/iridium/files/sndio_output.cc

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "media/audio/audio_parameters.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/sndio/sndio_output.h"
 

www/iridium/files/sndio_output.h

@@ -60,7 +60,7 @@ class SndioAudioOutputStream : public AudioOutputStream {
   // Parameters of the source
   AudioParameters params;
   // Source stores data here
-  scoped_ptr<AudioBus> audio_bus;
+  std::unique_ptr<AudioBus> audio_bus;
   // Call-back that produces data to play
   AudioSourceCallback* source;
   // Handle of the audio device

www/iridium/patches/patch-BUILD_gn

@@ -0,0 +1,87 @@
+$OpenBSD: patch-BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- BUILD.gn.orig.port	Wed Oct 12 21:02:52 2016
++++ BUILD.gn	Wed Oct 19 12:55:55 2016
+@@ -201,7 +201,7 @@ group("both_gn_and_gyp") {
+     ]
+   }
+ 
+-  if (!is_ios && !is_android && !is_chromecast) {
++  if (!is_ios && !is_android && !is_chromecast && !is_openbsd) {
+     deps += [
+       "//chrome",
+       "//chrome/test:browser_tests",
+@@ -432,7 +432,7 @@ group("both_gn_and_gyp") {
+     }
+   }
+ 
+-  if (is_linux || is_android) {
++  if ((is_linux && !is_openbsd) || is_android) {
+     deps += [
+       "//breakpad:breakpad_unittests",
+       "//breakpad:core-2-minidump",
+@@ -465,8 +465,6 @@ group("both_gn_and_gyp") {
+       "//net:disk_cache_memory_test",
+       "//net:quic_client",
+       "//net:quic_server",
+-      "//sandbox/linux:chrome_sandbox",
+-      "//sandbox/linux:sandbox_linux_unittests",
+     ]
+ 
+     if (use_dbus) {
+@@ -526,10 +524,6 @@ group("both_gn_and_gyp") {
+         "//chrome/test:sync_performance_tests",
+         "//chrome/test/chromedriver:chromedriver",
+         "//chrome/test/chromedriver:chromedriver_tests",
+-        "//courgette:courgette",
+-        "//courgette:courgette_fuzz",
+-        "//courgette:courgette_minimal_tool",
+-        "//courgette:courgette_unittests",
+         "//media/cast:generate_barcode_video",
+         "//media/cast:generate_timecode_audio",
+         "//net:crash_cache",
+@@ -575,10 +569,6 @@ group("both_gn_and_gyp") {
+ 
+   if (is_android || (is_linux && !is_chromeos)) {
+     deps += [
+-      "//breakpad:dump_syms($host_toolchain)",
+-      "//breakpad:microdump_stackwalk($host_toolchain)",
+-      "//breakpad:minidump_dump($host_toolchain)",
+-      "//breakpad:minidump_stackwalk($host_toolchain)",
+       "//components/network_hints/browser",
+       "//content/public/app:browser",
+       "//content/public/app:child",
+@@ -664,7 +654,7 @@ group("both_gn_and_gyp") {
+       deps +=
+           [ "//chrome/installer/mini_installer:next_version_mini_installer" ]
+     }
+-  } else if (!is_android && !is_ios) {
++  } else if (!is_android && !is_ios && !is_openbsd) {
+     deps += [ "//breakpad:symupload($host_toolchain)" ]
+   }
+ 
+@@ -906,7 +896,7 @@ if (!is_ios) {
+       ]
+     }
+ 
+-    if (!is_win && !is_android) {
++    if (!is_win && !is_android && !is_openbsd) {
+       deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
+     }
+ 
+@@ -917,7 +907,7 @@ if (!is_ios) {
+       ]
+     }
+ 
+-    if (is_linux) {
++    if (is_linux && !is_openbsd) {
+       deps += [ "//breakpad:dump_syms($host_toolchain)" ]
+     }
+ 
+@@ -966,7 +956,6 @@ group("chromium_builder_perf") {
+         "//third_party/angle/src/tests:angle_perftests",
+       ]
+     } else {
+-      deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
+     }
+   }
+ }

www/iridium/patches/patch-apps_apps_gypi

@@ -1,11 +0,0 @@
-$OpenBSD: patch-apps_apps_gypi,v 1.2 2015/05/06 14:27:23 robert Exp $
---- apps/apps.gypi.orig.port	Wed Nov 19 06:13:07 2014
-+++ apps/apps.gypi	Wed Nov 19 08:38:24 2014
-@@ -19,6 +19,7 @@
-         'chrome_resources.gyp:theme_resources',
-         'common/extensions/api/api.gyp:chrome_api',
-         '../skia/skia.gyp:skia',
-+        'chrome_resources.gyp:theme_resources',
-       ],
-       'include_dirs': [
-         '<(INTERMEDIATE_DIR)',

www/iridium/patches/patch-apps_ui_views_app_window_frame_view_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.3 2015/10/24 18:22:21 robert Exp $
+$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
 --- apps/ui/views/app_window_frame_view.cc.orig.port	Sat Aug 22 21:01:50 2015
 +++ apps/ui/views/app_window_frame_view.cc	Wed Sep  2 07:31:54 2015
 @@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()

www/iridium/patches/patch-ash_display_mirror_window_controller_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.5 2016/05/28 14:49:39 robert Exp $
---- ash/display/mirror_window_controller.cc.orig.port	Wed May 25 21:00:54 2016
-+++ ash/display/mirror_window_controller.cc	Thu May 26 08:09:39 2016
+$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.6 2016/10/27 18:30:40 robert Exp $
+--- ash/display/mirror_window_controller.cc.orig.port	Thu Sep  1 00:03:25 2016
++++ ash/display/mirror_window_controller.cc	Thu Sep  1 11:12:17 2016
 @@ -261,7 +261,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;
                         }) == display_info_list.end()) {

www/iridium/patches/patch-ash_shell_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-ash_shell_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- ash/shell.cc.orig.port	Tue Oct 25 21:56:43 2016
++++ ash/shell.cc	Tue Oct 25 21:57:45 2016
+@@ -698,7 +698,7 @@ void Shell::Init(const ShellInitParams& init_params) {
+ 
+   immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   DCHECK(in_mus_) << "linux desktop does not support ash.";
+ #endif
+ 

www/iridium/patches/patch-base_BUILD_gn

@@ -0,0 +1,32 @@
+$OpenBSD: patch-base_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/BUILD.gn.orig.port	Wed Oct 12 21:02:52 2016
++++ base/BUILD.gn	Wed Oct 19 12:55:55 2016
+@@ -1365,6 +1365,28 @@ component("base") {
+     }
+   }
+ 
++  if (is_openbsd) {
++    sources -= [
++      "debug/proc_maps_linux.cc",
++      "files/file_path_watcher_linux.cc",
++      "files/file_util_linux.cc",
++      "process/memory_linux.cc",
++      "process/process_linux.cc",
++      "sys_info_linux.cc",
++      "process/process_iterator_linux.cc",
++      "process/process_metrics_linux.cc",
++      "process/process_handle_linux.cc"
++    ]
++    sources += [
++      "process/memory_stubs.cc",
++      "process/process_handle_openbsd.cc",
++      "process/process_iterator_openbsd.cc",
++      "process/process_metrics_openbsd.cc",
++      "sys_info_openbsd.cc",
++      "files/file_path_watcher_stub.cc",
++    ]
++  }
++
+   # iOS
+   if (is_ios) {
+     set_sources_assignment_filter([])

www/iridium/patches/patch-base_atomicops_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_atomicops_h,v 1.2 2015/05/06 14:27:23 robert Exp $
+$OpenBSD: patch-base_atomicops_h,v 1.3 2016/10/27 18:30:40 robert Exp $
 --- base/atomicops.h.orig.port	Wed Apr 15 00:18:48 2015
 +++ base/atomicops.h	Wed Apr 15 08:32:49 2015
 @@ -66,7 +66,11 @@ typedef intptr_t Atomic64;

www/iridium/patches/patch-base_base_gypi

@@ -1,22 +0,0 @@
-$OpenBSD: patch-base_base_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $
---- base/base.gypi.orig.port	Wed May 25 21:00:55 2016
-+++ base/base.gypi	Thu May 26 08:09:39 2016
-@@ -1021,11 +1021,17 @@
-               'process/memory_stubs.cc',
-             ],
-             'sources/': [
-+              ['exclude', '^debug/proc_maps_linux\\.cc$'],
-               ['exclude', '^files/file_path_watcher_linux\\.cc$'],
--              ['exclude', '^files/file_path_watcher_stub\\.cc$'],
-+              ['exclude', '^files/file_path_watcher_kqueue\\.cc$'],
-               ['exclude', '^files/file_util_linux\\.cc$'],
-+              ['exclude', '^process/memory_linux\\.cc$'],
-               ['exclude', '^process/process_linux\\.cc$'],
-               ['exclude', '^sys_info_linux\\.cc$'],
-+              ['exclude', '^process/process_iterator_linux\\.cc$'],
-+              ['exclude', '^process/process_metrics_linux\\.cc$'],
-+              ['exclude', '^files/file_path_watcher_fsevents\\.cc$'],
-+              ['exclude', '^files/file_path_watcher_fsevents\\.h$'],
-             ],
-           }],
-           # Remove all unnecessary files for build_nexe.py to avoid exceeding

www/iridium/patches/patch-base_base_paths_posix_cc

@@ -1,8 +1,12 @@
-$OpenBSD: patch-base_base_paths_posix_cc,v 1.3 2016/05/28 14:49:39 robert Exp $
---- base/base_paths_posix.cc.orig.port	Wed May 25 04:54:06 2016
-+++ base/base_paths_posix.cc	Sat May 28 10:25:21 2016
-@@ -73,7 +73,7 @@ bool PathProviderPosix(int key, FilePath* result) {
-       if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
+$OpenBSD: patch-base_base_paths_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
+--- base/base_paths_posix.cc.orig.port	Thu Oct 27 14:43:06 2016
++++ base/base_paths_posix.cc	Thu Oct 27 14:43:25 2016
+@@ -70,10 +70,10 @@ bool PathProviderPosix(int key, FilePath* result) {
+ #elif defined(OS_OPENBSD)
+       // There is currently no way to get the executable path on OpenBSD
+       char* cpath;
+-      if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
++      if ((cpath = getenv("IRIDIUM_EXE_PATH")) != NULL)
          *result = FilePath(cpath);
        else
 -        *result = FilePath("/usr/local/chrome/chrome");

www/iridium/patches/patch-base_debug_debugger_posix_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.5 2016/05/28 14:49:39 robert Exp $
+$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.6 2016/10/27 18:30:40 robert Exp $
 --- base/debug/debugger_posix.cc.orig.port	Wed May 25 04:54:06 2016
 +++ base/debug/debugger_posix.cc	Thu May 26 08:09:39 2016
 @@ -32,6 +32,10 @@

www/iridium/patches/patch-base_debug_stack_trace_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_debug_stack_trace_h,v 1.3 2016/03/23 20:13:06 robert Exp $
+$OpenBSD: patch-base_debug_stack_trace_h,v 1.4 2016/10/27 18:30:40 robert Exp $
 --- base/debug/stack_trace.h.orig.port	Wed Feb 24 00:01:57 2016
 +++ base/debug/stack_trace.h	Thu Mar  3 09:43:25 2016
 @@ -14,6 +14,7 @@

www/iridium/patches/patch-base_debug_stack_trace_posix_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.7 2016/05/28 14:49:39 robert Exp $
---- base/debug/stack_trace_posix.cc.orig.port	Wed May 25 04:54:06 2016
-+++ base/debug/stack_trace_posix.cc	Thu May 26 08:09:39 2016
-@@ -572,6 +572,9 @@ class SandboxSymbolizeHelper {
+$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.8 2016/10/27 18:30:40 robert Exp $
+--- base/debug/stack_trace_posix.cc.orig.port	Wed Oct 12 21:02:52 2016
++++ base/debug/stack_trace_posix.cc	Wed Oct 19 12:55:56 2016
+@@ -571,6 +571,9 @@ class SandboxSymbolizeHelper {
    // for the modules that are loaded in the current process.
    // Returns true on success.
    bool CacheMemoryRegions() {
@@ -11,7 +11,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.7 2016/05/28 14:49:39 robert
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -587,6 +590,7 @@ class SandboxSymbolizeHelper {
+@@ -586,6 +589,7 @@ class SandboxSymbolizeHelper {
  
      is_initialized_ = true;
      return true;
@@ -19,7 +19,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.7 2016/05/28 14:49:39 robert
    }
  
    // Opens all object files and caches their file descriptors.
-@@ -717,7 +721,7 @@ StackTrace::StackTrace() {
+@@ -718,7 +722,7 @@ StackTrace::StackTrace() {
    // NOTE: This code MUST be async-signal safe (it's used by in-process
    // stack dumping signal handler). NO malloc or stdio is allowed here.
  

www/iridium/patches/patch-base_linux_util_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_linux_util_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/linux_util.cc.orig.port	Wed Oct 12 21:02:52 2016
++++ base/linux_util.cc	Wed Oct 19 12:55:56 2016
+@@ -115,7 +115,7 @@ char g_linux_distro[kDistroSize] =
+ #endif
+ 
+ std::string GetLinuxDistro() {
+-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
+   return g_linux_distro;
+ #elif defined(OS_LINUX)
+   LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();

www/iridium/patches/patch-base_message_loop_message_loop_cc

@@ -1,12 +0,0 @@
-$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.5 2016/05/28 14:49:39 robert Exp $
---- base/message_loop/message_loop.cc.orig.port	Wed May 25 21:00:55 2016
-+++ base/message_loop/message_loop.cc	Thu May 26 08:09:39 2016
-@@ -211,7 +211,7 @@ std::unique_ptr<MessagePump> MessageLoop::CreateMessag
- // TODO(rvargas): Get rid of the OS guards.
- #if defined(USE_GLIB) && !defined(OS_NACL)
-   typedef MessagePumpGlib MessagePumpForUI;
--#elif defined(OS_LINUX) && !defined(OS_NACL)
-+#elif defined(OS_BSD) && !defined(OS_NACL)
-   typedef MessagePumpLibevent MessagePumpForUI;
- #endif
- 

www/iridium/patches/patch-base_native_library_posix_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_native_library_posix_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/native_library_posix.cc.orig.port	Thu Oct 20 11:34:10 2016
++++ base/native_library_posix.cc	Thu Oct 20 11:34:27 2016
+@@ -30,7 +30,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
+   // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
+   // and http://crbug.com/40794.
+   int flags = RTLD_LAZY;
+-#if defined(OS_ANDROID)
++#if defined(OS_ANDROID) || defined(OS_BSD)
+   // Android dlopen() requires further investigation, as it might vary across
+   // versions. Crash here to warn developers that they're trying to rely on
+   // uncertain behavior.

www/iridium/patches/patch-base_posix_unix_domain_socket_linux_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.4 2015/10/24 18:22:21 robert Exp $
+$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
 --- base/posix/unix_domain_socket_linux.cc.orig.port	Sat Aug 22 21:01:50 2015
 +++ base/posix/unix_domain_socket_linux.cc	Wed Sep  2 07:31:54 2015
 @@ -5,7 +5,10 @@

www/iridium/patches/patch-base_process_launch_h

@@ -1,9 +1,9 @@
-$OpenBSD: patch-base_process_launch_h,v 1.5 2016/05/28 14:49:39 robert Exp $
---- base/process/launch.h.orig.port	Wed May 25 04:54:06 2016
-+++ base/process/launch.h	Thu May 26 08:09:39 2016
+$OpenBSD: patch-base_process_launch_h,v 1.6 2016/10/27 18:30:40 robert Exp $
+--- base/process/launch.h.orig.port	Wed Oct 12 21:02:52 2016
++++ base/process/launch.h	Wed Oct 19 12:55:56 2016
 @@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions {
    // will be the same as its pid.
-   bool new_process_group;
+   bool new_process_group = false;
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)

www/iridium/patches/patch-base_process_memory_cc

@@ -1,8 +1,17 @@
-$OpenBSD: patch-base_process_memory_cc,v 1.4 2016/03/23 20:13:06 robert Exp $
---- base/process/memory.cc.orig.port	Wed Feb 24 00:01:57 2016
-+++ base/process/memory.cc	Thu Mar  3 09:43:25 2016
-@@ -26,7 +26,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
- }
+$OpenBSD: patch-base_process_memory_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
+--- base/process/memory.cc.orig.port	Fri Oct 21 00:01:59 2016
++++ base/process/memory.cc	Sat Oct 22 15:54:28 2016
+@@ -10,7 +10,7 @@
+ namespace base {
+ 
+ // Defined in memory_win.cc for Windows.
+-#if !defined(OS_WIN)
++#if !defined(OS_WIN) && !defined(OS_BSD)
+ 
+ namespace {
+ 
+@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
+ #endif
  
  // Defined in memory_mac.mm for Mac.
 -#if !defined(OS_MACOSX)

www/iridium/patches/patch-base_process_process_handle_openbsd_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
+$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
 --- base/process/process_handle_openbsd.cc.orig.port	Thu Mar  3 09:47:09 2016
 +++ base/process/process_handle_openbsd.cc	Thu Mar  3 09:49:15 2016
 @@ -6,6 +6,8 @@

www/iridium/patches/patch-base_process_process_iterator_openbsd_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
+$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
 --- base/process/process_iterator_openbsd.cc.orig.port	Thu Mar  3 09:49:21 2016
 +++ base/process/process_iterator_openbsd.cc	Thu Mar  3 09:49:53 2016
 @@ -6,6 +6,9 @@

www/iridium/patches/patch-base_process_process_metrics_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_process_process_metrics_h,v 1.4 2016/05/28 14:49:39 robert Exp $
---- base/process/process_metrics.h.orig.port	Wed May 25 04:54:06 2016
-+++ base/process/process_metrics.h	Thu May 26 08:09:40 2016
-@@ -253,7 +253,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto
+$OpenBSD: patch-base_process_process_metrics_h,v 1.5 2016/10/27 18:30:40 robert Exp $
+--- base/process/process_metrics.h.orig.port	Wed Oct 12 21:02:53 2016
++++ base/process/process_metrics.h	Wed Oct 19 12:55:56 2016
+@@ -254,7 +254,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto
  #endif  // defined(OS_POSIX)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \

www/iridium/patches/patch-base_process_process_metrics_openbsd_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
---- base/process/process_metrics_openbsd.cc.orig.port	Thu Mar  3 09:50:00 2016
-+++ base/process/process_metrics_openbsd.cc	Thu Mar  3 09:52:22 2016
-@@ -5,10 +5,21 @@
- #include "base/macros.h"
+$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
+--- base/process/process_metrics_openbsd.cc.orig.port	Wed Oct 12 21:02:53 2016
++++ base/process/process_metrics_openbsd.cc	Wed Oct 19 12:55:56 2016
+@@ -4,10 +4,21 @@
+ 
  #include "base/process/process_metrics.h"
  
 +#include "base/files/file_util.h"
@@ -21,9 +21,9 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0
  #include <sys/sysctl.h>
 +#include <sys/vmmeter.h>
  
- namespace base {
- 
-@@ -18,20 +29,27 @@ ProcessMetrics* ProcessMetrics::CreateProcessMetrics(P
+ #include "base/macros.h"
+ #include "base/memory/ptr_util.h"
+@@ -22,20 +33,27 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
  }
  
  size_t ProcessMetrics::GetPagefileUsage() const {
@@ -56,7 +56,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0
  }
  
  size_t ProcessMetrics::GetPeakPagefileUsage() const {
-@@ -39,20 +57,28 @@ size_t ProcessMetrics::GetPeakPagefileUsage() const {
+@@ -43,20 +61,28 @@ size_t ProcessMetrics::GetPeakPagefileUsage() const {
  }
  
  size_t ProcessMetrics::GetWorkingSetSize() const {
@@ -90,7 +90,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0
  }
  
  size_t ProcessMetrics::GetPeakWorkingSetSize() const {
-@@ -92,20 +118,27 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
+@@ -96,20 +122,27 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
  }
  
  static int GetProcessCPU(pid_t pid) {
@@ -122,7 +122,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:0
  }
  
  double ProcessMetrics::GetCPUUsage() {
-@@ -119,7 +152,6 @@ double ProcessMetrics::GetCPUUsage() {
+@@ -123,7 +156,6 @@ double ProcessMetrics::GetCPUUsage() {
    }
  
    int64_t time_delta = (time - last_cpu_time_).InMicroseconds();

www/iridium/patches/patch-base_process_process_posix_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_process_process_posix_cc,v 1.6 2016/03/23 20:13:06 robert Exp $
---- base/process/process_posix.cc.orig.port	Wed Feb 24 00:01:57 2016
-+++ base/process/process_posix.cc	Thu Mar  3 09:43:25 2016
-@@ -19,9 +19,13 @@
+$OpenBSD: patch-base_process_process_posix_cc,v 1.7 2016/10/27 18:30:40 robert Exp $
+--- base/process/process_posix.cc.orig.port	Wed Oct 12 21:02:53 2016
++++ base/process/process_posix.cc	Wed Oct 19 12:55:56 2016
+@@ -20,9 +20,13 @@
  #if defined(OS_MACOSX)
  #include <sys/event.h>
  #endif
@@ -15,7 +15,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.6 2016/03/23 20:13:06 robert E
  #if !defined(OS_NACL_NONSFI)
  
  bool WaitpidWithTimeout(base::ProcessHandle handle,
-@@ -256,12 +260,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces
+@@ -257,12 +261,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces
    return Process(handle);
  }
  
@@ -29,7 +29,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.6 2016/03/23 20:13:06 robert E
  
  bool Process::IsValid() const {
    return process_ != kNullProcessHandle;
-@@ -357,21 +359,23 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout
+@@ -361,21 +363,23 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout
    return WaitForExitWithTimeoutImpl(Handle(), exit_code, timeout);
  }
  

www/iridium/patches/patch-base_sys_info_openbsd_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.5 2016/03/23 20:13:06 robert Exp $
---- base/sys_info_openbsd.cc.orig.port	Wed Feb 24 00:01:57 2016
-+++ base/sys_info_openbsd.cc	Sat Mar  5 23:38:02 2016
+$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.6 2016/10/27 18:30:40 robert Exp $
+--- base/sys_info_openbsd.cc.orig.port	Thu Sep  1 00:03:26 2016
++++ base/sys_info_openbsd.cc	Thu Sep  1 11:44:07 2016
 @@ -29,6 +29,8 @@ int64_t AmountOfMemory(int pages_name) {
  
  namespace base {
@@ -10,7 +10,7 @@ $OpenBSD: patch-base_sys_info_openbsd_cc,v 1.5 2016/03/23 20:13:06 robert Exp $
  // static
  int SysInfo::NumberOfProcessors() {
    int mib[] = { CTL_HW, HW_NCPU };
-@@ -43,12 +45,10 @@ int SysInfo::NumberOfProcessors() {
+@@ -43,24 +45,10 @@ int SysInfo::NumberOfProcessors() {
  
  // static
  int64_t SysInfo::AmountOfPhysicalMemory() {
@@ -20,6 +20,18 @@ $OpenBSD: patch-base_sys_info_openbsd_cc,v 1.5 2016/03/23 20:13:06 robert Exp $
 -// static
 -int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
 -  return AmountOfMemory(_SC_AVPHYS_PAGES);
+-}
+-
+-// static
+-uint64_t SysInfo::MaxSharedMemorySize() {
+-  int mib[] = { CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX };
+-  size_t limit;
+-  size_t size = sizeof(limit);
+-  if (sysctl(mib, arraysize(mib), &limit, &size, NULL, 0) < 0) {
+-    NOTREACHED();
+-    return 0;
+-  }
+-  return static_cast<uint64_t>(limit);
 +  // pledge(2)
 +  if (!aofpmem)
 +    aofpmem = AmountOfMemory(_SC_PHYS_PAGES);

www/iridium/patches/patch-base_sys_info_posix_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_sys_info_posix_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
---- base/sys_info_posix.cc.orig.port	Thu Mar  3 09:54:05 2016
-+++ base/sys_info_posix.cc	Thu Mar  3 11:01:40 2016
-@@ -89,6 +89,17 @@ int64_t SysInfo::AmountOfVirtualMemory() {
+$OpenBSD: patch-base_sys_info_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
+--- base/sys_info_posix.cc.orig.port	Wed Oct 12 21:02:53 2016
++++ base/sys_info_posix.cc	Wed Oct 19 12:55:56 2016
+@@ -140,6 +140,17 @@ int64_t SysInfo::AmountOfVirtualMemory() {
  }
  
  // static

www/iridium/patches/patch-base_third_party_libevent_event-config_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_third_party_libevent_event-config_h,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/third_party/libevent/event-config.h.orig.port	Sun Aug 14 16:13:31 2016
++++ base/third_party/libevent/event-config.h	Sun Aug 14 16:13:43 2016
+@@ -15,6 +15,8 @@
+ #include "base/third_party/libevent/linux/event-config.h"
+ #elif defined(__FreeBSD__)
+ #include "base/third_party/libevent/freebsd/event-config.h"
++#elif defined(__OpenBSD__)
++#include "base/third_party/libevent/openbsd/event-config.h"
+ #elif defined(__sun)
+ #include "base/third_party/libevent/solaris/event-config.h"
+ #else

www/iridium/patches/patch-base_third_party_libevent_openbsd_config_h

@@ -0,0 +1,280 @@
+$OpenBSD: patch-base_third_party_libevent_openbsd_config_h,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/third_party/libevent/openbsd/config.h.orig.port	Sun Aug 14 16:14:00 2016
++++ base/third_party/libevent/openbsd/config.h	Sun Aug 14 16:14:07 2016
+@@ -0,0 +1,276 @@
++/* config.h.  Generated from config.h.in by configure.  */
++/* config.h.in.  Generated from configure.in by autoheader.  */
++
++/* Define if clock_gettime is available in libc */
++#define DNS_USE_CPU_CLOCK_FOR_ID 1
++
++/* Define is no secure id variant is available */
++/* #undef DNS_USE_GETTIMEOFDAY_FOR_ID */
++
++/* Define to 1 if you have the `clock_gettime' function. */
++#define HAVE_CLOCK_GETTIME 1
++
++/* Define if /dev/poll is available */
++/* #undef HAVE_DEVPOLL */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define if your system supports the epoll system calls */
++/* #undef HAVE_EPOLL */
++
++/* Define to 1 if you have the `epoll_ctl' function. */
++/* #undef HAVE_EPOLL_CTL */
++
++/* Define if your system supports event ports */
++/* #undef HAVE_EVENT_PORTS */
++
++/* Define to 1 if you have the `fcntl' function. */
++#define HAVE_FCNTL 1
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#define HAVE_FCNTL_H 1
++
++/* Define to 1 if the system has the type `fd_mask'. */
++#define HAVE_FD_MASK 1
++
++/* Define to 1 if you have the `getaddrinfo' function. */
++#define HAVE_GETADDRINFO 1
++
++/* Define to 1 if you have the `getegid' function. */
++#define HAVE_GETEGID 1
++
++/* Define to 1 if you have the `geteuid' function. */
++#define HAVE_GETEUID 1
++
++/* Define to 1 if you have the `getnameinfo' function. */
++#define HAVE_GETNAMEINFO 1
++
++/* Define to 1 if you have the `gettimeofday' function. */
++#define HAVE_GETTIMEOFDAY 1
++
++/* Define to 1 if you have the `inet_ntop' function. */
++#define HAVE_INET_NTOP 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the `issetugid' function. */
++#define HAVE_ISSETUGID 1
++
++/* Define to 1 if you have the `kqueue' function. */
++#define HAVE_KQUEUE 1
++
++/* Define to 1 if you have the `nsl' library (-lnsl). */
++/* #undef HAVE_LIBNSL */
++
++/* Define to 1 if you have the `resolv' library (-lresolv). */
++/* #undef HAVE_LIBRESOLV */
++
++/* Define to 1 if you have the `rt' library (-lrt). */
++/* #undef HAVE_LIBRT */
++
++/* Define to 1 if you have the `socket' library (-lsocket). */
++/* #undef HAVE_LIBSOCKET */
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <netinet/in6.h> header file. */
++/* #undef HAVE_NETINET_IN6_H */
++
++/* Define to 1 if you have the `poll' function. */
++#define HAVE_POLL 1
++
++/* Define to 1 if you have the <poll.h> header file. */
++#define HAVE_POLL_H 1
++
++/* Define to 1 if you have the `port_create' function. */
++/* #undef HAVE_PORT_CREATE */
++
++/* Define to 1 if you have the <port.h> header file. */
++/* #undef HAVE_PORT_H */
++
++/* Define to 1 if you have the `select' function. */
++#define HAVE_SELECT 1
++
++/* Define if F_SETFD is defined in <fcntl.h> */
++#define HAVE_SETFD 1
++
++/* Define to 1 if you have the `sigaction' function. */
++#define HAVE_SIGACTION 1
++
++/* Define to 1 if you have the `signal' function. */
++#define HAVE_SIGNAL 1
++
++/* Define to 1 if you have the <signal.h> header file. */
++#define HAVE_SIGNAL_H 1
++
++/* Define to 1 if you have the <stdarg.h> header file. */
++#define HAVE_STDARG_H 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the `strlcpy' function. */
++#define HAVE_STRLCPY 1
++
++/* Define to 1 if you have the `strsep' function. */
++#define HAVE_STRSEP 1
++
++/* Define to 1 if you have the `strtok_r' function. */
++#define HAVE_STRTOK_R 1
++
++/* Define to 1 if you have the `strtoll' function. */
++#define HAVE_STRTOLL 1
++
++/* Define to 1 if the system has the type `struct in6_addr'. */
++#define HAVE_STRUCT_IN6_ADDR 1
++
++/* Define to 1 if you have the <sys/devpoll.h> header file. */
++/* #undef HAVE_SYS_DEVPOLL_H */
++
++/* Define to 1 if you have the <sys/epoll.h> header file. */
++/* #undef HAVE_SYS_EPOLL_H */
++
++/* Define to 1 if you have the <sys/event.h> header file. */
++#define HAVE_SYS_EVENT_H 1
++
++/* Define to 1 if you have the <sys/ioctl.h> header file. */
++#define HAVE_SYS_IOCTL_H 1
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++#define HAVE_SYS_PARAM_H 1
++
++/* Define to 1 if you have the <sys/queue.h> header file. */
++#define HAVE_SYS_QUEUE_H 1
++
++/* Define to 1 if you have the <sys/select.h> header file. */
++#define HAVE_SYS_SELECT_H 1
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#define HAVE_SYS_SOCKET_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
++#define HAVE_TAILQFOREACH 1
++
++/* Define if timeradd is defined in <sys/time.h> */
++#define HAVE_TIMERADD 1
++
++/* Define if timerclear is defined in <sys/time.h> */
++#define HAVE_TIMERCLEAR 1
++
++/* Define if timercmp is defined in <sys/time.h> */
++#define HAVE_TIMERCMP 1
++
++/* Define if timerisset is defined in <sys/time.h> */
++#define HAVE_TIMERISSET 1
++
++/* Define to 1 if the system has the type `uint16_t'. */
++#define HAVE_UINT16_T 1
++
++/* Define to 1 if the system has the type `uint32_t'. */
++#define HAVE_UINT32_T 1
++
++/* Define to 1 if the system has the type `uint64_t'. */
++#define HAVE_UINT64_T 1
++
++/* Define to 1 if the system has the type `uint8_t'. */
++#define HAVE_UINT8_T 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `vasprintf' function. */
++#define HAVE_VASPRINTF 1
++
++/* Define if kqueue works correctly with pipes */
++#define HAVE_WORKING_KQUEUE 1
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#define LT_OBJDIR ".libs/"
++
++/* Numeric representation of the version */
++#define NUMERIC_VERSION 0x01040f00
++
++/* Name of package */
++#define PACKAGE "libevent"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT ""
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME ""
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING ""
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME ""
++
++/* Define to the home page for this package. */
++#define PACKAGE_URL ""
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION ""
++
++/* The size of `int', as computed by sizeof. */
++#define SIZEOF_INT 4
++
++/* The size of `long', as computed by sizeof. */
++#define SIZEOF_LONG 8
++
++/* The size of `long long', as computed by sizeof. */
++#define SIZEOF_LONG_LONG 8
++
++/* The size of `short', as computed by sizeof. */
++#define SIZEOF_SHORT 2
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Version number of package */
++#define VERSION "1.4.15"
++
++/* Define to appropriate substitue if compiler doesnt have __func__ */
++/* #undef __func__ */
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
++/* #undef inline */
++#endif
++
++/* Define to `int' if <sys/types.h> does not define. */
++/* #undef pid_t */
++
++/* Define to `unsigned int' if <sys/types.h> does not define. */
++/* #undef size_t */
++
++/* Define to unsigned int if you dont have it */
++/* #undef socklen_t */

www/iridium/patches/patch-base_third_party_libevent_openbsd_event-config_h

@@ -0,0 +1,288 @@
+$OpenBSD: patch-base_third_party_libevent_openbsd_event-config_h,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/third_party/libevent/openbsd/event-config.h.orig.port	Sun Aug 14 16:14:04 2016
++++ base/third_party/libevent/openbsd/event-config.h	Sun Aug 14 16:14:07 2016
+@@ -0,0 +1,284 @@
++/* event-config.h
++ * Generated by autoconf; post-processed by libevent.
++ * Do not edit this file.
++ * Do not rely on macros in this file existing in later versions.
++ */
++#ifndef _EVENT_CONFIG_H_
++#define _EVENT_CONFIG_H_
++/* config.h.  Generated from config.h.in by configure.  */
++/* config.h.in.  Generated from configure.in by autoheader.  */
++
++/* Define if clock_gettime is available in libc */
++#define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1
++
++/* Define is no secure id variant is available */
++/* #undef _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID */
++
++/* Define to 1 if you have the `clock_gettime' function. */
++#define _EVENT_HAVE_CLOCK_GETTIME 1
++
++/* Define if /dev/poll is available */
++/* #undef _EVENT_HAVE_DEVPOLL */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define _EVENT_HAVE_DLFCN_H 1
++
++/* Define if your system supports the epoll system calls */
++/* #undef _EVENT_HAVE_EPOLL */
++
++/* Define to 1 if you have the `epoll_ctl' function. */
++/* #undef _EVENT_HAVE_EPOLL_CTL */
++
++/* Define if your system supports event ports */
++/* #undef _EVENT_HAVE_EVENT_PORTS */
++
++/* Define to 1 if you have the `fcntl' function. */
++#define _EVENT_HAVE_FCNTL 1
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#define _EVENT_HAVE_FCNTL_H 1
++
++/* Define to 1 if the system has the type `fd_mask'. */
++#define _EVENT_HAVE_FD_MASK 1
++
++/* Define to 1 if you have the `getaddrinfo' function. */
++#define _EVENT_HAVE_GETADDRINFO 1
++
++/* Define to 1 if you have the `getegid' function. */
++#define _EVENT_HAVE_GETEGID 1
++
++/* Define to 1 if you have the `geteuid' function. */
++#define _EVENT_HAVE_GETEUID 1
++
++/* Define to 1 if you have the `getnameinfo' function. */
++#define _EVENT_HAVE_GETNAMEINFO 1
++
++/* Define to 1 if you have the `gettimeofday' function. */
++#define _EVENT_HAVE_GETTIMEOFDAY 1
++
++/* Define to 1 if you have the `inet_ntop' function. */
++#define _EVENT_HAVE_INET_NTOP 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define _EVENT_HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the `issetugid' function. */
++#define _EVENT_HAVE_ISSETUGID 1
++
++/* Define to 1 if you have the `kqueue' function. */
++#define _EVENT_HAVE_KQUEUE 1
++
++/* Define to 1 if you have the `nsl' library (-lnsl). */
++/* #undef _EVENT_HAVE_LIBNSL */
++
++/* Define to 1 if you have the `resolv' library (-lresolv). */
++/* #undef _EVENT_HAVE_LIBRESOLV */
++
++/* Define to 1 if you have the `rt' library (-lrt). */
++/* #undef _EVENT_HAVE_LIBRT */
++
++/* Define to 1 if you have the `socket' library (-lsocket). */
++/* #undef _EVENT_HAVE_LIBSOCKET */
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define _EVENT_HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <netinet/in6.h> header file. */
++/* #undef _EVENT_HAVE_NETINET_IN6_H */
++
++/* Define to 1 if you have the `poll' function. */
++#define _EVENT_HAVE_POLL 1
++
++/* Define to 1 if you have the <poll.h> header file. */
++#define _EVENT_HAVE_POLL_H 1
++
++/* Define to 1 if you have the `port_create' function. */
++/* #undef _EVENT_HAVE_PORT_CREATE */
++
++/* Define to 1 if you have the <port.h> header file. */
++/* #undef _EVENT_HAVE_PORT_H */
++
++/* Define to 1 if you have the `select' function. */
++#define _EVENT_HAVE_SELECT 1
++
++/* Define if F_SETFD is defined in <fcntl.h> */
++#define _EVENT_HAVE_SETFD 1
++
++/* Define to 1 if you have the `sigaction' function. */
++#define _EVENT_HAVE_SIGACTION 1
++
++/* Define to 1 if you have the `signal' function. */
++#define _EVENT_HAVE_SIGNAL 1
++
++/* Define to 1 if you have the <signal.h> header file. */
++#define _EVENT_HAVE_SIGNAL_H 1
++
++/* Define to 1 if you have the <stdarg.h> header file. */
++#define _EVENT_HAVE_STDARG_H 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define _EVENT_HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define _EVENT_HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define _EVENT_HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define _EVENT_HAVE_STRING_H 1
++
++/* Define to 1 if you have the `strlcpy' function. */
++#define _EVENT_HAVE_STRLCPY 1
++
++/* Define to 1 if you have the `strsep' function. */
++#define _EVENT_HAVE_STRSEP 1
++
++/* Define to 1 if you have the `strtok_r' function. */
++#define _EVENT_HAVE_STRTOK_R 1
++
++/* Define to 1 if you have the `strtoll' function. */
++#define _EVENT_HAVE_STRTOLL 1
++
++/* Define to 1 if the system has the type `struct in6_addr'. */
++#define _EVENT_HAVE_STRUCT_IN6_ADDR 1
++
++/* Define to 1 if you have the <sys/devpoll.h> header file. */
++/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */
++
++/* Define to 1 if you have the <sys/epoll.h> header file. */
++/* #undef _EVENT_HAVE_SYS_EPOLL_H */
++
++/* Define to 1 if you have the <sys/event.h> header file. */
++#define _EVENT_HAVE_SYS_EVENT_H 1
++
++/* Define to 1 if you have the <sys/ioctl.h> header file. */
++#define _EVENT_HAVE_SYS_IOCTL_H 1
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++#define _EVENT_HAVE_SYS_PARAM_H 1
++
++/* Define to 1 if you have the <sys/queue.h> header file. */
++#define _EVENT_HAVE_SYS_QUEUE_H 1
++
++/* Define to 1 if you have the <sys/select.h> header file. */
++#define _EVENT_HAVE_SYS_SELECT_H 1
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#define _EVENT_HAVE_SYS_SOCKET_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define _EVENT_HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define _EVENT_HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define _EVENT_HAVE_SYS_TYPES_H 1
++
++/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
++#define _EVENT_HAVE_TAILQFOREACH 1
++
++/* Define if timeradd is defined in <sys/time.h> */
++#define _EVENT_HAVE_TIMERADD 1
++
++/* Define if timerclear is defined in <sys/time.h> */
++#define _EVENT_HAVE_TIMERCLEAR 1
++
++/* Define if timercmp is defined in <sys/time.h> */
++#define _EVENT_HAVE_TIMERCMP 1
++
++/* Define if timerisset is defined in <sys/time.h> */
++#define _EVENT_HAVE_TIMERISSET 1
++
++/* Define to 1 if the system has the type `uint16_t'. */
++#define _EVENT_HAVE_UINT16_T 1
++
++/* Define to 1 if the system has the type `uint32_t'. */
++#define _EVENT_HAVE_UINT32_T 1
++
++/* Define to 1 if the system has the type `uint64_t'. */
++#define _EVENT_HAVE_UINT64_T 1
++
++/* Define to 1 if the system has the type `uint8_t'. */
++#define _EVENT_HAVE_UINT8_T 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define _EVENT_HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `vasprintf' function. */
++#define _EVENT_HAVE_VASPRINTF 1
++
++/* Define if kqueue works correctly with pipes */
++#define _EVENT_HAVE_WORKING_KQUEUE 1
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#define _EVENT_LT_OBJDIR ".libs/"
++
++/* Numeric representation of the version */
++#define _EVENT_NUMERIC_VERSION 0x01040f00
++
++/* Name of package */
++#define _EVENT_PACKAGE "libevent"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define _EVENT_PACKAGE_BUGREPORT ""
++
++/* Define to the full name of this package. */
++#define _EVENT_PACKAGE_NAME ""
++
++/* Define to the full name and version of this package. */
++#define _EVENT_PACKAGE_STRING ""
++
++/* Define to the one symbol short name of this package. */
++#define _EVENT_PACKAGE_TARNAME ""
++
++/* Define to the home page for this package. */
++#define _EVENT_PACKAGE_URL ""
++
++/* Define to the version of this package. */
++#define _EVENT_PACKAGE_VERSION ""
++
++/* The size of `int', as computed by sizeof. */
++#define _EVENT_SIZEOF_INT 4
++
++/* The size of `long', as computed by sizeof. */
++#define _EVENT_SIZEOF_LONG 8
++
++/* The size of `long long', as computed by sizeof. */
++#define _EVENT_SIZEOF_LONG_LONG 8
++
++/* The size of `short', as computed by sizeof. */
++#define _EVENT_SIZEOF_SHORT 2
++
++/* Define to 1 if you have the ANSI C header files. */
++#define _EVENT_STDC_HEADERS 1
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define _EVENT_TIME_WITH_SYS_TIME 1
++
++/* Version number of package */
++#define _EVENT_VERSION "1.4.15"
++
++/* Define to appropriate substitue if compiler doesnt have __func__ */
++/* #undef _EVENT___func__ */
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef _EVENT_const */
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef _EVENT___cplusplus
++/* #undef _EVENT_inline */
++#endif
++
++/* Define to `int' if <sys/types.h> does not define. */
++/* #undef _EVENT_pid_t */
++
++/* Define to `unsigned int' if <sys/types.h> does not define. */
++/* #undef _EVENT_size_t */
++
++/* Define to unsigned int if you dont have it */
++/* #undef _EVENT_socklen_t */
++#endif

www/iridium/patches/patch-base_third_party_symbolize_symbolize_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_third_party_symbolize_symbolize_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/third_party/symbolize/symbolize.cc.orig.port	Sun Aug 14 15:07:06 2016
++++ base/third_party/symbolize/symbolize.cc	Sun Aug 14 15:07:14 2016
+@@ -108,7 +108,7 @@ _END_GOOGLE_NAMESPACE_
+ #if defined(__ELF__)
+ 
+ #include <dlfcn.h>
+-#if defined(OS_OPENBSD)
++#if defined(__OpenBSD__)
+ #include <sys/exec_elf.h>
+ #else
+ #include <elf.h>

www/iridium/patches/patch-base_threading_platform_thread_linux_cc

@@ -1,17 +1,17 @@
-$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.7 2016/04/27 12:46:16 robert Exp $
---- base/threading/platform_thread_linux.cc.orig.port	Fri Apr  8 18:02:06 2016
-+++ base/threading/platform_thread_linux.cc	Thu Apr 14 08:25:08 2016
-@@ -17,7 +17,9 @@
+$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.8 2016/10/27 18:30:40 robert Exp $
+--- base/threading/platform_thread_linux.cc.orig.port	Wed Oct 19 13:23:29 2016
++++ base/threading/platform_thread_linux.cc	Wed Oct 19 14:18:22 2016
+@@ -19,7 +19,9 @@
  
  #if !defined(OS_NACL)
  #include <pthread.h>
 +#if !defined(OS_BSD)
  #include <sys/prctl.h>
 +#endif
+ #include <sys/resource.h>
+ #include <sys/time.h>
  #include <sys/types.h>
- #include <unistd.h>
- #endif
-@@ -70,7 +72,7 @@ void PlatformThread::SetName(const std::string& name) 
+@@ -110,7 +112,7 @@ void PlatformThread::SetName(const std::string& name) 
    ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
    tracked_objects::ThreadData::InitializeThreadContext(name);
  
@@ -20,3 +20,12 @@ $OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.7 2016/04/27 12:46:1
    // On linux we can get the thread names to show up in the debugger by setting
    // the process name for the LWP.  We don't want to do this for the main
    // thread because that would rename the process, causing tools like killall
+@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name) 
+ #endif  //  !defined(OS_NACL)
+ }
+ 
+-#if !defined(OS_NACL)
++#if !defined(OS_NACL) && !defined(OS_BSD)
+ // static
+ void PlatformThread::SetThreadPriority(PlatformThreadId thread_id,
+                                        ThreadPriority priority) {

www/iridium/patches/patch-base_threading_platform_thread_posix_cc

@@ -1,10 +1,10 @@
-$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.2 2016/05/28 14:49:39 robert Exp $
+$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.3 2016/10/27 18:30:40 robert Exp $
 
 XXX pledge(2)
 
---- base/threading/platform_thread_posix.cc.orig.port	Wed May 25 04:54:06 2016
-+++ base/threading/platform_thread_posix.cc	Thu May 26 08:09:40 2016
-@@ -55,7 +55,7 @@ void* ThreadFunc(void* params) {
+--- base/threading/platform_thread_posix.cc.orig.port	Wed Oct 12 21:02:53 2016
++++ base/threading/platform_thread_posix.cc	Wed Oct 19 12:55:56 2016
+@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) {
      if (!thread_params->joinable)
        base::ThreadRestrictions::SetSingletonAllowed(false);
  

www/iridium/patches/patch-base_trace_event_malloc_dump_provider_cc

@@ -0,0 +1,22 @@
+$OpenBSD: patch-base_trace_event_malloc_dump_provider_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- base/trace_event/malloc_dump_provider.cc.orig.port	Wed Oct 19 13:24:08 2016
++++ base/trace_event/malloc_dump_provider.cc	Wed Oct 19 13:25:19 2016
+@@ -19,6 +19,8 @@
+ 
+ #if defined(OS_MACOSX)
+ #include <malloc/malloc.h>
++#elif defined(OS_BSD)
++#include <stdlib.h>
+ #else
+ #include <malloc.h>
+ #endif
+@@ -224,6 +226,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+   resident_size = all_heap_info.committed_size;
+   allocated_objects_size = all_heap_info.allocated_size;
+   allocated_objects_count = all_heap_info.block_count;
++#elif defined(OS_BSD)
++  total_virtual_size = 0;
++  allocated_objects_size = 0;
+ #else
+   struct mallinfo info = mallinfo();
+   DCHECK_GE(info.arena + info.hblkhd, info.uordblks);

www/iridium/patches/patch-base_trace_event_process_memory_dump_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_trace_event_process_memory_dump_cc,v 1.1 2016/05/28 14:49:39 robert Exp $
---- base/trace_event/process_memory_dump.cc.orig.port	Thu May 26 09:33:50 2016
-+++ base/trace_event/process_memory_dump.cc	Thu May 26 09:58:14 2016
-@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta
+$OpenBSD: patch-base_trace_event_process_memory_dump_cc,v 1.2 2016/10/27 18:30:40 robert Exp $
+--- base/trace_event/process_memory_dump.cc.orig.port	Thu Sep  1 00:03:26 2016
++++ base/trace_event/process_memory_dump.cc	Thu Sep  1 11:12:18 2016
+@@ -89,7 +89,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta
    const size_t kMaxChunkSize = 8 * 1024 * 1024;
    size_t max_vec_size =
        GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);

www/iridium/patches/patch-build_all_gyp

@@ -1,11 +0,0 @@
-$OpenBSD: patch-build_all_gyp,v 1.10 2016/05/28 14:49:39 robert Exp $
---- build/all.gyp.orig.port	Wed May 25 21:00:55 2016
-+++ build/all.gyp	Thu May 26 08:09:40 2016
-@@ -358,7 +358,6 @@
-             '../media/midi/midi.gyp:midi_unittests',
-             '../mojo/mojo.gyp:mojo',
-             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
--            '../remoting/remoting.gyp:remoting_unittests',
-             '../third_party/catapult/telemetry/telemetry.gyp:*',
-             '../third_party/WebKit/public/all.gyp:all_blink',
-             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',

www/iridium/patches/patch-build_common_gypi

@@ -1,107 +0,0 @@
-$OpenBSD: patch-build_common_gypi,v 1.10 2016/05/28 14:49:39 robert Exp $
---- build/common.gypi.orig.port	Wed May 25 21:00:55 2016
-+++ build/common.gypi	Thu May 26 08:09:40 2016
-@@ -113,7 +113,7 @@
- 
-           'conditions': [
-             # Windows and Linux use Aura, but not Ash.
--            ['OS=="win" or OS=="linux"', {
-+            ['OS=="win" or OS=="linux" or OS=="openbsd"', {
-               'use_aura%': 1,
-             }],
- 
-@@ -255,13 +255,13 @@
-           }],
- 
-           # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS).
--          ['OS=="mac" or OS=="win" or OS=="linux"', {
-+          ['OS=="mac" or OS=="win" or OS=="linux" or OS=="openbsd"', {
-             'enable_hidpi%': 1,
-           }],
- 
-           # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux,
-           # and Mac.
--          ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac"', {
-+          ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="openbsd"', {
-             'enable_topchrome_md%': 1,
-           }],
- 
-@@ -790,7 +790,7 @@
-         }],
- 
-         # DBus usage.
--        ['OS=="linux" and embedded==0', {
-+        ['(OS=="linux" or OS=="openbsd") and embedded==0', {
-           'use_dbus%': 1,
-         }, {
-           'use_dbus%': 0,
-@@ -892,7 +892,7 @@
- 
-         # Use GPU accelerated cross process image transport by default
-         # on linux builds with the Aura window manager
--        ['use_aura==1 and OS=="linux"', {
-+        ['use_aura==1 and (OS=="linux" or OS=="openbsd")', {
-           'ui_compositor_image_transport%': 1,
-         }, {
-           'ui_compositor_image_transport%': 0,
-@@ -1005,7 +1005,7 @@
-         # --help for more information. Meant to be overriden with GYP_DEFINES.
-         # TODO(maruel): Remove the conditions as more configurations are
-         # supported.
--        ['OS!="ios" and OS!="android" and chromeos==0', {
-+        ['OS!="ios" and OS!="android" and chromeos==0 and OS!="openbsd"', {
-           'test_isolation_mode%': 'check',
-         }, {
-           'test_isolation_mode%': 'noop',
-@@ -1021,7 +1021,7 @@
-         }, {
-           'use_openmax_dl_fft%': 0,
-         }],
--        ['OS=="win" or OS=="linux"', {
-+        ['OS=="win" or OS=="linux" or OS=="openbsd"', {
-           'enable_mdns%' : 1,
-         }],
- 
-@@ -1663,7 +1663,7 @@
-       ['OS=="win"', {
-         'windows_driver_kit_path%': '$(WDK_DIR)',
-       }],
--      ['os_posix==1 and OS!="mac" and OS!="ios"', {
-+      ['os_posix==1 and OS!="mac" and OS!="ios" and OS!="openbsd"', {
-         'conditions': [
-           ['target_arch=="mipsel" or target_arch=="mips64el"', {
-             'werror%': '',
-@@ -3594,6 +3594,13 @@
-     },
-   },
-   'conditions': [
-+    ['OS=="openbsd"', {
-+      'target_defaults': {
-+        'cflags': [
-+          '-Wno-unknown-warning-option',
-+        ],
-+      },
-+    }],
-     ['os_posix==1', {
-       'target_defaults': {
-         'ldflags': [
-@@ -4719,7 +4726,7 @@
-     }],
-     # FreeBSD-specific options; note that most FreeBSD options are set above,
-     # with Linux.
--    ['OS=="freebsd"', {
-+    ['OS=="freebsd" or OS=="openbsd"', {
-       'target_defaults': {
-         'ldflags': [
-           '-Wl,--no-keep-memory',
-@@ -6005,8 +6012,8 @@
-     ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
-         'and OS!="win"', {
-       'make_global_settings': [
--        ['CC', '<(make_clang_dir)/bin/clang'],
--        ['CXX', '<(make_clang_dir)/bin/clang++'],
-+        ['CC', '/usr/local/bin/clang'],
-+        ['CXX', '/usr/local/bin/clang++'],
-         ['CC.host', '$(CC)'],
-         ['CXX.host', '$(CXX)'],
-       ],

www/iridium/patches/patch-build_config_BUILDCONFIG_gn

@@ -0,0 +1,104 @@
+$OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/config/BUILDCONFIG.gn.orig.port	Wed Oct 19 13:25:29 2016
++++ build/config/BUILDCONFIG.gn	Wed Oct 19 14:21:17 2016
+@@ -134,12 +134,13 @@ declare_args() {
+   is_debug = !is_official_build
+ 
+   # Whether we're a traditional desktop unix.
+-  is_desktop_linux = current_os == "linux"
++  is_desktop_linux = current_os == "linux" || current_os == "openbsd"
+ 
+   # Set to true when compiling with the Clang compiler. Typically this is used
+   # to configure warnings.
+   is_clang = current_os == "mac" || current_os == "ios" ||
+-             current_os == "linux" || current_os == "chromeos"
++             current_os == "linux" || current_os == "chromeos" ||
++             current_os == "openbsd"
+ 
+   # Allows the path to a custom target toolchain to be injected as a single
+   # argument, and set as the default toolchain.
+@@ -195,6 +196,8 @@ if (host_toolchain == "") {
+     } else {
+       host_toolchain = "//build/toolchain/linux:$host_cpu"
+     }
++  } else if (host_os == "openbsd") {
++    host_toolchain = "//build/toolchain/openbsd:clang_$host_cpu"
+   } else if (host_os == "mac") {
+     host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
+   } else if (host_os == "win") {
+@@ -229,6 +232,8 @@ if (target_os == "android") {
+   }
+ } else if (target_os == "ios") {
+   _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu"
++} else if (target_os == "openbsd") {
++  _default_toolchain = host_toolchain
+ } else if (target_os == "mac") {
+   assert(host_os == "mac", "Mac cross-compiles are unsupported.")
+   _default_toolchain = host_toolchain
+@@ -282,6 +287,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
+   is_mac = false
+   is_nacl = false
+   is_posix = false
++  is_openbsd = false
+   is_win = true
+ } else if (current_os == "mac") {
+   is_android = false
+@@ -291,6 +297,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
+   is_mac = true
+   is_nacl = false
+   is_posix = true
++  is_openbsd = false
+   is_win = false
+ } else if (current_os == "android") {
+   is_android = true
+@@ -300,6 +307,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
+   is_mac = false
+   is_nacl = false
+   is_posix = true
++  is_openbsd = false
+   is_win = false
+ } else if (current_os == "chromeos") {
+   is_android = false
+@@ -309,6 +317,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
+   is_mac = false
+   is_nacl = false
+   is_posix = true
++  is_openbsd = false
+   is_win = false
+ } else if (current_os == "nacl") {
+   # current_os == "nacl" will be passed by the nacl toolchain definition.
+@@ -321,6 +330,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
+   is_mac = false
+   is_nacl = true
+   is_posix = true
++  is_openbsd = false
+   is_win = false
+ } else if (current_os == "ios") {
+   is_android = false
+@@ -330,6 +340,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
+   is_mac = false
+   is_nacl = false
+   is_posix = true
++  is_openbsd = false
+   is_win = false
+ } else if (current_os == "linux") {
+   is_android = false
+@@ -339,7 +350,18 @@ if (current_os == "win" || current_os == "winrt_81" ||
+   is_mac = false
+   is_nacl = false
+   is_posix = true
++  is_openbsd = false
+   is_win = false
++} else if (current_os == "openbsd") {
++  is_android = false
++  is_chromeos = false
++  is_ios = false
++  is_linux = true
++  is_mac = false
++  is_nacl = false
++  is_posix = true
++  is_win = false
++  is_openbsd = true
+ }
+ 
+ # =============================================================================

www/iridium/patches/patch-build_config_BUILD_gn

@@ -0,0 +1,12 @@
+$OpenBSD: patch-build_config_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/config/BUILD.gn.orig.port	Wed Oct 12 21:02:53 2016
++++ build/config/BUILD.gn	Wed Oct 19 12:55:56 2016
+@@ -380,7 +380,7 @@ config("default_libs") {
+       "CoreText.framework",
+       "Foundation.framework",
+     ]
+-  } else if (is_linux) {
++  } else if (is_linux && !is_openbsd) {
+     libs = [
+       "dl",
+       "rt",

www/iridium/patches/patch-build_config_allocator_gni

@@ -0,0 +1,12 @@
+$OpenBSD: patch-build_config_allocator_gni,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/config/allocator.gni.orig.port	Wed Oct 19 13:28:18 2016
++++ build/config/allocator.gni	Wed Oct 19 13:29:39 2016
+@@ -17,7 +17,7 @@ if (is_android || current_cpu == "mipsel" || is_mac ||
+ # the shim. NaCl in particular does seem to link some binaries statically
+ # against the debug CRT with "is_nacl=false".
+ if ((is_linux || is_android || (is_win && !is_component_build && !is_debug)) &&
+-    !is_syzyasan && !is_asan && !is_lsan && !is_tsan && !is_msan) {
++    !is_syzyasan && !is_asan && !is_lsan && !is_tsan && !is_msan && !is_openbsd) {
+   _default_use_experimental_allocator_shim = true
+ } else {
+   _default_use_experimental_allocator_shim = false

www/iridium/patches/patch-build_config_compiler_BUILD_gn

@@ -0,0 +1,47 @@
+$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/config/compiler/BUILD.gn.orig.port	Wed Oct 19 13:29:47 2016
++++ build/config/compiler/BUILD.gn	Wed Oct 19 13:30:51 2016
+@@ -38,7 +38,7 @@ declare_args() {
+   # only two architectures that are currently checked in). Turn this off when
+   # you are using a custom toolchain and need to control -B in cflags.
+   linux_use_bundled_binutils =
+-      is_linux && (current_cpu == "x64" || current_cpu == "x86")
++      (is_linux && !is_openbsd) && (current_cpu == "x64" || current_cpu == "x86")
+   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
+                               root_build_dir)
+ 
+@@ -201,7 +201,7 @@ config("compiler") {
+ 
+     # Linker warnings.
+     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
+-        !(is_android && use_order_profiling) && !is_mac && !is_ios) {
++        !(is_android && use_order_profiling) && !is_mac && !is_ios && !is_openbsd) {
+       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
+       # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
+       # crbug.com/485542
+@@ -283,7 +283,7 @@ config("compiler") {
+       "-Wl,-z,now",
+       "-Wl,-z,relro",
+     ]
+-    if (!using_sanitizer && !use_cfi_diag) {
++    if (!using_sanitizer && !use_cfi_diag && !is_openbsd) {
+       ldflags += [ "-Wl,-z,defs" ]
+     }
+   }
+@@ -1014,14 +1014,14 @@ config("default_warnings") {
+     # Chrome's hermetic Clang compiler, NaCl's Clang compiler and Xcode's Clang
+     # compiler will almost always have different versions. Certain flags may not
+     # be recognized by one version or the other.
+-    if (!is_nacl) {
++    if (!is_nacl && !is_openbsd) {
+       # Flags NaCl (Clang 3.7) does not recognize.
+       cflags += [
+         # TODO(thakis): Enable this, crbug.com/507717
+         "-Wno-shift-negative-value",
+       ]
+     }
+-    if (!is_nacl && !use_xcode_clang) {
++    if (!is_nacl && !use_xcode_clang && !is_openbsd) {
+       # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not
+       # recognize.
+       cflags += [

www/iridium/patches/patch-build_config_compiler_compiler_gni

@@ -0,0 +1,12 @@
+$OpenBSD: patch-build_config_compiler_compiler_gni,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/config/compiler/compiler.gni.orig.port	Thu Sep  1 00:03:26 2016
++++ build/config/compiler/compiler.gni	Thu Sep  1 11:12:18 2016
+@@ -67,7 +67,7 @@ declare_args() {
+ 
+ declare_args() {
+   # Whether to use the gold linker from binutils instead of lld or bfd.
+-  use_gold = !use_lld && !(is_chromecast && is_linux &&
++  use_gold = !is_openbsd && !use_lld && !(is_chromecast && is_linux &&
+                            (current_cpu == "arm" || current_cpu == "mipsel")) &&
+              ((is_linux && (current_cpu == "x64" || current_cpu == "x86" ||
+                             current_cpu == "arm" || current_cpu == "mipsel")) ||

www/iridium/patches/patch-build_config_features_gni

@@ -0,0 +1,21 @@
+$OpenBSD: patch-build_config_features_gni,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/config/features.gni.orig.port	Wed Oct 12 21:02:53 2016
++++ build/config/features.gni	Wed Oct 19 12:55:57 2016
+@@ -102,7 +102,7 @@ declare_args() {
+   enable_wifi_display = false
+ 
+   # libudev usage. This currently only affects the content layer.
+-  use_udev = is_linux && !is_chromecast
++  use_udev = is_linux && !is_chromecast && !is_openbsd
+ 
+   use_dbus = is_linux && !is_chromecast
+ 
+@@ -151,7 +151,7 @@ enable_pepper_cdms =
+ use_seccomp_bpf =
+     (is_linux || is_android) &&
+     (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" ||
+-     current_cpu == "arm64" || current_cpu == "mipsel")
++     current_cpu == "arm64" || current_cpu == "mipsel") && !is_openbsd
+ 
+ # Enable notifications everywhere except iOS.
+ enable_notifications = !is_ios

www/iridium/patches/patch-build_config_linux_pkg-config_py

@@ -0,0 +1,12 @@
+$OpenBSD: patch-build_config_linux_pkg-config_py,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/config/linux/pkg-config.py.orig.port	Sun Aug 14 13:26:34 2016
++++ build/config/linux/pkg-config.py	Sun Aug 14 13:26:45 2016
+@@ -107,7 +107,7 @@ def main():
+   # If this is run on non-Linux platforms, just return nothing and indicate
+   # success. This allows us to "kind of emulate" a Linux build from other
+   # platforms.
+-  if "linux" not in sys.platform:
++  if "openbsd" not in sys.platform:
+     print "[[],[],[],[],[]]"
+     return 0
+ 

www/iridium/patches/patch-build_filename_rules_gypi

@@ -1,12 +0,0 @@
-$OpenBSD: patch-build_filename_rules_gypi,v 1.3 2016/04/27 12:46:16 robert Exp $
---- build/filename_rules.gypi.orig.port	Fri Apr  8 18:02:06 2016
-+++ build/filename_rules.gypi	Thu Apr 14 08:25:08 2016
-@@ -89,7 +89,7 @@
-                     ['exclude', '_ashwin\\.(h|cc)$']
-       ]
-     }],
--    ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', {
-+    ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd") or >(nacl_untrusted_build)==1', {
-       'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ]
-     }],
-     ['<(use_ozone)==0 or >(nacl_untrusted_build)==1', {

www/iridium/patches/patch-build_toolchain_gcc_solink_wrapper_py

@@ -0,0 +1,12 @@
+$OpenBSD: patch-build_toolchain_gcc_solink_wrapper_py,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/toolchain/gcc_solink_wrapper.py.orig.port	Sun Aug 14 23:16:08 2016
++++ build/toolchain/gcc_solink_wrapper.py	Sun Aug 14 23:16:21 2016
+@@ -47,7 +47,7 @@ def CollectDynSym(args):
+   """Replaces: nm --format=posix -g -D $sofile | cut -f1-2 -d' '"""
+   toc = ''
+   nm = subprocess.Popen(CommandToRun([
+-      args.nm, '--format=posix', '-g', '-D', args.sofile]),
++      args.nm, '-g', '-D', args.sofile]),
+                         stdout=subprocess.PIPE, bufsize=-1)
+   for line in nm.stdout:
+     toc += ' '.join(line.split(' ', 2)[:2]) + '\n'

www/iridium/patches/patch-build_toolchain_gcc_toolchain_gni

@@ -0,0 +1,33 @@
+$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/toolchain/gcc_toolchain.gni.orig.port	Fri Oct 21 00:01:59 2016
++++ build/toolchain/gcc_toolchain.gni	Tue Oct 25 08:33:20 2016
+@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni")
+ import("//build/toolchain/goma.gni")
+ import("//build/toolchain/toolchain.gni")
+ 
++declare_args() {
++  extra_cppflags = ""
++  extra_ldflags = ""
++}
++
+ # This template defines a toolchain for something that works like gcc
+ # (including clang).
+ #
+@@ -258,7 +263,7 @@ template("gcc_toolchain") {
+       # POSIX-like toolchains such as NaCl on Windows).
+       ar_wrapper =
+           rebase_path("//build/toolchain/gcc_ar_wrapper.py", root_build_dir)
+-      command = "$python_path \"$ar_wrapper\" --output={{output}} --ar=\"$ar\" {{arflags}} rcsD @\"$rspfile\""
++      command = "$python_path \"$ar_wrapper\" --output={{output}} --ar=\"$ar\" {{arflags}} rcs @\"$rspfile\""
+       description = "AR {{output}}"
+       rspfile_content = "{{inputs}}"
+       outputs = [
+@@ -453,7 +458,7 @@ template("clang_toolchain") {
+   }
+ 
+   gcc_toolchain(target_name) {
+-    prefix = rebase_path("$clang_base_path/bin", root_build_dir)
++    prefix = "/usr/local/bin"
+     cc = "$prefix/clang"
+     cxx = "$prefix/clang++"
+     ld = cxx

www/iridium/patches/patch-build_toolchain_openbsd_BUILD_gn

@@ -0,0 +1,56 @@
+$OpenBSD: patch-build_toolchain_openbsd_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- build/toolchain/openbsd/BUILD.gn.orig.port	Wed Oct 19 13:16:59 2016
++++ build/toolchain/openbsd/BUILD.gn	Wed Oct 19 14:23:37 2016
+@@ -0,0 +1,52 @@
++# Copyright 2013 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/config/sysroot.gni")
++import("//build/toolchain/gcc_toolchain.gni")
++
++clang_toolchain("clang_x86") {
++  toolchain_args = {
++    current_cpu = "x86"
++    current_os = "openbsd"
++  }
++}
++
++gcc_toolchain("x86") {
++  cc = "gcc"
++  cxx = "g++"
++
++  readelf = "readelf"
++  nm = "nm"
++  ar = "ar"
++  ld = cxx
++
++  toolchain_args = {
++    current_cpu = "x86"
++    current_os = "openbsd"
++    is_clang = false
++  }
++}
++
++clang_toolchain("clang_x64") {
++  toolchain_args = {
++    current_cpu = "x64"
++    current_os = "openbsd"
++  }
++}
++
++gcc_toolchain("x64") {
++  cc = "gcc"
++  cxx = "g++"
++
++  readelf = "readelf"
++  nm = "nm"
++  ar = "ar"
++  ld = cxx
++
++  toolchain_args = {
++    current_cpu = "x64"
++    current_os = "openbsd"
++    is_clang = false
++  }
++}

www/iridium/patches/patch-cc_BUILD_gn

@@ -0,0 +1,23 @@
+$OpenBSD: patch-cc_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- cc/BUILD.gn.orig.port	Wed Oct 12 21:02:53 2016
++++ cc/BUILD.gn	Wed Oct 19 12:55:57 2016
+@@ -781,7 +781,7 @@ static_library("test_support") {
+     "//ui/gl",
+     "//ui/gl:test_support",
+   ]
+-  if (!is_android) {
++  if (!is_android && !is_openbsd) {
+     data_deps = [
+       "//third_party/mesa:osmesa",
+     ]
+@@ -989,10 +989,6 @@ test("cc_unittests") {
+     "//ui/gfx/geometry",
+     "//ui/gl",
+     "//ui/gl:test_support",
+-  ]
+-
+-  data_deps = [
+-    "//third_party/mesa:osmesa",
+   ]
+ }
+ 

www/iridium/patches/patch-chrome_app_chrome_command_ids_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/chrome_command_ids.h.orig.port	Sat Oct 22 15:48:44 2016
++++ chrome/app/chrome_command_ids.h	Sat Oct 22 15:48:55 2016
+@@ -75,7 +75,7 @@
+ #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
+ #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #define IDC_USE_SYSTEM_TITLE_BAR        34051
+ #endif
+ 

www/iridium/patches/patch-chrome_app_chrome_main_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_app_chrome_main_cc,v 1.4 2016/04/27 12:46:16 robert Exp $
---- chrome/app/chrome_main.cc.orig.port	Tue Apr 26 16:20:04 2016
-+++ chrome/app/chrome_main.cc	Wed Apr 27 11:11:15 2016
+$OpenBSD: patch-chrome_app_chrome_main_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/chrome_main.cc.orig.port	Thu Oct 27 14:43:34 2016
++++ chrome/app/chrome_main.cc	Thu Oct 27 20:19:45 2016
 @@ -3,6 +3,8 @@
  // found in the LICENSE file.
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_chrome_main_cc,v 1.4 2016/04/27 12:46:16 robert Exp $
  
  #include "build/build_config.h"
  #include "chrome/common/features.h"
-@@ -39,7 +41,11 @@ int ChromeMain(int argc, const char** argv);
+@@ -39,7 +41,12 @@ int ChromeMain(int argc, const char** argv);
  #if !defined(CHROME_MULTIPLE_DLL_CHILD)
  static void trace_url_request(const std::string &caller, const GURL &url)
  {
@@ -20,6 +20,7 @@ $OpenBSD: patch-chrome_app_chrome_main_cc,v 1.4 2016/04/27 12:46:16 robert Exp $
 +		return;
 +
 +        iridium::log_url_request(caller, url);
++
  	if (url.scheme() != url::kTraceScheme)
  		/* Do not show infobar for non-trk URLs */
  		return;

www/iridium/patches/patch-chrome_app_chrome_main_delegate_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 robert Exp $
---- chrome/app/chrome_main_delegate.cc.orig.port	Thu May 26 08:15:51 2016
-+++ chrome/app/chrome_main_delegate.cc	Thu May 26 08:18:13 2016
-@@ -80,7 +80,7 @@
- #include <signal.h>
+$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/chrome_main_delegate.cc.orig.port	Thu Sep  1 00:03:26 2016
++++ chrome/app/chrome_main_delegate.cc	Thu Sep  1 11:12:18 2016
+@@ -84,7 +84,7 @@
+ #include "chrome/app/chrome_crash_reporter_client.h"
  #endif
  
 -#if !defined(DISABLE_NACL) && defined(OS_LINUX)
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -115,7 +115,7 @@
+@@ -119,7 +119,7 @@
  #include "components/crash/content/app/breakpad_linux.h"
  #endif
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
  #include "base/environment.h"
  #endif
  
-@@ -151,7 +151,7 @@ base::LazyInstance<ChromeContentBrowserClient> g_chrom
+@@ -161,7 +161,7 @@ base::LazyInstance<ChromeContentBrowserClient> g_chrom
      LAZY_INSTANCE_INITIALIZER;
  #endif
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
  base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
      LAZY_INSTANCE_INITIALIZER;
  #endif
-@@ -268,7 +268,7 @@ static void AdjustLinuxOOMScore(const std::string& pro
+@@ -278,7 +278,7 @@ static void AdjustLinuxOOMScore(const std::string& pro
  // and resources loaded.
  bool SubprocessNeedsResourceBundle(const std::string& process_type) {
    return
@@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -320,7 +320,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -330,7 +330,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
  }
  #endif
  
@@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
  void SIGTERMProfilingShutdown(int signal) {
    Profiling::Stop();
    struct sigaction sigact;
-@@ -354,7 +354,7 @@ void InitializeUserDataDir() {
+@@ -364,7 +364,7 @@ void InitializeUserDataDir() {
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -684,7 +684,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -703,7 +703,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -64,7 +64,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
    crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
  #endif
  
-@@ -805,7 +805,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -836,7 +836,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    chrome::InitializePDF();
  #endif
  
@@ -73,7 +73,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.9 2016/05/28 14:49:39 rob
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -933,7 +933,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
+@@ -964,7 +964,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
  #endif
    return process_type == switches::kRelauncherProcess;
  }

www/iridium/patches/patch-chrome_app_chrome_main_delegate_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.3 2016/03/23 20:13:06 robert Exp $
---- chrome/app/chrome_main_delegate.h.orig.port	Wed Feb 24 00:01:57 2016
-+++ chrome/app/chrome_main_delegate.h	Thu Mar  3 09:43:25 2016
-@@ -38,7 +38,7 @@ class ChromeMainDelegate : public content::ContentMain
+$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.4 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/chrome_main_delegate.h.orig.port	Wed Jul 20 21:03:19 2016
++++ chrome/app/chrome_main_delegate.h	Thu Jul 21 10:25:26 2016
+@@ -39,7 +39,7 @@ class ChromeMainDelegate : public content::ContentMain
        const std::string& process_type) override;
    bool ShouldSendMachPort(const std::string& process_type) override;
    bool DelaySandboxInitialization(const std::string& process_type) override;

www/iridium/patches/patch-chrome_app_chromium_strings_grd

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.11 2016/05/28 14:49:39 robert Exp $
---- chrome/app/chromium_strings.grd.orig.port	Fri May 27 10:48:11 2016
-+++ chrome/app/chromium_strings.grd	Sat May 28 10:25:22 2016
-@@ -937,7 +937,7 @@ Signing in anyway will merge browser information like 
+$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.12 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/chromium_strings.grd.orig.port	Sun Oct 23 21:04:51 2016
++++ chrome/app/chromium_strings.grd	Thu Oct 27 11:16:53 2016
+@@ -938,7 +938,7 @@ Signing in anyway will merge browser information like 
        </message>
  
        <!-- ProcessSingleton -->

www/iridium/patches/patch-chrome_app_generated_resources_grd

@@ -1,12 +1,48 @@
-$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.3 2016/05/28 14:49:39 robert Exp $
---- chrome/app/generated_resources.grd.orig.port	Wed May 25 21:00:56 2016
-+++ chrome/app/generated_resources.grd	Thu May 26 08:09:40 2016
-@@ -6595,7 +6595,7 @@ Keep your key file in a safe place. You will need it t
+$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.4 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/generated_resources.grd.orig.port	Fri Oct 21 00:02:00 2016
++++ chrome/app/generated_resources.grd	Sat Oct 22 16:20:22 2016
+@@ -2,7 +2,7 @@
+ 
+ <!--
+ This file contains definitions of resources that will be translated for each
+-locale.  The variables is_win, is_macosx, is_linux, and is_posix are available
++locale.  The variables is_win, is_macosx, is_posix, and is_posix are available
+ for making strings OS specific.  Other platform defines such as use_titlecase
+ are declared in build/common.gypi.
+ -->
+@@ -6841,7 +6841,7 @@ Keep your key file in a safe place. You will need it t
        <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
            Right-to-left
        </message>
 -      <if expr="is_win or is_linux">
-+      <if expr="is_win or is_linux or is_posix">
++      <if expr="is_win or is_posix or is_posix">
          <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
            Enable Input IME API
          </message>
+@@ -10140,7 +10140,7 @@ I don't think this site should be blocked!
+       <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
+         Appearance
+       </message>
+-      <if expr="not is_linux or chromeos">
++      <if expr="not is_posix or chromeos">
+         <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
+           Themes
+         </message>
+@@ -10148,7 +10148,7 @@ I don't think this site should be blocked!
+       <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
+         Reset to default theme
+       </message>
+-      <if expr="is_linux and not chromeos">
++      <if expr="is_posix and not chromeos">
+         <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
+           Use GTK+ theme
+         </message>
+@@ -11435,7 +11435,7 @@ Tell us what happened exactly before you got the profi
+         Set as default
+       </message>
+ 
+-      <if expr="is_linux and not chromeos">
++      <if expr="is_posix and not chromeos">
+         <message name="IDS_SHOW_WINDOW_DECORATIONS_MENU" desc="The menu entry text in the tab strip context menu.  This toggles the system title bar and window borders (window decorations) on linux.">
+           Use system title bar and borders
+         </message>

www/iridium/patches/patch-chrome_app_google_chrome_strings_grd

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.10 2016/05/28 14:49:39 robert Exp $
---- chrome/app/google_chrome_strings.grd.orig.port	Wed May 25 21:00:56 2016
-+++ chrome/app/google_chrome_strings.grd	Sat May 28 10:25:24 2016
-@@ -938,7 +938,7 @@ Signing in anyway will merge Chrome information like b
+$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.11 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/google_chrome_strings.grd.orig.port	Wed Oct 12 21:02:53 2016
++++ chrome/app/google_chrome_strings.grd	Wed Oct 19 12:55:57 2016
+@@ -939,7 +939,7 @@ Signing in anyway will merge Chrome information like b
        </message>
  
        <!-- ProcessSingleton -->

www/iridium/patches/patch-chrome_app_mash_mash_runner_cc

@@ -0,0 +1,30 @@
+$OpenBSD: patch-chrome_app_mash_mash_runner_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- chrome/app/mash/mash_runner.cc.orig.port	Tue Oct 25 21:56:43 2016
++++ chrome/app/mash/mash_runner.cc	Tue Oct 25 21:59:47 2016
+@@ -35,7 +35,7 @@
+ #include "services/shell/runner/host/child_process_base.h"
+ #include "services/ui/service.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "components/font_service/font_service_app.h"
+ #endif
+ 
+@@ -100,7 +100,7 @@ class DefaultService : public shell::Service,
+       return base::WrapUnique(new mash::quick_launch::QuickLaunch);
+     if (name == "mojo:task_viewer")
+       return base::WrapUnique(new mash::task_viewer::TaskViewer);
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     if (name == "mojo:font_service")
+       return base::WrapUnique(new font_service::FontServiceApp);
+ #endif
+@@ -228,7 +228,7 @@ int MashMain() {
+ 
+   // TODO(sky): use MessagePumpMojo.
+   std::unique_ptr<base::MessageLoop> message_loop;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::AtExitManager exit_manager;
+ #endif
+   if (!IsChild())

www/iridium/patches/patch-chrome_app_resources_locale_settings_grd

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_app_resources_locale_settings_grd,v 1.4 2016/04/27 12:46:16 robert Exp $
+$OpenBSD: patch-chrome_app_resources_locale_settings_grd,v 1.5 2016/10/27 18:30:40 robert Exp $
 --- chrome/app/resources/locale_settings.grd.orig.port	Fri Apr  8 18:02:07 2016
 +++ chrome/app/resources/locale_settings.grd	Thu Apr 14 08:25:08 2016
 @@ -156,7 +156,7 @@

www/iridium/patches/patch-chrome_browser_BUILD_gn

@@ -0,0 +1,21 @@
+$OpenBSD: patch-chrome_browser_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/BUILD.gn.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/BUILD.gn	Wed Oct 19 12:55:57 2016
+@@ -729,6 +729,17 @@ split_static_library("browser") {
+                            "//chrome")
+   }
+ 
++  if (is_openbsd) {
++    sources -= [
++      "media_galleries/linux/mtp_device_delegate_impl_linux.cc",
++      "media_galleries/linux/mtp_device_object_enumerator.cc",
++      "media_galleries/linux/mtp_device_task_helper.cc",
++      "media_galleries/linux/mtp_device_task_helper_map_service.cc",
++      "media_galleries/linux/mtp_read_file_worker.cc",
++      "media_galleries/linux/snapshot_file_details.cc",
++    ]
++  }
++
+   if (!is_chrome_branded) {
+     sources += [
+       "search/local_files_ntp_source.cc",

www/iridium/patches/patch-chrome_browser_about_flags_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.10 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/about_flags.cc.orig.port	Wed May 25 21:00:57 2016
-+++ chrome/browser/about_flags.cc	Sat May 28 10:25:25 2016
-@@ -651,7 +651,7 @@ const FeatureEntry kFeatureEntries[] = {
+$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.11 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/about_flags.cc.orig.port	Fri Oct 21 00:02:00 2016
++++ chrome/browser/about_flags.cc	Tue Oct 25 22:00:03 2016
+@@ -785,7 +785,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
       ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
                                 switches::kDisableSmoothScrolling)},
@@ -10,9 +10,18 @@ $OpenBSD: patch-chrome_browser_about_flags_cc,v 1.10 2016/05/28 14:49:39 robert
      {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
       IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
       // Uses the system preference on Mac (a different implementation).
-@@ -1691,7 +1691,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1336,7 +1336,7 @@ const FeatureEntry kFeatureEntries[] = {
+      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
+                                switches::kDisableTranslateNewUX)},
+ #endif
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
+     {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME,
+      IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux,
+      FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
+@@ -1823,7 +1823,7 @@ const FeatureEntry kFeatureEntries[] = {
       IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
-      SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)},
+      FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
  #endif
 -#if defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)

www/iridium/patches/patch-chrome_browser_after_startup_task_utils_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.2 2016/03/23 20:13:06 robert Exp $
---- chrome/browser/after_startup_task_utils.cc.orig.port	Wed Feb 24 21:01:31 2016
-+++ chrome/browser/after_startup_task_utils.cc	Thu Mar  3 09:43:25 2016
-@@ -93,7 +93,7 @@ void QueueTask(scoped_ptr<AfterStartupTask> queued_tas
+$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.3 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/after_startup_task_utils.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/after_startup_task_utils.cc	Wed Oct 19 12:55:57 2016
+@@ -93,7 +93,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue
  
  void SetBrowserStartupIsComplete() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);

www/iridium/patches/patch-chrome_browser_browser_process_impl_cc

@@ -0,0 +1,21 @@
+$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/browser_process_impl.cc.orig.port	Tue Oct 25 21:56:43 2016
++++ chrome/browser/browser_process_impl.cc	Tue Oct 25 22:00:31 2016
+@@ -162,7 +162,7 @@
+ #include "chrome/browser/media/webrtc_log_uploader.h"
+ #endif
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/memory/tab_manager.h"
+ #endif
+ 
+@@ -778,7 +778,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() {
+ 
+ memory::TabManager* BrowserProcessImpl::GetTabManager() {
+   DCHECK(CalledOnValidThread());
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   if (!tab_manager_.get())
+     tab_manager_.reset(new memory::TabManager());
+   return tab_manager_.get();

www/iridium/patches/patch-chrome_browser_browser_process_impl_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.1 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/browser_process_impl.h.orig.port	Tue Oct 25 21:56:43 2016
++++ chrome/browser/browser_process_impl.h	Tue Oct 25 22:19:37 2016
+@@ -336,7 +336,7 @@ class BrowserProcessImpl : public BrowserProcess,
+ 
+   std::unique_ptr<ChromeDeviceClient> device_client_;
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   // Any change to this #ifdef must be reflected as well in
+   // chrome/browser/memory/tab_manager_browsertest.cc
+   std::unique_ptr<memory::TabManager> tab_manager_;

www/iridium/patches/patch-chrome_browser_browser_resources_grd

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.10 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/browser_resources.grd.orig.port	Wed May 25 21:00:57 2016
-+++ chrome/browser/browser_resources.grd	Thu May 26 08:09:40 2016
-@@ -278,7 +278,7 @@
+$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.11 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/browser_resources.grd.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/browser_resources.grd	Wed Oct 19 12:55:57 2016
+@@ -335,7 +335,7 @@
          <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
          <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
        </if>

www/iridium/patches/patch-chrome_browser_chrome_browser_main_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.6 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/chrome_browser_main.cc.orig.port	Sat May 28 10:26:16 2016
-+++ chrome/browser/chrome_browser_main.cc	Sat May 28 10:27:05 2016
-@@ -173,7 +173,7 @@
+$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.7 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/chrome_browser_main.cc.orig.port	Fri Oct 21 00:02:00 2016
++++ chrome/browser/chrome_browser_main.cc	Tue Oct 25 22:01:10 2016
+@@ -188,7 +188,7 @@
  #include "chrome/browser/feedback/feedback_profile_observer.h"
  #endif  // defined(OS_ANDROID)
  
@@ -10,7 +10,25 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.6 2016/05/28 14:49:39
  #include "chrome/browser/first_run/upgrade_util_linux.h"
  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
  
-@@ -1109,7 +1109,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -282,7 +282,7 @@
+ #endif
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ #include "chrome/browser/metrics/desktop_engagement/desktop_engagement_service.h"
+ #endif
+ 
+@@ -955,7 +955,7 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrial
+   sampling_profiler_config_.RegisterSyntheticFieldTrial();
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   metrics::DesktopEngagementService::Initialize();
+ #endif
+ 
+@@ -1325,7 +1325,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
    }
  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  
@@ -19,3 +37,12 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.6 2016/05/28 14:49:39
    // Set the product channel for crash reports.
    base::debug::SetCrashKeyValue(crash_keys::kChannel,
                                  chrome::GetChannelString());
+@@ -1516,7 +1516,7 @@ void ChromeBrowserMainParts::PreBrowserStart() {
+ 
+ // Start the tab manager here so that we give the most amount of time for the
+ // other services to start up before we start adjusting the oom priority.
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   g_browser_process->GetTabManager()->Start();
+ #endif
+ 

www/iridium/patches/patch-chrome_browser_chrome_browser_main_linux_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.4 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/chrome_browser_main_linux.cc.orig.port	Wed May 25 04:54:08 2016
-+++ chrome/browser/chrome_browser_main_linux.cc	Thu May 26 08:09:40 2016
-@@ -57,12 +57,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/chrome_browser_main_linux.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/chrome_browser_main_linux.cc	Wed Oct 19 12:55:58 2016
+@@ -75,12 +75,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
  void ChromeBrowserMainPartsLinux::PostProfileInit() {
    ChromeBrowserMainPartsPosix::PostProfileInit();
  
@@ -17,7 +17,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.4 2016/05/28 14:
    bluez::DBusThreadManagerLinux::Initialize();
    bluez::BluezDBusManager::Initialize(
        bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
-@@ -72,7 +74,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+@@ -90,7 +92,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
  }
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {

www/iridium/patches/patch-chrome_browser_chrome_browser_main_posix_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
---- chrome/browser/chrome_browser_main_posix.cc.orig.port	Wed Feb 24 00:01:58 2016
-+++ chrome/browser/chrome_browser_main_posix.cc	Thu Mar  3 09:43:25 2016
-@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
+$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/chrome_browser_main_posix.cc.orig.port	Thu Sep  1 00:03:27 2016
++++ chrome/browser/chrome_browser_main_posix.cc	Thu Sep  1 11:12:19 2016
+@@ -275,6 +275,11 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
      g_pipe_pid = getpid();
      g_shutdown_pipe_read_fd = pipefd[0];
      g_shutdown_pipe_write_fd = pipefd[1];
@@ -13,7 +13,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.3 2016/03/23 20:
  #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
      const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
  #else
-@@ -281,6 +286,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
+@@ -282,6 +287,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
      // shadow stacks) bloat the stack frames, so we need to increase the stack
      // size to avoid hitting the guard page.
      const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;

www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/chrome_content_browser_client.cc.orig.port	Wed May 25 21:00:57 2016
-+++ chrome/browser/chrome_content_browser_client.cc	Thu May 26 08:09:40 2016
-@@ -196,7 +196,7 @@
- #include "chrome/browser/chromeos/system/input_device_settings.h"
+$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.12 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/chrome_content_browser_client.cc.orig.port	Wed Oct 19 13:31:02 2016
++++ chrome/browser/chrome_content_browser_client.cc	Wed Oct 19 13:32:41 2016
+@@ -211,7 +211,7 @@
+ #include "chrome/browser/ui/browser_dialogs.h"
  #include "chromeos/chromeos_switches.h"
  #include "components/user_manager/user_manager.h"
 -#elif defined(OS_LINUX)
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "chrome/browser/chrome_browser_main_android.h"
-@@ -209,7 +209,7 @@
+@@ -223,7 +223,7 @@
  #include "chrome/browser/chrome_browser_main_posix.h"
  #endif
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2
  #include "base/debug/leak_annotations.h"
  #include "components/crash/content/app/breakpad_linux.h"
  #include "components/crash/content/browser/crash_handler_host_linux.h"
-@@ -231,7 +231,7 @@
+@@ -245,7 +245,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -508,7 +508,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
+@@ -534,7 +534,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
    return false;
  }
  
@@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -779,7 +779,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+@@ -840,7 +840,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
    main_parts = new ChromeBrowserMainPartsMac(parameters);
  #elif defined(OS_CHROMEOS)
    main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
@@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2
    main_parts = new ChromeBrowserMainPartsLinux(parameters);
  #elif defined(OS_ANDROID)
    main_parts = new ChromeBrowserMainPartsAndroid(parameters);
-@@ -795,7 +795,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+@@ -856,7 +856,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
    // Construct additional browser parts. Stages are called in the order in
    // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
  #else
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1407,7 +1407,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -1451,7 +1451,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -63,8 +63,8 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.11 2016/05/2
 +#elif defined(OS_POSIX) && !defined(OS_BSD)
    if (breakpad::IsCrashReporterEnabled()) {
      std::string switch_value;
-     scoped_ptr<metrics::ClientInfo> client_info =
-@@ -2604,7 +2604,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
+     std::unique_ptr<metrics::ClientInfo> client_info =
+@@ -2732,7 +2732,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
    PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
    DCHECK(!app_data_path.empty());
  }

www/iridium/patches/patch-chrome_browser_chrome_content_browser_client_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.9 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/chrome_content_browser_client.h.orig.port	Wed May 25 21:00:57 2016
-+++ chrome/browser/chrome_content_browser_client.h	Thu May 26 08:09:40 2016
-@@ -256,7 +256,7 @@ class ChromeContentBrowserClient : public content::Con
+$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.10 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/chrome_content_browser_client.h.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/chrome_content_browser_client.h	Wed Oct 19 12:55:58 2016
+@@ -269,7 +269,7 @@ class ChromeContentBrowserClient : public content::Con
        int child_process_id,
        content::FileDescriptorInfo* mappings,
        std::map<int, base::MemoryMappedFile::Region>* regions) override;

www/iridium/patches/patch-chrome_browser_custom_handlers_protocol_handler_registry_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.4 2016/03/23 20:13:06 robert Exp $
+$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
 --- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig.port	Wed Feb 24 21:01:31 2016
 +++ chrome/browser/custom_handlers/protocol_handler_registry.cc	Thu Mar  3 09:43:25 2016
 @@ -46,7 +46,7 @@ const ProtocolHandler& LookupHandler(

www/iridium/patches/patch-chrome_browser_defaults_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_defaults_cc,v 1.6 2016/05/28 14:49:39 robert Exp $
+$OpenBSD: patch-chrome_browser_defaults_cc,v 1.7 2016/10/27 18:30:40 robert Exp $
 --- chrome/browser/defaults.cc.orig.port	Wed May 25 04:54:08 2016
 +++ chrome/browser/defaults.cc	Thu May 26 08:09:40 2016
 @@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true;

www/iridium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.6 2016/04/27 12:46:16 robert Exp $
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port	Wed Apr 27 11:15:49 2016
-+++ chrome/browser/download/chrome_download_manager_delegate.cc	Wed Apr 27 11:16:04 2016
-@@ -736,7 +736,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.7 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port	Thu Sep  1 00:03:27 2016
++++ chrome/browser/download/chrome_download_manager_delegate.cc	Thu Sep  1 11:12:20 2016
+@@ -774,7 +774,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
          target_info->is_filetype_handled_safely)
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
-@@ -751,7 +751,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -789,7 +789,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
  
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
      const base::FilePath& path) {

www/iridium/patches/patch-chrome_browser_download_download_commands_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12:46:16 robert Exp $
---- chrome/browser/download/download_commands.cc.orig.port	Thu Apr 14 08:36:11 2016
-+++ chrome/browser/download/download_commands.cc	Thu Apr 14 08:36:32 2016
-@@ -211,7 +211,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
+$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.6 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/download/download_commands.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/download/download_commands.cc	Wed Oct 19 12:55:58 2016
+@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
        return download_item_->GetOpenWhenComplete() ||
               download_crx_util::IsExtensionDownload(*download_item_);
      case ALWAYS_OPEN_TYPE:
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12
        if (CanOpenPdfInSystemViewer()) {
          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
              download_item_->GetBrowserContext());
-@@ -254,7 +254,7 @@ void DownloadCommands::ExecuteCommand(Command command)
+@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command)
        bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
            download_item_->GetBrowserContext());
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12
        if (CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          DownloadItemModel(download_item_)
-@@ -352,7 +352,7 @@ Browser* DownloadCommands::GetBrowser() const {
+@@ -375,7 +375,7 @@ Browser* DownloadCommands::GetBrowser() const {
    return browser_displayer.browser();
  }
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.5 2016/04/27 12
  bool DownloadCommands::IsDownloadPdf() const {
    base::FilePath path = download_item_->GetTargetFilePath();
    return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -369,7 +369,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
+@@ -392,7 +392,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
    return IsDownloadPdf() &&
           (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                            : true);

www/iridium/patches/patch-chrome_browser_download_download_commands_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.3 2016/03/23 20:13:07 robert Exp $
---- chrome/browser/download/download_commands.h.orig.port	Wed Feb 24 00:01:58 2016
-+++ chrome/browser/download/download_commands.h	Thu Mar  3 09:43:25 2016
-@@ -42,7 +42,7 @@ class DownloadCommands {
+$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.4 2016/10/27 18:30:40 robert Exp $
+--- chrome/browser/download/download_commands.h.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/download/download_commands.h	Wed Oct 19 12:55:58 2016
+@@ -43,7 +43,7 @@ class DownloadCommands {
    void ExecuteCommand(Command command);
  
  #if defined(OS_WIN) || defined(OS_LINUX) || \

www/iridium/patches/patch-chrome_browser_download_download_prefs_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46:16 robert Exp $
---- chrome/browser/download/download_prefs.cc.orig.port	Thu Apr 14 08:36:37 2016
-+++ chrome/browser/download/download_prefs.cc	Thu Apr 14 08:37:05 2016
-@@ -55,7 +55,7 @@ namespace {
+$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.6 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/download/download_prefs.cc.orig.port	Wed Jul 20 21:03:19 2016
++++ chrome/browser/download/download_prefs.cc	Thu Jul 21 10:25:26 2016
+@@ -56,7 +56,7 @@ namespace {
  // Consider downloads 'dangerous' if they go to the home directory on Linux and
  // to the desktop on any platform.
  bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46
    base::FilePath home_dir = base::GetHomeDir();
    if (download_path == home_dir) {
      return true;
-@@ -135,7 +135,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
+@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
                   GetDefaultDownloadDirectoryForProfile()));
  #endif  // defined(OS_CHROMEOS)
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46
    should_open_pdf_in_system_reader_ =
        prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
  #endif
-@@ -211,7 +211,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs(
                                   default_download_path);
    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                   default_download_path);
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46
    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
  #endif
  }
-@@ -288,7 +288,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
+@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
  }
  
  bool DownloadPrefs::IsAutoOpenUsed() const {
@@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46
    if (ShouldOpenPdfInSystemReader())
      return true;
  #endif
-@@ -302,7 +302,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
+@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
      return false;
    DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
    extension.erase(0, 1);
@@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46
    if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
      return true;
  #endif
-@@ -335,7 +335,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
+@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
    SaveAutoOpenState();
  }
  
@@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.5 2016/04/27 12:46
  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
    if (should_open_pdf_in_system_reader_ == should_open)
      return;
-@@ -356,7 +356,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
  #endif
  
  void DownloadPrefs::ResetAutoOpen() {

www/iridium/patches/patch-chrome_browser_download_download_prefs_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.5 2016/04/27 12:46:16 robert Exp $
+$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.6 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/download/download_prefs.h.orig.port	Thu Apr 14 08:37:10 2016
 +++ chrome/browser/download/download_prefs.h	Thu Apr 14 08:37:20 2016
 @@ -79,7 +79,7 @@ class DownloadPrefs {

www/iridium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
---- chrome/browser/download/download_shelf_context_menu.cc.orig.port	Wed Feb 24 00:01:58 2016
-+++ chrome/browser/download/download_shelf_context_menu.cc	Thu Mar  3 09:43:25 2016
-@@ -142,7 +142,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
+$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.5 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/download/download_shelf_context_menu.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/download/download_shelf_context_menu.cc	Wed Oct 19 12:55:58 2016
+@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
                     : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
            break;
          }

www/iridium/patches/patch-chrome_browser_download_download_status_updater_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
+$OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/download/download_status_updater.cc.orig.port	Wed Feb 24 00:01:58 2016
 +++ chrome/browser/download/download_status_updater.cc	Thu Mar  3 09:43:25 2016
 @@ -13,7 +13,7 @@

www/iridium/patches/patch-chrome_browser_extensions_BUILD_gn

@@ -0,0 +1,14 @@
+$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.1 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/extensions/BUILD.gn.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/extensions/BUILD.gn	Wed Oct 19 12:55:58 2016
+@@ -252,6 +252,10 @@ static_library("extensions") {
+     defines += [ "ENABLE_HOTWORDING" ]
+   }
+ 
++  if (is_openbsd) {
++    sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ]
++  }
++
+   if (enable_service_discovery) {
+     sources += rebase_path(
+             gypi_values.chrome_browser_extensions_service_discovery_sources,

www/iridium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc,v 1.3 2015/10/24 18:22:21 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig.port	Sat Aug 22 21:01:52 2015
 +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	Wed Sep  2 07:31:55 2015
 @@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDevicesFunction:

www/iridium/patches/patch-chrome_browser_extensions_api_input_ime_input_ime_api_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_extensions_api_input_ime_input_ime_api_h,v 1.2 2016/05/28 14:49:39 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_api_input_ime_input_ime_api_h,v 1.3 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig.port	Wed May 25 04:54:08 2016
 +++ chrome/browser/extensions/api/input_ime/input_ime_api.h	Thu May 26 08:09:40 2016
 @@ -28,7 +28,7 @@

www/iridium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.5 2016/04/27 12:46:16 robert Exp $
---- chrome/browser/extensions/api/messaging/message_service.cc.orig.port	Wed Apr 13 22:59:39 2016
-+++ chrome/browser/extensions/api/messaging/message_service.cc	Thu Apr 14 08:25:09 2016
-@@ -118,7 +118,7 @@ MessageService::PolicyPermission MessageService::IsNat
+$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.6 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/extensions/api/messaging/message_service.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/extensions/api/messaging/message_service.cc	Wed Oct 19 12:55:58 2016
+@@ -119,7 +119,7 @@ MessageService::PolicyPermission MessageService::IsNat
  
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
@@ -10,12 +10,12 @@ $OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.5
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -415,7 +415,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -416,7 +416,7 @@ void MessageService::OpenChannelToNativeApp(
    if (!source)
      return;
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-   Profile* profile =
-       Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext());
-   ExtensionService* extension_service =
+   content::WebContents* web_contents =
+       content::WebContents::FromRenderFrameHost(source);
+   ExtensionWebContentsObserver* extension_web_contents_observer =

www/iridium/patches/patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig.port	Wed Feb 24 00:01:58 2016
 +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc	Sat Mar  5 19:12:21 2016
 @@ -4,6 +4,15 @@

www/iridium/patches/patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc,v 1.4 2016/05/28 14:49:39 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc,v 1.5 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig.port	Wed May 25 04:54:08 2016
 +++ chrome/browser/extensions/api/omnibox/omnibox_api.cc	Thu May 26 08:09:41 2016
 @@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] = "newBackgroun

www/iridium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.9 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/extensions/bookmark_app_helper.cc.orig.port	Wed May 25 04:54:08 2016
-+++ chrome/browser/extensions/bookmark_app_helper.cc	Thu May 26 08:09:41 2016
-@@ -705,7 +705,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
+$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.10 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/extensions/bookmark_app_helper.cc	Wed Oct 19 12:55:58 2016
+@@ -707,7 +707,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
  #if !defined(OS_MACOSX)
  #if !defined(USE_ASH)
    web_app::ShortcutLocations creation_locations;

www/iridium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.2 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig.port	Wed May 25 04:54:08 2016
-+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc	Thu May 26 08:09:41 2016
-@@ -63,7 +63,7 @@
+$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.3 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig.port	Wed Jul 20 21:03:20 2016
++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc	Thu Jul 21 10:25:27 2016
+@@ -62,7 +62,7 @@
  #include "chrome/browser/chromeos/extensions/media_player_api.h"
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #include "chrome/browser/extensions/api/log_private/log_private_api.h"
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factorie
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #endif
  
-@@ -104,7 +104,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
+@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
  #if defined(OS_CHROMEOS)
    extensions::InputImeAPI::GetFactoryInstance();
    extensions::InputMethodAPI::GetFactoryInstance();

www/iridium/patches/patch-chrome_browser_extensions_external_provider_impl_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.2 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/extensions/external_provider_impl.cc.orig.port	Wed May 25 04:54:09 2016
-+++ chrome/browser/extensions/external_provider_impl.cc	Thu May 26 08:09:41 2016
-@@ -646,7 +646,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.3 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/extensions/external_provider_impl.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/extensions/external_provider_impl.cc	Wed Oct 19 12:55:59 2016
+@@ -647,7 +647,7 @@ void ExternalProviderImpl::CreateExternalProviders(
                                   Manifest::EXTERNAL_PREF_DOWNLOAD,
                                   oem_extension_creation_flags)));
    }
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.2 2016/0
    if (!profile->IsLegacySupervised()) {
      provider_list->push_back(
          linked_ptr<ExternalProviderInterface>(
-@@ -688,7 +688,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -689,7 +689,7 @@ void ExternalProviderImpl::CreateExternalProviders(
                  bundled_extension_creation_flags)));
  
      // Define a per-user source of external extensions.

www/iridium/patches/patch-chrome_browser_first_run_first_run_internal_posix_cc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_browser_first_run_first_run_internal_posix_cc,v 1.9 2016/05/28 14:49:39 robert Exp $
---- chrome/browser/first_run/first_run_internal_posix.cc.orig.port	Fri May 27 10:48:10 2016
-+++ chrome/browser/first_run/first_run_internal_posix.cc	Sat May 28 10:25:25 2016
+$OpenBSD: patch-chrome_browser_first_run_first_run_internal_posix_cc,v 1.10 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/first_run/first_run_internal_posix.cc.orig.port	Sun Oct 23 21:05:00 2016
++++ chrome/browser/first_run/first_run_internal_posix.cc	Thu Oct 27 11:16:54 2016
 @@ -25,7 +25,7 @@ namespace first_run {
  namespace internal {
  

www/iridium/patches/patch-chrome_browser_gpu_gl_string_manager_cc

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.4 2016/04/27 12:46:16 robert Exp $
---- chrome/browser/gpu/gl_string_manager.cc.orig.port	Fri Apr  8 18:02:07 2016
-+++ chrome/browser/gpu/gl_string_manager.cc	Thu Apr 14 08:25:09 2016
-@@ -28,7 +28,7 @@ GLStringManager::~GLStringManager() {
+$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.5 2016/10/27 18:30:41 robert Exp $
+--- chrome/browser/gpu/gl_string_manager.cc.orig.port	Wed Oct 12 21:02:54 2016
++++ chrome/browser/gpu/gl_string_manager.cc	Wed Oct 19 12:55:59 2016
+@@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() {
  
  void GLStringManager::Initialize() {
    // On MacOSX or Windows, preliminary GPUInfo is enough.

www/iridium/patches/patch-chrome_browser_gpu_gpu_feature_checker_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
+$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/gpu/gpu_feature_checker.cc.orig.port	Wed Feb 24 00:01:58 2016
 +++ chrome/browser/gpu/gpu_feature_checker.cc	Thu Mar  3 09:43:25 2016
 @@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability() 

www/iridium/patches/patch-chrome_browser_interstitials_chrome_controller_client_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_interstitials_chrome_controller_client_cc,v 1.1 2016/04/27 12:46:16 robert Exp $
+$OpenBSD: patch-chrome_browser_interstitials_chrome_controller_client_cc,v 1.2 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/interstitials/chrome_controller_client.cc.orig.port	Sat Apr 16 13:33:45 2016
 +++ chrome/browser/interstitials/chrome_controller_client.cc	Sat Apr 16 13:36:17 2016
 @@ -55,7 +55,7 @@ void LaunchDateAndTimeSettingsOnFile() {

www/iridium/patches/patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc,v 1.3 2015/05/26 17:37:39 robert Exp $
+$OpenBSD: patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig.port	Wed May 20 10:03:54 2015
 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	Wed May 20 10:04:12 2015
 @@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(

www/iridium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.8 2016/05/28 14:49:39 robert Exp $
+$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.9 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port	Wed May 25 04:54:09 2016
 +++ chrome/browser/media_galleries/media_file_system_registry.cc	Thu May 26 08:09:41 2016
 @@ -757,7 +757,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI

www/iridium/patches/patch-chrome_browser_media_webrtc_log_uploader_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_media_webrtc_log_uploader_cc,v 1.1 2016/04/27 12:46:16 robert Exp $
+$OpenBSD: patch-chrome_browser_media_webrtc_log_uploader_cc,v 1.2 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/media/webrtc_log_uploader.cc.orig.port	Mon Apr 25 17:42:10 2016
 +++ chrome/browser/media/webrtc_log_uploader.cc	Mon Apr 25 17:42:31 2016
 @@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(

www/iridium/patches/patch-chrome_browser_memory_details_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.8 2016/05/28 14:49:39 robert Exp $
+$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.9 2016/10/27 18:30:41 robert Exp $
 --- chrome/browser/memory_details.cc.orig.port	Wed May 25 21:00:57 2016
 +++ chrome/browser/memory_details.cc	Thu May 26 08:09:41 2016
 @@ -32,7 +32,7 @@