| raw e-mail | index | archive | help
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 081297f4d758..f75f5f61a3b4 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
-PORTVERSION= 123.0.6312.122
+PORTVERSION= 124.0.6367.60
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index bc703b8167b7..48739ad45d84 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1712941251
-SHA256 (chromium-123.0.6312.122.tar.xz) = c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885
-SIZE (chromium-123.0.6312.122.tar.xz) = 3488275388
-SHA256 (ungoogled-chromium-123.0.6312.122-1.tar.gz) = 41bcd3b62218d02806063f247316c59f2beb899905457ab00bce7ce342f443fd
-SIZE (ungoogled-chromium-123.0.6312.122-1.tar.gz) = 668203
-SHA256 (chromium-123.0.6312.122-testdata.tar.xz) = f9075629ea813e184977811fd95c9edf3ca499d83af4e934706a0b344c874cbf
-SIZE (chromium-123.0.6312.122-testdata.tar.xz) = 279875756
+TIMESTAMP = 1713858634
+SHA256 (chromium-124.0.6367.60.tar.xz) = ebd553527149cb8477a522df90acd6cea2388a6f431e2db589a0301df1d0cae2
+SIZE (chromium-124.0.6367.60.tar.xz) = 3432734968
+SHA256 (ungoogled-chromium-124.0.6367.60-1.tar.gz) = 10996c17d79b4bf1baccc3138e6103c39379ca2f5bdc72092e67e4dda7a527a7
+SIZE (ungoogled-chromium-124.0.6367.60-1.tar.gz) = 667143
+SHA256 (chromium-124.0.6367.60-testdata.tar.xz) = 42fcb4454bb703343843b7b7b4c7c28cbc9e0f885f5e38748268aeeb00ce9d29
+SIZE (chromium-124.0.6367.60-testdata.tar.xz) = 279785420
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn
index 651a50c7693e..37e125a126fd 100644
--- a/www/ungoogled-chromium/files/patch-BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2024-03-22 14:16:19 UTC
+--- BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ BUILD.gn
@@ -64,7 +64,7 @@ declare_args() {
root_extra_deps = []
@@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
-@@ -428,7 +427,7 @@ group("gn_all") {
+@@ -427,7 +426,7 @@ group("gn_all") {
}
}
@@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -620,6 +619,15 @@ group("gn_all") {
+@@ -619,6 +618,15 @@ group("gn_all") {
}
}
@@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
-@@ -666,7 +674,7 @@ group("gn_all") {
+@@ -665,7 +673,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1087,7 +1095,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1086,7 +1094,7 @@ if (use_blink && !is_cronet_build) {
]
}
@@ -60,7 +60,7 @@
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
-@@ -1178,7 +1186,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1177,7 +1185,7 @@ if (use_blink && !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)" ]
}
-@@ -1187,7 +1195,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1186,7 +1194,7 @@ if (use_blink && !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)" ]
}
-@@ -1637,7 +1645,7 @@ group("chromium_builder_perf") {
+@@ -1646,7 +1654,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn
index ded8e83a42f1..e6a1bf006c83 100644
--- a/www/ungoogled-chromium/files/patch-base_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2024-03-22 14:16:19 UTC
+--- base/BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ base/BUILD.gn
-@@ -192,7 +192,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -200,7 +200,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"
-@@ -1126,11 +1126,23 @@ component("base") {
+@@ -1131,11 +1131,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) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1150,7 +1162,7 @@ component("base") {
+@@ -1155,7 +1167,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2106,6 +2118,22 @@ component("base") {
+@@ -2113,6 +2125,22 @@ component("base") {
]
}
@@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
-@@ -2241,6 +2269,31 @@ component("base") {
+@@ -2249,6 +2277,33 @@ component("base") {
}
}
@@ -74,6 +74,8 @@
+ sources -= [
+ "files/file_path_watcher_inotify.cc",
+ "files/scoped_file_linux.cc",
++ "process/set_process_title_linux.cc",
++ "process/set_process_title_linux.h",
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_linux.cc",
@@ -98,7 +100,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
-@@ -2251,7 +2304,7 @@ component("base") {
+@@ -2259,7 +2314,7 @@ component("base") {
}
if (dep_libevent) {
@@ -107,7 +109,7 @@
}
if (use_libevent) {
-@@ -3027,7 +3080,7 @@ if (is_apple) {
+@@ -3072,7 +3127,7 @@ if (is_apple) {
}
}
@@ -116,24 +118,16 @@
# This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") {
testonly = true
-@@ -3675,14 +3728,14 @@ test("base_unittests") {
+@@ -3716,7 +3771,7 @@ test("base_unittests") {
]
}
- if (is_linux || is_chromeos) {
-+ if ((is_linux || is_chromeos) && !is_bsd) {
++ if (!is_bsd && (is_linux || is_chromeos)) {
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
- "nix/mime_util_xdg_unittest.cc",
- ]
-
-- if (!is_nacl) {
-+ if (!is_nacl && !is_bsd) {
- deps += [ ":stack_canary_linux_unittests" ]
- }
- }
-@@ -3701,7 +3754,7 @@ test("base_unittests") {
+@@ -3743,7 +3798,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -142,7 +136,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3712,7 +3765,7 @@ test("base_unittests") {
+@@ -3754,7 +3809,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -151,7 +145,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3980,7 +4033,7 @@ test("base_unittests") {
+@@ -4022,7 +4077,7 @@ test("base_unittests") {
}
}
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h b/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h
index 122247d1d432..444fa64c4e5e 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,8 +1,8 @@
---- base/allocator/dispatcher/tls.h.orig 2023-11-04 07:08:51 UTC
+--- base/allocator/dispatcher/tls.h.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/dispatcher/tls.h
-@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator {
- partition_alloc::PartitionPageSize();
- #elif BUILDFLAG(IS_APPLE)
+@@ -76,7 +76,7 @@ struct BASE_EXPORT MMapAllocator {
+ constexpr static size_t AllocationChunkSize = 16384;
+ #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)
constexpr static size_t AllocationChunkSize = 16384;
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index 9882ab1dac47..4c5f2d0ca3b5 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,7 +1,7 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-03-22 14:16:19 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -30,7 +30,7 @@ if (is_nacl) {
- }
+@@ -33,7 +33,7 @@ if (is_nacl) {
+ use_large_empty_slot_span_ring = is_mac
has_memory_tagging =
- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
@@ -9,7 +9,7 @@
declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
-@@ -357,7 +357,7 @@ declare_args() {
+@@ -351,7 +351,7 @@ declare_args() {
# dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers.
enable_pkeys =
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index 372c63248989..6ed59dc622c7 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-03-22 14:16:19 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -858,7 +858,7 @@ if (is_clang_or_gcc) {
+@@ -851,7 +851,7 @@ if (is_clang_or_gcc) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
}
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
index 062ae211d75a..a75b6c620b86 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-02-25 20:22:18 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
@@ -9,7 +9,7 @@
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges
-@@ -126,7 +126,7 @@ AslrMask(uintptr_t bits) {
+@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) {
return AslrAddress(0x20000000ULL);
}
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
index cf46fed6f74e..9c9f80ace75e 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-02-25 20:22:18 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
-@@ -256,7 +256,7 @@ bool DecommitAndZeroSystemPages(void* address,
+@@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address,
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
index d3bc48b0842c..49bb4f4e9ad1 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
@@ -1,38 +1,11 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-02-25 20:22:18 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
-@@ -25,7 +25,7 @@
- // elimination.
+@@ -26,7 +26,7 @@
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
--#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+ #elif (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) || \
+- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
// This should work for all POSIX (if needed), but currently all other
// supported OS/architecture combinations use either hard-coded values
// (such as x86) or have means to determine these values without needing
-@@ -92,7 +92,7 @@ PageAllocationGranularityShift() {
- return 14; // 16kB
- #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
- return static_cast<size_t>(vm_page_shift);
--#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
- // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
- // page sizes. Retrieve from or initialize cache.
- size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
-@@ -113,7 +113,7 @@ PageAllocationGranularity() {
- // This is literally equivalent to |1 << PageAllocationGranularityShift()|
- // below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
- return vm_page_size;
--#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
- // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
- // initialize cache.
- size_t size = page_characteristics.size.load(std::memory_order_relaxed);
-@@ -153,7 +153,7 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONS
- SystemPageSize() {
- #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
- (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \
-- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
- // This is literally equivalent to |1 << SystemPageShift()| below, but was
- // separated out for 64-bit IS_APPLE and arm64 on Android/Linux to avoid <<
- // on a non-constexpr.
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc
deleted file mode 100644
index 60d77fc19b01..000000000000
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc.orig 2024-02-25 20:22:18 UTC
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc
-@@ -421,7 +421,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
- }
- #endif
-
--#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
-+#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
-
- PageCharacteristics page_characteristics;
-
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
index ed2d611605c4..02cfd2bdb7bd 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-02-25 20:22:18 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
@@ -11,10 +11,10 @@
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -299,7 +299,7 @@ constexpr bool kUseLazyCommit = false;
//
- // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
- // larger slot spans.
--#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
-+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
+ // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead
+ // to larger slot spans.
+-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64))
++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1
#else
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
index 44896d379a92..6cc6c41bd125 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
@@ -1,21 +1,11 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-02-25 20:22:18 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
-@@ -112,7 +112,7 @@ PartitionPageShift() {
- }
- #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
- (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \
-- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
- PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
- PartitionPageShift() {
- return PageAllocationGranularityShift() + 2;
-@@ -314,7 +314,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
+@@ -313,7 +313,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
- BUILDFLAG(ENABLE_POINTER_COMPRESSION)
-+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
-+ BUILDFLAG(IS_BSD)
++ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;
#else
constexpr size_t kPoolMaxSize = 16 * kGiB;
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h
deleted file mode 100644
index 41e4f9c75188..000000000000
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-02-25 20:22:18 UTC
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
-@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
- // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
- // PartitionPageSize() is 4 times the OS page size.
- static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
--#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
- // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
- // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
- // so we use the 16 kiB maximum (64 kiB will crash).
diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
index ae4d14863fe3..c838279c607b 100644
--- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
+++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-02-25 20:22:18 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-04-23 07:42:17 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -47,7 +47,7 @@
#include "wow64apiset.h"
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
-@@ -278,7 +278,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -279,7 +279,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@@ -18,16 +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.
-@@ -377,7 +377,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
- (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
- MinPurgeableSlotSize();
- #elif BUILDFLAG(IS_APPLE) || \
-- ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && \
-+ ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \
- defined(ARCH_CPU_ARM64))
- // 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,
-@@ -942,7 +942,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
+@@ -950,7 +950,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc b/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
index 9fd6f5ce5b82..3bd086bb0886 100644
--- a/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
@@ -1,4 +1,4 @@
---- base/base_paths_posix.cc.orig 2023-11-04 07:08:51 UTC
+--- base/base_paths_posix.cc.orig 2024-04-23 07:42:17 UTC
+++ base/base_paths_posix.cc
@@ -15,6 +15,7 @@
#include <ostream>
@@ -28,8 +28,8 @@
return true;
#elif BUILDFLAG(IS_FREEBSD)
- int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
-- absl::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
-+ absl::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
+- std::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
++ std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
NOTREACHED() << "Unable to resolve path.";
return false;
@@ -73,7 +73,7 @@
+ goto out;
+ }
+
-+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
++ if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, errbuf)) == NULL)
+ goto out;
+
+ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, cpid,
diff --git a/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc b/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc
index 2215c8de0bab..b5c2ec083686 100644
--- a/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc
@@ -1,6 +1,6 @@
---- base/debug/debugger_posix.cc.orig 2022-10-01 07:40:07 UTC
+--- base/debug/debugger_posix.cc.orig 2024-04-23 07:42:17 UTC
+++ base/debug/debugger_posix.cc
-@@ -35,6 +35,10 @@
+@@ -36,6 +36,10 @@
#include <sys/sysctl.h>
#endif
@@ -27,7 +27,8 @@
if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
return -1;
- mib[5] = (info_size / sizeof(struct kinfo_proc));
+- mib[5] = (info_size / sizeof(struct kinfo_proc));
++ mib[5] = static_cast<int>((info_size / sizeof(struct kinfo_proc)));
+ if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) {
+ is_set = true;
+ being_debugged = false;
diff --git a/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc b/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc
index 85e84ead7a7b..5a1b0e4f68df 100644
--- a/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc
+++ b/www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc
@@ -1,18 +1,13 @@
---- base/debug/elf_reader.cc.orig 2023-09-17 07:59:53 UTC
+--- base/debug/elf_reader.cc.orig 2024-04-23 07:42:17 UTC
+++ base/debug/elf_reader.cc
-@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
- bool found = false;
- while (current_section < section_end) {
- current_note = reinterpret_cast<const Nhdr*>(current_section);
-+#if !BUILDFLAG(IS_BSD)
- if (current_note->n_type == NT_GNU_BUILD_ID) {
- StringPiece note_name(current_section + sizeof(Nhdr),
- current_note->n_namesz);
-@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
- break;
- }
- }
-+#endif
+@@ -45,6 +45,10 @@ using Xword = Elf64_Xword;
+
+ constexpr char kGnuNoteName[] = "GNU";
- size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) +
- bits::AlignUp(current_note->n_descsz, 4u) +
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
++
+ // Returns a pointer to the header of the ELF binary mapped into memory, or a
+ // null pointer if the header is invalid. Here and below |elf_mapped_base| is a
+ // pointer to the start of the ELF image.
diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc
index 18f30776b747..4df9e4c087ae 100644
--- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc
+++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc
@@ -1,21 +1,29 @@
---- base/debug/stack_trace.cc.orig 2023-12-23 12:33:28 UTC
+--- base/debug/stack_trace.cc.orig 2024-04-23 07:42:17 UTC
+++ base/debug/stack_trace.cc
-@@ -266,7 +266,9 @@ void StackTrace::Print() const {
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if !BUILDFLAG(IS_BSD)
- OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
-
- std::string StackTrace::ToString() const {
-@@ -274,7 +276,7 @@ std::string StackTrace::ToString() const {
+@@ -247,7 +247,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
+ // Symbols are not expected to be reliable when gn args specifies
*** 10992 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?>