svn commit: r393091 - in branches/2015Q3/www/chromium: . files
Rene Ladan
rene at FreeBSD.org
Tue Jul 28 18:49:15 UTC 2015
Author: rene
Date: Tue Jul 28 18:49:02 2015
New Revision: 393091
URL: https://svnweb.freebsd.org/changeset/ports/393091
Log:
MFH: r393089
www/chromium: update to 44.0.2403.107
Note that chromium is currently broken on 9.X due to some obscure compiler
error caused possibly caused by Ports GCC.
Submitted by: LeFroid
Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/25
Security: http://vuxml.freebsd.org/freebsd/9d732078-32c7-11e5-b263-00262d5ed8ee.html
Approved by: ports-secteam (feld)
Added:
branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths_internal.h
- copied unchanged from r393089, head/www/chromium/files/patch-chrome__common__chrome_paths_internal.h
branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp
- copied unchanged from r393089, head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp
branches/2015Q3/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c
- copied unchanged from r393089, head/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c
branches/2015Q3/www/chromium/files/patch-third_party__skia__src__ports__SkTime_Unix.cpp
- copied unchanged from r393089, head/www/chromium/files/patch-third_party__skia__src__ports__SkTime_Unix.cpp
branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
- copied unchanged from r393089, head/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
Deleted:
branches/2015Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
branches/2015Q3/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
branches/2015Q3/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp
branches/2015Q3/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc
Modified:
branches/2015Q3/www/chromium/Makefile
branches/2015Q3/www/chromium/distinfo
branches/2015Q3/www/chromium/files/chrome.in
branches/2015Q3/www/chromium/files/extra-patch-clang
branches/2015Q3/www/chromium/files/extra-patch-gcc
branches/2015Q3/www/chromium/files/patch-base__process__memory_unittest.cc
branches/2015Q3/www/chromium/files/patch-base__sys_info_freebsd.cc
branches/2015Q3/www/chromium/files/patch-build__common.gypi
branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_prefs.cc
branches/2015Q3/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc
branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser.gypi
branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc
branches/2015Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc
branches/2015Q3/www/chromium/files/patch-content__gpu__gpu_main.cc
branches/2015Q3/www/chromium/files/patch-crypto__nss_util.cc
branches/2015Q3/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
branches/2015Q3/www/chromium/files/patch-device__usb__usb_context.cc
branches/2015Q3/www/chromium/files/patch-device__usb__usb_device_handle_impl.h
branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.cc
branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.h
branches/2015Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
branches/2015Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
branches/2015Q3/www/chromium/files/patch-net__net.gypi
branches/2015Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
branches/2015Q3/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.cc
branches/2015Q3/www/chromium/files/patch-ui__views__views_delegate.h
branches/2015Q3/www/chromium/pkg-plist
Directory Properties:
branches/2015Q3/ (props changed)
Modified: branches/2015Q3/www/chromium/Makefile
==============================================================================
--- branches/2015Q3/www/chromium/Makefile Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/Makefile Tue Jul 28 18:49:02 2015 (r393091)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 43.0.2357.134
+PORTVERSION= 44.0.2403.107
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -281,7 +281,7 @@ pre-configure:
'third_party/google_input_tools' \
'third_party/google_input_tools/third_party/closure_library' \
'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
- 'third_party/hunspell' \
+ 'third_party/hunspell_new' \
'third_party/iccjpeg' \
'third_party/icu/icu.isolate' \
'third_party/jinja2' \
@@ -372,8 +372,6 @@ do-install:
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
${STAGEDIR}${DATADIR}
- ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \
- ${STAGEDIR}${DATADIR}
cd ${WRKSRC}/out/${BUILDTYPE} && \
${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
Modified: branches/2015Q3/www/chromium/distinfo
==============================================================================
--- branches/2015Q3/www/chromium/distinfo Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/distinfo Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,4 +1,4 @@
-SHA256 (chromium-43.0.2357.134.tar.xz) = d3a1bbe3e1445dfcf5ef4aff4b11a8f3770436c8b8954b7cc5fee5416f117659
-SIZE (chromium-43.0.2357.134.tar.xz) = 290976408
-SHA256 (chromium-43.0.2357.134-testdata.tar.xz) = f69b79d44e670ffc73f476e1d8e08d04a540c011ff1c7b6afbc76cdde88dfdeb
-SIZE (chromium-43.0.2357.134-testdata.tar.xz) = 127570540
+SHA256 (chromium-44.0.2403.107.tar.xz) = d0634ffbe4f158010852fde3ee32aaf7bdf200932573fdf57328dd9ba5983d71
+SIZE (chromium-44.0.2403.107.tar.xz) = 292924752
+SHA256 (chromium-44.0.2403.107-testdata.tar.xz) = 43ba2f8df021fd1787cf4a96bb5068190905c21e0130db29a6d9e976176074c3
+SIZE (chromium-44.0.2403.107-testdata.tar.xz) = 128646184
Modified: branches/2015Q3/www/chromium/files/chrome.in
==============================================================================
--- branches/2015Q3/www/chromium/files/chrome.in Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/chrome.in Tue Jul 28 18:49:02 2015 (r393091)
@@ -15,4 +15,4 @@ $SYSCTL=1
EOMSG
exit 1
fi
-%%PREFIX%%/share/chromium/chrome "$@"
+%%PREFIX%%/share/chromium/chrome $*
Modified: branches/2015Q3/www/chromium/files/extra-patch-clang
==============================================================================
--- branches/2015Q3/www/chromium/files/extra-patch-clang Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/extra-patch-clang Tue Jul 28 18:49:02 2015 (r393091)
@@ -135,8 +135,8 @@
base::Bind(&DecryptingVideoDecoderTest::DecryptorSet,
base::Unretained(this))));
EXPECT_CALL(*this, DecryptorSet(_)).Times(0);
---- third_party/hunspell/src/hunspell/affentry.hxx 2015-04-15 00:31:35.000000000 +0200
-+++ third_party/hunspell/src/hunspell/affentry.hxx 2015-04-18 22:04:39.000000000 +0200
+--- third_party/hunspell_new/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400
++++ third_party/hunspell_new/src/hunspell/affentry.hxx 2015-07-21 18:48:02.034251000 -0400
@@ -27,7 +27,7 @@
struct hentry * checkword(const char * word, int len, char in_compound,
const FLAG needflag = FLAG_NULL);
@@ -213,9 +213,9 @@
tasks_.erase(it, tasks_.end());
---- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-15 00:32:17.000000000 +0200
-+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-18 22:13:27.000000000 +0200
-@@ -961,7 +961,7 @@
+--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-07-21 18:53:32.511953000 -0400
++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-07-21 18:54:56.010341000 -0400
+@@ -989,7 +989,7 @@
const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
FATAL() << "Not implemented yet.";
@@ -224,7 +224,7 @@
}
const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
-@@ -980,7 +980,7 @@
+@@ -1009,7 +1009,7 @@
const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
FATAL() << "Not implemented yet.";
Modified: branches/2015Q3/www/chromium/files/extra-patch-gcc
==============================================================================
--- branches/2015Q3/www/chromium/files/extra-patch-gcc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/extra-patch-gcc Tue Jul 28 18:49:02 2015 (r393091)
@@ -105,17 +105,28 @@
const char* suffix, const char* mode) {
EmbeddedVector<char, 256> filename;
SmartArrayPointer<char> function_name;
---- v8/src/compiler/graph-visualizer.h.orig 2015-04-28 22:29:10.000000000 +0200
-+++ v8/src/compiler/graph-visualizer.h 2015-05-02 21:34:40.659733000 +0200
-@@ -5,6 +5,7 @@
+--- third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c.orig 2015-07-24 22:27:11.000000000 +0200
++++ third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2015-07-26 17:38:40.937606000 +0200
+@@ -37,6 +37,7 @@
+ #if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
++#define __BSD_VISIBLE 1
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
+--- v8/src/compiler/graph-visualizer.h.orig 2015-07-24 22:28:03.000000000 +0200
++++ v8/src/compiler/graph-visualizer.h 2015-07-26 18:37:45.488253000 +0200
+@@ -5,7 +5,7 @@
#ifndef V8_COMPILER_GRAPH_VISUALIZER_H_
#define V8_COMPILER_GRAPH_VISUALIZER_H_
+-#include <stdio.h>
+#include <cstdio>
#include <iosfwd>
namespace v8 {
-@@ -20,7 +21,7 @@
+@@ -21,7 +21,7 @@
class Schedule;
class SourcePositionTable;
Modified: branches/2015Q3/www/chromium/files/patch-base__process__memory_unittest.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-base__process__memory_unittest.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-base__process__memory_unittest.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,20 +1,23 @@
---- base/process/memory_unittest.cc.orig 2014-10-10 09:15:29 UTC
-+++ base/process/memory_unittest.cc
-@@ -160,9 +160,9 @@
+--- base/process/memory_unittest.cc.orig 2015-07-15 16:29:55.000000000 -0400
++++ base/process/memory_unittest.cc 2015-07-21 19:03:40.407090000 -0400
+@@ -127,11 +127,11 @@
+ #endif // defined(OS_MACOSX)
// Android doesn't implement set_new_handler, so we can't use the
- // OutOfMemoryTest cases.
--// OpenBSD does not support these tests either.
-+// OpenBSD and FreeBSD do not support these tests either.
+-// OutOfMemoryTest cases. OpenBSD does not support these tests either.
++// OutOfMemoryTest cases. OpenBSD and FreeBSD do not support these tests either.
+ // Don't test these on ASan/TSan/MSan configurations: only test the real
+ // allocator.
// TODO(vandebo) make this work on Windows too.
--#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \
-+#if !defined(OS_ANDROID) && !defined(OS_BSD) && \
- !defined(OS_WIN)
+-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) && \
++#if !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) && \
+ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
#if defined(USE_TCMALLOC)
-@@ -448,4 +448,4 @@
+@@ -415,5 +415,5 @@
EXPECT_TRUE(value_ == NULL);
}
#endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
--#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN)
+-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) &&
+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN)
+ // !defined(ADDRESS_SANITIZER)
Modified: branches/2015Q3/www/chromium/files/patch-base__sys_info_freebsd.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-base__sys_info_freebsd.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-base__sys_info_freebsd.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,5 +1,5 @@
---- base/sys_info_freebsd.cc.orig 2014-10-10 08:54:09 UTC
-+++ base/sys_info_freebsd.cc
+--- base/sys_info_freebsd.cc.orig 2015-07-15 16:29:55.000000000 -0400
++++ base/sys_info_freebsd.cc 2015-07-21 20:50:15.595303000 -0400
@@ -4,6 +4,7 @@
#include "base/sys_info.h"
@@ -25,11 +25,11 @@
+}
+
+// static
- size_t SysInfo::MaxSharedMemorySize() {
+ uint64 SysInfo::MaxSharedMemorySize() {
size_t limit;
size_t size = sizeof(limit);
@@ -33,4 +47,25 @@
- return limit;
+ return static_cast<uint64>(limit);
}
+// static
Modified: branches/2015Q3/www/chromium/files/patch-build__common.gypi
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-build__common.gypi Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-build__common.gypi Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,6 @@
---- build/common.gypi.orig 2015-04-18 22:35:23.000000000 +0200
-+++ build/common.gypi 2015-04-18 22:42:51.000000000 +0200
-@@ -94,7 +94,7 @@
+--- build/common.gypi.orig 2015-07-15 16:29:56.000000000 -0400
++++ build/common.gypi 2015-07-22 18:47:32.413623000 -0400
+@@ -97,7 +97,7 @@
'conditions': [
# ChromeOS and Windows use Aura and Ash.
@@ -9,7 +9,29 @@
'use_ash%': 1,
'use_aura%': 1,
}],
-@@ -694,7 +694,7 @@
+@@ -676,7 +676,7 @@
+ # Whether the entire browser uses toolkit-views on Mac instead of Cocoa.
+ 'mac_views_browser%': 0,
+
+- # By default, use ICU data file (icudtl.dat).
++ # By default, use ICU data file (icudtl.dat)
+ 'icu_use_data_file_flag%': 1,
+
+ # Turn on JNI generation optimizations by default.
+@@ -697,6 +697,12 @@
+ 'os_bsd%': 0,
+ }],
+
++ ['OS=="freebsd" or OS=="openbsd"', {
++ 'icu_use_data_file_flag%': 0,
++ }, {
++ 'icu_use_data_file_flag%': 1,
++ }],
++
+ # NSS usage.
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', {
+ 'use_nss_certs%': 1,
+@@ -735,7 +741,7 @@
}],
# DBus usage.
@@ -18,7 +40,7 @@
'use_dbus%': 1,
}, {
'use_dbus%': 0,
-@@ -944,7 +944,7 @@
+@@ -986,7 +992,7 @@
}, {
'use_openmax_dl_fft%': 0,
}],
@@ -27,16 +49,7 @@
'enable_mdns%' : 1,
}],
-@@ -968,7 +968,7 @@
- # except when building Android WebView.
- # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
- # Set the data reduction proxy origin for Android Webview.
-- ['android_webview_build==0', {
-+ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', {
- 'icu_use_data_file_flag%' : 1,
- }, {
- 'icu_use_data_file_flag%' : 0,
-@@ -1216,6 +1216,10 @@
+@@ -1248,6 +1254,10 @@
# able to turn it off for various reasons.
'linux_disable_pie%': 0,
@@ -47,7 +60,7 @@
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
# The default is 'all', which does no channel-specific filtering.
-@@ -4479,6 +4483,13 @@
+@@ -4631,6 +4641,13 @@
'ldflags': [
'-Wl,--no-keep-memory',
],
Modified: branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_prefs.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_prefs.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_prefs.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,5 +1,5 @@
---- chrome/browser/download/download_prefs.cc.orig 2015-01-24 21:51:37 UTC
-+++ chrome/browser/download/download_prefs.cc
+--- chrome/browser/download/download_prefs.cc.orig 2015-07-15 16:29:57.000000000 -0400
++++ chrome/browser/download/download_prefs.cc 2015-07-21 21:27:54.085299000 -0400
@@ -51,7 +51,7 @@
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
@@ -18,15 +18,15 @@
(defined(OS_MACOSX) && !defined(OS_IOS))
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
-@@ -205,7 +205,7 @@
- prefs::kSaveFileDefaultDirectory,
- default_download_path,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+@@ -208,7 +208,7 @@
+ default_download_path);
+ registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
+ default_download_path);
-#if defined(OS_WIN) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
(defined(OS_MACOSX) && !defined(OS_IOS))
- registry->RegisterBooleanPref(
- prefs::kOpenPdfDownloadInSystemReader,
+ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
+ #endif
@@ -286,7 +286,7 @@
}
@@ -45,7 +45,7 @@
(defined(OS_MACOSX) && !defined(OS_IOS))
if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
return true;
-@@ -333,7 +333,7 @@
+@@ -335,7 +335,7 @@
SaveAutoOpenState();
}
@@ -54,7 +54,7 @@
(defined(OS_MACOSX) && !defined(OS_IOS))
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
-@@ -355,7 +355,7 @@
+@@ -357,7 +357,7 @@
#endif
void DownloadPrefs::ResetAutoOpen() {
Modified: branches/2015Q3/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,6 @@
---- chrome/browser/net/cookie_store_util.cc.orig 2015-04-14 18:31:21.000000000 -0400
-+++ chrome/browser/net/cookie_store_util.cc 2015-04-28 10:11:34.004175000 -0400
-@@ -120,7 +120,7 @@
+--- chrome/browser/net/cookie_store_util.cc.orig 2015-07-21 21:42:54.358730000 -0400
++++ chrome/browser/net/cookie_store_util.cc 2015-07-21 21:43:07.938330000 -0400
+@@ -85,7 +85,7 @@
new ChromeCookieMonsterDelegate(profile));
}
Modified: branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,9 +1,9 @@
---- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig 2015-04-14 18:31:21.000000000 -0400
-+++ chrome/browser/ui/toolbar/wrench_menu_model.cc 2015-04-28 09:58:56.258305000 -0400
-@@ -762,7 +762,7 @@
- #endif
+--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig 2015-07-15 16:29:58.000000000 -0400
++++ chrome/browser/ui/toolbar/wrench_menu_model.cc 2015-07-21 21:50:51.697458000 -0400
+@@ -796,7 +796,7 @@
case IDC_UPGRADE_DIALOG:
- return UpgradeDetector::GetInstance()->notify_upgrade();
+ return browser_defaults::kShowUpgradeMenuItem &&
+ UpgradeDetector::GetInstance()->notify_upgrade();
-#if !defined(OS_LINUX) || defined(USE_AURA)
+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
case IDC_BOOKMARK_PAGE:
Modified: branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,15 +1,15 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2015-01-21 20:28:16 UTC
-+++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -35,7 +35,7 @@
- #if defined(OS_WIN)
- virtual HICON GetDefaultWindowIcon() const override;
- virtual bool IsWindowInMetro(gfx::NativeWindow window) const override;
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2015-07-15 16:29:58.000000000 -0400
++++ chrome/browser/ui/views/chrome_views_delegate.h 2015-07-21 21:54:27.828544000 -0400
+@@ -31,7 +31,7 @@
+ HICON GetDefaultWindowIcon() const override;
+ HICON GetSmallWindowIcon() const override;
+ bool IsWindowInMetro(gfx::NativeWindow window) const override;
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
gfx::ImageSkia* GetDefaultWindowIcon() const override;
#endif
-@@ -48,7 +48,7 @@
+@@ -44,7 +44,7 @@
void OnBeforeWidgetInit(
views::Widget::InitParams* params,
views::internal::NativeWidgetDelegate* delegate) override;
@@ -17,4 +17,4 @@
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
bool WindowManagerProvidesTitleBar(bool maximized) override;
#endif
- #if defined(USE_AURA)
+ ui::ContextFactory* GetContextFactory() override;
Modified: branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser.gypi
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser.gypi Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser.gypi Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,20 @@
---- chrome/chrome_browser.gypi.orig 2014-10-10 09:15:30 UTC
-+++ chrome/chrome_browser.gypi
-@@ -3123,7 +3123,7 @@
+--- chrome/chrome_browser.gypi.orig 2015-07-21 22:00:15.902799000 -0400
++++ chrome/chrome_browser.gypi 2015-07-21 22:08:53.180707000 -0400
+@@ -3277,6 +3277,13 @@
+ 'browser/download/download_dir_policy_handler.h',
+ ],
+ }],
++ ['os_bsd==1', {
++ 'sources/': [
++ ['exclude', '^browser/chrome_browser_main_linux.cc'],
++ ['exclude', '^browser/chrome_browser_main_linux.h'],
++ ['exclude', '^browser/media_galleries/linux/'],
++ ],
++ }],
+ ['OS=="mac"', {
+ 'dependencies': [
+ 'app_shim',
+@@ -3416,7 +3423,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
],
}],
@@ -9,30 +23,16 @@
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
-@@ -3180,7 +3180,7 @@
- }],
- ],
+@@ -3472,7 +3479,7 @@
+ ['use_x11==1', {
+ 'sources': [ '<@(chrome_browser_x11_sources)' ],
}],
- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
'sources': [
'app/chrome_crash_reporter_client.cc',
'app/chrome_crash_reporter_client.h',
-@@ -3267,6 +3267,13 @@
- }, { # Non-Android.
- 'sources': [ '<@(chrome_browser_non_android_sources)' ],
- }],
-+ ['os_bsd==1', {
-+ 'sources/': [
-+ ['exclude', '^browser/chrome_browser_main_linux.cc'],
-+ ['exclude', '^browser/chrome_browser_main_linux.h'],
-+ ['exclude', '^browser/media_galleries/linux/'],
-+ ],
-+ }],
- ['OS=="mac"', {
- 'dependencies': [
- '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
-@@ -3343,7 +3350,7 @@
+@@ -3667,7 +3674,7 @@
}],
],
}],
Modified: branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,6 @@
---- chrome/chrome_browser_ui.gypi.orig 2014-10-10 09:15:30 UTC
-+++ chrome/chrome_browser_ui.gypi
-@@ -2875,7 +2875,7 @@
+--- chrome/chrome_browser_ui.gypi.orig 2015-07-15 16:29:59.000000000 -0400
++++ chrome/chrome_browser_ui.gypi 2015-07-21 22:40:24.997217000 -0400
+@@ -2922,7 +2922,7 @@
}],
],
}],
@@ -9,7 +9,7 @@
'dependencies': [
# gtk2 is the only component that can interact with gtk2 in our new
# world.
-@@ -2883,7 +2883,7 @@
+@@ -2930,7 +2930,7 @@
'../build/linux/system.gyp:gio',
],
}],
@@ -18,16 +18,7 @@
'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
}],
['use_aura==1', {
-@@ -2918,7 +2918,7 @@
- ['enable_print_preview==1', {
- 'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ],
- }],
-- ['OS=="linux" or OS=="android"', {
-+ ['OS=="linux" or OS=="android" or OS=="freebsd"', {
- 'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ],
- }],
- ['OS=="android"', {
-@@ -3030,10 +3030,10 @@
+@@ -3083,10 +3083,10 @@
}],
],
}],
Modified: branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,15 @@
--- chrome/common/chrome_paths.cc.orig 2014-10-10 08:54:11 UTC
+++ chrome/common/chrome_paths.cc
-@@ -461,10 +461,12 @@
+@@ -198,7 +198,7 @@
+ return false;
+ break;
+ case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ if (!GetUserDownloadsDirectorySafe(&cur))
+ return false;
+ break;
+@@ -488,10 +488,12 @@
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -14,7 +23,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
-@@ -542,7 +544,7 @@
+@@ -557,7 +559,7 @@
#endif
break;
@@ -23,7 +32,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
-@@ -556,6 +558,9 @@
+@@ -571,6 +573,9 @@
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
@@ -33,7 +42,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
-@@ -568,7 +573,7 @@
+@@ -583,7 +588,7 @@
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;
Copied: branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths_internal.h (from r393089, head/www/chromium/files/patch-chrome__common__chrome_paths_internal.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q3/www/chromium/files/patch-chrome__common__chrome_paths_internal.h Tue Jul 28 18:49:02 2015 (r393091, copy of r393089, head/www/chromium/files/patch-chrome__common__chrome_paths_internal.h)
@@ -0,0 +1,11 @@
+--- chrome/common/chrome_paths_internal.h.orig 2015-07-18 16:46:40.033337000 -0400
++++ chrome/common/chrome_paths_internal.h 2015-07-18 16:51:35.226378000 -0400
+@@ -39,7 +39,7 @@
+ // Get the path to the user's documents directory.
+ bool GetUserDocumentsDirectory(base::FilePath* result);
+
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ // Gets the path to a safe default download directory for a user.
+ bool GetUserDownloadsDirectorySafe(base::FilePath* result);
+ #endif
Modified: branches/2015Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,18 @@
--- content/browser/child_process_launcher.cc.orig 2015-05-13 18:23:06.000000000 -0400
+++ content/browser/child_process_launcher.cc 2015-05-20 11:55:38.781168000 -0400
-@@ -157,7 +157,7 @@
+@@ -111,7 +111,11 @@
+ base::EnvironmentMap env = delegate->GetEnvironment();
+ base::ScopedFD ipcfd = delegate->TakeIpcFd();
+ #elif defined(OS_POSIX) && !defined(OS_ANDROID)
++#if !defined(OS_BSD)
+ bool use_zygote = delegate->ShouldUseZygote();
++#else
++ bool use_zygote = false;
++#endif
+ base::EnvironmentMap env = delegate->GetEnvironment();
+ base::ScopedFD ipcfd = delegate->TakeIpcFd();
+ #endif
+@@ -157,7 +161,7 @@
// We need to close the client end of the IPC channel to reliably detect
// child termination.
@@ -9,7 +21,7 @@
GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
*cmd_line, child_process_id, files_to_register.get());
if (use_zygote) {
-@@ -166,14 +166,14 @@
+@@ -166,14 +170,14 @@
process = base::Process(handle);
} else
// Fall through to the normal posix case below when we're not zygoting.
@@ -26,7 +38,7 @@
if (process_type == switches::kRendererProcess) {
const int sandbox_fd =
RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -181,7 +181,7 @@
+@@ -181,7 +185,7 @@
sandbox_fd,
GetSandboxFD()));
}
@@ -35,7 +47,7 @@
// Actually launch the app.
base::LaunchOptions options;
-@@ -254,13 +254,13 @@
+@@ -254,13 +258,13 @@
process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
#if defined(OS_POSIX)
@@ -51,7 +63,7 @@
base::EnsureProcessTerminated(process.Pass());
#endif // OS_POSIX
#endif // defined(OS_ANDROID)
-@@ -351,7 +351,7 @@
+@@ -351,7 +355,7 @@
void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
DCHECK(CalledOnValidThread());
@@ -60,7 +72,7 @@
if (zygote_) {
termination_status_ = ZygoteHostImpl::GetInstance()->
GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
-@@ -359,7 +359,7 @@
+@@ -359,7 +363,7 @@
termination_status_ =
base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
} else {
@@ -69,7 +81,7 @@
if (known_dead) {
termination_status_ =
base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
-@@ -433,7 +433,7 @@
+@@ -433,7 +437,7 @@
starting_ = false;
process_ = process.Pass();
Modified: branches/2015Q3/www/chromium/files/patch-content__gpu__gpu_main.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-content__gpu__gpu_main.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-content__gpu__gpu_main.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig 2015-04-19 00:48:39.000000000 +0200
-+++ content/gpu/gpu_main.cc 2015-04-19 00:51:41.000000000 +0200
-@@ -73,7 +73,7 @@
+--- content/gpu/gpu_main.cc.orig 2015-07-15 16:30:03.000000000 -0400
++++ content/gpu/gpu_main.cc 2015-07-22 06:59:18.148443000 -0400
+@@ -81,7 +81,7 @@
const base::CommandLine& command_line);
bool WarmUpSandbox(const base::CommandLine& command_line);
@@ -9,12 +9,12 @@
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
#endif
-@@ -162,13 +162,13 @@
- message_loop_type = base::MessageLoop::TYPE_UI;
- }
- base::MessageLoop main_message_loop(message_loop_type);
+@@ -163,13 +163,13 @@
+ // Use a UI message loop because ANGLE and the desktop GL platform can
+ // create child windows to render to.
+ base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
-#elif defined(OS_LINUX) && defined(USE_X11)
-+#elif (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11)
// We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
// and https://crbug.com/326995.
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
@@ -25,7 +25,7 @@
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
#elif defined(OS_MACOSX)
// This is necessary for CoreAnimation layers hosted in the GPU process to be
-@@ -269,7 +269,7 @@
+@@ -274,7 +274,7 @@
// and we already registered them through SetGpuInfo() above.
base::TimeTicks before_collect_context_graphics_info =
base::TimeTicks::Now();
@@ -34,7 +34,7 @@
if (!CollectGraphicsInfo(gpu_info))
dead_on_arrival = true;
-@@ -402,7 +402,7 @@
+@@ -408,7 +408,7 @@
return true;
}
Modified: branches/2015Q3/www/chromium/files/patch-crypto__nss_util.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-crypto__nss_util.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-crypto__nss_util.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,5 +1,5 @@
---- crypto/nss_util.cc.orig 2014-10-10 08:54:15 UTC
-+++ crypto/nss_util.cc
+--- crypto/nss_util.cc.orig 2015-07-15 16:30:04.000000000 -0400
++++ crypto/nss_util.cc 2015-07-22 07:15:16.577810000 -0400
@@ -13,7 +13,7 @@
#include <prtime.h>
#include <secmod.h>
@@ -9,16 +9,16 @@
#include <sys/mount.h>
#include <sys/param.h>
#endif
-@@ -143,7 +143,7 @@
+@@ -146,7 +146,7 @@
// detection when database_dir is on NFS. See http://crbug.com/48585.
//
- // TODO(wtc): port this function to other USE_NSS platforms. It is defined
--// only for OS_LINUX and OS_OPENBSD simply because the statfs structure
-+// only for OS_LINUX and OS_BSD simply because the statfs structure
+ // TODO(wtc): port this function to other USE_NSS_CERTS platforms. It is
+-// defined only for OS_LINUX and OS_OPENBSD simply because the statfs structure
++// defined only for OS_LINUX and OS_BSD simply because the statfs structure
// is OS-specific.
//
// Because this function sets an environment variable it must be run before we
-@@ -154,10 +154,10 @@
+@@ -157,10 +157,10 @@
base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
if (base::GetFileSystemType(database_dir, &fs_type))
db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);
Modified: branches/2015Q3/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,20 +1,29 @@
---- device/serial/serial_io_handler_posix.cc.orig 2014-10-10 08:54:15 UTC
-+++ device/serial/serial_io_handler_posix.cc
-@@ -39,7 +39,7 @@
+--- device/serial/serial_io_handler_posix.cc.orig 2015-07-15 16:30:04.000000000 -0400
++++ device/serial/serial_io_handler_posix.cc 2015-07-22 07:27:41.841184000 -0400
+@@ -61,7 +61,7 @@
BITRATE_TO_SPEED_CASE(9600)
BITRATE_TO_SPEED_CASE(19200)
BITRATE_TO_SPEED_CASE(38400)
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
BITRATE_TO_SPEED_CASE(57600)
BITRATE_TO_SPEED_CASE(115200)
BITRATE_TO_SPEED_CASE(230400)
-@@ -77,7 +77,7 @@
+@@ -99,7 +99,7 @@
SPEED_TO_BITRATE_CASE(9600)
SPEED_TO_BITRATE_CASE(19200)
SPEED_TO_BITRATE_CASE(38400)
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
SPEED_TO_BITRATE_CASE(57600)
SPEED_TO_BITRATE_CASE(115200)
SPEED_TO_BITRATE_CASE(230400)
+@@ -131,7 +131,7 @@
+ return false;
+ }
+ return true;
+-#elif defined(OS_MACOSX)
++#elif defined(OS_MACOSX) || defined(OS_BSD)
+ speed_t speed = static_cast<speed_t>(bitrate);
+ cfsetispeed(config, speed);
+ cfsetospeed(config, speed);
Modified: branches/2015Q3/www/chromium/files/patch-device__usb__usb_context.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-device__usb__usb_context.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_context.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,7 +1,7 @@
---- device/usb/usb_context.cc.orig 2014-10-10 09:15:31 UTC
-+++ device/usb/usb_context.cc
-@@ -9,8 +9,13 @@
- #include "base/synchronization/waitable_event.h"
+--- device/usb/usb_context.cc.orig 2015-07-15 16:30:04.000000000 -0400
++++ device/usb/usb_context.cc 2015-07-22 07:32:40.938868000 -0400
+@@ -8,8 +8,13 @@
+ #include "base/logging.h"
#include "base/threading/platform_thread.h"
#include "device/usb/usb_error.h"
+#if defined(OS_FREEBSD)
@@ -14,13 +14,13 @@
namespace device {
-@@ -43,7 +48,9 @@
+@@ -62,7 +67,9 @@
- UsbContext::UsbEventHandler::~UsbEventHandler() {
+ void UsbContext::UsbEventHandler::Stop() {
base::subtle::Release_Store(&running_, 0);
+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version
libusb_interrupt_handle_event(context_);
+#endif
- base::PlatformThread::Join(thread_handle_);
}
+ UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {
Modified: branches/2015Q3/www/chromium/files/patch-device__usb__usb_device_handle_impl.h
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-device__usb__usb_device_handle_impl.h Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_device_handle_impl.h Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,9 +1,9 @@
---- device/usb/usb_device_handle_impl.h.orig 2014-10-10 09:15:31 UTC
-+++ device/usb/usb_device_handle_impl.h
-@@ -14,7 +14,12 @@
+--- device/usb/usb_device_handle_impl.h.orig 2015-07-15 16:30:04.000000000 -0400
++++ device/usb/usb_device_handle_impl.h 2015-07-22 07:35:03.384188000 -0400
+@@ -13,7 +13,12 @@
+ #include "base/memory/ref_counted.h"
#include "base/threading/thread_checker.h"
#include "device/usb/usb_device_handle.h"
- #include "net/base/io_buffer.h"
+#if defined(OS_FREEBSD)
+#include "libusb.h"
+#define LIBUSB_CALL
@@ -12,4 +12,4 @@
+#endif
namespace base {
- class SingleThreadTaskRunner;
+ class SequencedTaskRunner;
Modified: branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,42 +1,56 @@
---- device/usb/usb_service_impl.cc.orig 2015-04-19 21:12:40.000000000 +0200
-+++ device/usb/usb_service_impl.cc 2015-04-19 21:16:15.000000000 +0200
-@@ -113,6 +113,7 @@
- hotplug_enabled_(false),
+--- device/usb/usb_service_impl.cc.orig 2015-07-15 16:30:04.000000000 -0400
++++ device/usb/usb_service_impl.cc 2015-07-22 20:14:21.946835000 -0400
+@@ -17,7 +17,11 @@
+ #include "base/thread_task_runner_handle.h"
+ #include "components/device_event_log/device_event_log.h"
+ #include "device/usb/usb_error.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+
+ #if defined(OS_WIN)
+ #include <setupapi.h>
+@@ -294,6 +298,7 @@
weak_factory_(this) {
- task_runner_ = base::ThreadTaskRunnerHandle::Get();
+ base::MessageLoop::current()->AddDestructionObserver(this);
+
+#if !defined(OS_FREEBSD)
int rv = libusb_hotplug_register_callback(
context_->context(),
static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -130,12 +131,15 @@
- base::Unretained(ui_thread_helper_)));
+@@ -321,14 +326,16 @@
+ }
#endif // OS_WIN
}
+#endif // !OS_FREEBSD
}
UsbServiceImpl::~UsbServiceImpl() {
+ base::MessageLoop::current()->RemoveDestructionObserver(this);
+-
+#if !defined(OS_FREEBSD)
if (hotplug_enabled_) {
libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
}
+#endif // !OS_FREEBSD
- #if defined(OS_WIN)
- if (ui_thread_helper_) {
- ui_task_runner_->DeleteSoon(FROM_HERE, ui_thread_helper_);
-@@ -219,6 +223,7 @@
+ for (const auto& map_entry : devices_) {
+ map_entry.second->OnDisconnect();
}
+@@ -566,6 +573,7 @@
+ device->OnDisconnect();
}
+#if !defined(OS_FREEBSD)
// static
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
PlatformUsbDevice device,
-@@ -256,6 +261,7 @@
+@@ -603,6 +611,7 @@
return 0;
}
+#endif // !OS_FREEBSD
- void UsbServiceImpl::OnDeviceAdded(PlatformUsbDevice platform_device) {
+ void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
DCHECK(CalledOnValidThread());
Modified: branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.h
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.h Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-device__usb__usb_service_impl.h Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,7 +1,7 @@
---- device/usb/usb_service_impl.h.orig 2015-04-19 16:22:47.000000000 +0200
-+++ device/usb/usb_service_impl.h 2015-04-19 21:10:55.000000000 +0200
-@@ -10,7 +10,13 @@
- #include "base/single_thread_task_runner.h"
+--- device/usb/usb_service_impl.h.orig 2015-07-15 16:30:04.000000000 -0400
++++ device/usb/usb_service_impl.h 2015-07-22 07:42:23.863097000 -0400
+@@ -11,7 +11,13 @@
+ #include "base/message_loop/message_loop.h"
#include "device/usb/usb_context.h"
#include "device/usb/usb_device_impl.h"
+#if defined(OS_FREEBSD)
@@ -12,11 +12,11 @@
+#endif
+
- namespace device {
+ #if defined(OS_WIN)
+ #include "base/scoped_observer.h"
+@@ -92,11 +98,13 @@
-@@ -38,11 +44,13 @@
- // Adds a new UsbDevice to the devices_ map based on the given libusb device.
- scoped_refptr<UsbDeviceImpl> AddDevice(PlatformUsbDevice platform_device);
+ void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
+#if !defined(OS_FREEBSD)
// Handle hotplug events from libusb.
@@ -26,15 +26,15 @@
void* user_data);
+#endif
// These functions release a reference to the provided platform device.
- void OnDeviceAdded(PlatformUsbDevice platform_device);
- void OnDeviceRemoved(PlatformUsbDevice platform_device);
-@@ -63,7 +71,9 @@
+ void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);
+ void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);
+@@ -112,7 +120,9 @@
// connected instead of only when a full enumeration is requested.
// TODO(reillyg): Support this on all platforms. crbug.com/411715
- bool hotplug_enabled_;
+ bool hotplug_enabled_ = false;
+#if !defined(OS_FREEBSD)
libusb_hotplug_callback_handle hotplug_handle_;
+#endif
- // The map from unique IDs to UsbDevices.
- typedef std::map<uint32, scoped_refptr<UsbDeviceImpl>> DeviceMap;
+ // Enumeration callbacks are queued until an enumeration completes.
+ bool enumeration_ready_ = false;
Modified: branches/2015Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,11 +1,11 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig 2014-10-10 08:54:16 UTC
-+++ net/dns/dns_config_service_posix_unittest.cc
+--- net/dns/dns_config_service_posix_unittest.cc.orig 2015-07-15 16:30:05.000000000 -0400
++++ net/dns/dns_config_service_posix_unittest.cc 2015-07-22 07:45:57.034816000 -0400
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <resolv.h>
-
+ #include "base/cancelable_callback.h"
+ #include "base/files/file_util.h"
#include "base/sys_byteorder.h"
- #include "net/dns/dns_config_service_posix.h"
-
Modified: branches/2015Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,9 +1,9 @@
---- net/http/http_auth_gssapi_posix.cc.orig 2014-10-10 08:54:16 UTC
-+++ net/http/http_auth_gssapi_posix.cc
-@@ -431,8 +431,8 @@
- static const char* const kDefaultLibraryNames[] = {
+--- net/http/http_auth_gssapi_posix.cc.orig 2015-07-15 16:30:05.000000000 -0400
++++ net/http/http_auth_gssapi_posix.cc 2015-07-22 07:50:14.149575000 -0400
+@@ -432,8 +432,8 @@
#if defined(OS_MACOSX)
- "libgssapi_krb5.dylib" // MIT Kerberos
+ // This library is provided by Kerberos.framework.
+ "libgssapi_krb5.dylib"
-#elif defined(OS_OPENBSD)
- "libgssapi.so" // Heimdal - OpenBSD
+#elif defined(OS_BSD)
Modified: branches/2015Q3/www/chromium/files/patch-net__net.gypi
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-net__net.gypi Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-net__net.gypi Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,6 +1,6 @@
---- net/net.gypi.orig 2014-10-10 09:15:31 UTC
-+++ net/net.gypi
-@@ -182,8 +182,8 @@
+--- net/net.gypi.orig 2015-07-15 16:30:05.000000000 -0400
++++ net/net.gypi 2015-07-22 07:53:36.298350000 -0400
+@@ -196,8 +196,8 @@
'android/network_change_notifier_factory_android.h',
'android/network_library.cc',
'android/network_library.h',
@@ -10,13 +10,13 @@
+ #'base/address_tracker_linux.h',
'base/backoff_entry.cc',
'base/backoff_entry.h',
- 'base/bandwidth_metrics.cc',
-@@ -1252,7 +1252,7 @@
+ 'base/backoff_entry_serializer.cc',
+@@ -1278,7 +1278,7 @@
'android/keystore_unittest.cc',
'android/network_change_notifier_android_unittest.cc',
'base/address_list_unittest.cc',
- 'base/address_tracker_linux_unittest.cc',
+ #'base/address_tracker_linux_unittest.cc',
+ 'base/backoff_entry_serializer_unittest.cc',
'base/backoff_entry_unittest.cc',
- 'base/data_url_unittest.cc',
- 'base/directory_lister_unittest.cc',
+ 'base/chunked_upload_data_stream_unittest.cc',
Copied: branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp (from r393089, head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp Tue Jul 28 18:49:02 2015 (r393091, copy of r393089, head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2015-07-22 08:00:24.013307000 -0400
++++ third_party/WebKit/Source/platform/heap/GCInfo.cpp 2015-07-22 08:00:35.112590000 -0400
+@@ -8,6 +8,8 @@
+ #include "platform/heap/Handle.h"
+ #include "platform/heap/Heap.h"
+
++#include <stdlib.h>
++
+ namespace blink {
+
+ // GCInfo indices start from 1 for heap objects, with 0 being treated
Copied: branches/2015Q3/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c (from r393089, head/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q3/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c Tue Jul 28 18:49:02 2015 (r393091, copy of r393089, head/www/chromium/files/patch-third_party__boringssl__src__crypto__bn__generic.c)
@@ -0,0 +1,11 @@
+--- third_party/boringssl/src/crypto/bn/generic.c.orig 2015-07-22 18:56:54.552496000 -0400
++++ third_party/boringssl/src/crypto/bn/generic.c 2015-07-22 18:59:06.813075000 -0400
+@@ -71,6 +71,8 @@
+
+ #if defined(OPENSSL_WINDOWS)
+ #define alloca _alloca
++#elif defined(__FreeBSD__)
++#include <stdlib.h>
+ #else
+ #include <alloca.h>
+ #endif
Modified: branches/2015Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
==============================================================================
--- branches/2015Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp Tue Jul 28 18:41:36 2015 (r393090)
+++ branches/2015Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp Tue Jul 28 18:49:02 2015 (r393091)
@@ -1,18 +1,25 @@
---- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2014-10-10 09:15:55 UTC
-+++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp
-@@ -753,12 +753,17 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list