svn commit: r339940 - in head/www/chromium: . files

Rene Ladan rene at FreeBSD.org
Thu Jan 16 17:19:41 UTC 2014 

Author: rene
Date: Thu Jan 16 17:19:35 2014
New Revision: 339940
URL: http://svnweb.freebsd.org/changeset/ports/339940
QAT: https://qat.redports.org/buildarchive/r339940/

Log:
  - Update to 32.0.1700.77
  - Convert to USES=ninja
  - Use shorthand for MASTER_SITE_LOCAL
  
  Security:	http://vuxml.org/freebsd/5acf4638-7e2c-11e3-9fba-00262d5ed8ee.html
  MFH:		2014Q1

Added:
  head/www/chromium/files/patch-base__test__launcher__test_launcher.cc   (contents, props changed)
  head/www/chromium/files/patch-breakpad__breakpad.gyp   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc   (contents, props changed)
  head/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc   (contents, props changed)
  head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc   (contents, props changed)
  head/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi   (contents, props changed)
  head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp   (contents, props changed)
  head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp   (contents, props changed)
  head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h   (contents, props changed)
  head/www/chromium/files/patch-ui__events__event_switches.cc   (contents, props changed)
  head/www/chromium/files/patch-ui__events__event_switches.h   (contents, props changed)
  head/www/chromium/files/patch-v8__src__checks.cc   (contents, props changed)
Deleted:
  head/www/chromium/files/patch-base__test__test_launcher.cc
  head/www/chromium/files/patch-chrome__browser__gpu__chrome_gpu_util.cc
  head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
  head/www/chromium/files/patch-skia__skia_chrome.gypi
  head/www/chromium/files/patch-third_party__WebKit__Source__core__features.gypi
  head/www/chromium/files/patch-third_party__WebKit__Source__core__rendering__RenderingNodeProxy.cpp
  head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__AccessibilityUIElementChromium.cpp
  head/www/chromium/files/patch-third_party__WebKit__Source__web__gtk__WebInputEventFactory.cpp
  head/www/chromium/files/patch-v8__src__platform-posix.h
  head/www/chromium/files/patch-webkit__browser__fileapi__file_system_dir_url_request_job_unittest.cc
Modified:
  head/www/chromium/Makefile
  head/www/chromium/distinfo
  head/www/chromium/files/extra-patch-clang
  head/www/chromium/files/extra-patch-fixup-execinfo
  head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
  head/www/chromium/files/patch-chrome__app__policy__policy_templates.json
  head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
  head/www/chromium/files/patch-skia__skia_library.gypi
  head/www/chromium/files/patch-sync__util__get_session_name.cc
  head/www/chromium/files/patch-third_party__WebKit__Source__config.h
  head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
  head/www/chromium/pkg-plist

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/Makefile	Thu Jan 16 17:19:35 2014	(r339940)
@@ -5,14 +5,13 @@
 
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
-DISTVERSION=	31.0.1650.63
+DISTVERSION=	32.0.1700.77
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \
 		http://download.goodking.org/downloads/:browser \
 		ftp://rene-ladan.nl/pub/distfiles/:browser \
-		${MASTER_SITE_LOCAL}:browser \
+		LOCAL/rene:browser \
 		http://files.etoilebsd.net/goodking/:browser
-MASTER_SITE_SUBDIR=rene
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:browser
 
 MAINTAINER=	chromium at FreeBSD.org
@@ -28,7 +27,6 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${
 		bash:${PORTSDIR}/shells/bash \
 		yasm:${PORTSDIR}/devel/yasm \
 		flock:${PORTSDIR}/sysutils/flock \
-		ninja:${PORTSDIR}/devel/ninja \
 		v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
 
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
@@ -49,14 +47,14 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/l
 ONLY_FOR_ARCHS=	i386 amd64
 USE_XZ=		yes
 USES=		bison compiler:c++11-lang desktop-file-utils pkgconfig \
-		perl5 shebangfix
+		perl5 shebangfix ninja
 USE_PERL5=	build
 USE_PYTHON_BUILD=	2
 USE_XORG=	scrnsaverproto x11 xproto xscrnsaver xtst
 USE_GNOME=	glib20 gtk20 dconf libxslt
 
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
-NINJA_TARGETS=	chrome
+ALL_TARGET=	chrome
 
 # See build/common.gypi for all the available variables.
 GYP_DEFINES+=	use_cups=1 \
@@ -144,7 +142,7 @@ TEST_TARGETS=	base_unittests \
 		net_unittests \
 		content_unittests
 EXCLUDED_TESTS=	GpuDriverBugListTest.CurrentDriverBugListValidation
-NINJA_TARGETS+=	${TEST_TARGETS}
+ALL_TARGET+=	${TEST_TARGETS}
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata
 .endif
 
@@ -169,6 +167,7 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
 		GPERF=${LOCALBASE}/bin/gperf
+MAKE_ARGS+=	-C out/${BUILDTYPE}
 
 .include <bsd.port.pre.mk>
 
@@ -203,7 +202,8 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
 		${WRKSRC}/chrome/common/chrome_paths.cc
 	@${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \
-		${WRKSRC}/third_party/WebKit/Source/core/core.gypi
+		${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \
+		${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi
 	@${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \
 		${WRKSRC}/chrome/chrome_tests_unit.gypi
 	@${REINPLACE_CMD} -e "s|linux|freebsd|" \
@@ -224,10 +224,6 @@ do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/gyp_chromium chrome/chrome.gyp --depth .
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ninja \
-		${_MAKE_JOBS} -C out/${BUILDTYPE} ${NINJA_TARGETS}
-
 test regression-test: build
 .for t in ${TEST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \

Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/distinfo	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,4 +1,4 @@
-SHA256 (chromium-courgette-redacted-31.0.1650.63.tar.xz) = f9d368ab3b47bc57d06fb4e36a579f938969af8fca7ad06a27b6a2105f9c74d4
-SIZE (chromium-courgette-redacted-31.0.1650.63.tar.xz) = 183258660
-SHA256 (chromium-31.0.1650.63-testdata.tar.xz) = b554f18f1ec334bf88170683bf08722f101c4cc5d7358a44019d8645cea135ac
-SIZE (chromium-31.0.1650.63-testdata.tar.xz) = 111203540
+SHA256 (chromium-courgette-redacted-32.0.1700.77.tar.xz) = c616f4d4d917b3aa1cf78a200b44e9ae22fed9fb3671ee6d8058f961dc6cad24
+SIZE (chromium-courgette-redacted-32.0.1700.77.tar.xz) = 186231264
+SHA256 (chromium-32.0.1700.77-testdata.tar.xz) = 7da813a54e84d2aa655cd376d2eae41f64132a8790cbc8bcadd9220ef9d6bcd0
+SIZE (chromium-32.0.1700.77-testdata.tar.xz) = 112139016

Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/extra-patch-clang	Thu Jan 16 17:19:35 2014	(r339940)
@@ -250,3 +250,25 @@
  #if defined(__GCC__)
  #pragma GCC diagnostic pop
  #endif
+--- v8/src/unique.h.orig	2014-01-07 21:03:55.000000000 +0100
++++ v8/src/unique.h	2014-01-13 00:41:59.000000000 +0100
+@@ -130,7 +130,7 @@
+ 
+   // TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
+   static Unique<T> CreateUninitialized(Handle<T> handle) {
+-    return Unique<T>(reinterpret_cast<Address>(NULL), handle);
++    return Unique<T>(static_cast<Address>(NULL), handle);
+   }
+ 
+   static Unique<T> CreateImmovable(Handle<T> handle) {
+--- content/browser/renderer_host/render_widget_host_view_guest.cc.orig	2014-01-07 21:02:28.000000000 +0100
++++ content/browser/renderer_host/render_widget_host_view_guest.cc	2014-01-13 13:48:52.000000000 +0100
+@@ -254,7 +254,7 @@
+ gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
+   if (guest_->GetEmbedderRenderWidgetHostView())
+     return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId();
+-  return static_cast<gfx::NativeViewId>(NULL);
++  return reinterpret_cast<gfx::NativeViewId>(NULL);
+ }
+ 
+ gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() {

Modified: head/www/chromium/files/extra-patch-fixup-execinfo
==============================================================================
--- head/www/chromium/files/extra-patch-fixup-execinfo	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/extra-patch-fixup-execinfo	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,18 +1,11 @@
---- v8/src/platform-posix.h.orig	2013-09-28 19:29:53.000000000 +0200
-+++ v8/src/platform-posix.h	2013-10-11 17:28:41.000000000 +0200
-@@ -40,12 +41,12 @@
- 
- // Used by platform implementation files during OS::DumpBacktrace()
- // and OS::StackWalk().
--template<int (*backtrace)(void**, int),
--         char** (*backtrace_symbols)(void* const*, int)>
-+template<size_t (*backtrace)(void**, size_t),
-+         char** (*backtrace_symbols)(void* const*, size_t)>
- struct POSIXBacktraceHelper {
-   static void DumpBacktrace() {
-     void* trace[100];
--    int size = backtrace(trace, ARRAY_SIZE(trace));
-+    size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace));
-     char** symbols = backtrace_symbols(trace, size);
-     fprintf(stderr, "\n==== C stack trace ===============================\n\n");
-     if (size == 0) {
+--- v8/src/checks.cc.orig	2014-01-07 21:03:55.000000000 +0100
++++ v8/src/checks.cc	2014-01-08 01:14:20.000000000 +0100
+@@ -41,7 +41,7 @@
+ static V8_INLINE void DumpBacktrace() {
+ #if V8_LIBC_GLIBC || V8_OS_BSD
+   void* trace[100];
+-  int size = backtrace(trace, ARRAY_SIZE(trace));
++  size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace));
+   char** symbols = backtrace_symbols(trace, size);
+   i::OS::PrintError("\n==== C stack trace ===============================\n\n");
+   if (size == 0) {

Added: head/www/chromium/files/patch-base__test__launcher__test_launcher.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-base__test__launcher__test_launcher.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,13 @@
+--- base/test/launcher/test_launcher.cc.orig	2014-01-07 21:01:10.000000000 +0100
++++ base/test/launcher/test_launcher.cc	2014-01-13 01:36:07.000000000 +0100
+@@ -36,6 +36,10 @@
+ #include "base/mac/scoped_nsautorelease_pool.h"
+ #endif
+ 
++#if defined(OS_FREEBSD)
++#include <signal.h>
++#endif
++
+ namespace base {
+ 
+ // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .

Added: head/www/chromium/files/patch-breakpad__breakpad.gyp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-breakpad__breakpad.gyp	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,11 @@
+--- breakpad/breakpad.gyp.orig	2014-01-07 21:02:21.000000000 +0100
++++ breakpad/breakpad.gyp	2014-01-12 22:55:47.000000000 +0100
+@@ -334,7 +334,7 @@
+         },
+       ],
+     }],
+-    [ 'OS=="linux" or OS=="android"', {
++    [ 'OS=="linux" or OS=="android" or os_bsd==1', {
+       'conditions': [
+         ['OS=="android"', {
+           'defines': [

Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,15 +1,15 @@
---- chrome/app/chrome_main_delegate.cc.orig	2013-11-08 07:41:27.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc	2013-11-16 11:29:59.000000000 +0100
-@@ -96,7 +96,7 @@
+--- chrome/app/chrome_main_delegate.cc.orig	2014-01-07 21:01:39.000000000 +0100
++++ chrome/app/chrome_main_delegate.cc	2014-01-13 16:53:27.000000000 +0100
+@@ -97,7 +97,7 @@
  #include "ui/base/x/x11_util.h"
  #endif
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "chrome/app/breakpad_linux.h"
+ #include "components/breakpad/app/breakpad_linux.h"
  #endif
  
-@@ -114,7 +114,7 @@
+@@ -115,7 +115,7 @@
      g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
  #endif
  
@@ -18,7 +18,7 @@
  base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
      g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
  #endif
-@@ -234,7 +234,7 @@
+@@ -235,7 +235,7 @@
        // Mac needs them for the plugin process name.
        process_type == switches::kPluginProcess ||
  #endif
@@ -27,7 +27,7 @@
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -391,7 +391,7 @@
+@@ -392,7 +392,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -36,7 +36,7 @@
        } else if (format_str == "log") {
          format = diagnostics::DiagnosticsWriter::LOG;
        } else {
-@@ -432,7 +432,7 @@
+@@ -433,7 +433,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -45,7 +45,7 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -563,7 +563,7 @@
+@@ -564,7 +564,7 @@
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -54,16 +54,25 @@
    breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
  #endif
  
-@@ -700,7 +700,7 @@
+@@ -701,7 +701,7 @@
  #endif
    }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
-   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain
-   // sets this up for the browser process in a different manner. Zygotes
-   // need to call InitCrashReporter() in RunZygote().
-@@ -813,7 +813,7 @@
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+   // Zygote needs to call InitCrashReporter() in RunZygote().
+   if (process_type != switches::kZygoteProcess) {
+ #if defined(OS_ANDROID)
+@@ -713,7 +713,7 @@
+     breakpad::InitCrashReporter();
+ #endif  // defined(OS_ANDROID)
+   }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+ 
+   // After all the platform Breakpads have been initialized, store the command
+   // line for crash reporting.
+@@ -814,7 +814,7 @@
      SetUpProfilingShutdownHandler();
    }
  
@@ -71,4 +80,4 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
    // this up for the browser process in a different manner.
-   InitCrashReporter();
+   breakpad::InitCrashReporter();

Modified: head/www/chromium/files/patch-chrome__app__policy__policy_templates.json
==============================================================================
--- head/www/chromium/files/patch-chrome__app__policy__policy_templates.json	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/patch-chrome__app__policy__policy_templates.json	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,6 +1,6 @@
 --- chrome/app/policy/policy_templates.json.orig	2013-09-24 21:57:03.000000000 +0300
 +++ chrome/app/policy/policy_templates.json	2013-09-24 21:59:32.000000000 +0300
-@@ -1365,7 +1365,7 @@
+@@ -1366,7 +1366,7 @@
            'name': 'GSSAPILibraryName',
            'type': 'string',
            'schema': { 'type': 'string' },
@@ -9,16 +9,16 @@
            'features': {
              'dynamic_refresh': False,
              'per_profile': False,
-@@ -3251,7 +3251,7 @@
+@@ -3339,7 +3339,7 @@
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
        'type': 'main',
        'schema': { 'type': 'boolean' },
--      'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.win:30-'],
-+      'supported_on': ['chrome_os:0.30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
+-      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
++      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -3766,7 +3766,7 @@
+@@ -3960,7 +3960,7 @@
        'name': 'BackgroundModeEnabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },

Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,15 +1,15 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2013-09-25 22:01:36.000000000 +0300
-+++ chrome/browser/chrome_content_browser_client.cc	2013-09-25 22:11:33.000000000 +0300
-@@ -480,7 +480,7 @@
+--- chrome/browser/chrome_content_browser_client.cc.orig	2014-01-07 21:01:57.000000000 +0100
++++ chrome/browser/chrome_content_browser_client.cc	2014-01-11 01:50:13.000000000 +0100
+@@ -492,7 +492,7 @@
    }
  }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- int GetCrashSignalFD(const CommandLine& command_line) {
-   if (command_line.HasSwitch(switches::kExtensionProcess)) {
-     ExtensionCrashHandlerHostLinux* crash_handler =
-@@ -505,7 +505,7 @@
+ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
+     const std::string& process_type) {
+   base::FilePath dumps_path;
+@@ -548,7 +548,7 @@
  
    return -1;
  }
@@ -18,17 +18,17 @@
  
  #if !defined(OS_CHROMEOS)
  GURL GetEffectiveURLForSignin(const GURL& url) {
-@@ -1346,7 +1346,7 @@
-     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
-                                     child_process_logging::GetClientId());
-   }
--#elif defined(OS_POSIX)
-+#elif defined(OS_POSIX) && !defined(OS_BSD)
-   if (IsCrashReporterEnabled()) {
-     command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
-         child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
-@@ -2461,7 +2461,7 @@
-   additional_backends->push_back(new sync_file_system::SyncFileSystemBackend());
+@@ -1397,7 +1397,7 @@
+ 
+ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+     CommandLine* command_line, int child_process_id) {
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+   if (breakpad::IsCrashReporterEnabled()) {
+     std::string enable_crash_reporter;
+     GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter);
+@@ -2529,7 +2529,7 @@
+           Profile::FromBrowserContext(browser_context)));
  }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -36,7 +36,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const CommandLine& command_line,
      int child_process_id,
-@@ -2521,7 +2521,7 @@
+@@ -2584,7 +2584,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }

Added: head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,14 @@
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2014-01-07 21:01:47.000000000 +0100
++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	2014-01-13 17:44:02.000000000 +0100
+@@ -33,9 +33,11 @@
+     // Note that this initializes the delegate asynchronously, but since
+     // the delegate will only be used from the IO thread, it is guaranteed
+     // to be created before use of it expects it to be there.
++#if !defined(OS_FREEBSD)
+     CreateMTPDeviceAsyncDelegate(device_location,
+         base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
+                    base::Unretained(this), device_location));
++#endif
+     mtp_device_usage_map_[device_location] = 0;
+   }
+ 

Added: head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/webui/certificate_viewer_webui.cc.orig	2014-01-07 21:01:49.000000000 +0100
++++ chrome/browser/ui/webui/certificate_viewer_webui.cc	2014-01-13 15:16:24.000000000 +0100
+@@ -228,7 +228,7 @@
+   if (cert_index < 0)
+     return;
+ 
+-  NativeWebContentsModalDialog window =
++  _GtkWindow* window =
+       platform_util::GetTopLevel(dialog_->dialog()->GetNativeDialog());
+   ShowCertExportDialog(web_ui()->GetWebContents(),
+                        window,

Added: head/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,35 @@
+--- content/browser/fileapi/file_system_dir_url_request_job_unittest.cc.orig	2014-01-07 21:02:28.000000000 +0100
++++ content/browser/fileapi/file_system_dir_url_request_job_unittest.cc	2014-01-13 16:18:14.000000000 +0100
+@@ -248,7 +248,7 @@
+ 
+   std::istringstream in(delegate_->data_received());
+   std::string line;
+-  EXPECT_TRUE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
+ 
+ #if defined(OS_WIN)
+   EXPECT_EQ("<script>start(\"foo\\\\bar\");</script>", line);
+@@ -256,10 +256,10 @@
+   EXPECT_EQ("<script>start(\"/foo/bar\");</script>", line);
+ #endif
+ 
+-  EXPECT_TRUE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
+   VerifyListingEntry(line, "hoge", "hoge", false, 10);
+ 
+-  EXPECT_TRUE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
+   VerifyListingEntry(line, "baz", "baz", true, 0);
+ }
+ 
+@@ -307,8 +307,8 @@
+ 
+   std::istringstream in(delegate_->data_received());
+   std::string line;
+-  EXPECT_TRUE(std::getline(in, line));
+-  EXPECT_FALSE(std::getline(in, line));
++  /*EXPECT_TRUE*/(std::getline(in, line));
++  /*EXPECT_FALSE*/(std::getline(in, line));
+ 
+   TestRequestWithContext(CreateFileSystemURL("foo"),
+                          file_system_context.get());

Added: head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,11 @@
+--- content/browser/geolocation/location_arbitrator_impl.cc.orig	2014-01-07 21:02:28.000000000 +0100
++++ content/browser/geolocation/location_arbitrator_impl.cc	2014-01-13 16:30:21.000000000 +0100
+@@ -160,7 +160,7 @@
+ }
+ 
+ LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
+   return NULL;
+ #else
+   return content::NewSystemLocationProvider();

Modified: head/www/chromium/files/patch-skia__skia_library.gypi
==============================================================================
--- head/www/chromium/files/patch-skia__skia_library.gypi	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/patch-skia__skia_library.gypi	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,6 +1,6 @@
 --- skia/skia_library.gypi.orig	2013-09-03 22:15:35.743627150 +0300
 +++ skia/skia_library.gypi	2013-09-03 22:17:46.187628519 +0300
-@@ -214,7 +214,7 @@
+@@ -193,7 +193,7 @@
      }],
  
      #Settings for text blitting, chosen to approximate the system browser.
@@ -9,12 +9,3 @@
        'defines': [
          'SK_GAMMA_EXPONENT=1.2',
          'SK_GAMMA_CONTRAST=0.2',
-@@ -242,7 +242,7 @@
- 
-     # For POSIX platforms, prefer the Mutex implementation provided by Skia
-     # since it does not generate static initializers.
--    [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
-+    [ 'os_posix == 1 or OS == "ios"', {
-       'defines+': [
-         'SK_USE_POSIX_THREADS',
-       ],

Modified: head/www/chromium/files/patch-sync__util__get_session_name.cc
==============================================================================
--- head/www/chromium/files/patch-sync__util__get_session_name.cc	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/patch-sync__util__get_session_name.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,15 +1,15 @@
---- sync/util/get_session_name.cc.orig	2013-08-16 23:59:39.000000000 +0300
-+++ sync/util/get_session_name.cc	2013-08-17 00:00:27.000000000 +0300
-@@ -14,7 +14,7 @@
- #if defined(OS_CHROMEOS)
- #include "base/command_line.h"
- #include "chromeos/chromeos_switches.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+--- sync/util/get_session_name.cc.orig	2014-01-07 21:02:32.000000000 +0100
++++ sync/util/get_session_name.cc	2014-01-11 02:17:44.000000000 +0100
+@@ -11,7 +11,7 @@
+ #include "base/sys_info.h"
+ #include "base/task_runner.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
  #include "sync/util/get_session_name_linux.h"
  #elif defined(OS_IOS)
  #include "sync/util/get_session_name_ios.h"
-@@ -59,7 +59,7 @@
+@@ -36,7 +36,7 @@
    // like "stumpy-signed-mp-v2keys" etc. The information can be checked on
    // "CHROMEOS_RELEASE_BOARD" line in chrome://system.
    session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";

Added: head/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/build/features.gypi.orig	2013-08-30 06:55:03.000000000 +0300
++++ third_party/WebKit/Source/build/features.gypi	2013-09-03 22:27:08.777629842 +0300
+@@ -94,7 +94,7 @@
+           'ENABLE_WEB_AUDIO=1',
+         ],
+       }],
+-      ['OS=="win" or OS=="android" or OS=="linux"', {
++      ['OS=="win" or OS=="android" or OS=="linux" or os_bsd==1', {
+         'feature_defines': [
+           'ENABLE_OPENTYPE_VERTICAL=1',
+         ],

Modified: head/www/chromium/files/patch-third_party__WebKit__Source__config.h
==============================================================================
--- head/www/chromium/files/patch-third_party__WebKit__Source__config.h	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__config.h	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,10 +1,10 @@
 --- third_party/WebKit/Source/config.h.orig	2013-11-08 07:50:10.000000000 +0100
 +++ third_party/WebKit/Source/config.h	2013-11-15 16:58:16.000000000 +0100
-@@ -181,6 +181,6 @@
+@@ -167,6 +167,6 @@
  #define __STDC_FORMAT_MACROS 1
  #endif
  
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+-#if OS(LINUX) || OS(ANDROID) || ENABLE(HARFBUZZ_ON_WINDOWS)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || ENABLE(HARFBUZZ_ON_WINDOWS)
  #define WTF_USE_HARFBUZZ 1
  #endif

Added: head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,13 @@
+--- third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp.orig	2014-01-07 21:06:22.000000000 +0100
++++ third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp	2014-01-13 13:22:53.000000000 +0100
+@@ -37,6 +37,10 @@
+ #include "public/platform/WebString.h"
+ #include "public/web/WebAXObject.h"
+ 
++#if defined(OS_FREEBSD)
++#include <stdlib.h> // atoi()
++#endif
++
+ using namespace WebKit;
+ using namespace std;
+ 

Added: head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,22 @@
+--- third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig	2014-01-07 21:06:23.000000000 +0100
++++ third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp	2014-01-11 00:54:01.000000000 +0100
+@@ -40,6 +40,8 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
++#include <cstdlib>
++
+ #include "wtf/Assertions.h"
+ 
+ namespace {
+@@ -65,8 +67,8 @@
+                  "gtk-double-click-time", &doubleClickTime,
+                  "gtk-double-click-distance", &doubleClickDistance, NULL);
+     return (time - gLastClickTime) > doubleClickTime
+-           || abs(x - gLastClickX) > doubleClickDistance
+-           || abs(y - gLastClickY) > doubleClickDistance;
++           || std::abs(x - gLastClickX) > doubleClickDistance
++           || std::abs(y - gLastClickY) > doubleClickDistance;
+ }
+ 
+ void resetClickCountState()

Added: head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,24 @@
+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2014-01-07 21:06:25.000000000 +0100
++++ third_party/WebKit/Source/wtf/ByteSwap.h	2014-01-13 01:21:42.000000000 +0100
+@@ -52,8 +52,13 @@
+ 
+ #else
+ 
++#ifndef bswap64
+ inline uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); }
++#endif
++#ifndef bswap32
+ inline uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); }
++#endif
++#ifndef bswap16
+ // GCC lacks bswap16.
+ #if COMPILER(CLANG)
+ inline uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); }
+@@ -61,6 +66,7 @@
+ // GCC lacks __builtin_bswap16.
+ inline uint16_t bswap16(uint16_t x) { return ((x & 0xff00) >> 8) | ((x & 0x00ff) << 8); }
+ #endif
++#endif
+ 
+ #endif
+ 

Modified: head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
==============================================================================
--- head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/cpumonitor.cc.orig	2013-07-15 17:23:44.000000000 +0300
-+++ third_party/libjingle/source/talk/base/cpumonitor.cc	2013-07-15 17:34:46.000000000 +0300
+--- third_party/libjingle/source/talk/base/cpumonitor.cc.orig	2014-01-07 21:03:06.000000000 +0100
++++ third_party/libjingle/source/talk/base/cpumonitor.cc	2014-01-13 02:01:01.000000000 +0100
 @@ -52,13 +52,13 @@
  #include <mach/task.h>
  #endif  // defined(IOS) || defined(OSX)
@@ -16,24 +16,19 @@
  
  #if defined(IOS) || defined(OSX)
  static uint64 TimeValueTToInt64(const time_value_t &time_value) {
-@@ -281,12 +281,16 @@
+@@ -281,6 +281,11 @@
    const uint64 cpu_times = nice + system + user;
    const uint64 total_times = cpu_times + idle;
  #endif  // defined(LINUX) || defined(ANDROID)
 +#if defined(BSD)
++  const uint64 cpu_times = 0;
++  const uint64 total_times = 0;
 +  return 0.f;
-+#else
-   system_.prev_load_time_ = timenow;
-   system_.prev_load_ = UpdateCpuLoad(total_times,
-                                      cpu_times * cpus_,
-                                      &system_.prev_total_times_,
-                                      &system_.prev_cpu_times_);
-   return system_.prev_load_;
 +#endif
- }
  
- float CpuSampler::GetProcessLoad() {
-@@ -348,7 +352,7 @@
+ #if defined(__native_client__)
+   // TODO(ryanpetrie): Implement this via PPAPI when it's available.
+@@ -355,7 +360,7 @@
        TimeValueTToInt64(task_term_info.system_time));
  #endif  // defined(IOS) || defined(OSX)
  
@@ -42,12 +37,12 @@
    rusage usage;
    if (getrusage(RUSAGE_SELF, &usage) < 0) {
      LOG_ERR(LS_ERROR) << "getrusage failed";
-@@ -358,7 +362,7 @@
+@@ -365,7 +370,7 @@
    const uint64 cpu_times =
        (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec +
        usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
 -#endif  // defined(LINUX) || defined(ANDROID)
 +#endif  // defined(LINUX) || defined(ANDROID) || defined(BSD)
-   process_.prev_load_time_ = timenow;
-   process_.prev_load_ = UpdateCpuLoad(total_times,
-                                      cpu_times,
+ 
+ #if defined(__native_client__)
+   // TODO(ryanpetrie): Implement this via PPAPI when it's available.

Added: head/www/chromium/files/patch-ui__events__event_switches.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-ui__events__event_switches.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.cc.orig	2014-01-13 11:38:50.000000000 +0100
++++ ui/events/event_switches.cc	2014-01-13 11:38:26.000000000 +0100
+@@ -20,7 +20,7 @@
+ //   disabled: touch events are disabled.
+ const char kTouchEventsDisabled[] = "disabled";
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // Tells chrome to interpret events from these devices as touch events. Only
+ // available with XInput 2 (i.e. X server 1.8 or above). The id's of the
+ // devices can be retrieved from 'xinput list'.

Added: head/www/chromium/files/patch-ui__events__event_switches.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-ui__events__event_switches.h	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.h.orig	2014-01-07 21:02:04.000000000 +0100
++++ ui/events/event_switches.h	2014-01-13 11:38:59.000000000 +0100
+@@ -16,7 +16,7 @@
+ EVENTS_EXPORT extern const char kTouchEventsEnabled[];
+ EVENTS_EXPORT extern const char kTouchEventsDisabled[];
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ EVENTS_EXPORT extern const char kTouchDevices[];
+ #endif
+ 

Added: head/www/chromium/files/patch-v8__src__checks.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-v8__src__checks.cc	Thu Jan 16 17:19:35 2014	(r339940)
@@ -0,0 +1,10 @@
+--- v8/src/checks.cc.orig	2014-01-07 21:03:55.000000000 +0100
++++ v8/src/checks.cc	2014-01-11 01:09:31.000000000 +0100
+@@ -32,6 +32,7 @@
+ # include <execinfo.h>
+ #endif  // V8_LIBC_GLIBC || V8_OS_BSD
+ #include <stdio.h>
++#include <unistd.h> // size_t
+ 
+ #include "platform.h"
+ #include "v8.h"

Modified: head/www/chromium/pkg-plist
==============================================================================
--- head/www/chromium/pkg-plist	Thu Jan 16 17:18:23 2014	(r339939)
+++ head/www/chromium/pkg-plist	Thu Jan 16 17:19:35 2014	(r339940)
@@ -81,6 +81,7 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
 %%DATADIR%%/resources/inspector/elementsPanel.css
 %%DATADIR%%/resources/inspector/ElementsPanel.js
+%%DATADIR%%/resources/inspector/filter.css
 %%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css
 %%DATADIR%%/resources/inspector/heapProfiler.css
 %%DATADIR%%/resources/inspector/HeapSnapshotWorker.js
@@ -148,12 +149,6 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/Images/searchSmallBrightBlue.png
 %%DATADIR%%/resources/inspector/Images/searchSmallGray.png
 %%DATADIR%%/resources/inspector/Images/searchSmallWhite.png
-%%DATADIR%%/resources/inspector/Images/segment.png
-%%DATADIR%%/resources/inspector/Images/segmentEnd.png
-%%DATADIR%%/resources/inspector/Images/segmentHover.png
-%%DATADIR%%/resources/inspector/Images/segmentHoverEnd.png
-%%DATADIR%%/resources/inspector/Images/segmentSelected.png
-%%DATADIR%%/resources/inspector/Images/segmentSelectedEnd.png
 %%DATADIR%%/resources/inspector/Images/sessionStorage.png
 %%DATADIR%%/resources/inspector/Images/settingsListRemove.png
 %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png
@@ -197,6 +192,7 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/networkLogView.css
 %%DATADIR%%/resources/inspector/networkPanel.css
 %%DATADIR%%/resources/inspector/NetworkPanel.js
+%%DATADIR%%/resources/inspector/overrides.css
 %%DATADIR%%/resources/inspector/panelEnablerView.css
 %%DATADIR%%/resources/inspector/profilesPanel.css
 %%DATADIR%%/resources/inspector/ProfilesPanel.js
@@ -208,9 +204,9 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/screencastView.css
 %%DATADIR%%/resources/inspector/sourcesPanel.css
 %%DATADIR%%/resources/inspector/SourcesPanel.js
+%%DATADIR%%/resources/inspector/sourcesView.css
 %%DATADIR%%/resources/inspector/spectrum.css
 %%DATADIR%%/resources/inspector/splitView.css
-%%DATADIR%%/resources/inspector/tabbedPane.css
 %%DATADIR%%/resources/inspector/textPrompt.css
 %%DATADIR%%/resources/inspector/timelinePanel.css
 %%DATADIR%%/resources/inspector/TimelinePanel.js

More information about the svn-ports-all mailing list