Skip to content

Commit

Permalink
www/chromium: update to 112.0.5615.49
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Nagy authored and Robert Nagy committed Apr 9, 2023
1 parent 59641eb commit 6355e9a
Show file tree
Hide file tree
Showing 311 changed files with 1,696 additions and 1,431 deletions.
7 changes: 3 additions & 4 deletions www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
PORTVERSION= 111.0.5563.147
PORTVERSION= 112.0.5615.49
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
Expand Down Expand Up @@ -98,7 +98,6 @@ BINARY_ALIAS= python3=${PYTHON_CMD} \
GN_ARGS+= clang_use_chrome_plugins=false \
enable_backup_ref_ptr_support=false \
enable_hangout_services_extension=true \
enable_js_type_check=false \
enable_nacl=false \
enable_remoting=false \
fatal_linker_warnings=false \
Expand Down Expand Up @@ -215,8 +214,8 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif

.if ${COMPILER_VERSION} != 130
LLVM_DEFAULT= 13
.if ${COMPILER_VERSION} < 150
LLVM_DEFAULT= 15
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
Expand Down
14 changes: 7 additions & 7 deletions www/chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1680003790
SHA256 (chromium-111.0.5563.147.tar.xz) = c49d4e0bd01b264529991e74ab58aeac33903532e413cc62bfa9fca99bf77a29
SIZE (chromium-111.0.5563.147.tar.xz) = 1741186492
SHA256 (chrome-linux-111.0.5563.147-llvm13.profdata.tar.xz) = 664dbf49b3e2a0844e8d887a26740f752798348ef07386297e5a8f30eabcd024
SIZE (chrome-linux-111.0.5563.147-llvm13.profdata.tar.xz) = 26312768
SHA256 (chromium-111.0.5563.147-testdata.tar.xz) = ab5ba7d703e962126829298d0d0053839d5c40159e592017aab3f8463ac3d8ab
SIZE (chromium-111.0.5563.147-testdata.tar.xz) = 259363560
TIMESTAMP = 1680693621
SHA256 (chromium-112.0.5615.49.tar.xz) = ddfd37373c1fa0f433a6ac11f0baa2b1f3fdfb9c7b5867e32a4300f2eb5aff41
SIZE (chromium-112.0.5615.49.tar.xz) = 1730346508
SHA256 (chrome-linux-112.0.5615.49-llvm13.profdata.tar.xz) = 40db48c12e5aecb75bf0849bb673b2ff7ac1a562c4a4179dd7a9d9084336db78
SIZE (chrome-linux-112.0.5615.49-llvm13.profdata.tar.xz) = 26554476
SHA256 (chromium-112.0.5615.49-testdata.tar.xz) = 157e9c99242c13b906e08e5693c1a13fc7888a3d1207f5cf9bd96b62d6760ff1
SIZE (chromium-112.0.5615.49-testdata.tar.xz) = 263752520
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
16 changes: 8 additions & 8 deletions www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-03-09 06:31:50 UTC
--- BUILD.gn.orig 2023-04-05 11:05:06 UTC
+++ BUILD.gn
@@ -60,7 +60,7 @@ declare_args() {
root_extra_deps = []
Expand All @@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -417,7 +416,7 @@ group("gn_all") {
@@ -423,7 +422,7 @@ group("gn_all") {
}
}

Expand All @@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -616,6 +615,15 @@ group("gn_all") {
@@ -622,6 +621,15 @@ group("gn_all") {
}
}

Expand All @@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
@@ -664,7 +672,7 @@ group("gn_all") {
@@ -670,7 +678,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
Expand All @@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}

@@ -1086,7 +1094,7 @@ if (!is_ios) {
@@ -1093,7 +1101,7 @@ if (!is_ios) {
]
}

Expand All @@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1186,7 +1194,7 @@ if (!is_ios) {
@@ -1193,7 +1201,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}

Expand All @@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1195,7 +1203,7 @@ if (!is_ios) {
@@ -1202,7 +1210,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

Expand All @@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

@@ -1661,7 +1669,7 @@ group("chromium_builder_perf") {
@@ -1670,7 +1678,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

Expand Down
56 changes: 18 additions & 38 deletions www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2023-03-09 06:31:50 UTC
--- base/BUILD.gn.orig 2023-04-05 11:05:06 UTC
+++ base/BUILD.gn
@@ -168,7 +168,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -188,7 +188,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}

Expand All @@ -9,31 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1053,7 +1053,7 @@ component("base") {
"timer/hi_res_timer_manager_posix.cc",
]

- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"profiler/stack_base_address_posix.cc",
"profiler/stack_base_address_posix.h",
@@ -1064,6 +1064,14 @@ component("base") {
"profiler/thread_delegate_posix.h",
]
}
+
+ if (is_bsd) {
+ sources += [
+ "profiler/stack_base_address_posix.cc",
+ "profiler/stack_base_address_posix.h",
+ "profiler/stack_sampler_posix.cc",
+ ]
+ }
}

if (is_win) {
@@ -1544,11 +1552,23 @@ component("base") {
@@ -1093,11 +1093,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.
Expand All @@ -58,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1576,7 +1596,7 @@ component("base") {
@@ -1125,7 +1137,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
Expand All @@ -67,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",
@@ -1617,7 +1637,7 @@ component("base") {
@@ -1166,7 +1178,7 @@ component("base") {

# Allow more direct string conversions on platforms with native utf8
# strings
Expand All @@ -76,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -2208,6 +2228,39 @@ component("base") {
@@ -2107,6 +2119,43 @@ component("base") {
}
}

Expand All @@ -88,7 +64,11 @@
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_metrics_linux.cc",
+ "process/process_handle_linux.cc"
+ "process/process_handle_linux.cc",
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+ "profiler/thread_delegate_posix.cc",
+ "profiler/thread_delegate_posix.h",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
Expand All @@ -115,8 +95,8 @@
+
# iOS
if (is_ios) {
sources -= [
@@ -2303,7 +2356,7 @@ component("base") {
sources += [
@@ -2202,7 +2251,7 @@ component("base") {
}

if (dep_libevent) {
Expand All @@ -125,16 +105,16 @@
}

if (use_libevent) {
@@ -3556,7 +3609,7 @@ test("base_unittests") {
}
@@ -3470,7 +3519,7 @@ test("base_unittests") {
]
}

- if (is_linux || is_chromeos) {
+ if ((is_linux || is_chromeos) && !is_bsd) {
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3602,7 +3655,7 @@ test("base_unittests") {
@@ -3519,7 +3568,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
Expand All @@ -143,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3613,7 +3666,7 @@ test("base_unittests") {
@@ -3530,7 +3579,7 @@ test("base_unittests") {

# Allow more direct string conversions on platforms with native utf8
# strings
Expand All @@ -152,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -3829,7 +3882,7 @@ test("base_unittests") {
@@ -3751,7 +3800,7 @@ test("base_unittests") {
}
}

Expand Down
@@ -1,8 +1,8 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-02-08 09:03:45 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -371,8 +371,12 @@ bool TryRecommitSystemPagesInternal(
@@ -380,8 +380,12 @@ bool TryRecommitSystemPagesInternal(

void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
#if !BUILDFLAG(IS_NACL)
void* ptr = reinterpret_cast<void*>(address);
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-03-09 06:31:50 UTC
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -416,7 +416,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
}
#endif

Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-03-09 06:31:50 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -233,7 +233,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
@@ -276,7 +276,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")

declare_args() {
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-03-09 06:31:50 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -120,7 +120,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
#define PA_CONFIG_HAS_LINUX_KERNEL() \
Expand All @@ -9,7 +9,7 @@

// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
@@ -267,7 +267,7 @@ constexpr bool kUseLazyCommit = false;
@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
Expand All @@ -18,7 +18,7 @@

// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -312,7 +312,7 @@ constexpr bool kUseLazyCommit = false;
@@ -296,7 +296,7 @@ constexpr bool kUseLazyCommit = false;
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-03-09 06:31:50 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -91,7 +91,7 @@ PartitionPageShift() {
@@ -92,7 +92,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
Expand All @@ -9,10 +9,10 @@
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -277,7 +277,7 @@ constexpr size_t kNumPools = 3;
//
@@ -296,7 +296,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// When pointer compression is enabled, we cannot use large pools (at most
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_page.h.orig 2023-01-11 09:17:16 UTC
--- base/allocator/partition_allocator/partition_page.h.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/partition_page.h
@@ -144,7 +144,7 @@ struct SlotSpanMetadata {
@@ -143,7 +143,7 @@ struct SlotSpanMetadata {
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan =
4 * (1 << 14) / kSmallestBucket;
Expand Down
@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-03-09 06:31:50 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -42,7 +42,7 @@
#include "wow64apiset.h"
Expand Down Expand Up @@ -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
@@ -800,7 +800,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -811,7 +811,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-05-19 14:06:27 UTC
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-04-05 11:05:06 UTC
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
@@ -17,6 +17,10 @@
@@ -18,6 +18,10 @@
#include <pthread.h>
#endif

Expand All @@ -11,7 +11,7 @@
#if defined(LIBC_GLIBC)
extern "C" void* __libc_stack_end;
#endif
@@ -47,6 +51,36 @@ void* GetStackTop() {
@@ -48,6 +52,36 @@ void* GetStackTop() {

void* GetStackTop() {
return pthread_get_stackaddr_np(pthread_self());
Expand Down
4 changes: 2 additions & 2 deletions www/chromium/files/patch-base_atomicops.h
@@ -1,6 +1,6 @@
--- base/atomicops.h.orig 2022-05-19 14:06:27 UTC
--- base/atomicops.h.orig 2023-04-05 11:05:06 UTC
+++ base/atomicops.h
@@ -56,7 +56,11 @@ typedef intptr_t Atomic64;
@@ -71,7 +71,11 @@ typedef intptr_t Atomic64;

// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.
Expand Down

0 comments on commit 6355e9a

Please sign in to comment.