update to 57.0
This commit is contained in:
parent
c23b043d8d
commit
b69404504f
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.56 2016/10/27 18:30:40 robert Exp $
|
||||
# $OpenBSD: Makefile,v 1.57 2017/04/19 05:16:46 robert Exp $
|
||||
|
||||
USE_WXNEEDED= Yes
|
||||
|
||||
@ -7,7 +7,7 @@ DPB_PROPERTIES= parallel
|
||||
|
||||
COMMENT= Iridium browser
|
||||
|
||||
V= 54.0
|
||||
V= 57.0
|
||||
DISTNAME= iridium-browser-${V}
|
||||
PKGNAME= iridium-${V}
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
|
||||
@ -18,7 +18,7 @@ HOMEPAGE= https://iridiumbrowser.de/
|
||||
|
||||
MAINTAINER= Robert Nagy <robert@openbsd.org>
|
||||
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
#EXTRACT_SUFX= .tar.xz
|
||||
|
||||
FLAVORS= debug
|
||||
FLAVOR?=
|
||||
@ -115,6 +115,8 @@ GN_ARGS= enable_nacl=false \
|
||||
treat_warnings_as_errors=false \
|
||||
clang_use_chrome_plugins=false \
|
||||
use_allocator=\"none\" \
|
||||
is_official_build=false \
|
||||
fieldtrial_testing_like_official_build=true \
|
||||
extra_cppflags=\"-idirafter ${LOCALBASE}/include -idirafter ${X11BASE}/include\" \
|
||||
extra_ldflags=\"-L${LOCALBASE}/lib -L${X11BASE}/lib\"
|
||||
|
||||
@ -134,8 +136,10 @@ MAKE_ENV+= V=1
|
||||
pre-configure:
|
||||
@ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
|
||||
.for _arch in x64 ia32
|
||||
@cp -pR ${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/linux/${_arch}/libavutil \
|
||||
${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/openbsd/${_arch}/libavutil
|
||||
. for _dir in avcodec avformat avutil
|
||||
@cp -pR ${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/linux/${_arch}/lib${_dir} \
|
||||
${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/openbsd/${_arch}/lib${_dir}
|
||||
. endfor
|
||||
.endfor
|
||||
@mkdir -p ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd
|
||||
@cp ${FILESDIR}/sndio_{out,in}put.{cc,h} ${WRKSRC}/media/audio/sndio
|
||||
@ -168,6 +172,7 @@ do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/iridium/locales
|
||||
${INSTALL_DATA} ${BUILDDIR}/locales/* ${PREFIX}/iridium/locales
|
||||
${INSTALL_DATA} ${BUILDDIR}/*.png ${PREFIX}/iridium
|
||||
${INSTALL_DATA} ${BUILDDIR}/*.service ${PREFIX}/iridium
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/iridium/resources
|
||||
@cp -Rp ${BUILDDIR}/resources/* ${PREFIX}/iridium/resources
|
||||
@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/iridium/resources
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (iridium-browser-54.0.tar.xz) = D5O+66BiWReP3haUj3ErmXQIsUvQRxjHVjpUN0gRx04=
|
||||
SIZE (iridium-browser-54.0.tar.xz) = 546141012
|
||||
SHA256 (iridium-browser-57.0.tar.gz) = W4LeA7wM2iZeItHXgHoZT5HRPuFlsA2MQ3hOBPa8nRI=
|
||||
SIZE (iridium-browser-57.0.tar.gz) = 747015073
|
||||
|
@ -2,17 +2,33 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
|
||||
#include "media/audio/openbsd/audio_manager_openbsd.h"
|
||||
|
||||
#include "media/audio/audio_device_description.h"
|
||||
#include "media/audio/audio_output_dispatcher.h"
|
||||
#if defined(USE_PULSEAUDIO)
|
||||
#include "media/audio/pulse/audio_manager_pulse.h"
|
||||
#endif
|
||||
#if defined(USE_SNDIO)
|
||||
#include "media/audio/sndio/sndio_input.h"
|
||||
#include "media/audio/sndio/sndio_output.h"
|
||||
#else
|
||||
#include "media/audio/fake_audio_manager.h"
|
||||
#endif
|
||||
#include "media/base/limits.h"
|
||||
#include "media/base/media_switches.h"
|
||||
|
||||
namespace media {
|
||||
|
||||
enum OpenBSDAudioIO {
|
||||
kPulse,
|
||||
kSndio,
|
||||
kAudioIOMax = kSndio
|
||||
};
|
||||
|
||||
#if defined(USE_SNDIO)
|
||||
// Maximum number of output streams that can be open simultaneously.
|
||||
static const int kMaxOutputStreams = 4;
|
||||
|
||||
@ -47,6 +63,12 @@ void AudioManagerOpenBSD::GetAudioOutputDeviceNames(
|
||||
AddDefaultDevice(device_names);
|
||||
}
|
||||
|
||||
#if defined(USE_SNDIO)
|
||||
const char* AudioManagerOpenBSD::GetName() {
|
||||
return "SNDIO";
|
||||
}
|
||||
#endif
|
||||
|
||||
AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
|
||||
const std::string& device_id) {
|
||||
static const int kDefaultInputBufferSize = 1024;
|
||||
@ -146,15 +168,38 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
|
||||
DLOG(WARNING) << "MakeOutputStream";
|
||||
return new SndioAudioOutputStream(params, this);
|
||||
}
|
||||
#endif
|
||||
|
||||
ScopedAudioManagerPtr CreateAudioManager(
|
||||
scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
||||
scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
|
||||
AudioLogFactory* audio_log_factory) {
|
||||
DLOG(WARNING) << "CreateAudioManager";
|
||||
#if defined(USE_PULSEAUDIO)
|
||||
// Do not move task runners when creating AudioManagerPulse.
|
||||
// If the creation fails, we need to use the task runners to create other
|
||||
// AudioManager implementations.
|
||||
std::unique_ptr<AudioManagerPulse, AudioManagerDeleter> manager(
|
||||
new AudioManagerPulse(task_runner, worker_task_runner,
|
||||
audio_log_factory));
|
||||
if (manager->Init()) {
|
||||
UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kPulse, kAudioIOMax + 1);
|
||||
return std::move(manager);
|
||||
}
|
||||
DVLOG(1) << "PulseAudio is not available on the OS";
|
||||
#endif
|
||||
|
||||
#if defined(USE_SNDIO)
|
||||
UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1);
|
||||
return ScopedAudioManagerPtr(
|
||||
new AudioManagerOpenBSD(std::move(task_runner),
|
||||
std::move(worker_task_runner),audio_log_factory));
|
||||
#else
|
||||
return ScopedAudioManagerPtr(
|
||||
new FakeAudioManager(std::move(task_runner),
|
||||
std::move(worker_task_runner), audio_log_factory));
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
} // namespace media
|
||||
|
@ -8,7 +8,9 @@
|
||||
#include <set>
|
||||
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/threading/thread.h"
|
||||
#include "media/audio/audio_manager_base.h"
|
||||
|
||||
namespace media {
|
||||
@ -28,6 +30,7 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
|
||||
void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
|
||||
AudioParameters GetInputStreamParameters(
|
||||
const std::string& device_id) override;
|
||||
const char* GetName() override;
|
||||
|
||||
// Implementation of AudioManagerBase.
|
||||
AudioOutputStream* MakeLinearOutputStream(
|
||||
@ -58,9 +61,6 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
|
||||
AudioOutputStream* MakeOutputStream(const AudioParameters& params);
|
||||
AudioInputStream* MakeInputStream(const AudioParameters& params);
|
||||
|
||||
// Flag to indicate whether the pulse library has been initialized or not.
|
||||
bool pulse_library_is_initialized_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
|
||||
};
|
||||
|
||||
|
@ -3,7 +3,10 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "base/time/time.h"
|
||||
#include "base/time/default_tick_clock.h"
|
||||
#include "media/audio/audio_manager_base.h"
|
||||
#include "media/base/audio_timestamp_helper.h"
|
||||
#include "media/audio/sndio/sndio_output.h"
|
||||
|
||||
namespace media {
|
||||
@ -11,7 +14,7 @@ namespace media {
|
||||
void sndio_onmove(void *arg, int delta) {
|
||||
SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
|
||||
|
||||
self->hw_delay = delta * self->params.GetBytesPerFrame();
|
||||
self->hw_delay = delta;
|
||||
}
|
||||
|
||||
void sndio_onvol(void *arg, unsigned int vol) {
|
||||
@ -32,6 +35,7 @@ SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
|
||||
: manager(manager),
|
||||
params(params),
|
||||
audio_bus(AudioBus::Create(params)),
|
||||
bytes_per_frame(params.GetBytesPerFrame()),
|
||||
state(kClosed),
|
||||
mutex(PTHREAD_MUTEX_INITIALIZER) {
|
||||
}
|
||||
@ -147,7 +151,8 @@ void SndioAudioOutputStream::RealTimeThread(void) {
|
||||
pthread_mutex_unlock(&mutex);
|
||||
|
||||
// Get data to play
|
||||
count = source->OnMoreData(audio_bus.get(), hw_delay, 0);
|
||||
const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, params.sample_rate() * 1000);
|
||||
count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
|
||||
audio_bus->ToInterleaved(count, params.bits_per_sample() / 8, buffer);
|
||||
if (count == 0) {
|
||||
// We have to submit something to the device
|
||||
|
@ -8,8 +8,11 @@
|
||||
#include <pthread.h>
|
||||
#include <sndio.h>
|
||||
|
||||
#include "base/time/tick_clock.h"
|
||||
#include "base/time/time.h"
|
||||
#include "media/audio/audio_io.h"
|
||||
|
||||
|
||||
namespace media {
|
||||
|
||||
class AudioParameters;
|
||||
@ -61,6 +64,7 @@ class SndioAudioOutputStream : public AudioOutputStream {
|
||||
AudioParameters params;
|
||||
// Source stores data here
|
||||
std::unique_ptr<AudioBus> audio_bus;
|
||||
int bytes_per_frame;
|
||||
// Call-back that produces data to play
|
||||
AudioSourceCallback* source;
|
||||
// Handle of the audio device
|
||||
|
@ -0,0 +1,32 @@
|
||||
$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig.port Fri Mar 10 08:44:16 2017
|
||||
+++ chrome/browser/resources/plugin_metadata/plugins_linux.json Fri Mar 10 08:44:27 2017
|
||||
@@ -70,28 +70,6 @@
|
||||
"displayurl": true,
|
||||
"group_name_matcher": "Java*"
|
||||
},
|
||||
- "adobe-flash-player": {
|
||||
- "mime_types": [
|
||||
- "application/futuresplash",
|
||||
- "application/x-shockwave-flash"
|
||||
- ],
|
||||
- "matching_mime_types": [
|
||||
- "application/futuresplash"
|
||||
- ],
|
||||
- "versions": [
|
||||
- {
|
||||
- "version": "24.0.0.221",
|
||||
- "status": "up_to_date",
|
||||
- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb17-04.html"
|
||||
- }
|
||||
- ],
|
||||
- "lang": "en-US",
|
||||
- "name": "Adobe Flash Player",
|
||||
- "help_url": "https://support.google.com/chrome/?p=plugin_flash",
|
||||
- "url": "https://support.google.com/chrome/answer/6258784",
|
||||
- "displayurl": true,
|
||||
- "group_name_matcher": "*Shockwave Flash*"
|
||||
- },
|
||||
"lightspark": {
|
||||
"mime_types": [
|
||||
"application/x-lightspark"
|
@ -1,16 +1,7 @@
|
||||
$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") {
|
||||
$OpenBSD: patch-BUILD_gn,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- BUILD.gn.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ BUILD.gn Fri Mar 10 07:46:16 2017
|
||||
@@ -466,7 +466,7 @@ group("both_gn_and_gyp") {
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,7 +10,7 @@ $OpenBSD: patch-BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
deps += [
|
||||
"//breakpad:breakpad_unittests",
|
||||
"//breakpad:core-2-minidump",
|
||||
@@ -465,8 +465,6 @@ group("both_gn_and_gyp") {
|
||||
@@ -503,8 +503,6 @@ group("both_gn_and_gyp") {
|
||||
"//net:disk_cache_memory_test",
|
||||
"//net:quic_client",
|
||||
"//net:quic_server",
|
||||
@ -28,7 +19,7 @@ $OpenBSD: patch-BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
]
|
||||
|
||||
if (use_dbus) {
|
||||
@@ -526,10 +524,6 @@ group("both_gn_and_gyp") {
|
||||
@@ -563,10 +561,6 @@ group("both_gn_and_gyp") {
|
||||
"//chrome/test:sync_performance_tests",
|
||||
"//chrome/test/chromedriver:chromedriver",
|
||||
"//chrome/test/chromedriver:chromedriver_tests",
|
||||
@ -39,7 +30,7 @@ $OpenBSD: patch-BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
"//media/cast:generate_barcode_video",
|
||||
"//media/cast:generate_timecode_audio",
|
||||
"//net:crash_cache",
|
||||
@@ -575,10 +569,6 @@ group("both_gn_and_gyp") {
|
||||
@@ -612,10 +606,6 @@ group("both_gn_and_gyp") {
|
||||
|
||||
if (is_android || (is_linux && !is_chromeos)) {
|
||||
deps += [
|
||||
@ -50,7 +41,7 @@ $OpenBSD: patch-BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
"//components/network_hints/browser",
|
||||
"//content/public/app:browser",
|
||||
"//content/public/app:child",
|
||||
@@ -664,7 +654,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -700,7 +690,7 @@ group("both_gn_and_gyp") {
|
||||
deps +=
|
||||
[ "//chrome/installer/mini_installer:next_version_mini_installer" ]
|
||||
}
|
||||
@ -59,29 +50,30 @@ $OpenBSD: patch-BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
deps += [ "//breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -906,7 +896,7 @@ if (!is_ios) {
|
||||
]
|
||||
@@ -948,7 +938,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//content/shell:content_shell_crash_service" ]
|
||||
}
|
||||
|
||||
- if (!is_win && !is_android) {
|
||||
+ if (!is_win && !is_android && !is_openbsd) {
|
||||
deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -917,7 +907,7 @@ if (!is_ios) {
|
||||
]
|
||||
@@ -956,7 +946,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
- if (is_linux) {
|
||||
+ if (is_linux && !is_openbsd) {
|
||||
deps += [ "//breakpad:dump_syms($host_toolchain)" ]
|
||||
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -966,7 +956,6 @@ group("chromium_builder_perf") {
|
||||
"//third_party/angle/src/tests:angle_perftests",
|
||||
@@ -1008,8 +998,6 @@ group("chromium_builder_perf") {
|
||||
"//chrome/installer/mini_installer:mini_installer",
|
||||
"//chrome/test:angle_perftests",
|
||||
]
|
||||
} else {
|
||||
- deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
- } else {
|
||||
- data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.5 2017/04/19 05:16:46 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()
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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(
|
||||
$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.7 2017/04/19 05:16:46 robert Exp $
|
||||
--- ash/display/mirror_window_controller.cc.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ ash/display/mirror_window_controller.cc Fri Mar 10 07:46:16 2017
|
||||
@@ -251,7 +251,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
return info.id() == iter->first;
|
||||
}) == display_info_list.end()) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
|
@ -1,12 +0,0 @@
|
||||
$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
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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") {
|
||||
$OpenBSD: patch-base_BUILD_gn,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/BUILD.gn.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ base/BUILD.gn Fri Mar 10 07:46:16 2017
|
||||
@@ -1457,6 +1457,28 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
|
12
www/iridium/patches/patch-base_allocator_allocator_shim_cc
Normal file
12
www/iridium/patches/patch-base_allocator_allocator_shim_cc
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-base_allocator_allocator_shim_cc,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/allocator/allocator_shim.cc.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ base/allocator/allocator_shim.cc Fri Mar 10 07:46:16 2017
|
||||
@@ -77,7 +77,7 @@ inline const allocator::AllocatorDispatch* GetChainHea
|
||||
// Unfortunately due to that bug NoBarrier_Load() is mistakenly fully
|
||||
// barriered on Linux+Clang, and that causes visible perf regressons.
|
||||
return reinterpret_cast<const allocator::AllocatorDispatch*>(
|
||||
-#if defined(OS_LINUX) && defined(__clang__)
|
||||
+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__)
|
||||
*static_cast<const volatile subtle::AtomicWord*>(&g_chain_head)
|
||||
#else
|
||||
subtle::NoBarrier_Load(&g_chain_head)
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_atomicops_h,v 1.3 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_atomicops_h,v 1.4 2017/04/19 05:16:46 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;
|
||||
|
@ -1,6 +1,6 @@
|
||||
$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
|
||||
$OpenBSD: patch-base_base_paths_posix_cc,v 1.5 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/base_paths_posix.cc.orig.port Sat Apr 8 19:38:10 2017
|
||||
+++ base/base_paths_posix.cc Sat Apr 8 19:42:40 2017
|
||||
@@ -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
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.7 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/debug/debugger_posix.cc.orig.port Thu Dec 15 00:02:02 2016
|
||||
+++ base/debug/debugger_posix.cc Tue Jan 3 20:29:54 2017
|
||||
@@ -34,6 +34,10 @@
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-base_debug_debugger_posix_cc,v 1.6 2016/10/27 18:30:40 robert Ex
|
||||
#if defined(OS_FREEBSD)
|
||||
#include <sys/user.h>
|
||||
#endif
|
||||
@@ -90,33 +94,38 @@ bool BeingDebugged() {
|
||||
@@ -92,33 +96,38 @@ bool BeingDebugged() {
|
||||
|
||||
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
|
||||
// binary interfaces may change.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-base_debug_stack_trace_h,v 1.5 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/debug/stack_trace.h.orig.port Thu Dec 15 00:02:02 2016
|
||||
+++ base/debug/stack_trace.h Tue Jan 3 20:29:54 2017
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "build/build_config.h"
|
||||
|
||||
#if defined(OS_POSIX)
|
||||
|
@ -1,7 +1,16 @@
|
||||
$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 {
|
||||
$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.9 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/debug/stack_trace_posix.cc.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ base/debug/stack_trace_posix.cc Fri Mar 10 18:55:57 2017
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <AvailabilityMacros.h>
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -574,6 +574,9 @@ class SandboxSymbolizeHelper {
|
||||
// for the modules that are loaded in the current process.
|
||||
// Returns true on success.
|
||||
bool CacheMemoryRegions() {
|
||||
@ -11,7 +20,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.8 2016/10/27 18:30:40 robert
|
||||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -586,6 +589,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -589,6 +592,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
@ -19,7 +28,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.8 2016/10/27 18:30:40 robert
|
||||
}
|
||||
|
||||
// Opens all object files and caches their file descriptors.
|
||||
@@ -718,7 +722,7 @@ StackTrace::StackTrace() {
|
||||
@@ -721,7 +725,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.
|
||||
|
||||
|
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-base_debug_thread_heap_usage_tracker_cc,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/debug/thread_heap_usage_tracker.cc.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ base/debug/thread_heap_usage_tracker.cc Fri Mar 10 07:46:16 2017
|
||||
@@ -15,10 +15,12 @@
|
||||
#include "base/threading/thread_local_storage.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
+#if !defined(OS_OPENBSD)
|
||||
#if defined(OS_MACOSX) || defined(OS_IOS)
|
||||
#include <malloc/malloc.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
namespace base {
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_linux_util_cc,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_linux_util_cc,v 1.2 2017/04/19 05:16:46 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] =
|
||||
|
@ -1,12 +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
|
||||
$OpenBSD: patch-base_native_library_posix_cc,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/native_library_posix.cc.orig.port Fri Dec 2 17:54:51 2016
|
||||
+++ base/native_library_posix.cc Fri Dec 2 17:55:04 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.
|
||||
-#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND)
|
||||
+#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD)
|
||||
// Certain platforms don't define RTLD_DEEPBIND. 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.
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.6 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_process_launch_h,v 1.6 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_process_launch_h,v 1.7 2017/04/19 05:16:46 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 {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_process_memory_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_process_memory_cc,v 1.6 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.5 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.5 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-base_process_process_metrics_h,v 1.6 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/process/process_metrics.h.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ base/process/process_metrics.h Fri Mar 10 07:46:16 2017
|
||||
@@ -257,7 +257,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto
|
||||
#endif // defined(OS_POSIX)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.5 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,12 +1,16 @@
|
||||
$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
|
||||
$OpenBSD: patch-base_process_process_posix_cc,v 1.8 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/process/process_posix.cc.orig.port Tue Jan 3 20:30:22 2017
|
||||
+++ base/process/process_posix.cc Tue Jan 3 20:56:09 2017
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <stdint.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/wait.h>
|
||||
+#include <signal.h>
|
||||
|
||||
#include "base/debug/activity_tracker.h"
|
||||
#include "base/files/scoped_file.h"
|
||||
@@ -23,6 +24,9 @@
|
||||
|
||||
namespace {
|
||||
|
||||
+const int kBackgroundPriority = 5;
|
||||
@ -19,13 +23,13 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.7 2016/10/27 18:30:40 robert E
|
||||
return Process(handle);
|
||||
}
|
||||
|
||||
-#if !defined(OS_LINUX)
|
||||
-#if !defined(OS_LINUX) && !defined(OS_MACOSX)
|
||||
// static
|
||||
bool Process::CanBackgroundProcesses() {
|
||||
- return false;
|
||||
+ return true;
|
||||
}
|
||||
-#endif // !defined(OS_LINUX)
|
||||
-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX)
|
||||
|
||||
bool Process::IsValid() const {
|
||||
return process_ != kNullProcessHandle;
|
||||
@ -33,7 +37,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.7 2016/10/27 18:30:40 robert E
|
||||
return WaitForExitWithTimeoutImpl(Handle(), exit_code, timeout);
|
||||
}
|
||||
|
||||
-#if !defined(OS_LINUX)
|
||||
-#if !defined(OS_LINUX) && !defined(OS_MACOSX)
|
||||
bool Process::IsProcessBackgrounded() const {
|
||||
// See SetProcessBackgrounded().
|
||||
DCHECK(IsValid());
|
||||
@ -42,14 +46,14 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.7 2016/10/27 18:30:40 robert E
|
||||
}
|
||||
|
||||
-bool Process::SetProcessBackgrounded(bool value) {
|
||||
- // Not implemented for POSIX systems other than Linux. With POSIX, if we were
|
||||
- // to lower the process priority we wouldn't be able to raise it back to its
|
||||
- // initial priority.
|
||||
- // Not implemented for POSIX systems other than Linux and Mac. With POSIX, if
|
||||
- // we were to lower the process priority we wouldn't be able to raise it back
|
||||
- // to its initial priority.
|
||||
- NOTIMPLEMENTED();
|
||||
- return false;
|
||||
+bool Process::SetProcessBackgrounded(bool background) {
|
||||
+ DCHECK(IsValid());
|
||||
+
|
||||
+
|
||||
+ if (!CanBackgroundProcesses())
|
||||
+ return false;
|
||||
+
|
||||
@ -58,7 +62,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.7 2016/10/27 18:30:40 robert E
|
||||
+ DPCHECK(result == 0);
|
||||
+ return result == 0;
|
||||
}
|
||||
-#endif // !defined(OS_LINUX)
|
||||
-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX)
|
||||
|
||||
int Process::GetPriority() const {
|
||||
DCHECK(IsValid());
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.6 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.7 2017/04/19 05:16:46 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) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_sys_info_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_sys_info_posix_cc,v 1.5 2017/04/19 05:16:46 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() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_third_party_libevent_event-config_h,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_third_party_libevent_event-config_h,v 1.2 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_third_party_libevent_openbsd_config_h,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_third_party_libevent_openbsd_config_h,v 1.2 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_third_party_libevent_openbsd_event-config_h,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_third_party_libevent_openbsd_event-config_h,v 1.2 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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_
|
||||
$OpenBSD: patch-base_third_party_symbolize_symbolize_cc,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/third_party/symbolize/symbolize.cc.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ base/third_party/symbolize/symbolize.cc Fri Mar 10 07:46:16 2017
|
||||
@@ -109,7 +109,7 @@ _END_GOOGLE_NAMESPACE_
|
||||
#if defined(__ELF__)
|
||||
|
||||
#include <dlfcn.h>
|
||||
|
12
www/iridium/patches/patch-base_threading_platform_thread_h
Normal file
12
www/iridium/patches/patch-base_threading_platform_thread_h
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-base_threading_platform_thread_h,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/threading/platform_thread.h.orig.port Fri Jan 13 11:22:11 2017
|
||||
+++ base/threading/platform_thread.h Fri Jan 13 11:22:17 2017
|
||||
@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread {
|
||||
|
||||
static ThreadPriority GetCurrentThreadPriority();
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
// Toggles a specific thread's priority at runtime. This can be used to
|
||||
// change the priority of a thread in a different process and will fail
|
||||
// if the calling process does not have proper permissions. The
|
@ -1,6 +1,6 @@
|
||||
$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
|
||||
$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.9 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/threading/platform_thread_linux.cc.orig.port Thu Mar 9 21:04:26 2017
|
||||
+++ base/threading/platform_thread_linux.cc Sat Mar 11 20:23:16 2017
|
||||
@@ -19,7 +19,9 @@
|
||||
|
||||
#if !defined(OS_NACL)
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.8 2016/10/27 18:30:4
|
||||
#include <sys/resource.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
@@ -110,7 +112,7 @@ void PlatformThread::SetName(const std::string& name)
|
||||
@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name)
|
||||
ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
|
||||
tracked_objects::ThreadData::InitializeThreadContext(name);
|
||||
|
||||
@ -20,12 +20,3 @@ $OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.8 2016/10/27 18:30:4
|
||||
// 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) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.3 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-base_threading_platform_thread_posix_cc,v 1.4 2017/04/19 05:16:46 robert Exp $
|
||||
|
||||
XXX pledge(2)
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-base_trace_event_malloc_dump_provider_cc,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/trace_event/malloc_dump_provider.cc.orig.port Fri Mar 10 08:38:26 2017
|
||||
+++ base/trace_event/malloc_dump_provider.cc Fri Mar 10 08:39:07 2017
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
#include <malloc/malloc.h>
|
||||
@ -10,10 +10,10 @@ $OpenBSD: patch-base_trace_event_malloc_dump_provider_cc,v 1.1 2016/10/27 18:30:
|
||||
#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;
|
||||
@@ -187,6 +189,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
|
||||
resident_size = main_heap_info.committed_size;
|
||||
allocated_objects_size = main_heap_info.allocated_size;
|
||||
allocated_objects_count = main_heap_info.block_count;
|
||||
+#elif defined(OS_BSD)
|
||||
+ total_virtual_size = 0;
|
||||
+ allocated_objects_size = 0;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-base_trace_event_process_memory_dump_cc,v 1.3 2017/04/19 05:16:46 robert Exp $
|
||||
--- base/trace_event/process_memory_dump.cc.orig.port Fri Dec 2 00:02:05 2016
|
||||
+++ base/trace_event/process_memory_dump.cc Fri Dec 2 17:44:51 2016
|
||||
@@ -83,7 +83,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);
|
||||
|
12
www/iridium/patches/patch-build_compiler_version_py
Normal file
12
www/iridium/patches/patch-build_compiler_version_py
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-build_compiler_version_py,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/compiler_version.py.orig.port Tue Jan 3 20:48:31 2017
|
||||
+++ build/compiler_version.py Tue Jan 3 20:48:44 2017
|
||||
@@ -58,7 +58,7 @@ def GetVersion(compiler, tool):
|
||||
# Unmodified: GNU assembler (GNU Binutils) 2.24
|
||||
# Ubuntu: GNU assembler (GNU Binutils for Ubuntu) 2.22
|
||||
# Fedora: GNU assembler version 2.23.2
|
||||
- version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)
|
||||
+ version_re = re.compile(r"^GNU assembler (\d+).(\d+)")
|
||||
else:
|
||||
raise Exception("Unknown tool %s" % tool)
|
||||
|
@ -1,8 +1,8 @@
|
||||
$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
|
||||
$OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/config/BUILDCONFIG.gn.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ build/config/BUILDCONFIG.gn Fri Mar 10 07:46:16 2017
|
||||
@@ -131,12 +131,13 @@ declare_args() {
|
||||
is_official_build = false
|
||||
|
||||
# Whether we're a traditional desktop unix.
|
||||
- is_desktop_linux = current_os == "linux"
|
||||
@ -17,7 +17,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
|
||||
# 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 == "") {
|
||||
@@ -197,6 +198,8 @@ if (host_toolchain == "") {
|
||||
} else {
|
||||
host_toolchain = "//build/toolchain/linux:$host_cpu"
|
||||
}
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
} 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") {
|
||||
@@ -231,6 +234,8 @@ if (target_os == "android") {
|
||||
}
|
||||
} else if (target_os == "ios") {
|
||||
_default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu"
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
} 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" ||
|
||||
@@ -284,6 +289,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
is_mac = false
|
||||
is_nacl = false
|
||||
is_posix = false
|
||||
@ -43,7 +43,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
is_win = true
|
||||
} else if (current_os == "mac") {
|
||||
is_android = false
|
||||
@@ -291,6 +297,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
@@ -293,6 +299,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
is_mac = true
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
@ -51,7 +51,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
is_win = false
|
||||
} else if (current_os == "android") {
|
||||
is_android = true
|
||||
@@ -300,6 +307,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
@@ -302,6 +309,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
is_mac = false
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
@ -59,7 +59,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
is_win = false
|
||||
} else if (current_os == "chromeos") {
|
||||
is_android = false
|
||||
@@ -309,6 +317,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
@@ -311,6 +319,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
is_mac = false
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
@ -67,7 +67,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
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" ||
|
||||
@@ -323,6 +332,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
is_mac = false
|
||||
is_nacl = true
|
||||
is_posix = true
|
||||
@ -75,7 +75,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
is_win = false
|
||||
} else if (current_os == "ios") {
|
||||
is_android = false
|
||||
@@ -330,6 +340,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
@@ -332,6 +342,7 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
is_mac = false
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
@ -83,7 +83,7 @@ $OpenBSD: patch-build_config_BUILDCONFIG_gn,v 1.1 2016/10/27 18:30:40 robert Exp
|
||||
is_win = false
|
||||
} else if (current_os == "linux") {
|
||||
is_android = false
|
||||
@@ -339,7 +350,18 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
@@ -341,7 +352,18 @@ if (current_os == "win" || current_os == "winrt_81" ||
|
||||
is_mac = false
|
||||
is_nacl = false
|
||||
is_posix = true
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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") {
|
||||
$OpenBSD: patch-build_config_BUILD_gn,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/config/BUILD.gn.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ build/config/BUILD.gn Fri Mar 10 07:46:16 2017
|
||||
@@ -279,7 +279,7 @@ config("default_libs") {
|
||||
"CoreText.framework",
|
||||
"Foundation.framework",
|
||||
]
|
||||
|
@ -1,12 +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
|
||||
$OpenBSD: patch-build_config_allocator_gni,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/config/allocator.gni.orig.port Fri Dec 2 17:55:10 2016
|
||||
+++ build/config/allocator.gni Sat Dec 3 14:29:11 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) {
|
||||
- !is_asan && !is_lsan && !is_tsan && !is_msan) {
|
||||
+ !is_asan && !is_lsan && !is_tsan && !is_msan && !is_openbsd) {
|
||||
_default_use_experimental_allocator_shim = true
|
||||
} else {
|
||||
_default_use_experimental_allocator_shim = false
|
||||
|
@ -1,16 +1,16 @@
|
||||
$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() {
|
||||
$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/config/compiler/BUILD.gn.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ build/config/compiler/BUILD.gn Fri Mar 10 07:46:16 2017
|
||||
@@ -36,7 +36,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")
|
||||
- linux_use_bundled_binutils_override && is_linux &&
|
||||
+ linux_use_bundled_binutils_override && (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") {
|
||||
@@ -215,7 +215,7 @@ config("compiler") {
|
||||
|
||||
# Linker warnings.
|
||||
if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
|
||||
@ -19,16 +19,16 @@ $OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert
|
||||
# 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",
|
||||
@@ -295,7 +295,7 @@ config("compiler") {
|
||||
"-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") {
|
||||
if (!using_sanitizer) {
|
||||
- if (!use_cfi_diag) {
|
||||
+ if (!use_cfi_diag && !is_openbsd) {
|
||||
ldflags += [ "-Wl,-z,defs" ]
|
||||
}
|
||||
|
||||
@@ -1058,14 +1058,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.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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() {
|
||||
$OpenBSD: patch-build_config_compiler_compiler_gni,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/config/compiler/compiler.gni.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ build/config/compiler/compiler.gni Fri Mar 10 07:46:16 2017
|
||||
@@ -72,7 +72,7 @@ declare_args() {
|
||||
|
||||
declare_args() {
|
||||
# Whether to use the gold linker from binutils instead of lld or bfd.
|
||||
|
@ -1,8 +1,8 @@
|
||||
$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
|
||||
$OpenBSD: patch-build_config_features_gni,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/config/features.gni.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ build/config/features.gni Fri Mar 10 17:51:01 2017
|
||||
@@ -55,7 +55,7 @@ declare_args() {
|
||||
fieldtrial_testing_like_official_build = is_chrome_branded
|
||||
|
||||
# libudev usage. This currently only affects the content layer.
|
||||
- use_udev = is_linux && !is_chromecast
|
||||
@ -10,12 +10,3 @@ $OpenBSD: patch-build_config_features_gni,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
|
||||
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
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-build_config_linux_pkg-config_py,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-build_config_linux_pkg-config_py,v 1.2 2017/04/19 05:16:46 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():
|
||||
|
@ -1,10 +1,10 @@
|
||||
$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):
|
||||
$OpenBSD: patch-build_toolchain_gcc_solink_wrapper_py,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/toolchain/gcc_solink_wrapper.py.orig.port Fri Dec 2 17:57:17 2016
|
||||
+++ build/toolchain/gcc_solink_wrapper.py Fri Dec 2 17:57:28 2016
|
||||
@@ -33,7 +33,7 @@ def CollectDynSym(args):
|
||||
"""Replaces: nm --format=posix -g -D $sofile | cut -f1-2 -d' '"""
|
||||
toc = ''
|
||||
nm = subprocess.Popen(CommandToRun([
|
||||
nm = subprocess.Popen(wrapper_utils.CommandToRun([
|
||||
- args.nm, '--format=posix', '-g', '-D', args.sofile]),
|
||||
+ args.nm, '-g', '-D', args.sofile]),
|
||||
stdout=subprocess.PIPE, bufsize=-1)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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")
|
||||
$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- build/toolchain/gcc_toolchain.gni.orig.port Fri Dec 2 17:57:33 2016
|
||||
+++ build/toolchain/gcc_toolchain.gni Fri Dec 2 17:57:59 2016
|
||||
@@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni")
|
||||
import("//build/toolchain/goma.gni")
|
||||
import("//build/toolchain/toolchain.gni")
|
||||
|
||||
@ -13,16 +13,16 @@ $OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.1 2016/10/27 18:30:40 robe
|
||||
# This template defines a toolchain for something that works like gcc
|
||||
# (including clang).
|
||||
#
|
||||
@@ -258,7 +263,7 @@ template("gcc_toolchain") {
|
||||
@@ -279,7 +284,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\""
|
||||
- command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} rcsD @\"$rspfile\""
|
||||
+ command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} rcs @\"$rspfile\""
|
||||
description = "AR {{output}}"
|
||||
rspfile_content = "{{inputs}}"
|
||||
outputs = [
|
||||
@@ -453,7 +458,7 @@ template("clang_toolchain") {
|
||||
@@ -482,7 +487,7 @@ template("clang_toolchain") {
|
||||
}
|
||||
|
||||
gcc_toolchain(target_name) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-build_toolchain_openbsd_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-build_toolchain_openbsd_BUILD_gn,v 1.2 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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") {
|
||||
$OpenBSD: patch-cc_BUILD_gn,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- cc/BUILD.gn.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ cc/BUILD.gn Fri Mar 10 07:46:17 2017
|
||||
@@ -774,7 +774,7 @@ cc_static_library("test_support") {
|
||||
"//ui/gl",
|
||||
"//ui/gl:test_support",
|
||||
]
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-cc_BUILD_gn,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
data_deps = [
|
||||
"//third_party/mesa:osmesa",
|
||||
]
|
||||
@@ -989,10 +989,6 @@ test("cc_unittests") {
|
||||
@@ -985,10 +985,6 @@ cc_test("cc_unittests") {
|
||||
"//ui/gfx/geometry",
|
||||
"//ui/gl",
|
||||
"//ui/gl:test_support",
|
||||
|
12
www/iridium/patches/patch-chrome_BUILD_gn
Normal file
12
www/iridium/patches/patch-chrome_BUILD_gn
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-chrome_BUILD_gn,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/BUILD.gn.orig.port Tue Apr 18 08:33:21 2017
|
||||
+++ chrome/BUILD.gn Sun Apr 16 12:30:23 2017
|
||||
@@ -253,7 +253,7 @@ if (!is_android && !is_mac) {
|
||||
"//chrome/common:features",
|
||||
]
|
||||
|
||||
- ldflags = [ "-pie", "-Wl,--no-keep-memory" ]
|
||||
+ ldflags += [ "-pie", "-Wl,--no-keep-memory" ]
|
||||
|
||||
if (use_pango || use_cairo) {
|
||||
# Needed for chrome_main.cc initialization of libraries.
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.1 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.2 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,26 +0,0 @@
|
||||
$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.
|
||||
|
||||
#include "chrome/app/chrome_main_delegate.h"
|
||||
+#include "base/command_line.h"
|
||||
+#include "content/public/common/content_switches.h"
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "chrome/common/features.h"
|
||||
@@ -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)
|
||||
{
|
||||
- iridium::log_url_request(caller, url);
|
||||
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
||||
+ if (!command_line->HasSwitch(switches::kTrk))
|
||||
+ return;
|
||||
+
|
||||
+ iridium::log_url_request(caller, url);
|
||||
+
|
||||
if (url.scheme() != url::kTraceScheme)
|
||||
/* Do not show infobar for non-trk URLs */
|
||||
return;
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.11 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/chrome_main_delegate.cc.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ chrome/app/chrome_main_delegate.cc Fri Mar 10 07:46:17 2017
|
||||
@@ -89,7 +89,7 @@
|
||||
#include "chrome/app/chrome_crash_reporter_client.h"
|
||||
#endif
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 ro
|
||||
#include "components/nacl/common/nacl_paths.h"
|
||||
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
|
||||
#endif
|
||||
@@ -119,7 +119,7 @@
|
||||
@@ -121,7 +121,7 @@
|
||||
#include "components/crash/content/app/breakpad_linux.h"
|
||||
#endif
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 ro
|
||||
#include "base/environment.h"
|
||||
#endif
|
||||
|
||||
@@ -161,7 +161,7 @@ base::LazyInstance<ChromeContentBrowserClient> g_chrom
|
||||
@@ -163,7 +163,7 @@ base::LazyInstance<ChromeContentBrowserClient> g_chrom
|
||||
LAZY_INSTANCE_INITIALIZER;
|
||||
#endif
|
||||
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 ro
|
||||
base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
|
||||
LAZY_INSTANCE_INITIALIZER;
|
||||
#endif
|
||||
@@ -278,7 +278,7 @@ static void AdjustLinuxOOMScore(const std::string& pro
|
||||
@@ -280,7 +280,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.10 2016/10/27 18:30:40 ro
|
||||
// The zygote process opens the resources for the renderers.
|
||||
process_type == switches::kZygoteProcess ||
|
||||
#endif
|
||||
@@ -330,7 +330,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
@@ -332,7 +332,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 ro
|
||||
void SIGTERMProfilingShutdown(int signal) {
|
||||
Profiling::Stop();
|
||||
struct sigaction sigact;
|
||||
@@ -364,7 +364,7 @@ void InitializeUserDataDir() {
|
||||
@@ -399,7 +399,7 @@ void InitializeUserDataDir(base::CommandLine* command_
|
||||
std::string process_type =
|
||||
command_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 ro
|
||||
// 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.
|
||||
@@ -703,7 +703,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -754,7 +754,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.10 2016/10/27 18:30:40 ro
|
||||
crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
|
||||
#endif
|
||||
|
||||
@@ -836,7 +836,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -884,7 +884,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
chrome::InitializePDF();
|
||||
#endif
|
||||
|
||||
@ -73,7 +73,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.10 2016/10/27 18:30:40 ro
|
||||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess) {
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -964,7 +964,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
|
||||
@@ -1008,7 +1008,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
|
||||
#endif
|
||||
return process_type == switches::kRelauncherProcess;
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.5 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/chrome_main_delegate.h.orig.port Fri Dec 2 00:02:06 2016
|
||||
+++ chrome/app/chrome_main_delegate.h Fri Dec 2 17:44:51 2016
|
||||
@@ -44,7 +44,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;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.13 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/chromium_strings.grd.orig.port Sat Apr 8 19:22:36 2017
|
||||
+++ chrome/app/chromium_strings.grd Sat Apr 8 19:22:39 2017
|
||||
@@ -887,7 +887,7 @@ Signing in anyway will merge browser information like
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
|
@ -1,6 +1,6 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.5 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/generated_resources.grd.orig.port Sat Apr 1 21:15:12 2017
|
||||
+++ chrome/app/generated_resources.grd Sun Apr 16 12:26:36 2017
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<!--
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.4 2016/10/27 18:30:40 rob
|
||||
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
|
||||
@@ -6868,7 +6868,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>
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.4 2016/10/27 18:30:40 rob
|
||||
<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!
|
||||
@@ -10119,7 +10119,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>
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.4 2016/10/27 18:30:40 rob
|
||||
<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!
|
||||
@@ -10127,7 +10127,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>
|
||||
@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.4 2016/10/27 18:30:40 rob
|
||||
<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
|
||||
@@ -11449,7 +11449,7 @@ Tell us what happened exactly before you got the profi
|
||||
Set as default
|
||||
</message>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.12 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/google_chrome_strings.grd.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ chrome/app/google_chrome_strings.grd Fri Mar 10 07:46:17 2017
|
||||
@@ -888,7 +888,7 @@ Signing in anyway will merge Chrome information like b
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
|
@ -1,30 +1,12 @@
|
||||
$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"
|
||||
$OpenBSD: patch-chrome_app_mash_mash_runner_cc,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/mash/mash_runner.cc.orig.port Fri Mar 10 08:40:54 2017
|
||||
+++ chrome/app/mash/mash_runner.cc Fri Mar 10 08:41:00 2017
|
||||
@@ -249,7 +249,7 @@ int MashMain() {
|
||||
// TODO(sky): wire this up correctly.
|
||||
service_manager::InitializeLogging();
|
||||
|
||||
-#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())
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-chrome_app_resources_locale_settings_grd,v 1.6 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/resources/locale_settings.grd.orig.port Fri Dec 2 00:02:06 2016
|
||||
+++ chrome/app/resources/locale_settings.grd Fri Dec 2 17:44:52 2016
|
||||
@@ -151,7 +151,7 @@
|
||||
55
|
||||
</message>
|
||||
|
||||
|
21
www/iridium/patches/patch-chrome_app_settings_strings_grdp
Normal file
21
www/iridium/patches/patch-chrome_app_settings_strings_grdp
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-chrome_app_settings_strings_grdp,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/app/settings_strings.grdp.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ chrome/app/settings_strings.grdp Fri Mar 10 07:46:17 2017
|
||||
@@ -225,7 +225,7 @@
|
||||
<message name="IDS_SETTINGS_THEMES" desc="Name of the control which allows the user to get a theme for the browser.">
|
||||
Themes
|
||||
</message>
|
||||
- <if expr="is_linux and not chromeos">
|
||||
+ <if expr="is_posix and not chromeos">
|
||||
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
|
||||
GTK+
|
||||
</message>
|
||||
@@ -239,7 +239,7 @@
|
||||
Use Classic
|
||||
</message>
|
||||
</if>
|
||||
- <if expr="not is_linux or chromeos">
|
||||
+ <if expr="not is_posix or chromeos">
|
||||
<message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme.">
|
||||
Reset to default
|
||||
</message>
|
@ -1,21 +0,0 @@
|
||||
$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",
|
@ -1,7 +1,7 @@
|
||||
$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[] = {
|
||||
$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.12 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/about_flags.cc.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ chrome/browser/about_flags.cc Fri Mar 10 07:46:17 2017
|
||||
@@ -820,7 +820,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
|
||||
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
|
||||
switches::kDisableSmoothScrolling)},
|
||||
@ -10,19 +10,19 @@ $OpenBSD: patch-chrome_browser_about_flags_cc,v 1.11 2016/10/27 18:30:40 robert
|
||||
{"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
|
||||
IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
|
||||
// Uses the system preference on Mac (a different implementation).
|
||||
@@ -1336,7 +1336,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -1345,7 +1345,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
|
||||
switches::kDisableTranslateNewUX)},
|
||||
#endif
|
||||
#endif // OS_MACOSX
|
||||
-#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[] = {
|
||||
@@ -1778,7 +1778,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
|
||||
#endif
|
||||
#endif // ENABLE_EXTENSIONS
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
{"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME,
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.3 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.4 2017/04/19 05:16:46 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
|
||||
|
@ -1,8 +1,8 @@
|
||||
$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"
|
||||
$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/browser_process_impl.cc.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ chrome/browser/browser_process_impl.cc Fri Mar 10 07:46:17 2017
|
||||
@@ -170,7 +170,7 @@
|
||||
#include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
|
||||
#endif
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.1 2016/10/27 18:30:40
|
||||
#include "chrome/browser/memory/tab_manager.h"
|
||||
#endif
|
||||
|
||||
@@ -778,7 +778,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() {
|
||||
@@ -783,7 +783,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() {
|
||||
|
||||
memory::TabManager* BrowserProcessImpl::GetTabManager() {
|
||||
DCHECK(CalledOnValidThread());
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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,
|
||||
$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/browser_process_impl.h.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ chrome/browser/browser_process_impl.h Fri Mar 10 07:46:17 2017
|
||||
@@ -341,7 +341,7 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
|
||||
std::unique_ptr<ChromeDeviceClient> device_client_;
|
||||
|
||||
|
@ -1,7 +1,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 @@
|
||||
$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.12 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/browser_resources.grd.orig.port Thu Mar 9 21:04:27 2017
|
||||
+++ chrome/browser/browser_resources.grd Fri Mar 10 07:46:17 2017
|
||||
@@ -384,7 +384,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>
|
||||
|
@ -1,8 +1,8 @@
|
||||
$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"
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.8 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main.cc.orig.port Sat Apr 1 21:15:12 2017
|
||||
+++ chrome/browser/chrome_browser_main.cc Sun Apr 16 12:26:36 2017
|
||||
@@ -180,7 +180,7 @@
|
||||
#include "chrome/browser/lifetime/application_lifetime.h"
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
@ -10,25 +10,25 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.7 2016/10/27 18:30:40
|
||||
#include "chrome/browser/first_run/upgrade_util_linux.h"
|
||||
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
|
||||
@@ -282,7 +282,7 @@
|
||||
@@ -273,7 +273,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"
|
||||
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
|
||||
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
|
||||
#endif
|
||||
|
||||
@@ -955,7 +955,7 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrial
|
||||
sampling_profiler_config_.RegisterSyntheticFieldTrial();
|
||||
@@ -759,7 +759,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() {
|
||||
field_trial_synchronizer_ = new FieldTrialSynchronizer();
|
||||
|
||||
#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();
|
||||
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
|
||||
metrics::DesktopSessionDurationTracker::Initialize();
|
||||
#endif
|
||||
|
||||
@@ -1325,7 +1325,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1173,7 +1173,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
}
|
||||
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
|
||||
@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.7 2016/10/27 18:30:40
|
||||
// Set the product channel for crash reports.
|
||||
base::debug::SetCrashKeyValue(crash_keys::kChannel,
|
||||
chrome::GetChannelString());
|
||||
@@ -1516,7 +1516,7 @@ void ChromeBrowserMainParts::PreBrowserStart() {
|
||||
@@ -1356,7 +1356,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.
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.5 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.6 2017/04/19 05:16:46 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() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.4 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.5 2017/04/19 05:16:46 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
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.13 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig.port Sat Apr 1 21:15:12 2017
|
||||
+++ chrome/browser/chrome_content_browser_client.cc Sun Apr 16 12:26:36 2017
|
||||
@@ -242,7 +242,7 @@
|
||||
#include "chrome/browser/ui/browser_dialogs.h"
|
||||
#include "chromeos/chromeos_switches.h"
|
||||
#include "components/user_manager/user_manager.h"
|
||||
@ -10,16 +10,21 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.12 2016/10/2
|
||||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#elif defined(OS_ANDROID)
|
||||
#include "chrome/browser/chrome_browser_main_android.h"
|
||||
@@ -223,7 +223,7 @@
|
||||
@@ -254,11 +254,11 @@
|
||||
#include "chrome/browser/chrome_browser_main_posix.h"
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
|
||||
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
|
||||
#include "chrome/browser/payments/payment_request_factory.h"
|
||||
#endif
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
#include "base/debug/leak_annotations.h"
|
||||
#include "components/crash/content/app/breakpad_linux.h"
|
||||
#include "components/crash/content/browser/crash_handler_host_linux.h"
|
||||
@@ -245,7 +245,7 @@
|
||||
@@ -281,7 +281,7 @@
|
||||
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
|
||||
#endif
|
||||
|
||||
@ -28,7 +33,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.12 2016/10/2
|
||||
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -534,7 +534,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
|
||||
@@ -576,7 +576,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -37,7 +42,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.12 2016/10/2
|
||||
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
|
||||
const std::string& process_type) {
|
||||
base::FilePath dumps_path;
|
||||
@@ -840,7 +840,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
|
||||
@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
|
||||
main_parts = new ChromeBrowserMainPartsMac(parameters);
|
||||
#elif defined(OS_CHROMEOS)
|
||||
main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
|
||||
@ -46,16 +51,25 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.12 2016/10/2
|
||||
main_parts = new ChromeBrowserMainPartsLinux(parameters);
|
||||
#elif defined(OS_ANDROID)
|
||||
main_parts = new ChromeBrowserMainPartsAndroid(parameters);
|
||||
@@ -856,7 +856,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
|
||||
@@ -915,7 +915,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
|
||||
// Construct additional browser parts. Stages are called in the order in
|
||||
// which they are added.
|
||||
#if defined(TOOLKIT_VIEWS)
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
|
||||
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
|
||||
main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
|
||||
#else
|
||||
main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
|
||||
@@ -1451,7 +1451,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
ChromeBrowserMainExtraPartsViews* extra_parts_views =
|
||||
@@ -1449,7 +1449,7 @@ bool IsAutoReloadVisibleOnlyEnabled() {
|
||||
}
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
|
||||
- defined(OS_ANDROID)
|
||||
+ defined(OS_ANDROID) || defined(OS_BSD)
|
||||
bool AreExperimentalWebPlatformFeaturesEnabled() {
|
||||
const base::CommandLine& browser_command_line =
|
||||
*base::CommandLine::ForCurrentProcess();
|
||||
@@ -1552,7 +1552,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
||||
client_info->client_id);
|
||||
}
|
||||
@ -64,12 +78,30 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.12 2016/10/2
|
||||
if (breakpad::IsCrashReporterEnabled()) {
|
||||
std::string switch_value;
|
||||
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());
|
||||
@@ -2806,7 +2806,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
|
||||
}
|
||||
}
|
||||
-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
@@ -3036,7 +3036,7 @@ void ChromeContentBrowserClient::RegisterRenderFrameMo
|
||||
shape_detection::mojom::TextDetection>());
|
||||
}
|
||||
}
|
||||
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
|
||||
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD)
|
||||
// TODO(crbug.com/679127): Enable for MacViews implementation.
|
||||
if (AreExperimentalWebPlatformFeaturesEnabled()) {
|
||||
content::WebContents* web_contents =
|
||||
@@ -3048,7 +3048,7 @@ void ChromeContentBrowserClient::RegisterRenderFrameMo
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_WIN)
|
||||
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
|
||||
if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
|
||||
registry->AddInterface(base::Bind(&ShareServiceImpl::Create));
|
||||
}
|
||||
|
@ -1,12 +1,12 @@
|
||||
$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;
|
||||
-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.11 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig.port Fri Mar 10 08:42:54 2017
|
||||
+++ chrome/browser/chrome_content_browser_client.h Fri Mar 10 08:43:05 2017
|
||||
@@ -259,7 +259,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
blink::WebPageVisibilityState* visibility_state) override;
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
void GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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(
|
||||
$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.6 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig.port Fri Dec 2 00:02:07 2016
|
||||
+++ chrome/browser/custom_handlers/protocol_handler_registry.cc Fri Dec 2 17:44:52 2016
|
||||
@@ -47,7 +47,7 @@ const ProtocolHandler& LookupHandler(
|
||||
// If true default protocol handlers will be removed if the OS level
|
||||
// registration for a protocol is no longer Chrome.
|
||||
bool ShouldRemoveHandlersNotInOS() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_defaults_cc,v 1.7 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_defaults_cc,v 1.8 2017/04/19 05:16:46 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;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.8 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc Fri Mar 10 07:46:18 2017
|
||||
@@ -777,7 +777,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
|
||||
@@ -789,7 +789,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
@@ -792,7 +792,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
|
||||
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
|
||||
const base::FilePath& path) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.7 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/download/download_commands.cc.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/download/download_commands.cc Fri Mar 10 07:46:18 2017
|
||||
@@ -218,7 +218,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.6 2016/10/27 18
|
||||
if (CanOpenPdfInSystemViewer()) {
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
|
||||
download_item_->GetBrowserContext());
|
||||
@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command)
|
||||
@@ -262,7 +262,7 @@ void DownloadCommands::ExecuteCommand(Command command)
|
||||
bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
|
||||
download_item_->GetBrowserContext());
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.4 2016/10/27 18:30:40 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.5 2017/04/19 05:16:46 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 {
|
||||
|
@ -1,6 +1,6 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.7 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/download/download_prefs.cc.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/download/download_prefs.cc Fri Mar 10 07:46:18 2017
|
||||
@@ -56,7 +56,7 @@ namespace {
|
||||
// Consider downloads 'dangerous' if they go to the home directory on Linux and
|
||||
// to the desktop on any platform.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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 {
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.7 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/download/download_prefs.h.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/download/download_prefs.h Fri Mar 10 07:46:18 2017
|
||||
@@ -78,7 +78,7 @@ class DownloadPrefs {
|
||||
// Disables auto-open based on file extension.
|
||||
void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.6 2016/10/27 18:30:
|
||||
// Store the user preference to disk. If |should_open| is true, also disable
|
||||
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
|
||||
void SetShouldOpenPdfInSystemReader(bool should_open);
|
||||
@@ -110,7 +110,7 @@ class DownloadPrefs {
|
||||
@@ -109,7 +109,7 @@ class DownloadPrefs {
|
||||
AutoOpenCompareFunctor> AutoOpenSet;
|
||||
AutoOpenSet auto_open_;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.5 2016/10/27 18:30:41 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.6 2017/04/19 05:16:46 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
|
||||
|
@ -1,8 +1,8 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.5 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/download/download_status_updater.cc.orig.port Thu Dec 15 00:02:04 2016
|
||||
+++ chrome/browser/download/download_status_updater.cc Tue Jan 3 20:29:55 2017
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "base/stl_util.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.4 2016/10
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -140,7 +140,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(
|
||||
@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(
|
||||
#if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN))
|
||||
void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
|
||||
content::DownloadItem* download) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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") {
|
||||
$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.2 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/extensions/BUILD.gn.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/extensions/BUILD.gn Fri Mar 10 07:46:19 2017
|
||||
@@ -1127,6 +1127,10 @@ static_library("extensions") {
|
||||
defines += [ "ENABLE_HOTWORDING" ]
|
||||
}
|
||||
|
||||
@ -10,5 +10,5 @@ $OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.1 2016/10/27 18:30:41 rob
|
||||
+ }
|
||||
+
|
||||
if (enable_service_discovery) {
|
||||
sources += rebase_path(
|
||||
gypi_values.chrome_browser_extensions_service_discovery_sources,
|
||||
sources += [
|
||||
"api/gcd_private/gcd_private_api.cc",
|
||||
|
@ -1,4 +1,4 @@
|
||||
$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 $
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc,v 1.5 2017/04/19 05:16:46 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:
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_input_ime_input_ime_api_h,v 1.3 2016/10/27 18:30:41 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_input_ime_input_ime_api_h,v 1.4 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.7 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/extensions/api/messaging/message_service.cc.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/extensions/api/messaging/message_service.cc Fri Mar 10 07:46:19 2017
|
||||
@@ -106,7 +106,7 @@ MessageService::PolicyPermission MessageService::IsNat
|
||||
|
||||
const char kReceivingEndDoesntExistError[] =
|
||||
"Could not establish connection. Receiving end does not exist.";
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.6
|
||||
const char kMissingPermissionError[] =
|
||||
"Access to native messaging requires nativeMessaging permission.";
|
||||
const char kProhibitedByPoliciesError[] =
|
||||
@@ -416,7 +416,7 @@ void MessageService::OpenChannelToNativeApp(
|
||||
@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNativeApp(
|
||||
if (!source)
|
||||
return;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.5 2017/04/19 05:16:46 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 @@
|
||||
|
@ -1,12 +0,0 @@
|
||||
$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
|
||||
// Pref key for omnibox.setDefaultSuggestion.
|
||||
const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
static const int kOmniboxIconPaddingLeft = 2;
|
||||
static const int kOmniboxIconPaddingRight = 2;
|
||||
#elif defined(OS_MACOSX)
|
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_settings_private_prefs_util_cc,v 1.1 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig.port Sat Feb 4 11:46:22 2017
|
||||
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc Sat Feb 4 12:05:10 2017
|
||||
@@ -83,7 +83,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
|
||||
settings_private::PrefType::PREF_TYPE_BOOLEAN;
|
||||
(*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
|
||||
settings_private::PrefType::PREF_TYPE_BOOLEAN;
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
||||
(*s_whitelist)[::prefs::kUseCustomChromeFrame] =
|
||||
settings_private::PrefType::PREF_TYPE_BOOLEAN;
|
||||
#endif
|
||||
@@ -93,7 +93,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
|
||||
// Appearance settings.
|
||||
(*s_whitelist)[::prefs::kCurrentThemeID] =
|
||||
settings_private::PrefType::PREF_TYPE_STRING;
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
||||
(*s_whitelist)[::prefs::kUsesSystemTheme] =
|
||||
settings_private::PrefType::PREF_TYPE_BOOLEAN;
|
||||
#endif
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.11 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/extensions/bookmark_app_helper.cc.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/extensions/bookmark_app_helper.cc Fri Mar 10 07:46:19 2017
|
||||
@@ -716,7 +716,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
|
||||
#if !defined(OS_MACOSX)
|
||||
#if !defined(USE_ASH)
|
||||
web_app::ShortcutLocations creation_locations;
|
||||
|
@ -1,7 +1,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 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.4 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc Fri Mar 10 07:46:19 2017
|
||||
@@ -63,7 +63,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
|
||||
|
||||
@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
|
||||
@@ -111,7 +111,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
|
||||
#if defined(OS_CHROMEOS)
|
||||
extensions::InputImeAPI::GetFactoryInstance();
|
||||
extensions::InputMethodAPI::GetFactoryInstance();
|
||||
|
@ -1,21 +1,21 @@
|
||||
$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)));
|
||||
$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.4 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/extensions/external_provider_impl.cc.orig.port Fri Dec 2 18:06:03 2016
|
||||
+++ chrome/browser/extensions/external_provider_impl.cc Fri Dec 2 18:06:25 2016
|
||||
@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
|
||||
oem_extension_creation_flags));
|
||||
}
|
||||
-#elif defined(OS_LINUX)
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
if (!profile->IsLegacySupervised()) {
|
||||
provider_list->push_back(
|
||||
linked_ptr<ExternalProviderInterface>(
|
||||
@@ -689,7 +689,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
bundled_extension_creation_flags)));
|
||||
provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
|
||||
service,
|
||||
@@ -664,7 +664,7 @@ void ExternalProviderImpl::CreateExternalProviders(
|
||||
bundled_extension_creation_flags));
|
||||
|
||||
// Define a per-user source of external extensions.
|
||||
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD))
|
||||
+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD))
|
||||
provider_list->push_back(
|
||||
linked_ptr<ExternalProviderInterface>(
|
||||
new ExternalProviderImpl(
|
||||
provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
|
||||
service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
|
||||
ExternalPrefLoader::NONE, nullptr),
|
||||
|
@ -1,6 +1,6 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_first_run_first_run_internal_posix_cc,v 1.11 2017/04/19 05:16:46 robert Exp $
|
||||
--- chrome/browser/first_run/first_run_internal_posix.cc.orig.port Sat Apr 8 19:22:37 2017
|
||||
+++ chrome/browser/first_run/first_run_internal_posix.cc Sat Apr 8 19:22:40 2017
|
||||
@@ -25,7 +25,7 @@ namespace first_run {
|
||||
namespace internal {
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.5 2016/10/27 18:30:41 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.6 2017/04/19 05:16:47 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() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.5 2017/04/19 05:16:47 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()
|
||||
|
@ -1,16 +1,16 @@
|
||||
$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() {
|
||||
chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
|
||||
sub_page);
|
||||
$OpenBSD: patch-chrome_browser_interstitials_chrome_controller_client_cc,v 1.3 2017/04/19 05:16:47 robert Exp $
|
||||
--- chrome/browser/interstitials/chrome_controller_client.cc.orig.port Thu Mar 9 21:04:28 2017
|
||||
+++ chrome/browser/interstitials/chrome_controller_client.cc Fri Mar 10 07:46:19 2017
|
||||
@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThread() {
|
||||
#if defined(OS_ANDROID)
|
||||
chrome::android::OpenDateAndTimeSettings();
|
||||
|
||||
-#elif defined(OS_LINUX)
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
struct ClockCommand {
|
||||
const char* pathname;
|
||||
const char* argument;
|
||||
@@ -138,7 +138,7 @@ void ChromeControllerClient::set_interstitial_page(
|
||||
const char* const pathname;
|
||||
const char* const argument;
|
||||
@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControllerClient() {}
|
||||
|
||||
bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
|
||||
#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc,v 1.4 2016/10/27 18:30:41 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_fileapi_mtp_device_map_service_cc,v 1.5 2017/04/19 05:16:47 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(
|
||||
|
@ -1,6 +1,6 @@
|
||||
$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
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.10 2017/04/19 05:16:47 robert Exp $
|
||||
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port Thu Dec 15 00:02:04 2016
|
||||
+++ chrome/browser/media_galleries/media_file_system_registry.cc Tue Jan 3 20:29:55 2017
|
||||
@@ -757,7 +757,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
|
||||
// Constructor in 'private' section because depends on private class definition.
|
||||
MediaFileSystemRegistry::MediaFileSystemRegistry()
|
||||
|
@ -1,12 +0,0 @@
|
||||
$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(
|
||||
const char product[] = "Chrome_Android";
|
||||
#elif defined(OS_CHROMEOS)
|
||||
const char product[] = "Chrome_ChromeOS";
|
||||
+#elif defined(OS_OPENBSD)
|
||||
+ const char product[] = "Chrome_OpenBSD";
|
||||
#else
|
||||
#error Platform not supported.
|
||||
#endif
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user