Index: branches/2017Q2/www/chromium/Makefile =================================================================== --- branches/2017Q2/www/chromium/Makefile (revision 440683) +++ branches/2017Q2/www/chromium/Makefile (revision 440684) @@ -1,282 +1,282 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 58.0.3029.96 +PORTVERSION= 58.0.3029.110 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 MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ clang39:devel/llvm39 \ yasm:devel/yasm \ python:lang/python \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ bash:shells/bash \ flock:sysutils/flock \ node:www/node \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libcups.so:print/cups \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libgcrypt.so:security/libgcrypt \ libgnome-keyring.so:security/libgnome-keyring \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libxml2.so:textproc/libxml2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf ONLY_FOR_ARCHS= i386 amd64 USES= compiler bison cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst USE_GNOME= atk glib20 gtk20 gtk30 dconf libxslt libxml2 MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= is_clang=true \ clang_use_chrome_plugins=false \ enable_media_router=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ enable_webrtc=false \ fieldtrial_testing_like_official_build=true \ toolkit_views=true \ use_allocator="none" \ use_aura=true \ use_cups=true \ use_experimental_allocator_shim=false \ treat_warnings_as_errors=false \ use_sysroot=false \ use_system_libjpeg=true \ use_system_sqlite=false # chrome has additional patches # TODO: investigate building with these options: # use_system_icu use_system_harfbuzz use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ google_default_client_id="996322985003.apps.googleusercontent.com" \ google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS GCONF KERBEROS DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO TESTS OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO OPTIONS_GROUP_TESTS= DEBUG TEST OPTIONS_DEFAULT= ALSA CODECS DRIVER GCONF KERBEROS OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio DRIVER_MAKE_ARGS=chromedriver TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .include .if ${PORT_OPTIONS:MALSA} GN_ARGS+= use_alsa=true .else GN_ARGS+= use_alsa=false .endif .if ${PORT_OPTIONS:MCODECS} GN_ARGS+= ffmpeg_branding="Chrome" GN_ARGS+= proprietary_codecs=true GN_ARGS+= enable_hevc_demuxing=true .else GN_ARGS+= ffmpeg_branding="Chromium" GN_ARGS+= proprietary_codecs=false GN_ARGS+= enable_hevc_demuxing=false .endif DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug GN_ARGS+= is_debug=true GN_BOOTSTRAP_FLAGS+= --debug #GN_ARGS+= is_component_build=true .else BUILDTYPE= Release .if ${ARCH} == amd64 GN_ARGS+= use_lld=true # harder, better, faster, stronger .endif GN_ARGS+= is_debug=false GN_ARGS+= symbol_level=0 GN_ARGS+= remove_webcore_debug_symbols=true .endif .if ${PORT_OPTIONS:MGCONF} GN_ARGS+= use_gconf=true .else GN_ARGS+= use_gconf=false .endif .if ${PORT_OPTIONS:MKERBEROS} GN_ARGS+= use_kerberos=true .else GN_ARGS+= use_kerberos=false .endif .if ${PORT_OPTIONS:MPULSEAUDIO} GN_ARGS+= use_pulseaudio=true .else GN_ARGS+= use_pulseaudio=false .endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} .endif .include CC= clang39 CXX= clang++39 #optionally set AR, LD, NM, READELF ? # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include # TODO: move this big extra to small ones EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # Work around base r261801 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" .endif pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory," .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "lots of free diskspace (~ 40GB)" @${ECHO_MSG} "and no less then 16GB of memory for linking." .else @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shippen ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/linux/node-linux-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node test regression-test: build .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 .for t in font_service test_ime_driver ui ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \ ${STAGEDIR}${DATADIR} .endfor .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} .for p in chrome_100_percent chrome_200_percent headless_lib keyboard_resources \ resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \ views_mus_resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ ${STAGEDIR}${DATADIR} .endfor .for d in icudtl.dat natives_blob.bin snapshot_blob.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDRIVER} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: branches/2017Q2/www/chromium/distinfo =================================================================== --- branches/2017Q2/www/chromium/distinfo (revision 440683) +++ branches/2017Q2/www/chromium/distinfo (revision 440684) @@ -1,5 +1,5 @@ -TIMESTAMP = 1493784258 -SHA256 (chromium-58.0.3029.96.tar.xz) = 5d38fd7ad3b58bd09da8ff05f12354e94c2ad1bb203527a632b72cc3ff4a5181 -SIZE (chromium-58.0.3029.96.tar.xz) = 518160320 -SHA256 (chromium-58.0.3029.96-testdata.tar.xz) = 2451cfe8f25f578dbce3b85a00589e4609958db969ad4421f89e780751bf067b -SIZE (chromium-58.0.3029.96-testdata.tar.xz) = 124156492 +TIMESTAMP = 1494416961 +SHA256 (chromium-58.0.3029.110.tar.xz) = f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff +SIZE (chromium-58.0.3029.110.tar.xz) = 518167664 +SHA256 (chromium-58.0.3029.110-testdata.tar.xz) = 53ace1eaee38bc3bb11aef932851131d563a2deefb2fd9c9f1fa524b7098e472 +SIZE (chromium-58.0.3029.110-testdata.tar.xz) = 124161428 Index: branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc =================================================================== --- branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc (revision 440684) @@ -0,0 +1,19 @@ +--- chrome/app/chrome_main.cc.orig 2017-05-09 19:02:41 UTC ++++ chrome/app/chrome_main.cc +@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar + ALLOW_UNUSED_LOCAL(command_line); + #endif + +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + if (command_line->HasSwitch(switches::kHeadless)) { + #if defined(OS_MACOSX) + SetUpBundleOverrides(); + #endif + return headless::HeadlessShellMain(argc, argv); + } +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + + #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) + version_info::Channel channel = chrome::GetChannel(); Property changes on: branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni =================================================================== --- branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni (revision 440684) @@ -0,0 +1,11 @@ +--- chrome/chrome_paks.gni.orig 2017-05-09 19:02:43 UTC ++++ chrome/chrome_paks.gni +@@ -157,7 +157,7 @@ template("chrome_extra_paks") { + "//ui/file_manager:resources", + ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ] + deps += [ "//headless:resources" ] + } Property changes on: branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc =================================================================== --- branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (revision 440684) @@ -0,0 +1,20 @@ +--- headless/lib/browser/headless_content_browser_client.cc.orig 2017-05-09 19:02:47 UTC ++++ headless/lib/browser/headless_content_browser_client.cc +@@ -171,7 +171,7 @@ void HeadlessContentBrowserClient::GetQu + callback); + } + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, +@@ -182,7 +182,7 @@ void HeadlessContentBrowserClient::GetAd + mappings->Share(kCrashDumpSignal, crash_signal_fd); + #endif // defined(HEADLESS_USE_BREAKPAD) + } +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + + void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches( + base::CommandLine* command_line, Property changes on: branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h =================================================================== --- branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 440684) @@ -0,0 +1,11 @@ +--- headless/lib/browser/headless_content_browser_client.h.orig 2017-05-09 19:02:47 UTC ++++ headless/lib/browser/headless_content_browser_client.h +@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : pub + content::BrowserContext* context, + content::StoragePartition* partition, + const storage::OptionalQuotaSettingsCallback& callback) override; +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + void GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, Property changes on: branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc =================================================================== --- branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc (revision 440684) @@ -0,0 +1,38 @@ +--- headless/lib/headless_content_main_delegate.cc.orig 2017-05-09 19:02:47 UTC ++++ headless/lib/headless_content_main_delegate.cc +@@ -147,7 +147,7 @@ void HeadlessContentMainDelegate::InitCr + g_headless_crash_client.Pointer()->set_crash_dumps_dir( + browser_->options()->crash_dumps_dir); + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + if (!browser_->options()->enable_crash_reporter) { + DCHECK(!breakpad::IsCrashReporterEnabled()); + return; +@@ -156,7 +156,7 @@ void HeadlessContentMainDelegate::InitCr + if (process_type != switches::kZygoteProcess) + breakpad::InitCrashReporter(process_type); + #endif // defined(HEADLESS_USE_BREAKPAD) +-#endif // !defined(OS_MACOSX) ++#endif // !defined(OS_MACOSX) && !defined(OS_BSD) + } + + void HeadlessContentMainDelegate::PreSandboxStartup() { +@@ -170,7 +170,7 @@ void HeadlessContentMainDelegate::PreSan + if (command_line.HasSwitch(switches::kEnableLogging)) + InitLogging(command_line); + #endif +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + InitCrashReporter(command_line); + #endif + InitializeResourceBundle(); +@@ -202,7 +202,7 @@ int HeadlessContentMainDelegate::RunProc + return 0; + } + +-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) + void HeadlessContentMainDelegate::ZygoteForked() { + const base::CommandLine& command_line( + *base::CommandLine::ForCurrentProcess()); Property changes on: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h =================================================================== --- branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h (revision 440684) @@ -0,0 +1,11 @@ +--- headless/lib/headless_content_main_delegate.h.orig 2017-05-09 19:02:47 UTC ++++ headless/lib/headless_content_main_delegate.h +@@ -39,7 +39,7 @@ class HeadlessContentMainDelegate : publ + + HeadlessBrowserImpl* browser() const { return browser_.get(); } + +-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) + void ZygoteForked() override; + #endif + Property changes on: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__macros.h =================================================================== --- branches/2017Q2/www/chromium/files/patch-headless_lib_headless__macros.h (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-headless_lib_headless__macros.h (revision 440684) @@ -0,0 +1,13 @@ +--- headless/lib/headless_macros.h.orig 2017-05-09 19:02:47 UTC ++++ headless/lib/headless_macros.h +@@ -5,8 +5,8 @@ + #ifndef HEADLESS_LIB_HEADLESS_MACROS_H_ + #define HEADLESS_LIB_HEADLESS_MACROS_H_ + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + #define HEADLESS_USE_BREAKPAD +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + + #endif // HEADLESS_LIB_HEADLESS_MACROS_H_ Property changes on: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__macros.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc =================================================================== --- branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc (nonexistent) +++ branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc (revision 440684) @@ -0,0 +1,11 @@ +--- remoting/host/host_details.cc.orig 2017-05-09 19:02:49 UTC ++++ remoting/host/host_details.cc +@@ -26,6 +26,8 @@ std::string GetHostOperatingSystemName() + return "Linux"; + #elif defined(OS_ANDROID) + return "Android"; ++#elif defined(OS_BSD) ++ return "BSD"; + #else + #error "Unsupported host OS" + #endif Property changes on: branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 440683) +++ branches/2017Q2 (revision 440684) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r440680,440682