www/chromium: update to 114.0.5735.90

Approved by: rene (mentor, implicit) Security: https://vuxml.freebsd.org/freebsd/fd87a250-ff78-11ed-8290-a8a1599412c6.html
freebsd · May 31, 2023 · e0eb878 · e0eb878
1 parent 5fc5f6e
commit e0eb878
Show file tree

Hide file tree

Showing 330 changed files with 2,040 additions and 11,631 deletions.
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chromium
-PORTVERSION=	113.0.5672.126
+PORTVERSION=	114.0.5735.90
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		https://nerd.hu/distfiles/:external
@@ -69,9 +69,9 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-basic>0:x11-fonts/noto-basic
 
-USES=		bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv:wchar_t jpeg \
-		localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \
-		tar:xz xorg
+USES=		bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
+		iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
+		python:3.7+,build qt:5 shebangfix tar:xz xorg
 
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
@@ -121,7 +121,8 @@ GN_ARGS+=	clang_use_chrome_plugins=false \
 		use_system_libjpeg=true \
 		use_udev=false \
 		extra_cxxflags="${CXXFLAGS}" \
-		extra_ldflags="${LDFLAGS}"
+		extra_ldflags="${LDFLAGS}" \
+		ffmpeg_branding="${FFMPEG_BRAND}"
 
 # TODO: investigate building with these options:
 # use_system_minigbm
@@ -156,10 +157,10 @@ ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
-CODECS_VARS=		GN_ARGS+=ffmpeg_branding="Chrome" \
-			GN_ARGS+=proprietary_codecs=true
-CODECS_VARS_OFF=	GN_ARGS+=ffmpeg_branding="Chromium" \
-			GN_ARGS+=proprietary_codecs=false
+CODECS_VARS=		GN_ARGS+=proprietary_codecs=true \
+			FFMPEG_BRAND="Chrome"
+CODECS_VARS_OFF=	GN_ARGS+=proprietary_codecs=false \
+			FFMPEG_BRAND="Chromium"
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
@@ -229,13 +230,24 @@ BINARY_ALIAS+=		ar=/usr/bin/llvm-ar \
 			nm=/usr/bin/llvm-nm
 .endif
 
-# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - map ffmpeg target to ${ARCH}
 .if ${ARCH} == aarch64
 PLIST_SUB+=	NOT_AARCH64="@comment "
-.else
+FFMPEG_TARGET=	arm64
+.elif ${ARCH} == amd64
+BUILD_DEPENDS+=	nasm:devel/nasm
+PLIST_SUB+=	NOT_AARCH64=""
+FFMPEG_TARGET=	x64
+.elif ${ARCH} == i386
+BUILD_DEPENDS+=	nasm:devel/nasm
 PLIST_SUB+=	NOT_AARCH64=""
+FFMPEG_TARGET=	ia32
 .endif
 
+FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
+FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
+
 # Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-znotext
 
@@ -264,10 +276,13 @@ pre-configure:
 		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
 		libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
-.for brand in Chrome Chromium
-	${CP} -R \
-		${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
-		${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
+	cd ${WRKSRC}/third_party/ffmpeg && \
+		${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
+		--config-only --branding=${FFMPEG_BRAND}
+	cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
+	${MKDIR} ${FFMPEG_CDIR}
+.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
+	-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
 .endfor
 
 do-configure:

diff --git a/www/chromium/distinfo b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1684318714
-SHA256 (chromium-113.0.5672.126.tar.xz) = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93
-SIZE (chromium-113.0.5672.126.tar.xz) = 1556790928
-SHA256 (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 401df2b0b0452bcb0841b52383a98649e15ad4f6baea47dc99e913a35ae40111
-SIZE (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 27020448
-SHA256 (chromium-113.0.5672.126-testdata.tar.xz) = 89088e4cdc494ad5c468c7cf7e7ed26c4f76244d42ec74dac0ee141ead0fd6e6
-SIZE (chromium-113.0.5672.126-testdata.tar.xz) = 262980780
+TIMESTAMP = 1685521034
+SHA256 (chromium-114.0.5735.90.tar.xz) = 071a8620b6175923f91f0ce0e3a0b2b20bf350a7d1a0f5513c160df7c17526d8
+SIZE (chromium-114.0.5735.90.tar.xz) = 1570683592
+SHA256 (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 2a7f6a89475266193420ba70c00858093d7cd3ed0eda2a34ded2f3a6006b1526
+SIZE (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 27343652
+SHA256 (chromium-114.0.5735.90-testdata.tar.xz) = 9ce66f3d7b60e5f74d0f4e4290b1e159b3346e4afb85373c745ac44fc1d14994
+SIZE (chromium-114.0.5735.90-testdata.tar.xz) = 256217488
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2023-04-28 17:01:32 UTC
+--- BUILD.gn.orig	2023-05-31 08:12:17 UTC
 +++ BUILD.gn
-@@ -60,7 +60,7 @@ declare_args() {
+@@ -61,7 +61,7 @@ declare_args() {
    root_extra_deps = []
  }
 
@@ -9,49 +9,49 @@
    # An official (maximally optimized!) component (optimized for build times)
    # build doesn't make sense and usually doesn't work.
    assert(!is_component_build)
-@@ -85,7 +85,6 @@ group("gn_all") {
-     "//codelabs",
-     "//components:components_unittests",
-     "//components/gwp_asan:gwp_asan_unittests",
--    "//infra/orchestrator:orchestrator_all",
-     "//net:net_unittests",
-     "//sandbox:sandbox_unittests",
-     "//services:services_unittests",
-@@ -426,7 +425,7 @@ group("gn_all") {
+@@ -95,7 +95,6 @@ group("gn_all") {
+       "//codelabs",
+       "//components:components_unittests",
+       "//components/gwp_asan:gwp_asan_unittests",
+-      "//infra/orchestrator:orchestrator_all",
+       "//net:net_unittests",
+       "//sandbox:sandbox_unittests",
+       "//services:services_unittests",
+@@ -419,7 +418,7 @@ group("gn_all") {
+       }
      }
-   }
 
--  if (is_linux || is_chromeos || is_android) {
-+  if ((is_linux && !is_bsd) || is_chromeos || is_android) {
-     deps += [
-       "//third_party/breakpad:breakpad_unittests",
-       "//third_party/breakpad:core-2-minidump",
-@@ -630,6 +629,15 @@ group("gn_all") {
+-    if (is_linux || is_chromeos || is_android) {
++    if ((is_linux && !is_bsd) || is_chromeos || is_android) {
+       deps += [
+         "//third_party/breakpad:breakpad_unittests",
+         "//third_party/breakpad:core-2-minidump",
+@@ -619,6 +618,15 @@ group("gn_all") {
+       }
      }
-   }
 
-+  if (is_bsd) {
-+    deps -= [
-+      "//third_party/breakpad:dump_syms($host_toolchain)",
-+      "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
-+      "//third_party/breakpad:minidump_dump($host_toolchain)",
-+      "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
-+    ]
-+  }
++    if (is_bsd) {
++      deps -= [
++        "//third_party/breakpad:dump_syms($host_toolchain)",
++        "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
++        "//third_party/breakpad:minidump_dump($host_toolchain)",
++        "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
++      ]
++    }
 +
-   if (is_mac) {
-     deps += [
-       "//third_party/breakpad:dump_syms",
-@@ -677,7 +685,7 @@ group("gn_all") {
-         host_os == "win") {
-       deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+     if (is_mac) {
+       deps += [
+         "//third_party/breakpad:dump_syms",
+@@ -666,7 +674,7 @@ group("gn_all") {
+           host_os == "win") {
+         deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+       }
+-    } else if (!is_android && !is_ios && !is_fuchsia) {
++    } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
+       deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
      }
--  } else if (!is_android && !is_ios && !is_fuchsia) {
-+  } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
-     deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
-   }
 
-@@ -1100,7 +1108,7 @@ if (!is_ios) {
+@@ -1096,7 +1104,7 @@ if (!is_ios && !is_cronet_build) {
      ]
    }
 
@@ -60,7 +60,7 @@
      # WPT Webdriver tests runner
      # chrome/test/chromedriver/test/run_webdriver_tests.py
      script_test("webdriver_wpt_tests") {
-@@ -1200,7 +1208,7 @@ if (!is_ios) {
+@@ -1196,7 +1204,7 @@ if (!is_ios && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
 
@@ -69,7 +69,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1209,7 +1217,7 @@ if (!is_ios) {
+@@ -1205,7 +1213,7 @@ if (!is_ios && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
@@ -78,7 +78,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
-@@ -1677,7 +1685,7 @@ group("chromium_builder_perf") {
+@@ -1672,7 +1680,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
 

diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig	2022-10-24 13:33:33 UTC
+--- ash/display/mirror_window_controller.cc.orig	2023-05-31 08:12:17 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
        if (!base::Contains(display_info_list, iter->first,
                            &display::ManagedDisplayInfo::id)) {
          CloseAndDeleteHost(iter->second, true);

diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2023-04-28 17:01:32 UTC
+--- base/BUILD.gn.orig	2023-05-31 08:12:17 UTC
 +++ base/BUILD.gn
-@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -197,7 +197,7 @@ buildflag_header("ios_cronet_buildflags") {
    flags = [ "CRONET_BUILD=$is_cronet_build" ]
  }
 
@@ -9,7 +9,7 @@
  buildflag_header("message_pump_buildflags") {
    header = "message_pump_buildflags.h"
    header_dir = "base/message_loop"
-@@ -1105,11 +1105,23 @@ component("base") {
+@@ -1100,11 +1100,23 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -34,7 +34,7 @@
    if (use_allocator_shim) {
      sources += [
        "allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1137,7 +1149,7 @@ component("base") {
+@@ -1132,7 +1144,7 @@ component("base") {
        ]
        configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
      }
@@ -43,7 +43,7 @@
        sources += [
          "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
          "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1178,7 +1190,7 @@ component("base") {
+@@ -1173,7 +1185,7 @@ component("base") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -52,7 +52,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -2135,6 +2147,43 @@ component("base") {
+@@ -2127,6 +2139,43 @@ component("base") {
      }
    }
 
@@ -96,7 +96,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2244,7 +2293,7 @@ component("base") {
+@@ -2236,7 +2285,7 @@ component("base") {
    }
 
    if (dep_libevent) {
@@ -105,7 +105,7 @@
    }
 
    if (use_libevent) {
-@@ -3562,7 +3611,7 @@ test("base_unittests") {
+@@ -3559,7 +3608,7 @@ test("base_unittests") {
      ]
    }
 
@@ -114,7 +114,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3611,7 +3660,7 @@ test("base_unittests") {
+@@ -3608,7 +3657,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -123,7 +123,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3622,7 +3671,7 @@ test("base_unittests") {
+@@ -3619,7 +3668,7 @@ test("base_unittests") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -132,7 +132,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -3848,7 +3897,7 @@ test("base_unittests") {
+@@ -3843,7 +3892,7 @@ test("base_unittests") {
      }
    }
 

diff --git a/www/chromium/files/patch-base_allocator_dispatcher_tls.h b/www/chromium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- base/allocator/dispatcher/tls.h.orig	2023-02-08 09:03:45 UTC
+--- base/allocator/dispatcher/tls.h.orig	2023-05-31 08:12:17 UTC
 +++ base/allocator/dispatcher/tls.h
-@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
        partition_alloc::PartitionPageSize();
  #elif BUILDFLAG(IS_APPLE)
    constexpr static size_t AllocationChunkSize = 16384;

diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator.h.orig	2022-11-30 08:12:58 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig	2023-05-31 08:12:17 UTC
 +++ base/allocator/partition_allocator/page_allocator.h
-@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
+@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
  // recommitted. Do not assume that this will not change over time.
  constexpr PA_COMPONENT_EXPORT(
      PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

diff --git a/...omium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/...omium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2023-04-28 17:01:32 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2023-05-31 08:12:17 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -383,8 +383,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal(
 
  void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
    void* ptr = reinterpret_cast<void*>(address);

diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-04-28 17:01:32 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-05-31 08:12:17 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -285,7 +285,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
+@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
         "AsanBackupRefPtr requires RawPtrHookableImpl")
 
  declare_args() {

diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_root.cc.orig	2023-04-28 17:01:32 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig	2023-05-31 08:12:17 UTC
 +++ base/allocator/partition_allocator/partition_root.cc
-@@ -43,7 +43,7 @@
+@@ -46,7 +46,7 @@
  #include "wow64apiset.h"
  #endif
 
@@ -9,7 +9,7 @@
  #include <pthread.h>
  #endif
 
-@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() {
      return;
    }
 
@@ -18,7 +18,7 @@
    // When fork() is called, only the current thread continues to execute in the
    // child process. If the lock is held, but *not* by this thread when fork() is
    // called, we have a deadlock.
-@@ -378,7 +378,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan(
    constexpr size_t kMaxSlotCount =
        (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
        MinPurgeableSlotSize();
@@ -27,7 +27,7 @@
    // It's better for slot_usage to be stack-allocated and fixed-size, which
    // demands that its size be constexpr. On IS_APPLE and Linux on arm64,
    // PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -850,7 +850,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -853,7 +853,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
      // apple OSes.
      PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
               (internal::SystemPageSize() == (size_t{1} << 14)));