Date: Fri, 23 Aug 2013 23:10:05 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325283 - in head/www/chromium: . files Message-ID: <201308232310.r7NNA5hc053785@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Fri Aug 23 23:10:05 2013 New Revision: 325283 URL: http://svnweb.freebsd.org/changeset/ports/325283 Log: Update to 29.0.1547.57 Use devel/ninja instead of gmake as a build tool. Submitted by: George Liaskos Security: http://vuxml.org/freebsd/ae651a4b-0a42-11e3-ba52-00262d5ed8ee.html Added: head/www/chromium/files/extra-patch-clang (contents, props changed) head/www/chromium/files/patch-base__base.gypi (contents, props changed) head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc (contents, props changed) head/www/chromium/files/patch-base__process__process_iterator.h (contents, props changed) head/www/chromium/files/patch-base__process__process_metrics.h (contents, props changed) head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc (contents, props changed) head/www/chromium/files/patch-base__threading__platform_thread_linux.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__media_galleries__scoped_mtp_device_map_entry.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h (contents, props changed) head/www/chromium/files/patch-chrome__common__pref_names.cc (contents, props changed) head/www/chromium/files/patch-chrome__common__pref_names.h (contents, props changed) head/www/chromium/files/patch-chrome__test__perf__perf_test.cc (contents, props changed) head/www/chromium/files/patch-content__browser__download__base_file.cc (contents, props changed) head/www/chromium/files/patch-content__browser__download__base_file_linux.cc (contents, props changed) head/www/chromium/files/patch-gpu__gpu_config.gypi (contents, props changed) head/www/chromium/files/patch-issue-17359002 (contents, props changed) head/www/chromium/files/patch-skia__skia.gyp (contents, props changed) head/www/chromium/files/patch-sync__util__get_session_name.cc (contents, props changed) head/www/chromium/files/patch-sync__util__get_session_name_linux.cc (contents, props changed) head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp (contents, props changed) head/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi (contents, props changed) head/www/chromium/files/patch-webkit__plugins__ppapi__usb_key_code_conversion.cc (contents, props changed) Deleted: head/www/chromium/files/patch-base__allocator__allocator_extension.cc head/www/chromium/files/patch-base__base.gyp head/www/chromium/files/patch-base__profiler__alternate_timer.cc head/www/chromium/files/patch-base__tracked_objects.cc head/www/chromium/files/patch-build__build_config.h head/www/chromium/files/patch-chrome__browser__metrics__thread_watcher.cc head/www/chromium/files/patch-chrome__browser__sync__glue__synced_session_tracker.cc head/www/chromium/files/patch-content__browser__geolocation__location_provider.cc head/www/chromium/files/patch-content__content_gpu.gypi head/www/chromium/files/patch-content__test__layout_browsertest.cc head/www/chromium/files/patch-net__third_party__nss__ssl__bodge__secitem_array.c head/www/chromium/files/patch-ppapi__proxy__pdf_resource.cc head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp__core.gyp head/www/chromium/files/patch-third_party__WebKit__Source__wtf__TypeTraits.h head/www/chromium/files/patch-third_party__hunspell__src__hunspell__affentry.hxx head/www/chromium/files/patch-third_party__libjingle__source__talk__base__taskrunner.cc head/www/chromium/files/patch-third_party__sfntly__cpp__src__sfntly__table__core__cmap_table.cc head/www/chromium/files/patch-v8__src__stub-cache.cc Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/patch-base__process_util_freebsd.cc head/www/chromium/files/patch-chrome__chrome_browser.gypi head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc head/www/chromium/files/patch-content__content_common.gypi head/www/chromium/files/patch-content__renderer__render_process_impl.cc head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc (contents, props changed) head/www/chromium/files/patch-net__proxy__proxy_service.cc (contents, props changed) head/www/chromium/files/patch-remoting__remoting.gyp head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc head/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h head/www/chromium/files/patch-tools__grit__grit__node__base.py head/www/chromium/files/patch-ui__gl__gl.gyp head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/Makefile Fri Aug 23 23:10:05 2013 (r325283) @@ -5,7 +5,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 28.0.1500.95 +DISTVERSION= 29.0.1547.57 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ @@ -17,12 +17,11 @@ COMMENT= Mostly BSD-licensed web browser LICENSE= BSD LGPL21 MPL LICENSE_COMB= multi -CFLAGS+= -Wno-error -fno-stack-protector - BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/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= execinfo:${PORTSDIR}/devel/libexecinfo \ @@ -43,7 +42,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ONLY_FOR_ARCHS= i386 amd64 USE_XZ= yes -USES= bison gmake desktop-file-utils pkgconfig +USES= bison desktop-file-utils pkgconfig USE_PERL5_BUILD= yes USE_PYTHON_BUILD= 2.6-2.7 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst @@ -70,6 +69,7 @@ GYP_DEFINES+= use_cups=1 \ enable_webrtc=1 \ enable_openmax=1 \ enable_one_click_signin=1 \ + werror= \ no_gc_sections=1 \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ @@ -137,6 +137,7 @@ CC= clang CXX= clang++ .endif GYP_DEFINES+= clang=1 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .else USE_GCC?= yes GYP_DEFINES+= gcc_version=${CXX:S/g++//} @@ -146,11 +147,20 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- .if ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= V=1 BUILDTYPE= Debug +GYP_DEFINES+= remove_webcore_debug_symbols=1 .else BUILDTYPE= Release GYP_DEFINES+= buildtype=Official .endif +CONFIGURE_ENV+= CC=${CC} \ + CXX=${CXX} \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + GYP_GENERATORS=ninja \ + GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF=${LOCALBASE}/bin/gperf @@ -173,9 +183,11 @@ post-patch: ${WRKSRC}/third_party/libvpx/libvpx.gyp \ ${WRKSRC}/crypto/crypto.gyp \ ${WRKSRC}/v8/tools/gyp/v8.gyp \ - ${WRKSRC}/v8/build/common.gypi + ${WRKSRC}/v8/build/common.gypi @${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \ ${WRKSRC}/third_party/WebKit/Source/core/core.gypi + @${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \ + ${WRKSRC}/chrome/chrome_tests_unit.gypi @${REINPLACE_CMD} -e "s|linux|freebsd|" \ ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py @${REINPLACE_CMD} -e "s|is_linux|(is_linux or is_bsd)|" \ @@ -191,9 +203,12 @@ post-patch: ${WRKSRC}/ui/base/strings/app_locale_settings_th.xtb do-configure: - cd ${WRKSRC} && CC="${CC}" CXX="${CXX}" \ - GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \ - ./build/gyp_chromium chrome/chrome.gyp --depth . + 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} ${ALL_TARGET} do-install: @${MKDIR} ${DATADIR} Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/distinfo Fri Aug 23 23:10:05 2013 (r325283) @@ -1,2 +1,2 @@ -SHA256 (chromium-courgette-redacted-28.0.1500.95.tar.xz) = e782b523b92e12bec2024b593ec826c2ff476c77545a716963e914672e9e92fb -SIZE (chromium-courgette-redacted-28.0.1500.95.tar.xz) = 157216824 +SHA256 (chromium-courgette-redacted-29.0.1547.57.tar.xz) = 2a6f136248ae5c36df56a8516d9108e586101e600d21390bd65ae9350b1415c2 +SIZE (chromium-courgette-redacted-29.0.1547.57.tar.xz) = 173670128 Added: head/www/chromium/files/extra-patch-clang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/extra-patch-clang Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,170 @@ +--- base/allocator/allocator_extension.cc 2013-07-03 23:39:54.000000000 -0400 ++++ base/allocator/allocator_extension.cc 2013-07-19 00:39:26.000000000 -0400 +@@ -35,20 +35,20 @@ + void SetGetAllocatorWasteSizeFunction( + thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) { + DCHECK_EQ(thunks::GetGetAllocatorWasteSizeFunction(), +- reinterpret_cast<thunks::GetAllocatorWasteSizeFunction>(NULL)); ++ static_cast<thunks::GetAllocatorWasteSizeFunction>(0)); + thunks::SetGetAllocatorWasteSizeFunction(get_allocator_waste_size_function); + } + + void SetGetStatsFunction(thunks::GetStatsFunction get_stats_function) { + DCHECK_EQ(thunks::GetGetStatsFunction(), +- reinterpret_cast<thunks::GetStatsFunction>(NULL)); ++ static_cast<thunks::GetStatsFunction>(0)); + thunks::SetGetStatsFunction(get_stats_function); + } + + void SetReleaseFreeMemoryFunction( + thunks::ReleaseFreeMemoryFunction release_free_memory_function) { + DCHECK_EQ(thunks::GetReleaseFreeMemoryFunction(), +- reinterpret_cast<thunks::ReleaseFreeMemoryFunction>(NULL)); ++ static_cast<thunks::ReleaseFreeMemoryFunction>(0)); + thunks::SetReleaseFreeMemoryFunction(release_free_memory_function); + } + +--- base/profiler/alternate_timer.cc 2013-07-03 23:39:54.000000000 -0400 ++++ base/profiler/alternate_timer.cc 2013-07-19 00:41:06.000000000 -0400 +@@ -21,7 +21,7 @@ + // Set an alternate timer function to replace the OS time function when + // profiling. + void SetAlternateTimeSource(NowFunction* now_function, TimeSourceType type) { +- DCHECK_EQ(reinterpret_cast<NowFunction*>(NULL), g_time_function); ++ DCHECK_EQ(static_cast<NowFunction*>(0), g_time_function); + g_time_function = now_function; + g_time_source_type = type; + } +--- base/tracked_objects.cc 2013-07-03 23:39:54.000000000 -0400 ++++ base/tracked_objects.cc 2013-07-19 00:42:10.000000000 -0400 +@@ -346,7 +346,7 @@ + } + // We must NOT do any allocations during this callback. + // Using the simple linked lists avoids all allocations. +- DCHECK_EQ(this->next_retired_worker_, reinterpret_cast<ThreadData*>(NULL)); ++ DCHECK_EQ(this->next_retired_worker_, static_cast<ThreadData*>(0)); + this->next_retired_worker_ = first_retired_worker_; + first_retired_worker_ = this; + } +--- chrome/browser/metrics/thread_watcher.cc 2013-07-03 23:45:55.000000000 -0400 ++++ chrome/browser/metrics/thread_watcher.cc 2013-07-19 01:38:45.000000000 -0400 +@@ -40,7 +40,7 @@ + MSVC_PUSH_DISABLE_WARNING(4748) + + int* NullPointer() { +- return reinterpret_cast<int*>(NULL); ++ return static_cast<int*>(0); + } + + void NullPointerCrash(int line_number) { +--- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400 ++++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400 +@@ -232,7 +232,7 @@ + } + DCHECK(window_ptr); + DCHECK_EQ(window_ptr->window_id.id(), window_id); +- DCHECK_EQ(reinterpret_cast<SessionWindow*>(NULL), ++ DCHECK_EQ(static_cast<SessionWindow*>(0), + GetSession(session_tag)->windows[window_id]); + GetSession(session_tag)->windows[window_id] = window_ptr; + } +--- third_party/WebKit/Source/wtf/TypeTraits.h 2013-07-04 00:14:12.000000000 -0400 ++++ third_party/WebKit/Source/wtf/TypeTraits.h 2013-07-19 01:29:01.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include <wtf/Platform.h> + +-#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) ++#if !COMPILER(CLANG) && ((defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))) + #include <type_traits> + #if defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__) + #include <tr1/memory> +--- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400 ++++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400 +@@ -27,7 +27,7 @@ + struct hentry * checkword(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); + +- struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); + + char * check_morph(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); +@@ -90,7 +90,7 @@ + // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); + const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); + +- struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); + + char * check_twosfx_morph(const char * word, int len, int optflags, + PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); +--- third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-03 23:54:05.000000000 -0400 ++++ third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-19 00:46:25.000000000 -0400 +@@ -119,7 +119,7 @@ + std::vector<Task *>::iterator it; + it = std::remove(tasks_.begin(), + tasks_.end(), +- reinterpret_cast<Task *>(NULL)); ++ static_cast<Task *>(0)); + + tasks_.erase(it, tasks_.end()); + +--- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-03 23:54:15.000000000 -0400 ++++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-19 00:44:09.000000000 -0400 +@@ -439,7 +439,7 @@ + } + + CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) +- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), ++ : CMap::Builder(static_cast<ReadableFontData*>(0), + CMapFormat::kFormat0, + cmap_id) { + } +@@ -563,7 +563,7 @@ + : CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>( + data->Slice(offset, data->ReadUShort( + offset + Offset::kFormat0Length))) +- : reinterpret_cast<WritableFontData*>(NULL), ++ : static_cast<WritableFontData*>(0), + CMapFormat::kFormat2, cmap_id) { + // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. + } +@@ -574,7 +574,7 @@ + : CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>( + data->Slice(offset, data->ReadUShort( + offset + Offset::kFormat0Length))) +- : reinterpret_cast<ReadableFontData*>(NULL), ++ : static_cast<ReadableFontData*>(0), + CMapFormat::kFormat2, cmap_id) { + // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. + } +@@ -958,7 +958,7 @@ + CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, + IntegerList* glyph_id_array, + const CMapId& cmap_id) +- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), ++ : CMap::Builder(static_cast<ReadableFontData*>(0), + CMapFormat::kFormat4, cmap_id), + segments_(segments->begin(), segments->end()), + glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { +@@ -966,7 +966,7 @@ + } + + CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) +- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), ++ : CMap::Builder(static_cast<ReadableFontData*>(0), + CMapFormat::kFormat4, cmap_id) { + } + +--- v8/src/stub-cache.cc 2013-07-03 23:56:49.000000000 -0400 ++++ v8/src/stub-cache.cc 2013-07-19 00:35:10.000000000 -0400 +@@ -1476,7 +1476,7 @@ + Handle<Name> name) { + return (FLAG_print_code_stubs && !name.is_null() && name->IsString()) + ? GetCodeWithFlags(flags, *Handle<String>::cast(name)->ToCString()) +- : GetCodeWithFlags(flags, reinterpret_cast<char*>(NULL)); ++ : GetCodeWithFlags(flags, static_cast<char*>(0)); + } + + Added: head/www/chromium/files/patch-base__base.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__base.gypi Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- base/base.gypi.orig 2013-08-09 22:05:55.000000000 +0300 ++++ base/base.gypi 2013-08-17 20:58:50.000000000 +0300 +@@ -838,6 +838,8 @@ + ['exclude', '^process_linux\\.cc$'], + ['exclude', '^process_util_linux\\.cc$'], + ['exclude', '^sys_info_linux\\.cc$'], ++ ['exclude', '^process/process_iterator_linux\\.cc$'], ++ ['exclude', '^process/process_metrics_linux\\.cc$'], + ], + }], + ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { Added: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,12 @@ +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2013-08-19 23:12:24.000000000 +0300 ++++ base/posix/unix_domain_socket_linux_unittest.cc 2013-08-19 23:16:20.000000000 +0300 +@@ -4,6 +4,9 @@ + + #include <sys/socket.h> + #include <sys/types.h> ++#if defined(OS_BSD) ++#include <signal.h> ++#endif + #include <unistd.h> + + #include "base/bind.h" Added: head/www/chromium/files/patch-base__process__process_iterator.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__process__process_iterator.h Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,14 @@ +--- base/process/process_iterator.h.orig 2013-08-16 22:08:02.000000000 +0300 ++++ base/process/process_iterator.h 2013-08-16 22:08:08.000000000 +0300 +@@ -21,6 +21,11 @@ + #include <windows.h> + #include <tlhelp32.h> + #elif defined(OS_MACOSX) || defined(OS_BSD) ++#if defined(OS_BSD) ++#include <kvm.h> ++#include <sys/param.h> ++#include <sys/user.h> ++#endif + #include <sys/sysctl.h> + #elif defined(OS_POSIX) + #include <dirent.h> Added: head/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__process__process_metrics.h Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,16 @@ +--- base/process/process_metrics.h.orig 2013-08-16 22:01:16.000000000 +0300 ++++ base/process/process_metrics.h 2013-08-16 22:04:12.000000000 +0300 +@@ -15,6 +15,13 @@ + #include "base/process.h" + #include "base/time.h" + ++#if defined(OS_BSD) ++#include <kvm.h> ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#include <sys/user.h> ++#endif ++ + #if defined(OS_MACOSX) + #include <mach/mach.h> + #endif Added: head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- base/process/process_metrics_freebsd.cc.orig 2013-08-17 19:21:48.000000000 +0300 ++++ base/process/process_metrics_freebsd.cc 2013-08-17 19:22:18.000000000 +0300 +@@ -4,6 +4,8 @@ + + #include "base/process/process_metrics.h" + ++#include "base/sys_info.h" ++ + namespace base { + + ProcessMetrics::ProcessMetrics(ProcessHandle process) Modified: head/www/chromium/files/patch-base__process_util_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__process_util_freebsd.cc Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-base__process_util_freebsd.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -1,11 +1,11 @@ ---- base/process_util_freebsd.cc.orig 2013-03-06 22:18:54.000000000 +0200 -+++ base/process_util_freebsd.cc 2013-03-06 22:19:07.000000000 +0200 -@@ -19,7 +19,7 @@ +--- base/process_util_freebsd.cc.orig 2013-08-16 22:09:53.000000000 +0300 ++++ base/process_util_freebsd.cc 2013-08-16 22:10:18.000000000 +0300 +@@ -18,7 +18,7 @@ + #include <unistd.h> - #include "base/file_util.h" #include "base/logging.h" -#include "base/string_tokenizer.h" +#include "base/strings/string_tokenizer.h" - #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" + #include "base/strings/string_util.h" Added: head/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,21 @@ +--- base/threading/platform_thread_linux.cc.orig 2013-08-17 20:52:20.000000000 +0300 ++++ base/threading/platform_thread_linux.cc 2013-08-17 20:56:34.000000000 +0300 +@@ -16,7 +16,9 @@ + #include "base/tracked_objects.h" + + #if !defined(OS_NACL) ++#if !defined(OS_BSD) + #include <sys/prctl.h> ++#endif + #include <sys/resource.h> + #include <sys/syscall.h> + #include <sys/time.h> +@@ -52,7 +54,7 @@ + ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); + tracked_objects::ThreadData::InitializeThreadContext(name); + +-#ifndef OS_NACL ++#if !defined(OS_NACL) && !defined(OS_BSD) + // 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 Added: head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- chrome/browser/media/webrtc_log_uploader.cc.orig 2013-08-17 21:10:06.000000000 +0300 ++++ chrome/browser/media/webrtc_log_uploader.cc 2013-08-17 21:10:45.000000000 +0300 +@@ -102,6 +102,8 @@ + const char product[] = "Chrome_Android"; + #elif defined(OS_CHROMEOS) + const char product[] = "Chrome_ChromeOS"; ++#elif defined(OS_FREEBSD) ++ const char product[] = "Chrome_FreeBSD"; + #else + // This file should not be compiled for other platforms. + COMPILE_ASSERT(false); Added: head/www/chromium/files/patch-chrome__browser__media_galleries__scoped_mtp_device_map_entry.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__browser__media_galleries__scoped_mtp_device_map_entry.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,18 @@ +--- chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc.orig 2013-08-17 22:11:30.000000000 +0300 ++++ chrome/browser/media_galleries/scoped_mtp_device_map_entry.cc 2013-08-17 22:12:55.000000000 +0300 +@@ -56,6 +56,7 @@ + } + + void ScopedMTPDeviceMapEntry::Init() { ++#if !defined(OS_BSD) + CreateMTPDeviceAsyncDelegateCallback callback = + base::Bind(&ScopedMTPDeviceMapEntry::OnMTPDeviceAsyncDelegateCreated, + this); +@@ -65,6 +66,7 @@ + base::Bind(&CreateMTPDeviceAsyncDelegate, + device_location_, + callback)); ++#endif + } + + ScopedMTPDeviceMapEntry::~ScopedMTPDeviceMapEntry() { Added: head/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,18 @@ +--- chrome/browser/storage_monitor/storage_monitor.cc.orig 2013-08-23 15:58:31.000000000 +0300 ++++ chrome/browser/storage_monitor/storage_monitor.cc 2013-08-23 15:59:02.000000000 +0300 +@@ -63,6 +63,7 @@ + + void StorageMonitor::EnsureInitialized(base::Closure callback) { + DCHECK(thread_checker_.CalledOnValidThread()); ++#if !defined(OS_BSD) + if (initialized_) { + if (!callback.is_null()) + callback.Run(); +@@ -78,6 +79,7 @@ + + initializing_ = true; + Init(); ++#endif + } + + bool StorageMonitor::IsInitialized() { Added: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,38 @@ +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-23 16:36:11.000000000 +0300 ++++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-08-23 16:38:28.000000000 +0300 +@@ -337,7 +337,7 @@ + { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, + { "translateEnableTranslate", + IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, + { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, + { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, +@@ -583,7 +583,7 @@ + "themesReset", + base::Bind(&BrowserOptionsHandler::ThemesReset, + base::Unretained(this))); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + web_ui()->RegisterMessageCallback( + "themesSetNative", + base::Bind(&BrowserOptionsHandler::ThemesSetNative, +@@ -1327,7 +1327,7 @@ + ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); + bool is_native_theme = false; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + is_native_theme = theme_service->UsingNativeTheme(); + base::FundamentalValue native_theme_enabled(!is_native_theme && + !profile_is_managed); +@@ -1350,7 +1350,7 @@ + ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void BrowserOptionsHandler::ThemesSetNative(const ListValue* args) { + content::RecordAction(UserMetricsAction("Options_GtkThemeSet")); + Profile* profile = Profile::FromWebUI(web_ui()); Added: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2013-08-23 16:36:30.000000000 +0300 ++++ chrome/browser/ui/webui/options/browser_options_handler.h 2013-08-23 16:54:38.000000000 +0300 +@@ -194,7 +194,7 @@ + + void ObserveThemeChanged(); + void ThemesReset(const base::ListValue* args); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void ThemesSetNative(const base::ListValue* args); + #endif + Modified: head/www/chromium/files/patch-chrome__chrome_browser.gypi ============================================================================== --- head/www/chromium/files/patch-chrome__chrome_browser.gypi Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-chrome__chrome_browser.gypi Fri Aug 23 23:10:05 2013 (r325283) @@ -1,7 +1,16 @@ ---- chrome/chrome_browser.gypi.orig 2013-07-04 06:39:58.000000000 +0300 -+++ chrome/chrome_browser.gypi 2013-07-15 18:45:11.000000000 +0300 -@@ -2470,7 +2470,7 @@ - '../device/device.gyp:device_media_transfer_protocol', +--- chrome/chrome_browser.gypi.orig 2013-08-09 22:06:42.000000000 +0300 ++++ chrome/chrome_browser.gypi 2013-08-17 22:05:42.000000000 +0300 +@@ -2456,7 +2456,7 @@ + 'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']}, + }, + }], +- ['OS=="mac" or OS=="win" or OS=="linux" or chromeos==1', { ++ ['OS=="mac" or OS=="win" or OS=="linux" or chromeos==1 or os_bsd==1', { + 'sources': [ + 'browser/media_galleries/fileapi/device_media_async_file_util.cc', + 'browser/media_galleries/fileapi/device_media_async_file_util.h', +@@ -2640,7 +2640,7 @@ + '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], - ['OS=="linux" and chromeos==0', { @@ -9,7 +18,7 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -2803,6 +2803,25 @@ +@@ -2996,6 +2996,25 @@ ['exclude', '^browser/usb/'], ], }], Added: head/www/chromium/files/patch-chrome__common__pref_names.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__common__pref_names.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- chrome/common/pref_names.cc.orig 2013-08-17 21:26:00.000000000 +0300 ++++ chrome/common/pref_names.cc 2013-08-17 21:26:43.000000000 +0300 +@@ -955,7 +955,7 @@ + // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. + const char kForceSafeSearch[] = "settings.force_safesearch"; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Linux specific preference on whether we should match the system theme. + const char kUsesSystemTheme[] = "extensions.theme.use_system"; + #endif Added: head/www/chromium/files/patch-chrome__common__pref_names.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__common__pref_names.h Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- chrome/common/pref_names.h.orig 2013-08-17 20:35:53.000000000 +0300 ++++ chrome/common/pref_names.h 2013-08-17 20:36:25.000000000 +0300 +@@ -341,7 +341,7 @@ + extern const char kForceSafeSearch[]; + extern const char kDeleteTimePeriod[]; + extern const char kLastClearBrowsingDataTime[]; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + extern const char kUsesSystemTheme[]; + #endif + extern const char kCurrentThemePackFilename[]; Added: head/www/chromium/files/patch-chrome__test__perf__perf_test.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__test__perf__perf_test.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- chrome/test/perf/perf_test.cc.orig 2013-08-19 21:01:58.000000000 +0300 ++++ chrome/test/perf/perf_test.cc 2013-08-19 21:03:16.000000000 +0300 +@@ -494,7 +494,7 @@ + AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, + total_working_set_size, "bytes", + false /* not important */); +-#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_NACL) + AppendResult(output, + "vm_size_final_b", + std::string(), Added: head/www/chromium/files/patch-content__browser__download__base_file.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__browser__download__base_file.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,12 @@ +--- content/browser/download/base_file.cc.orig 2013-08-18 21:43:48.000000000 +0300 ++++ content/browser/download/base_file.cc 2013-08-18 21:44:22.000000000 +0300 +@@ -212,7 +212,8 @@ + } + + // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations. +-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) ++#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) && \ ++ !defined(OS_BSD) + DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() { + return DOWNLOAD_INTERRUPT_REASON_NONE; + } Added: head/www/chromium/files/patch-content__browser__download__base_file_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__browser__download__base_file_linux.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,12 @@ +--- content/browser/download/base_file_linux.cc.orig 2013-08-21 09:50:31.000000000 +0300 ++++ content/browser/download/base_file_linux.cc 2013-08-21 09:51:22.000000000 +0300 +@@ -13,7 +13,9 @@ + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK(!detached_); + ++#if !defined(OS_BSD) + AddOriginMetadataToFile(full_path_, source_url_, referrer_url_); ++#endif + return DOWNLOAD_INTERRUPT_REASON_NONE; + } + Modified: head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -1,5 +1,5 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2012-12-27 23:17:38.000000000 +0100 -+++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2012-12-28 12:28:16.000000000 +0100 +--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2013-08-17 18:48:06.000000000 +0300 ++++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2013-08-17 20:22:02.000000000 +0300 @@ -0,0 +1,201 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -23,7 +23,7 @@ +#include <net80211/ieee80211_ioctl.h> +#include <net/ethernet.h> + -+#include "base/utf_string_conversions.h" ++#include "base/strings/utf_string_conversions.h" +#include "content/browser/geolocation/wifi_data_provider_common.h" + +namespace content { Modified: head/www/chromium/files/patch-content__content_common.gypi ============================================================================== --- head/www/chromium/files/patch-content__content_common.gypi Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-content__content_common.gypi Fri Aug 23 23:10:05 2013 (r325283) @@ -1,6 +1,6 @@ ---- content/content_common.gypi.orig 2012-11-27 10:01:27.000000000 +0200 -+++ content/content_common.gypi 2012-12-10 22:16:37.000000000 +0200 -@@ -436,6 +436,14 @@ +--- content/content_common.gypi.orig 2013-08-09 22:07:06.000000000 +0300 ++++ content/content_common.gypi 2013-08-17 20:29:03.000000000 +0300 +@@ -391,6 +391,15 @@ 'content.gyp:common_aidl', ], }], @@ -8,6 +8,7 @@ + 'sources!': [ + 'common/sandbox_linux.cc', + 'common/sandbox_linux.h', ++ 'common/sandbox_init_linux.cc', + 'common/sandbox_seccomp_bpf_linux.cc', + 'common/sandbox_seccomp_bpf_linux.h', + ], Modified: head/www/chromium/files/patch-content__renderer__render_process_impl.cc ============================================================================== --- head/www/chromium/files/patch-content__renderer__render_process_impl.cc Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-content__renderer__render_process_impl.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -1,5 +1,5 @@ ---- content/renderer/render_process_impl.cc.orig 2012-12-20 10:01:28.000000000 +0200 -+++ content/renderer/render_process_impl.cc 2013-01-06 22:32:44.000000000 +0200 +--- content/renderer/render_process_impl.cc.orig 2013-08-09 19:07:03.000000000 +0000 ++++ content/renderer/render_process_impl.cc 2013-08-12 21:00:44.000000000 +0000 @@ -89,7 +89,7 @@ bool RenderProcessImpl::InProcessPlugins() { @@ -9,15 +9,6 @@ // Plugin processes require a UI message loop, and the Linux message loop // implementation only allows one UI loop per process. if (command_line.HasSwitch(switches::kInProcessPlugins)) -@@ -114,7 +114,7 @@ - - TransportDIB* RenderProcessImpl::CreateTransportDIB(size_t size) { - #if defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_OPENBSD) || defined(OS_ANDROID) -+ defined(OS_BSD) || defined(OS_ANDROID) - // Windows and Linux create transport DIBs inside the renderer - return TransportDIB::Create(size, transport_dib_next_sequence_number_++); - #elif defined(OS_MACOSX) @@ -152,7 +152,7 @@ int width = rect.width(); int height = rect.height(); Added: head/www/chromium/files/patch-gpu__gpu_config.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-gpu__gpu_config.gypi Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,11 @@ +--- gpu/gpu_config.gypi.orig 2013-08-12 20:57:26.000000000 +0000 ++++ gpu/gpu_config.gypi 2013-08-12 20:58:18.000000000 +0000 +@@ -67,7 +67,7 @@ + '../third_party/amd/amd_videocard_info_win.cc', + ], + }], +- ['OS=="linux" and use_x11==1', { ++ ['(OS=="linux" or os_bsd==1) and use_x11==1', { + 'dependencies': [ + '../build/linux/system.gyp:libpci', + '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', Added: head/www/chromium/files/patch-issue-17359002 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-issue-17359002 Fri Aug 23 23:10:05 2013 (r325283) @@ -0,0 +1,35 @@ +Index: tools/gyp/pylib/gyp/generator/ninja.py +=================================================================== +--- tools/gyp/pylib/gyp/generator/ninja.py (revision 1690) ++++ tools/gyp/pylib/gyp/generator/ninja.py (working copy) +@@ -755,9 +755,16 @@ + self.WriteVariableList(ninja_file, 'pchprefix', [self.name]) + else: + cflags = config.get('cflags', []) +- cflags_c = config.get('cflags_c', []) +- cflags_cc = config.get('cflags_cc', []) + ++ # Respect environment variables related to build, but target-specific ++ # flags can still override them. ++ cflags_c = (os.environ.get('CPPFLAGS', '').split() + ++ os.environ.get('CFLAGS', '').split() + ++ config.get('cflags_c', [])) ++ cflags_cc = (os.environ.get('CPPFLAGS', '').split() + ++ os.environ.get('CXXFLAGS', '').split() + ++ config.get('cflags_cc', [])) ++ + defines = config.get('defines', []) + extra_defines + self.WriteVariableList(ninja_file, 'defines', + [Define(d, self.flavor) for d in defines]) +@@ -932,7 +939,10 @@ + if def_file: + implicit_deps.add(def_file) + else: +- ldflags = config.get('ldflags', []) ++ # Respect environment variables related to build, but target-specific ++ # flags can still override them. ++ ldflags = (os.environ.get('LDFLAGS', '').split() + ++ config.get('ldflags', [])) + if is_executable and len(solibs): + rpath = 'lib/' + if self.toolset != 'target': Modified: head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc ============================================================================== --- head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -1,6 +1,6 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2012-04-25 10:01:34.000000000 +0300 -+++ net/proxy/proxy_config_service_linux.cc 2012-04-29 21:37:33.000000000 +0300 -@@ -18,7 +18,13 @@ +--- net/proxy/proxy_config_service_linux.cc.orig 2013-08-22 10:48:23.000000000 +0300 ++++ net/proxy/proxy_config_service_linux.cc 2013-08-22 14:41:23.000000000 +0300 +@@ -12,7 +12,13 @@ #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -14,37 +14,33 @@ #include <unistd.h> #include <map> -@@ -907,9 +913,10 @@ +@@ -845,9 +851,10 @@ public base::MessagePumpLibevent::Watcher { public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) - : inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false), - auto_no_pac_(false), reversed_bypass_list_(false), - env_var_getter_(env_var_getter), file_loop_(NULL) { -+ : config_fd_(-1), inotify_fd_(-1), notify_delegate_(NULL), -+ indirect_manual_(false), auto_no_pac_(false), ++ : inotify_fd_(-1), config_fd_(-1), notify_delegate_(NULL), ++ indirect_manual_(false), auto_no_pac_(false), + reversed_bypass_list_(false), env_var_getter_(env_var_getter), + file_loop_(NULL) { // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; -@@ -972,9 +979,14 @@ - // task is left pending on the file loop after the loop was quit, +@@ -911,9 +918,10 @@ // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor -- // anyway. (Not that it really matters; the process is exiting.) -+ // anyway. (Not that it really matters; the process is exiting.) -+ if(config_fd_ >= 0) { -+ close(config_fd_); -+ config_fd_ = -1; -+ } - if (inotify_fd_ >= 0) + // anyway. (Not that it really matters; the process is exiting.) +- if (inotify_fd_ >= 0) ++ if (inotify_fd_ >= 0 || config_fd_ >= 0) ShutDown(); -+ DCHECK(config_fd_ < 0); DCHECK(inotify_fd_ < 0); ++ DCHECK(config_fd_ < 0); } -@@ -983,18 +995,25 @@ + virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner, +@@ -921,11 +929,21 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); @@ -54,15 +50,19 @@ inotify_fd_ = inotify_init(); +#endif if (inotify_fd_ < 0) { ++#if defined(OS_FREEBSD) ++ PLOG(ERROR) << "kqueue failed"; ++#else PLOG(ERROR) << "inotify_init failed"; ++#endif return false; } ++ +#if !defined(OS_FREEBSD) int flags = fcntl(inotify_fd_, F_GETFL); -+ // This call returns ENOTTY on FreeBSD. if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) { PLOG(ERROR) << "fcntl failed"; - close(inotify_fd_); +@@ -933,6 +951,7 @@ inotify_fd_ = -1; return false; } @@ -70,37 +70,49 @@ file_loop_ = file_loop; // The initial read is done on the current thread, not |file_loop_|, // since we will need to have it for SetUpAndFetchInitialConfig(). -@@ -1014,6 +1033,18 @@ - bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) { +@@ -947,20 +966,38 @@ + close(inotify_fd_); + inotify_fd_ = -1; + } ++ if (config_fd_ >= 0) { ++ close(config_fd_); ++ config_fd_ = -1; ++ } + } + + virtual bool SetUpNotifications( + ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { DCHECK(inotify_fd_ >= 0); - DCHECK(MessageLoop::current() == file_loop_); ++ DCHECK(config_fd_ >= 0); + DCHECK(base::MessageLoop::current() == file_loop_); + // We can't just watch the kioslaverc file directly, since KDE will write + // a new copy of it and then rename it whenever settings are changed and + // inotify watches inodes (so we'll be watching the old deleted file after + // the first change, and it will never change again). So, we watch the + // directory instead. We then act only on changes to the kioslaverc entry. +#if defined(OS_FREEBSD) -+ config_fd_ = open(kde_config_dir_.value().c_str(), O_RDONLY); ++ config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY)); + + if (config_fd_ == -1) + return false; + + struct kevent ev; -+ EV_SET(&ev, config_fd_, EVFILT_VNODE, -+ (EV_ADD | EV_CLEAR), NOTE_WRITE, 0, NULL); ++ EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE, ++ 0, NULL); + if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1) + return false; +#else - // We can't just watch the kioslaverc file directly, since KDE will write - // a new copy of it and then rename it whenever settings are changed and - // inotify watches inodes (so we'll be watching the old deleted file after -@@ -1022,6 +1053,7 @@ if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(), IN_MODIFY | IN_MOVED_TO) < 0) return false; +#endif notify_delegate_ = delegate; - if (!file_loop_->WatchFileDescriptor(inotify_fd_, true, - MessageLoopForIO::WATCH_READ, &inotify_watcher_, this)) -@@ -1039,7 +1071,23 @@ - void OnFileCanReadWithoutBlocking(int fd) { + if (!file_loop_->WatchFileDescriptor(inotify_fd_, + true, +@@ -981,7 +1018,19 @@ + virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { DCHECK_EQ(fd, inotify_fd_); - DCHECK(MessageLoop::current() == file_loop_); + DCHECK(base::MessageLoop::current() == file_loop_); +#if defined(OS_FREEBSD) + struct kevent ev; + int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL); @@ -109,36 +121,28 @@ + OnChangeNotification(); + } else { + LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!"; -+ inotify_watcher_.StopWatchingFileDescriptor(); -+ close(config_fd_); -+ config_fd_ = -1; -+ close(inotify_fd_); -+ inotify_fd_ = -1; ++ ShutDown(); + } +#else OnChangeNotification(); +#endif } - void OnFileCanWriteWithoutBlocking(int fd) { + virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { NOTREACHED(); -@@ -1317,10 +1365,14 @@ - // from the inotify file descriptor and starts up a debounce timer if - // an event for kioslaverc is seen. +@@ -1260,8 +1309,11 @@ void OnChangeNotification() { -+ DCHECK_GE(config_fd_, 0); DCHECK_GE(inotify_fd_, 0); -- DCHECK(MessageLoop::current() == file_loop_); + DCHECK(base::MessageLoop::current() == file_loop_); - char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; -+ DCHECK(MessageLoop::current() == file_loop_); bool kioslaverc_touched = false; -+ #if defined(OS_FREEBSD) -+ kioslaverc_touched = true; -+ #else ++#if defined(OS_BSD) ++ kioslaverc_touched = true; ++#else + char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1357,6 +1409,7 @@ +@@ -1298,6 +1350,7 @@ inotify_fd_ = -1; } } @@ -146,11 +150,11 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1371,6 +1424,7 @@ - typedef std::map<StringListSetting, +@@ -1313,6 +1366,7 @@ std::vector<std::string> > strings_map_type; -+ int config_fd_; int inotify_fd_; ++ int config_fd_; base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_; ProxyConfigServiceLinux::Delegate* notify_delegate_; + base::OneShotTimer<SettingGetterImplKDE> debounce_timer_; Modified: head/www/chromium/files/patch-net__proxy__proxy_service.cc ============================================================================== --- head/www/chromium/files/patch-net__proxy__proxy_service.cc Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-net__proxy__proxy_service.cc Fri Aug 23 23:10:05 2013 (r325283) @@ -1,15 +1,15 @@ ---- net/proxy/proxy_service.cc.orig 2012-05-30 10:01:26.000000000 +0300 -+++ net/proxy/proxy_service.cc 2012-06-05 22:28:13.000000000 +0300 -@@ -38,7 +38,7 @@ +--- net/proxy/proxy_service.cc.orig 2013-08-09 22:05:31.000000000 +0300 ++++ net/proxy/proxy_service.cc 2013-08-19 21:08:08.000000000 +0300 +@@ -39,7 +39,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" #include "net/proxy/proxy_resolver_mac.h" -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) #include "net/proxy/proxy_config_service_linux.h" - #endif - -@@ -1429,7 +1429,7 @@ + #elif defined(OS_ANDROID) + #include "net/proxy/proxy_config_service_android.h" +@@ -1347,7 +1347,7 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return new UnsetProxyConfigService; Modified: head/www/chromium/files/patch-remoting__remoting.gyp ============================================================================== --- head/www/chromium/files/patch-remoting__remoting.gyp Fri Aug 23 22:10:03 2013 (r325282) +++ head/www/chromium/files/patch-remoting__remoting.gyp Fri Aug 23 23:10:05 2013 (r325283) @@ -1,6 +1,6 @@ ---- remoting/remoting.gyp.orig 2013-04-30 10:22:16.000000000 +0300 -+++ remoting/remoting.gyp 2013-05-07 21:24:08.000000000 +0300 -@@ -56,7 +56,7 @@ +--- remoting/remoting.gyp.orig 2013-08-09 19:06:51.000000000 +0000 ++++ remoting/remoting.gyp 2013-08-12 21:21:56.000000000 +0000 +@@ -53,7 +53,7 @@ 'conditions': [ # Remoting host is supported only on Windows, OSX and Linux (with X11). @@ -9,12 +9,12 @@ 'enable_remoting_host': 1, }, { 'enable_remoting_host': 0, -@@ -479,7 +479,7 @@ - '*_gtk.cc', - ], - }], +@@ -484,7 +484,7 @@ + 'host/win/wts_terminal_observer.h', + ], + 'conditions': [ - ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { - 'link_settings': { - 'libraries': [ - '-lX11', ++ ['OS=="linux" or os_bsd==1', { + 'dependencies': [ + # Always use GTK on Linux, even for Aura builds. + # Added: head/www/chromium/files/patch-skia__skia.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308232310.r7NNA5hc053785>