Merge branch 'v89'

www/chromium/Makefile

@@ -1,8 +1,7 @@
 # Created by: Florent Thoumie <flz@FreeBSD.org>
-# $FreeBSD: head/www/chromium/Makefile 563913 2021-02-03 19:46:35Z sunpoet $
 
 PORTNAME=	chromium
-PORTVERSION=	88.0.4324.150
+PORTVERSION=	89.0.4389.128
 CATEGORIES=	www java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/rene/chromium/:fonts
@@ -60,30 +59,31 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libxkbcommon.so:x11/libxkbcommon
+		libxkbcommon.so:x11/libxkbcommon \
+		libxshmfence.so:x11/libxshmfence
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-basic>0:x11-fonts/noto-basic
 
-USES=		bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
+USES=		bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
 		ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
 
-MAKE_ARGS=	-C out/${BUILDTYPE}
-BINARY_ALIAS=	python=${PYTHON_CMD}
-DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
-
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
+DOS2UNIX_FILES=	third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
 USE_GL=		gbm gl
+USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
-USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
+
+MAKE_ARGS=	-C out/${BUILDTYPE}
 ALL_TARGET=	chrome
-INSTALLS_ICONS=	yes
 
+BINARY_ALIAS=	python=${PYTHON_CMD}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
@@ -121,20 +121,23 @@ GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
 # 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"
+GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8"
+
 SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
-OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER KERBEROS TEST
-CODECS_DESC=	Compile and enable patented codecs like H.264
-DRIVER_DESC=	Install chromedriver
+OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST
+OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
-
-OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS SNDIO
+OPTIONS_RADIO=		KERBEROS
+OPTIONS_RADIO_KERBEROS=	HEIMDAL HEIMDAL_BASE MIT
 OPTIONS_SUB=		yes
+CODECS_DESC=		Compile and enable patented codecs like H.264
+DRIVER_DESC=		Install chromedriver
+HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
+HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
+MIT_DESC=		MIT Kerberos (security/krb5)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
@@ -156,19 +159,25 @@ DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_component_build=false \
 			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
-			WANTSPACE="lots of free disk space (~ 13GB)"
+			WANTSPACE="13 GB"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
-			WANTSPACE="a fair amount of free disk space (~ 6.5GB)"
+			WANTSPACE="6.5 GB"
 
 DRIVER_MAKE_ARGS=	chromedriver
 
+HEIMDAL_LIB_DEPENDS=	libkrb.so.26:security/heimdal
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
+LTO_VARS=		GN_ARGS+=use_thin_lto=true \
+			GN_ARGS+=thin_lto_enable_optimizations=true \
+			WANTSPACE="14 GB"
+
+MIT_LIB_DEPENDS=	libkrb.so.3:security/krb5
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
@@ -182,14 +191,23 @@ SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 .include "Makefile.tests"
-TEST_ALL_TARGET=	${TEST_TARGETS}
 TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
 			test_fonts-85${EXTRACT_SUFX}:fonts
+TEST_ALL_TARGET=	${TEST_TARGETS}
 
 .include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
+IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
+.endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
+.if ${COMPILER_VERSION} < 120
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-build_config_compiler_pgo_pgo.gni
+
+.if ${PORT_OPTIONS:MLTO}
+BROKEN+=	does not build with LTO needs LLVM 12+
+.endif
 .endif
 
 # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
@@ -215,7 +233,7 @@ MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory"
-	@${ECHO_MSG} "and ${WANTSPACE}."
+	@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
 	@${ECHO_MSG}
 
 post-extract-TEST-on:
@@ -268,12 +286,6 @@ do-configure:
 	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
 	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 
-do-test-TEST-on:
-.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}/chrome/app/resources/manpage.1.in \
@@ -324,11 +336,19 @@ do-install:
 post-install-DEBUG-on:
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
 		${STAGEDIR}${DATADIR}
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \
+		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
 		${STAGEDIR}${DATADIR}
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
 		${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.mk>
+do-test-TEST-on:
+.for t in ${TEST_TARGETS}
+	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
+		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
+.endfor
+
+.include <bsd.port.post.mk>

www/chromium/distinfo

@@ -1,7 +1,7 @@
-TIMESTAMP = 1612555606
-SHA256 (chromium-88.0.4324.150.tar.xz) = ae12e94392986c6b8ea4413356a49bae0a19356ffe2ea95495303cf2decb38c3
-SIZE (chromium-88.0.4324.150.tar.xz) = 857377456
-SHA256 (chromium-88.0.4324.150-testdata.tar.xz) = 9b9be53ed5259f32e38ae5e03e960b96fa6933de8094213bfff632b5635ce7e7
-SIZE (chromium-88.0.4324.150-testdata.tar.xz) = 257453172
+TIMESTAMP = 1618388739
+SHA256 (chromium-89.0.4389.128.tar.xz) = 1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b
+SIZE (chromium-89.0.4389.128.tar.xz) = 890850492
+SHA256 (chromium-89.0.4389.128-testdata.tar.xz) = 03f16939f3fc8182a0f306abf1e6c801e2e6fd11533d18787c05c852cbec46bd
+SIZE (chromium-89.0.4389.128-testdata.tar.xz) = 257707276
 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
 SIZE (test_fonts-85.tar.xz) = 9511984

www/chromium/files/audio_manager_openbsd.cc

@@ -80,7 +80,7 @@ AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thre
                                          AudioLogFactory* audio_log_factory)
     : AudioManagerBase(std::move(audio_thread),
                        audio_log_factory) {
-  DLOG(WARNING) << "AudioManagerOpenBSD";
+  DLOG(INFO) << "AudioManagerOpenBSD";
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 }
 
@@ -147,22 +147,22 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
 
 AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
     const AudioParameters& params) {
-  DLOG(WARNING) << "MakeInputStream";
+  DLOG(INFO) << "MakeInputStream";
   return new SndioAudioInputStream(this,
              AudioDeviceDescription::kDefaultDeviceId, params);
 }
 
 AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
     const AudioParameters& params) {
-  DLOG(WARNING) << "MakeOutputStream";
+  DLOG(INFO) << "MakeOutputStream";
   return new SndioAudioOutputStream(params, this);
 }
 #endif
 
 std::unique_ptr<media::AudioManager> CreateAudioManager(
     std::unique_ptr<AudioThread> audio_thread,
     AudioLogFactory* audio_log_factory) {
-  DLOG(WARNING) << "CreateAudioManager";
+  DLOG(INFO) << "CreateAudioManager";
 #if defined(USE_SNDIO)
   UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1);
   return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),

www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni

@@ -1,11 +1,11 @@
---- build/config/compiler/pgo/pgo.gni.orig	2021-01-18 21:28:45 UTC
+--- build/config/compiler/pgo/pgo.gni.orig	2021-03-12 23:57:15 UTC
 +++ build/config/compiler/pgo/pgo.gni
-@@ -13,7 +13,7 @@ declare_args() {
-   #     2 : Used during the PGO (optimization) phase.
-   chrome_pgo_phase = 0
-   if (is_official_build &&
--      (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast))) {
-+      (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) {
+@@ -16,7 +16,7 @@ declare_args() {
+       # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once
+       # target_os switch for lacros-chrome is completed.
+       (is_win || is_mac ||
+-       (is_linux && !chromeos_is_browser_only && !is_chromecast))) {
++       (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) {
      chrome_pgo_phase = 2
    }
 

www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h

@@ -1,4 +1,4 @@
---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2021-01-18 21:31:51 UTC
+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2021-03-13 00:03:39 UTC
 +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
 @@ -16,7 +16,7 @@
  #if defined(OS_ANDROID)

www/chromium/files/patch-BUILD.gn

@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2021-01-18 21:28:44 UTC
+--- BUILD.gn.orig	2021-03-12 23:57:14 UTC
 +++ BUILD.gn
-@@ -424,7 +424,7 @@ group("gn_all") {
+@@ -421,7 +421,7 @@ group("gn_all") {
      ]
    }
 
@@ -9,7 +9,7 @@
      deps += [
        "//third_party/breakpad:breakpad_unittests",
        "//third_party/breakpad:core-2-minidump",
-@@ -467,8 +467,6 @@ group("gn_all") {
+@@ -464,8 +464,6 @@ group("gn_all") {
        "//net:disk_cache_memory_test",
        "//net:quic_client",
        "//net:quic_server",
@@ -18,7 +18,7 @@
        "//testing:empty_main",
      ]
 
-@@ -523,10 +521,6 @@ group("gn_all") {
+@@ -520,10 +518,6 @@ group("gn_all") {
          "//chrome/test:load_library_perf_tests",
          "//chrome/test:sync_performance_tests",
          "//chrome/test/chromedriver:chromedriver",
@@ -29,7 +29,7 @@
          "//media/cast:generate_barcode_video",
          "//media/cast:generate_timecode_audio",
          "//net:crash_cache",
-@@ -586,10 +580,6 @@ group("gn_all") {
+@@ -582,10 +576,6 @@ group("gn_all") {
        "//mojo:mojo_perftests",
        "//services/service_manager/public/cpp",
        "//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
      ]
 
      if (!is_android) {
-@@ -667,7 +657,7 @@ group("gn_all") {
+@@ -663,7 +653,7 @@ group("gn_all") {
          host_os == "win") {
        deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
      }
@@ -49,7 +49,7 @@
      deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
    }
 
-@@ -682,7 +672,7 @@ group("gn_all") {
+@@ -678,7 +668,7 @@ group("gn_all") {
      }
    }
 
@@ -58,15 +58,15 @@
      deps += [
        "//third_party/crashpad/crashpad:crashpad_tests",
        "//third_party/crashpad/crashpad/handler:crashpad_handler",
-@@ -802,7 +792,6 @@ group("gn_all") {
+@@ -790,7 +780,6 @@ group("gn_all") {
        "//chrome/browser/vr:vr_common_perftests",
        "//chrome/browser/vr:vr_common_unittests",
        "//chrome/browser/vr:vr_pixeltests",
 -      "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
      ]
      if (is_android) {
        deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
-@@ -1090,7 +1079,7 @@ if (!is_ios) {
+@@ -1081,7 +1070,7 @@ if (!is_ios) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
 
@@ -75,7 +75,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1099,7 +1088,7 @@ if (!is_ios) {
+@@ -1090,7 +1079,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
@@ -84,7 +84,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
-@@ -1320,9 +1309,6 @@ group("chromium_builder_perf") {
+@@ -1315,9 +1304,6 @@ group("chromium_builder_perf") {
 
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

www/chromium/files/patch-apps_app__restore__service__browsertest.cc

@@ -1,4 +1,4 @@
---- apps/app_restore_service_browsertest.cc.orig	2020-11-13 06:36:34 UTC
+--- apps/app_restore_service_browsertest.cc.orig	2021-03-12 23:57:14 UTC
 +++ apps/app_restore_service_browsertest.cc
 @@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc
  }

www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc

@@ -1,6 +1,6 @@
---- apps/ui/views/app_window_frame_view.cc.orig	2021-01-18 21:28:44 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2021-03-12 23:57:14 UTC
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -139,7 +139,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
+@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
    gfx::Rect window_bounds = client_bounds;
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.

www/chromium/files/patch-ash_display_mirror__window__controller.cc

@@ -1,4 +1,4 @@
---- ash/display/mirror_window_controller.cc.orig	2021-01-18 21:28:44 UTC
+--- ash/display/mirror_window_controller.cc.orig	2021-03-12 23:57:14 UTC
 +++ ash/display/mirror_window_controller.cc
 @@ -286,7 +286,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;