sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 10:56:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/ungoogled-chromium: update to 124.0.6367.60

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/9bed230f-ffc8-11ee-8e76-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2024-04-23 14:29:34 +02:00
parent 79522a57f4
commit 2c87898679
375 changed files with 2312 additions and 1911 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/ungoogled-chromium/Makefile
View file

@ -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/ \

14
www/ungoogled-chromium/distinfo
View file

@ -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

16
www/ungoogled-chromium/files/patch-BUILD.gn
View file

@ -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" ]
}

36
www/ungoogled-chromium/files/patch-base_BUILD.gn
View file

@ -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") {
}
}

8
www/ungoogled-chromium/files/patch-base_allocator_dispatcher_tls.h
View file

@ -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)

8
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
View file

@ -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 =

4
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
View file

@ -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" ]
}
}

4
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
View file

@ -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);
}

4
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
View file

@ -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() {

37
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
View file

@ -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.

11
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc
View file

@ -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;

10
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
View file

@ -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

16
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
View file

@ -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;

11
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h
View file

@ -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).

15
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
View file

@ -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)));

8
www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
View file

@ -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,

7
www/ungoogled-chromium/files/patch-base_debug_debugger__posix.cc
View file

@ -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;

27
www/ungoogled-chromium/files/patch-base_debug_elf__reader.cc
View file

@ -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;
size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) +
bits::AlignUp(current_note->n_descsz, 4u) +
constexpr char kGnuNoteName[] = "GNU";
+#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.

38
www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc
View file

@ -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
// symbol_level=0.
return false;
-#elif defined(__UCLIBC__) || defined(_AIX)
+#elif defined(__UCLIBC__) || defined(_AIX) || BUILDFLAG(IS_BSD)
// StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
// See https://crbug.com/706728
return false;
@@ -291,7 +291,7 @@ std::string StackTrace::ToString() const {
}
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
std::stringstream stream;
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
OutputToStreamWithPrefix(&stream, prefix_string);
#endif
return stream.str();
if (ShouldSuppressOutput()) {
return "Backtrace suppressed.";
}
@@ -301,7 +301,7 @@ std::string StackTrace::ToStringWithPrefix(const char*
}
std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
s.OutputToStream(&os);
#else
os << "StackTrace::OutputToStream not implemented.";

18
www/ungoogled-chromium/files/patch-base_debug_stack__trace__posix.cc
View file

@ -1,4 +1,4 @@
--- base/debug/stack_trace_posix.cc.orig 2023-11-04 07:08:51 UTC
--- base/debug/stack_trace_posix.cc.orig 2024-04-23 07:42:17 UTC
+++ base/debug/stack_trace_posix.cc
@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
@ -21,7 +21,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) {
@@ -301,7 +303,7 @@ void PrintToStderr(const char* output) {
std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
}
@ -30,7 +30,7 @@
void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
// We have seen rare cases on AMD linux where the default signal handler
// either does not run or a thread (Probably an AMD driver thread) prevents
@@ -319,7 +321,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
@@ -318,7 +320,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
"Warning: Default signal handler failed to terminate process.\n");
PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
// See: https://man7.org/linux/man-pages/man2/exit_group.2.html
@ -42,7 +42,7 @@
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -535,7 +541,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
_exit(EXIT_FAILURE);
}
@ -51,7 +51,7 @@
// Set an alarm to trigger in case the default handler does not terminate
// the process. See 'AlarmSignalHandler' for more details.
struct sigaction action;
@@ -561,6 +567,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -560,6 +566,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
// signals that do not re-raise autonomously), such as signals delivered via
// kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
// otherwise be lost when re-raising the signal via raise().
@ -59,7 +59,7 @@
long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
info->si_signo, info);
if (retval == 0) {
@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -574,6 +581,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
if (errno != EPERM) {
_exit(EXIT_FAILURE);
}
@ -67,7 +67,7 @@
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper {
@@ -763,6 +771,7 @@ class SandboxSymbolizeHelper {
return -1;
}
@ -75,7 +75,7 @@
// This class is copied from
// third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
// It aims at ensuring the process is dumpable before opening /proc/self/mem.
@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper {
@@ -855,11 +864,15 @@ class SandboxSymbolizeHelper {
r.base = cur_base;
}
}
@ -91,7 +91,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper {
@@ -877,6 +890,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;

4
www/ungoogled-chromium/files/patch-base_files_file__util__posix.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_util_posix.cc.orig 2024-02-25 20:22:18 UTC
--- base/files/file_util_posix.cc.orig 2024-04-23 07:42:17 UTC
+++ base/files/file_util_posix.cc
@@ -779,33 +779,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -816,33 +816,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().

6
www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2024-02-25 20:22:18 UTC
--- base/files/file_util_unittest.cc.orig 2024-04-23 07:42:17 UTC
+++ base/files/file_util_unittest.cc
@@ -3869,7 +3869,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3870,7 +3870,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -4592,7 +4592,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4651,7 +4651,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =

12
www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h
View file

@ -1,15 +1,15 @@
--- base/memory/platform_shared_memory_region.h.orig 2023-07-21 09:49:17 UTC
--- base/memory/platform_shared_memory_region.h.orig 2024-04-23 07:42:17 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -16,7 +16,7 @@
#include <stdint.h>
@@ -17,7 +17,7 @@
#include "base/unguessable_token.h"
#include "build/build_config.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
namespace content {
class SandboxIPCHandler;
}
@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
@@ -84,7 +84,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
};
@ -18,7 +18,7 @@
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
@@ -216,7 +216,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size

20
www/ungoogled-chromium/files/patch-base_posix_unix__domain__socket.cc
View file

@ -1,4 +1,4 @@
--- base/posix/unix_domain_socket.cc.orig 2022-10-01 07:40:07 UTC
--- base/posix/unix_domain_socket.cc.orig 2024-04-23 07:42:17 UTC
+++ base/posix/unix_domain_socket.cc
@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
@ -9,6 +9,24 @@
const int enable = 1;
return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
#else
@@ -77,7 +77,7 @@ bool UnixDomainSocket::SendMsg(int fd,
struct cmsghdr* cmsg;
msg.msg_control = control_buffer;
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
msg.msg_controllen = checked_cast<socklen_t>(control_len);
#else
msg.msg_controllen = control_len;
@@ -85,7 +85,7 @@ bool UnixDomainSocket::SendMsg(int fd,
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size()));
#else
cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size());
@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
const size_t kControlBufferSize =

20
www/ungoogled-chromium/files/patch-base_process_internal__linux.h Normal file
View file

@ -0,0 +1,20 @@
--- base/process/internal_linux.h.orig 2024-04-23 07:42:17 UTC
+++ base/process/internal_linux.h
@@ -138,6 +138,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks);
// arguments to the lambda.
template <typename Lambda>
void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) {
+#if BUILDFLAG(IS_BSD)
+ return;
+#else
// Iterate through the different threads tracked in /proc/<pid>/task.
FilePath fd_path = GetProcPidDir(process).Append("task");
@@ -157,6 +160,7 @@ void ForEachProcessTask(base::ProcessHandle process, L
FilePath task_path = fd_path.Append(tid_str);
lambda(tid, task_path);
}
+#endif
}
} // namespace internal

4
www/ungoogled-chromium/files/patch-base_process_process__handle__freebsd.cc
View file

@ -1,4 +1,4 @@
--- base/process/process_handle_freebsd.cc.orig 2023-11-04 07:08:51 UTC
--- base/process/process_handle_freebsd.cc.orig 2024-04-23 07:42:17 UTC
+++ base/process/process_handle_freebsd.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
@ -8,7 +8,7 @@
#include <limits.h>
#include <stddef.h>
@@ -19,10 +20,13 @@ namespace base {
@@ -20,10 +21,13 @@ namespace base {
ProcessId GetParentProcessId(ProcessHandle process) {
struct kinfo_proc info;

30
www/ungoogled-chromium/files/patch-base_process_process__handle__openbsd.cc
View file

@ -1,4 +1,4 @@
--- base/process/process_handle_openbsd.cc.orig 2024-03-22 14:16:19 UTC
--- base/process/process_handle_openbsd.cc.orig 2024-04-23 07:42:17 UTC
+++ base/process/process_handle_openbsd.cc
@@ -3,48 +3,112 @@
// found in the LICENSE file.
@ -62,7 +62,7 @@
- sizeof(struct kinfo_proc), 0 };
+ char *tokens[2];
+ struct stat sb;
+ FilePath *result = nullptr;
+ FilePath result;
- if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1)
- return FilePath();
@ -77,44 +77,44 @@
- return FilePath();
+ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
+ *result = FilePath(cpath);
+ result = FilePath(cpath);
+ else
+ *result = FilePath("/usr/local/chrome/chrome");
+ result = FilePath("/usr/local/chrome/chrome");
+
+ if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) != -1) {
+ retvalargs = static_cast<char**>(malloc(len));
+ if (!retvalargs)
+ return *result;
+ return result;
+
+ if (sysctl(mib, std::size(mib), retvalargs, &len, NULL, 0) < 0) {
+ free(retvalargs);
+ return *result;
+ return result;
+ }
+
+ if ((*tokens = strtok(retvalargs[0], ":")) == NULL) {
+ free(retvalargs);
+ return *result;
+ return result;
+ }
+
+ free(retvalargs);
+
+ if (tokens[0] == NULL)
+ return *result;
+ return result;
+
+ if (realpath(tokens[0], retval) == NULL)
+ return *result;
+ return result;
+
+ if (stat(retval, &sb) < 0)
+ return *result;
+ return result;
+
+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES,
+ if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES,
+ errbuf)) == NULL)
+ return *result;
+ return result;
+
+ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process,
+ sizeof(struct kinfo_file), &cnt)) == NULL) {
+ kvm_close(kd);
+ return *result;
+ return result;
+ }
+
+ for (int i = 0; i < cnt; i++) {
@ -122,12 +122,12 @@
+ files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) &&
+ files[i].va_fileid == sb.st_ino) {
+ kvm_close(kd);
+ *result = FilePath(retval);
+ result = FilePath(retval);
+ }
+ }
+ }
+
+ return *result;
+ return result;
}
} // namespace base

13
www/ungoogled-chromium/files/patch-base_process_process__metrics.cc
View file

@ -1,4 +1,4 @@
--- base/process/process_metrics.cc.orig 2023-06-05 19:39:05 UTC
--- base/process/process_metrics.cc.orig 2024-04-23 07:42:17 UTC
+++ base/process/process_metrics.cc
@@ -17,7 +17,7 @@ namespace base {
namespace {
@ -35,17 +35,12 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now();
@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
@@ -130,10 +129,9 @@ std::optional<double> ProcessMetrics::GetPlatformIndep
}
return GetPlatformIndependentCPUUsage(cpu_usage.value());
}
-#endif
#if BUILDFLAG(IS_WIN)
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)

37
www/ungoogled-chromium/files/patch-base_process_process__metrics.h
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics.h.orig 2024-03-22 14:16:19 UTC
--- base/process/process_metrics.h.orig 2024-04-23 07:42:17 UTC
+++ base/process/process_metrics.h
@@ -37,7 +37,7 @@
@@ -38,7 +38,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -9,16 +9,16 @@
#include <string>
#include <utility>
#include <vector>
@@ -50,7 +50,7 @@ namespace base {
// Full declaration is in process_metrics_iocounters.h.
struct IoCounters;
@@ -48,7 +48,7 @@
namespace base {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -103,7 +103,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@ -27,8 +27,8 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
@@ -137,7 +137,7 @@ class BASE_EXPORT ProcessMetrics {
[[nodiscard]] std::optional<TimeDelta> GetCumulativeCPUUsage();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_AIX)
@ -36,7 +36,7 @@
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of
@@ -219,7 +219,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -182,7 +182,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
@@ -240,7 +240,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -203,7 +203,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -54,7 +54,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
@@ -262,9 +262,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -225,12 +225,10 @@ class BASE_EXPORT ProcessMetrics {
// Used to store the previous times and CPU usage counts so we can
// compute the CPU usage between calls.
TimeTicks last_cpu_time_;
@ -62,18 +62,13 @@
TimeDelta last_cumulative_cpu_;
-#endif
#if BUILDFLAG(IS_WIN)
TimeTicks last_cpu_time_for_precise_cpu_usage_;
@@ -272,7 +270,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -271,7 +269,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@ -82,7 +77,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -306,7 +304,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -91,7 +86,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -321,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -100,7 +95,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
@@ -358,7 +356,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -109,7 +104,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -594,7 +592,7 @@ class BASE_EXPORT SystemMetrics {
@@ -552,7 +550,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

51
www/ungoogled-chromium/files/patch-base_process_process__metrics__freebsd.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics_freebsd.cc.orig 2023-03-10 11:01:21 UTC
--- base/process/process_metrics_freebsd.cc.orig 2024-04-23 07:42:17 UTC
+++ base/process/process_metrics_freebsd.cc
@@ -3,20 +3,39 @@
@@ -3,42 +3,57 @@
// found in the LICENSE file.
#include "base/process/process_metrics.h"
@ -17,7 +17,6 @@
+#include <libutil.h>
+
#include "base/memory/ptr_util.h"
#include "base/process/process_metrics_iocounters.h"
+#include "base/values.h"
namespace base {
@ -26,28 +25,28 @@
+ int pagesize = getpagesize();
+ int pageshift = 0;
-ProcessMetrics::ProcessMetrics(ProcessHandle process)
- : process_(process),
- last_cpu_(0) {}
+ while (pagesize > 1) {
+ pageshift++;
+ pagesize >>= 1;
+ }
+
+ return pageshift;
+}
+}
+
ProcessMetrics::ProcessMetrics(ProcessHandle process)
- : process_(process),
- last_cpu_(0) {}
+ : process_(process) {}
+ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
+
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
ProcessHandle process) {
return WrapUnique(new ProcessMetrics(process));
}
-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() {
+std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
struct kinfo_proc info;
- int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
- size_t length = sizeof(info);
@ -57,22 +56,22 @@
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
+
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
+ return TimeDelta();
- return std::nullopt;
+ return std::optional(TimeDelta());
- return (info.ki_pctcpu / FSCALE) * 100.0;
+ return Microseconds(info.ki_runtime);
- return std::optional(double{info.ki_pctcpu} / FSCALE * 100.0);
+ return std::optional(Microseconds(info.ki_runtime));
}
-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED();
- return TimeDelta();
- return std::nullopt;
-}
-
bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
return false;
}
@@ -65,6 +81,230 @@ size_t GetSystemCommitCharge() {
size_t GetSystemCommitCharge() {
int mib[2], pagesize;
unsigned long mem_total, mem_free, mem_inactive;
@@ -60,6 +75,230 @@ size_t GetSystemCommitCharge() {
pagesize = getpagesize();
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
@ -171,7 +170,7 @@
+ kvm_close(kd);
+ return 0;
+ }
+
+
+ size_t rss;
+
+ if (nproc > 0) {
@ -197,7 +196,7 @@
+ kvm_close(kd);
+ return 0;
+ }
+
+
+ size_t swrss;
+
+ if (nproc > 0) {
@ -247,7 +246,7 @@
+
+Value::Dict SystemDiskInfo::ToDict() const {
+ Value::Dict res;
+
+
+ // Write out uint64_t variables as doubles.
+ // Note: this may discard some precision, but for JS there's no other option.
+ res.Set("reads", static_cast<double>(reads));
@ -263,7 +262,7 @@
+ res.Set("weighted_io_time", static_cast<double>(weighted_io_time));
+
+ NOTIMPLEMENTED();
+
+
+ return res;
+}
+

69
www/ungoogled-chromium/files/patch-base_process_process__metrics__openbsd.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics_openbsd.cc.orig 2024-02-25 20:22:18 UTC
--- base/process/process_metrics_openbsd.cc.orig 2024-04-23 07:42:17 UTC
+++ base/process/process_metrics_openbsd.cc
@@ -6,14 +6,23 @@
@@ -6,73 +6,49 @@
#include <stddef.h>
#include <stdint.h>
@ -8,28 +8,21 @@
#include <sys/param.h>
#include <sys/sysctl.h>
+#include <sys/vmmeter.h>
#include <optional>
+#include <kvm.h>
+
#include "base/memory/ptr_util.h"
#include "base/process/process_metrics_iocounters.h"
+#include "base/values.h"
+#include "base/notreached.h"
namespace base {
+ProcessMetrics::ProcessMetrics(ProcessHandle process)
+ : process_(process) {}
+
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
ProcessHandle process) {
@@ -24,52 +33,26 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
return false;
}
-namespace {
+ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
-static int GetProcessCPU(pid_t pid) {
+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
-static std::optional<int> GetProcessCPU(pid_t pid) {
+std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
struct kinfo_proc info;
- size_t length;
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
@ -37,43 +30,55 @@
+ size_t length = sizeof(struct kinfo_proc);
+ struct timeval tv;
- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
- return -1;
- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
- return std::nullopt;
- }
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
+ sizeof(struct kinfo_proc), 1 };
- mib[5] = (length / sizeof(struct kinfo_proc));
-
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
+ return TimeDelta();
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
- return std::nullopt;
+ return std::optional(TimeDelta());
}
- return info.p_pctcpu;
-}
- return std::optional(info.p_pctcpu);
+ tv.tv_sec = info.p_rtime_sec;
+ tv.tv_usec = info.p_rtime_usec;
+
+ return std::optional(Microseconds(TimeValToMicroseconds(tv)));
}
-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
-} // namespace
-
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
ProcessHandle process) {
return WrapUnique(new ProcessMetrics(process));
}
-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() {
- TimeTicks time = TimeTicks::Now();
-
- if (last_cpu_time_.is_zero()) {
- // First call, just set the last values.
- last_cpu_time_ = time;
- return 0;
- return std::optional(0.0);
- }
-
- int cpu = GetProcessCPU(process_);
- const std::optional<int> cpu = GetProcessCPU(process_);
- if (!cpu.has_value()) {
- return std::nullopt;
- }
-
- last_cpu_time_ = time;
- double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
- return std::optional(double{cpu.value()} / FSCALE * 100.0);
-}
-
- return percentage;
+ return Microseconds(TimeValToMicroseconds(tv));
}
-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED();
- return TimeDelta();
- return std::nullopt;
-}
-
-ProcessMetrics::ProcessMetrics(ProcessHandle process)
@ -87,7 +92,7 @@
struct vmtotal vmtotal;
unsigned long mem_total, mem_free, mem_inactive;
size_t len = sizeof(vmtotal);
@@ -81,9 +64,136 @@ size_t GetSystemCommitCharge() {
@@ -84,9 +60,136 @@ size_t GetSystemCommitCharge() {
mem_free = vmtotal.t_free;
mem_inactive = vmtotal.t_vm - vmtotal.t_avm;

4
www/ungoogled-chromium/files/patch-base_process_process__metrics__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_metrics_unittest.cc.orig 2024-02-25 20:22:18 UTC
--- base/process/process_metrics_unittest.cc.orig 2024-04-23 07:42:17 UTC
+++ base/process/process_metrics_unittest.cc
@@ -54,7 +54,8 @@
@@ -56,7 +56,8 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \

4
www/ungoogled-chromium/files/patch-base_profiler_module__cache.cc
View file

@ -1,6 +1,6 @@
--- base/profiler/module_cache.cc.orig 2023-12-23 12:33:28 UTC
--- base/profiler/module_cache.cc.orig 2024-04-23 07:42:17 UTC
+++ base/profiler/module_cache.cc
@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri
@@ -38,7 +38,7 @@ std::string TransformModuleIDToSymbolServerFormat(std:
// Android and Linux Chrome builds use the "breakpad" format to index their
// build id, so we transform the build id for these platforms. All other
// platforms keep their symbols indexed by the original build ID.

4
www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc
View file

@ -1,4 +1,4 @@
--- base/profiler/sampling_profiler_thread_token.cc.orig 2023-02-11 09:11:04 UTC
--- base/profiler/sampling_profiler_thread_token.cc.orig 2024-04-23 07:42:17 UTC
+++ base/profiler/sampling_profiler_thread_token.cc
@@ -6,7 +6,7 @@
@ -15,6 +15,6 @@
return {id, pthread_self()};
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
absl::optional<uintptr_t> maybe_stack_base =
std::optional<uintptr_t> maybe_stack_base =
GetThreadStackBaseAddress(id, pthread_self());
return {id, maybe_stack_base};

6
www/ungoogled-chromium/files/patch-base_profiler_sampling__profiler__thread__token.h
View file

@ -1,6 +1,6 @@
--- base/profiler/sampling_profiler_thread_token.h.orig 2023-02-11 09:11:04 UTC
--- base/profiler/sampling_profiler_thread_token.h.orig 2024-04-23 07:42:17 UTC
+++ base/profiler/sampling_profiler_thread_token.h
@@ -12,7 +12,7 @@
@@ -13,7 +13,7 @@
#if BUILDFLAG(IS_ANDROID)
#include <pthread.h>
@ -9,7 +9,7 @@
#include <stdint.h>
#endif
@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken {
@@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken {
PlatformThreadId id;
#if BUILDFLAG(IS_ANDROID)
pthread_t pthread_id;

13
www/ungoogled-chromium/files/patch-base_profiler_stack__base__address__posix.cc
View file

@ -1,4 +1,4 @@
--- base/profiler/stack_base_address_posix.cc.orig 2023-02-11 09:11:04 UTC
--- base/profiler/stack_base_address_posix.cc.orig 2024-04-23 07:42:17 UTC
+++ base/profiler/stack_base_address_posix.cc
@@ -17,6 +17,10 @@
#include "base/files/scoped_file.h"
@ -11,7 +11,7 @@
#if BUILDFLAG(IS_CHROMEOS)
extern "C" void* __libc_stack_end;
#endif
@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas
@@ -45,7 +49,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase
#if !BUILDFLAG(IS_LINUX)
uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
@ -48,3 +48,12 @@
const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
return base_address;
}
@@ -80,7 +100,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla
// trying to work around the problem.
return std::nullopt;
#else
- const bool is_main_thread = id == GetCurrentProcId();
+ const bool is_main_thread = id == checked_cast<PlatformThreadId>(GetCurrentProcId());
if (is_main_thread) {
#if BUILDFLAG(IS_ANDROID)
// The implementation of pthread_getattr_np() in Bionic reads proc/self/maps

4
www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
View file

@ -1,6 +1,6 @@
--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-05-05 12:12:41 UTC
--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2024-04-23 07:42:17 UTC
+++ base/profiler/stack_sampling_profiler_test_util.cc
@@ -36,7 +36,7 @@
@@ -37,7 +37,7 @@
// Fortunately, it provides _alloca, which functions identically.
#include <malloc.h>
#define alloca _alloca

10
www/ungoogled-chromium/files/patch-base_profiler_thread__delegate__posix.cc
View file

@ -1,18 +1,18 @@
--- base/profiler/thread_delegate_posix.cc.orig 2022-10-29 17:50:56 UTC
--- base/profiler/thread_delegate_posix.cc.orig 2024-04-23 07:42:17 UTC
+++ base/profiler/thread_delegate_posix.cc
@@ -13,7 +13,7 @@
@@ -14,7 +14,7 @@
#include "base/process/process_handle.h"
#include "build/build_config.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
#include "base/profiler/stack_base_address_posix.h"
#endif
@@ -22,7 +22,7 @@ namespace base {
@@ -23,7 +23,7 @@ namespace base {
std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
SamplingProfilerThreadToken thread_token) {
absl::optional<uintptr_t> base_address;
std::optional<uintptr_t> base_address;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base_address = thread_token.stack_base_address;

6
www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h
View file

@ -1,6 +1,6 @@
--- base/synchronization/lock_impl.h.orig 2024-03-22 14:16:19 UTC
--- base/synchronization/lock_impl.h.orig 2024-04-23 07:42:17 UTC
+++ base/synchronization/lock_impl.h
@@ -105,6 +105,10 @@ void LockImpl::Unlock() {
@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@ -11,7 +11,7 @@
#if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv);
@@ -125,6 +129,9 @@ void LockImpl::Unlock() {
@@ -127,6 +131,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv);
#endif
}

6
www/ungoogled-chromium/files/patch-base_system_sys__info.h
View file

@ -1,6 +1,6 @@
--- base/system/sys_info.h.orig 2024-02-03 15:42:55 UTC
--- base/system/sys_info.h.orig 2024-04-23 07:42:17 UTC
+++ base/system/sys_info.h
@@ -318,6 +318,8 @@ class BASE_EXPORT SysInfo {
@@ -322,6 +322,8 @@ class BASE_EXPORT SysInfo {
static void ResetCpuSecurityMitigationsEnabledForTesting();
#endif
@ -9,7 +9,7 @@
private:
friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
@@ -330,7 +332,7 @@ class BASE_EXPORT SysInfo {
@@ -334,7 +336,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

4
www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/system/sys_info_unittest.cc.orig 2023-08-18 10:26:52 UTC
--- base/system/sys_info_unittest.cc.orig 2024-04-23 07:42:17 UTC
+++ base/system/sys_info_unittest.cc
@@ -263,12 +263,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
@@ -264,12 +264,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
bool empty_result_expected =
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \

11
www/ungoogled-chromium/files/patch-base_threading_platform__thread.h Normal file
View file

@ -0,0 +1,11 @@
--- base/threading/platform_thread.h.orig 2024-04-23 07:42:17 UTC
+++ base/threading/platform_thread.h
@@ -46,6 +46,8 @@ typedef DWORD PlatformThreadId;
typedef zx_koid_t PlatformThreadId;
#elif BUILDFLAG(IS_APPLE)
typedef mach_port_t PlatformThreadId;
+#elif BUILDFLAG(IS_BSD)
+typedef uint64_t PlatformThreadId;
#elif BUILDFLAG(IS_POSIX)
typedef pid_t PlatformThreadId;
#endif

6
www/ungoogled-chromium/files/patch-base_threading_platform__thread__bsd.cc
View file

@ -1,4 +1,4 @@
--- base/threading/platform_thread_bsd.cc.orig 2023-09-17 07:59:53 UTC
--- base/threading/platform_thread_bsd.cc.orig 2024-04-23 07:42:17 UTC
+++ base/threading/platform_thread_bsd.cc
@@ -0,0 +1,31 @@
+// Copyright 2023 The Chromium Authors
@ -20,9 +20,9 @@
+ return false;
+}
+
+absl::optional<ThreadPriorityForTest>
+std::optional<ThreadPriorityForTest>
+GetCurrentThreadPriorityForPlatformForTest() {
+ return absl::nullopt;
+ return std::nullopt;
+}
+} // namespace internal
+

17
www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc
View file

@ -1,4 +1,4 @@
--- base/threading/platform_thread_posix.cc.orig 2024-02-25 20:22:18 UTC
--- base/threading/platform_thread_posix.cc.orig 2024-04-23 07:42:17 UTC
+++ base/threading/platform_thread_posix.cc
@@ -78,12 +78,12 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
@ -15,7 +15,16 @@
#if BUILDFLAG(IS_APPLE)
PlatformThread::SetCurrentThreadRealtimePeriodValue(
delegate->GetRealtimePeriod());
@@ -357,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
@@ -267,6 +267,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() {
return reinterpret_cast<int32_t>(pthread_self());
#elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX)
return pthread_self();
+#elif BUILDFLAG(IS_BSD)
+ return reinterpret_cast<uint64_t>(pthread_self());
#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX)
return reinterpret_cast<int64_t>(pthread_self());
#endif
@@ -357,7 +359,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
// static
bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
@ -24,7 +33,7 @@
return false;
#else
if (from >= to) {
@@ -378,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
@@ -378,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
NOTIMPLEMENTED();
@ -34,7 +43,7 @@
#else
if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
return;
@@ -400,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
@@ -400,7 +405,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
// static
ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {

8
www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc
View file

@ -1,6 +1,6 @@
--- base/trace_event/malloc_dump_provider.cc.orig 2024-02-25 20:22:18 UTC
--- base/trace_event/malloc_dump_provider.cc.orig 2024-04-23 07:42:17 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -25,6 +25,8 @@
@@ -24,6 +24,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
@@ -182,7 +184,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
@@ -181,7 +183,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
@ -18,7 +18,7 @@
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
@@ -353,6 +355,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
@@ -366,6 +368,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.

6
www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc
View file

@ -1,6 +1,6 @@
--- base/trace_event/process_memory_dump.cc.orig 2024-03-22 14:16:19 UTC
--- base/trace_event/process_memory_dump.cc.orig 2024-04-23 07:42:17 UTC
+++ base/trace_event/process_memory_dump.cc
@@ -113,7 +113,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
@@ -113,7 +113,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
#if BUILDFLAG(IS_WIN)
std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
@ -9,7 +9,7 @@
std::unique_ptr<char[]> vec(new char[max_vec_size]);
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
@@ -135,7 +135,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
@@ -135,7 +135,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
for (size_t i = 0; i < page_count; i++)
resident_page_count += vec[i].VirtualAttributes.Valid;

4
www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn
View file

@ -1,6 +1,6 @@
--- build/config/clang/BUILD.gn.orig 2024-03-22 14:16:19 UTC
--- build/config/clang/BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ build/config/clang/BUILD.gn
@@ -194,7 +194,7 @@ template("clang_lib") {
@@ -203,7 +203,7 @@ template("clang_lib") {
# Adds a dependency on the Clang runtime library clang_rt.builtins.
clang_lib("compiler_builtins") {

25
www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn
View file

@ -1,4 +1,4 @@
--- build/config/compiler/BUILD.gn.orig 2024-03-22 14:16:19 UTC
--- build/config/compiler/BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ build/config/compiler/BUILD.gn
@@ -204,7 +204,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
@ -47,7 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -1174,7 +1181,7 @@ config("compiler_cpu_abi") {
@@ -1180,7 +1187,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -56,7 +56,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -1189,7 +1196,7 @@ config("compiler_cpu_abi") {
@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -65,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1524,7 +1531,7 @@ config("compiler_deterministic") {
@@ -1530,7 +1537,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@ -74,7 +74,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1576,7 +1583,7 @@ config("compiler_deterministic") {
@@ -1582,7 +1589,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -83,7 +83,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1877,12 +1884,9 @@ config("default_warnings") {
@@ -1890,9 +1897,6 @@ config("default_warnings") {
# TODO(crbug.com/1494809): Evaluate and possibly enable.
"-Wno-vla-extension",
@ -92,12 +92,17 @@
- "-Wno-thread-safety-reference-return",
]
cflags_cc += [
@@ -1900,7 +1904,7 @@ config("default_warnings") {
"-Wenum-compare-conditional",
]
- if (!is_nacl) {
+ if (!is_nacl && !is_bsd) {
cflags_cc += [
# TODO(https://crbug.com/1513724): Fix and re-enable.
"-Wno-c++11-narrowing-const-reference",
@@ -2100,7 +2104,7 @@ config("no_chromium_code") {
@@ -2089,7 +2093,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -106,7 +111,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2619,7 +2623,7 @@ config("afdo_optimize_size") {
@@ -2597,7 +2601,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@ -115,7 +120,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2646,7 +2650,7 @@ config("afdo") {
@@ -2624,7 +2628,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@ -124,7 +129,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2810,7 +2814,8 @@ config("symbols") {
@@ -2788,7 +2792,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

4
www/ungoogled-chromium/files/patch-build_config_rust.gni
View file

@ -1,6 +1,6 @@
--- build/config/rust.gni.orig 2024-03-22 14:16:19 UTC
--- build/config/rust.gni.orig 2024-04-23 07:42:17 UTC
+++ build/config/rust.gni
@@ -280,6 +280,10 @@ if (is_linux || is_chromeos) {
@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) {
}
}

27
www/ungoogled-chromium/files/patch-build_linux_unbundle_libwebp.gn Normal file
View file

@ -0,0 +1,27 @@
--- build/linux/unbundle/libwebp.gn.orig 2024-04-23 07:42:17 UTC
+++ build/linux/unbundle/libwebp.gn
@@ -22,6 +22,8 @@ shim_headers("libwebp_shim") {
"webp/mux.h",
"webp/mux_types.h",
"webp/types.h",
+ "webp/sharpyuv/sharpyuv.h",
+ "webp/sharpyuv/sharpyuv_csp.h",
]
}
@@ -30,6 +32,14 @@ source_set("libwebp_webp") {
public_configs = [ ":system_libwebp" ]
}
+source_set("libwebp_sharpyuv") {
+ deps = [ ":libwebp_shim" ]
+ public_configs = [ ":system_libwebp" ]
+}
+
group("libwebp") {
- deps = [ ":libwebp_webp" ]
+ deps = [
+ ":libwebp_webp",
+ ":libwebp_sharpyuv",
+ ]
}

6
www/ungoogled-chromium/files/patch-cc_BUILD.gn
View file

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2024-03-22 14:16:19 UTC
--- cc/BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ cc/BUILD.gn
@@ -678,7 +678,7 @@ cc_test_static_library("test_support") {
@@ -681,7 +681,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
if (skia_use_dawn) {
@@ -937,7 +937,6 @@ cc_test("cc_unittests") {
@@ -940,7 +940,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

52
www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
View file

@ -1,4 +1,4 @@
--- chrome/app/chrome_main_delegate.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -146,7 +146,7 @@
#include "components/about_ui/credit_utils.h"
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -188,16 +188,16 @@
@@ -189,20 +189,20 @@
#include "v8/include/v8.h"
#endif
@ -18,6 +18,11 @@
#include "base/environment.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/nix/scoped_xdg_activation_token_injector.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "base/message_loop/message_pump_libevent.h"
@ -29,7 +34,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -337,7 +337,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -346,7 +346,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -38,7 +43,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -431,7 +431,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -47,7 +52,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
@@ -481,7 +481,7 @@ void AddFeatureFlagsToCommandLine(
@@ -477,7 +477,7 @@ void SetCrashpadUploadConsentPostLogin() {
}
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -56,7 +61,16 @@
void SIGTERMProfilingShutdown(int signal) {
content::Profiling::Stop();
struct sigaction sigact;
@@ -636,7 +636,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -559,7 +559,7 @@ std::optional<int> AcquireProcessSingleton(
// process can be exited.
ChromeProcessSingleton::CreateInstance(user_data_dir);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Read the xdg-activation token and set it in the command line for the
// duration of the notification in order to ensure this is propagated to an
// already running browser process if it exists.
@@ -643,7 +643,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -65,7 +79,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
@@ -763,7 +763,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -74,25 +88,25 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -1116,7 +1116,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
@@ -1155,7 +1155,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
chrome::GetChannel() == version_info::Channel::DEV;
const bool emit_crashes =
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
chrome::GetChannel() == version_info::Channel::CANARY ||
chrome::GetChannel() == version_info::Channel::DEV;
is_canary_dev;
#else
@@ -1130,7 +1130,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
base::sequence_manager::internal::ThreadController::InitializeFeatures();
false;
@@ -1174,7 +1174,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
// for more context.
base::sequence_manager::internal::ThreadController::InitializeFeatures(
/*record_sample_metadata=*/is_canary_dev);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
@@ -1276,7 +1276,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1323,7 +1323,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -101,7 +115,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1306,7 +1306,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1353,7 +1353,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -110,7 +124,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1703,7 +1703,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1750,7 +1750,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -119,7 +133,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1804,7 +1804,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1851,7 +1851,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.

4
www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn
View file

@ -1,6 +1,6 @@
--- chrome/browser/BUILD.gn.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/BUILD.gn
@@ -6490,6 +6490,13 @@ static_library("browser") {
@@ -6529,6 +6529,13 @@ static_library("browser") {
}
}

67
www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/about_flags.cc.orig 2024-04-04 19:16:34 UTC
--- chrome/browser/about_flags.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/about_flags.cc
@@ -235,7 +235,7 @@
#include "ui/ui_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -327,7 +327,7 @@
@@ -323,7 +323,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@ -18,16 +18,16 @@
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -336,7 +336,7 @@
@@ -332,7 +332,7 @@
#include "chrome/browser/win/titlebar_config.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#include "components/supervised_user/core/common/features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -493,7 +493,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -490,7 +490,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -36,7 +36,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1375,7 +1375,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
@@ -1385,7 +1385,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -45,7 +45,7 @@
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
{"ShortcutBoostSearchScore", "0"},
{"ShortcutBoostNonTopHitThreshold", "0"},
@@ -3688,7 +3688,7 @@ const flags_ui::FeatureEntry::FeatureVariation
@@ -3705,7 +3705,7 @@ const flags_ui::FeatureEntry::FeatureVariation
std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
};
@ -54,7 +54,7 @@
const flags_ui::FeatureEntry::FeatureParam
kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
const flags_ui::FeatureEntry::FeatureParam
@@ -4434,7 +4434,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4504,7 +4504,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_ANDROID)
@ -63,7 +63,7 @@
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
@@ -4873,7 +4873,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4945,7 +4945,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -72,7 +72,7 @@
{"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
flag_descriptions::kShortcutsNotAppsDescription,
kOsMac | kOsWin | kOsLinux | kOsFuchsia,
@@ -5002,7 +5002,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5070,7 +5070,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -81,7 +81,7 @@
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5018,7 +5018,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5086,7 +5086,7 @@ const FeatureEntry kFeatureEntries[] = {
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
#endif // BUILDFLAG(IS_LINUX)
@ -90,25 +90,16 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5301,7 +5301,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kRefreshFeedOnRestart)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -5952,7 +5952,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5990,7 +5990,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
{"omnibox-actions-ui-simplification",
flag_descriptions::kOmniboxActionsUISimplificationName,
flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop,
@@ -6809,7 +6809,7 @@ const FeatureEntry kFeatureEntries[] = {
{"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6861,7 +6861,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@ -117,7 +108,7 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(net::features::kAsyncDns)},
@@ -7794,7 +7794,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7866,7 +7866,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -126,16 +117,16 @@
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -7827,7 +7827,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)},
@@ -7890,7 +7890,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
#endif
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
@@ -8725,7 +8725,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8742,7 +8742,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -144,7 +135,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -8767,7 +8767,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8784,7 +8784,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -153,7 +144,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9056,7 +9056,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9053,7 +9053,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -162,7 +153,7 @@
{"policy-indication-for-managed-default-search",
flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
@@ -9360,7 +9360,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9349,7 +9349,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -171,7 +162,7 @@
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
@@ -10350,7 +10350,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10289,7 +10289,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@ -180,7 +171,7 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10381,7 +10381,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10327,7 +10327,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -189,7 +180,7 @@
{"site-search-settings-policy",
flag_descriptions::kSiteSearchSettingsPolicyName,
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
@@ -10511,7 +10511,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10461,7 +10461,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
#endif
@ -198,7 +189,7 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -10854,7 +10854,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10813,7 +10813,7 @@ const FeatureEntry kFeatureEntries[] = {
trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
#endif
@ -207,7 +198,7 @@
{"restart-to-gain-access-to-keychain",
flag_descriptions::kRestartToGainAccessToKeychainName,
flag_descriptions::kRestartToGainAccessToKeychainDescription,
@@ -11108,7 +11108,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11087,7 +11087,7 @@ const FeatureEntry kFeatureEntries[] = {
// Controls the view mode for (history) sync screen.
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \

10
www/ungoogled-chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2024-02-03 15:42:55 UTC
--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/apps/app_service/publishers/extension_apps.cc
@@ -24,7 +24,7 @@ ExtensionApps::~ExtensionApps() = default;
@@ -23,7 +23,7 @@ ExtensionApps::ExtensionApps(AppServiceProxy* proxy)
ExtensionApps::~ExtensionApps() = default;
bool ExtensionApps::Accepts(const extensions::Extension* extension) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(),
extension->id())) {
return false;

63
www/ungoogled-chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
View file

@ -1,20 +1,65 @@
--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.cc
@@ -20,7 +20,7 @@
@@ -19,7 +19,7 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
@@ -86,7 +86,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
if (launch_container == LaunchContainer::kLaunchContainerTab)
return false;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
return false;
}
@@ -118,7 +118,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
if (launch_container != apps::LaunchContainer::kLaunchContainerTab)
return nullptr;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
return nullptr;
}
@@ -134,7 +134,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
return app_tab;
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool OpenDeprecatedApplicationPrompt(Profile* profile,
const std::string& app_id) {
if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id))
@@ -170,7 +170,7 @@ bool OpenExtensionApplicationWithReenablePrompt(
if (!GetPlatformApp(profile, app_id))
return false;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (OpenDeprecatedApplicationPrompt(profile, app_id)) {
return false;
}
@@ -192,7 +192,7 @@ content::WebContents* OpenExtensionAppShortcutWindow(P
->enabled_extensions()
.GetAppByURL(url);
if (app) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (OpenDeprecatedApplicationPrompt(profile, app->id())) {
return nullptr;
}
@@ -215,7 +215,7 @@ void RecordExtensionAppLaunchOnTabRestored(Profile* pr
if (!extension)
return;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (OpenDeprecatedApplicationPrompt(profile, extension->id())) {
return;
}

6
www/ungoogled-chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
View file

@ -1,7 +1,7 @@
--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.h
@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id);
@@ -39,7 +39,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
const std::string& app_id);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)

4
www/ungoogled-chromium/files/patch-chrome_browser_background_background__mode__manager.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/background/background_mode_manager.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/background/background_mode_manager.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/background/background_mode_manager.cc
@@ -870,7 +870,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
@@ -872,7 +872,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();

6
www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/browser_features.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/browser_features.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/browser_features.cc
@@ -44,7 +44,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
@@ -76,7 +76,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose",
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -9,7 +9,7 @@
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -328,7 +328,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2,
@@ -337,7 +337,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
"SupportSearchSuggestionForPrerender2",
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \

18
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -128,13 +128,13 @@
@@ -129,13 +129,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
@@ -222,7 +222,7 @@
@@ -224,7 +224,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,7 +25,7 @@
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor(
@@ -834,7 +834,7 @@ void BindScreen2xMainContentExtractor(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -34,7 +34,7 @@
void BindVisualSuggestionsModelProvider(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<
@@ -1027,7 +1027,7 @@ void PopulateChromeFrameBinders(
@@ -1030,7 +1030,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -43,7 +43,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -1035,7 +1035,7 @@ void PopulateChromeFrameBinders(
@@ -1038,7 +1038,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -52,7 +52,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -1122,7 +1122,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1125,7 +1125,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -61,7 +61,7 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1134,7 +1134,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -70,7 +70,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1687,7 +1687,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1704,7 +1704,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

34
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -246,11 +246,11 @@
@@ -246,15 +246,15 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -14,7 +14,12 @@
#include "components/crash/core/app/crashpad.h"
#endif
@@ -283,14 +283,14 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/nix/xdg_util.h"
#endif
@@ -287,14 +287,14 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -31,7 +36,7 @@
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
#include "components/headless/select_file_dialog/headless_select_file_dialog.h"
@@ -352,14 +352,14 @@
@@ -361,14 +361,14 @@
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -48,7 +53,16 @@
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
FILE_PATH_LITERAL("Media History");
@@ -1074,7 +1074,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -523,7 +523,7 @@ void ProcessSingletonNotificationCallbackImpl(
}
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Set the global activation token sent as a command line switch by another
// browser process. This also removes the switch after use to prevent any side
// effects of leaving it in the command line after this point.
@@ -1090,7 +1090,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -57,7 +71,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1122,7 +1122,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1138,7 +1138,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -66,7 +80,7 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1321,7 +1321,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1329,7 +1329,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -75,7 +89,7 @@
// Delete the media history database if it still exists.
// TODO(crbug.com/1198344): Remove this.
base::ThreadPool::PostTask(
@@ -1370,7 +1370,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1378,7 +1378,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -84,7 +98,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1478,7 +1478,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1486,7 +1486,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.
@ -93,7 +107,7 @@
if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp();
}
@@ -2012,7 +2012,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
@@ -2026,7 +2026,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from
// a headless Chrome process.

4
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
@@ -117,7 +117,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
@@ -169,7 +169,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {

4
www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc
@@ -31,7 +31,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM
@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM
}
void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() {

35
www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -456,7 +456,7 @@
@@ -459,7 +459,7 @@
#include "storage/browser/file_system/external_mount_points.h"
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#elif BUILDFLAG(IS_ANDROID)
@@ -564,12 +564,12 @@
@@ -568,12 +568,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -24,15 +24,16 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -580,14 +580,14 @@
@@ -584,7 +584,7 @@
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
#include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
#include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
#include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
@@ -592,7 +592,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -41,7 +42,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -603,7 +603,7 @@
@@ -608,7 +608,7 @@
#include "components/lens/lens_features.h"
#endif
@ -50,7 +51,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1470,7 +1470,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1477,7 +1477,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
#if BUILDFLAG(IS_CHROMEOS)
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
#endif // BUILDFLAG(IS_CHROMEOS)
@ -59,7 +60,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1591,7 +1591,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1601,7 +1601,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -68,7 +69,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1628,7 +1628,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1638,7 +1638,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -77,7 +78,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1649,7 +1649,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1659,7 +1659,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -86,7 +87,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1668,7 +1668,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1678,7 +1678,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -95,7 +96,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2808,7 +2808,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2832,7 +2832,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -104,7 +105,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4491,7 +4491,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4536,7 +4536,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -113,7 +114,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5046,7 +5046,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5090,7 +5090,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -122,7 +123,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5056,7 +5056,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5104,7 +5104,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -131,7 +132,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5087,7 +5087,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5135,7 +5135,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@ -140,7 +141,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -7005,7 +7005,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7059,7 +7059,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be
// launched there.

4
www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -497,7 +497,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -500,7 +500,7 @@ class ChromeContentBrowserClient : public content::Con
bool IsPluginAllowedToUseDevChannelAPIs(
content::BrowserContext* browser_context,
const GURL& url) override;

6
www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1645,7 +1645,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1671,7 +1671,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
@@ -1711,7 +1711,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1737,7 +1737,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

8
www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/download/download_item_model.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -744,7 +744,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -749,7 +749,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
@@ -790,7 +790,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -795,7 +795,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1065,7 +1065,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1145,7 +1145,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

18
www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/download/download_prefs.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
#include <vector>
@ -8,7 +8,7 @@
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
@@ -63,6 +64,10 @@
@@ -64,6 +65,10 @@
#include "chrome/browser/flags/android/chrome_feature_list.h"
#endif
@ -19,7 +19,7 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -73,7 +78,7 @@ namespace {
@@ -74,7 +79,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@ -28,7 +28,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -179,7 +184,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -298,7 +303,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -299,7 +304,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -461,7 +466,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -462,7 +467,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
@@ -493,7 +498,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -494,7 +499,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
@@ -533,7 +538,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -534,7 +539,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
@@ -657,7 +662,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -686,7 +691,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.

29
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc Normal file
View file

@ -0,0 +1,29 @@
--- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/enterprise/browser_management/browser_management_service.cc
@@ -21,7 +21,7 @@ namespace policy {
namespace {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void UpdateEnterpriseLogo(
Profile* profile,
base::OnceCallback<void(const gfx::Image&,
@@ -98,7 +98,7 @@ GetManagementStatusProviders(Profile* profile) {
} // namespace
BrowserManagementMetadata::BrowserManagementMetadata(Profile* profile) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
UpdateManagementLogo(profile);
pref_change_registrar_.Init(profile->GetPrefs());
pref_change_registrar_.Add(
@@ -114,7 +114,7 @@ const gfx::Image& BrowserManagementMetadata::GetManage
return management_logo_;
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void BrowserManagementMetadata::UpdateManagementLogo(Profile* profile) {
UpdateEnterpriseLogo(
profile, base::BindOnce(&BrowserManagementMetadata::SetManagementLogo,

11
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/enterprise/browser_management/browser_management_service.h
@@ -28,7 +28,7 @@ class BrowserManagementMetadata {
const gfx::Image& GetManagementLogo() const;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
private:
void UpdateManagementLogo(Profile* profile);
void SetManagementLogo(

4
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
@@ -513,7 +513,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
@@ -519,7 +519,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_);

6
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -58,7 +58,7 @@
#include "base/strings/utf_string_conversions.h"
@ -18,7 +18,7 @@
void PopulateSignals(base::Value::Dict event,
policy::CloudPolicyClient* client,
std::string name,
@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
/*include_profile_user_name=*/false);
}
@ -27,7 +27,7 @@
void AddCrowdstrikeSignalsToEvent(
base::Value::Dict& event,
@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
if (include_profile_user_name) {
event.Set(kKeyProfileUserName, GetProfileUserName());
}

20
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc Normal file
View file

@ -0,0 +1,20 @@
--- chrome/browser/enterprise/watermark/watermark_view.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/enterprise/watermark/watermark_view.cc
@@ -33,7 +33,7 @@ const gfx::Font& WatermarkFont() {
"Segoe UI",
#elif BUILDFLAG(IS_MAC)
"SF Pro Text",
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
"Ubuntu",
#elif BUILDFLAG(IS_CHROMEOS)
"Google Sans",
@@ -45,7 +45,7 @@ const gfx::Font& WatermarkFont() {
}
gfx::Font::Weight WatermarkFontWeight() {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return gfx::Font::Weight::SEMIBOLD;
#else
return gfx::Font::Weight::MEDIUM;

4
www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1370,6 +1370,10 @@ static_library("extensions") {
@@ -1378,6 +1378,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

8
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
View file

@ -1,15 +1,15 @@
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-02-03 15:42:55 UTC
--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -44,7 +44,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
@@ -45,7 +45,7 @@
#include "printing/buildflags/buildflags.h"
#include "services/screen_ai/buildflags/buildflags.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
@@ -126,7 +126,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
@@ -127,7 +127,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SidePanelService::GetFactoryInstance();

11
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
apps::LaunchContainer launch_container =
GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
Profile* profile = Profile::FromBrowserContext(context);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (extensions::IsExtensionUnsupportedDeprecatedApp(profile,
extension->id())) {
return false;

4
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
@@ -605,7 +605,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

4
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -281,7 +281,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
} else if (strcmp(os, "linux") == 0) {
info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "openbsd") == 0) {

6
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
settings_api::PrefType::kBoolean;
@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::kBoolean;
#endif
@@ -212,7 +212,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// Appearance settings.
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;

4
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -866,7 +866,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
@@ -867,7 +867,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
// minimized.
// TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
// TODO(crbug.com/1410400): Find a fix for wayland as well.

10
www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
View file

@ -1,9 +1,9 @@
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-02-03 15:42:55 UTC
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -892,7 +892,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
RequestExtensionApproval(contents);
return;
}
@@ -922,7 +922,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
#if BUILDFLAG(IS_CHROMEOS)
RequestExtensionApproval(contents);
return;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// Shows a parental permission dialog directly bypassing the extension

4
www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -315,7 +315,7 @@ const struct {
@@ -316,7 +316,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif

22
www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2024-04-04 19:16:34 UTC
--- chrome/browser/flag_descriptions.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -2940,7 +2940,7 @@ const char kCbdTimeframeRequiredDescription[] =
@@ -2950,7 +2950,7 @@ const char kCbdTimeframeRequiredDescription[] =
"value to the list.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
const char kPolicyIndicationForManagedDefaultSearchName[] =
"Enable policy indication for managed Default Search provider";
const char kPolicyIndicationForManagedDefaultSearchDescription[] =
@@ -3265,7 +3265,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
@@ -3263,7 +3263,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
"but in the same SiteInstanceGroup, and thus the same process.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
const char kSiteSearchSettingsPolicyDescription[] =
"Allow site search engines to be defined by the SiteSearchSettings policy.";
@@ -7494,7 +7494,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
@@ -7500,7 +7500,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -27,7 +27,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7740,7 +7740,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
@@ -7760,7 +7760,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
// Linux -----------------------------------------------------------------------
@ -36,7 +36,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7788,7 +7788,7 @@ const char kZeroCopyVideoCaptureDescription[] =
@@ -7808,7 +7808,7 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -45,7 +45,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7803,7 +7803,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
@@ -7823,7 +7823,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
@ -54,7 +54,7 @@
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7835,7 +7835,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -7855,7 +7855,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -63,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -7855,7 +7855,7 @@ const char kRestartToGainAccessToKeychainDescription[]
@@ -7875,7 +7875,7 @@ const char kRestartToGainAccessToKeychainDescription[]
"to restart Chrome to gain access to computer's password manager.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -72,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -7956,7 +7956,7 @@ const char kElementCaptureDescription[] =
@@ -7976,7 +7976,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -81,7 +81,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -8005,7 +8005,7 @@ const char kComposeTextSelectionDescription[] =
@@ -8025,7 +8025,7 @@ const char kComposeTextSelectionDescription[] =
"Enables feature for different heuristics for selecting text for Compose";
#endif // BUILDFLAG(ENABLE_COMPOSE)

20
www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2024-04-04 19:16:34 UTC
--- chrome/browser/flag_descriptions.h.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/flag_descriptions.h
@@ -1697,7 +1697,7 @@ extern const char kCbdTimeframeRequiredName[];
@@ -1712,7 +1712,7 @@ extern const char kCbdTimeframeRequiredName[];
extern const char kCbdTimeframeRequiredDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,7 @@
extern const char kPolicyIndicationForManagedDefaultSearchName[];
extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
#endif
@@ -1882,7 +1882,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
@@ -1893,7 +1893,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
extern const char kSiteSearchSettingsPolicyName[];
extern const char kSiteSearchSettingsPolicyDescription[];
#endif
@@ -4308,7 +4308,7 @@ extern const char kLacrosMergeIcuDataFileName[];
@@ -4326,7 +4326,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -27,7 +27,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4448,7 +4448,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
@@ -4474,7 +4474,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
// Linux ---------------------------------------------------------------------
@ -36,7 +36,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4490,7 +4490,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4516,7 +4516,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -45,7 +45,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4501,13 +4501,13 @@ extern const char kRestartToGainAccessToKeychainName[]
@@ -4527,13 +4527,13 @@ extern const char kRestartToGainAccessToKeychainName[]
extern const char kRestartToGainAccessToKeychainDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -61,7 +61,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4518,7 +4518,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
@@ -4544,7 +4544,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@ -70,7 +70,7 @@
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4595,7 +4595,7 @@ extern const char kElementCaptureDescription[];
@@ -4621,7 +4621,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -79,7 +79,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4629,7 +4629,7 @@ extern const char kComposeTextSelectionName[];
@@ -4655,7 +4655,7 @@ extern const char kComposeTextSelectionName[];
extern const char kComposeTextSelectionDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)

12
www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -79,8 +79,10 @@
@@ -80,8 +80,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -105,7 +107,7 @@
@@ -106,7 +108,7 @@
#include "chromeos/crosapi/cpp/crosapi_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -21,7 +21,7 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -114,7 +116,7 @@
@@ -115,7 +117,7 @@
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -30,7 +30,7 @@
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -838,7 +840,7 @@ void RecordStartupMetrics() {
@@ -858,7 +860,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@ -39,7 +39,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
@@ -1142,11 +1144,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -1162,11 +1164,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)

29
www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -193,7 +193,7 @@
@@ -194,7 +194,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -210,7 +210,7 @@
@@ -211,7 +211,7 @@
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
#endif
@ -18,7 +18,7 @@
#include "chrome/browser/metrics/bluetooth_metrics_provider.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -586,7 +586,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
@@ -577,7 +577,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -27,7 +27,7 @@
metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
#if !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -773,7 +773,7 @@ void ChromeMetricsServiceClient::Initialize() {
@@ -749,7 +749,7 @@ void ChromeMetricsServiceClient::Initialize() {
RegisterUKMProviders();
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -36,7 +36,7 @@
metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
base::SequencedTaskRunner::GetCurrentDefault());
#endif
@@ -820,7 +820,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -796,7 +796,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -45,7 +45,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -905,7 +905,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -881,7 +881,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@ -54,7 +54,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
@@ -1015,7 +1015,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -991,7 +991,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -63,16 +63,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1180,7 +1180,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
// Begin initializing the structured metrics system. Initialization must wait
// until a profile is added, because it reads keys stored within the user's
// cryptohome. We only initialize for profiles that are valid candidates
@@ -1211,7 +1211,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1170,7 +1170,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@ -81,7 +72,7 @@
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
@@ -1554,7 +1554,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
@@ -1513,7 +1513,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
recorder =
std::make_unique<metrics::structured::AshStructuredMetricsRecorder>(
cros_system_profile_provider_.get());

4
www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf
@@ -65,7 +65,7 @@ void RecordProcessHistograms(const char* histogram_suf
const ProcessMonitor::Metrics& metrics) {
RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage);
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

14
www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
View file

@ -1,7 +1,7 @@
--- chrome/browser/metrics/power/process_monitor.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/metrics/power/process_monitor.cc
@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
#endif
@@ -61,7 +61,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
metrics.cpu_usage = process_metrics.GetPlatformIndependentCPUUsage();
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
@ -9,8 +9,8 @@
metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
#endif
#if BUILDFLAG(IS_MAC)
@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
metrics->cpu_usage *= factor;
@@ -79,7 +79,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
}
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
@ -18,8 +18,8 @@
metrics->idle_wakeups *= factor;
#endif
@@ -172,7 +172,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
lhs.cpu_usage += rhs.cpu_usage;
@@ -167,7 +167,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
}
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)

6
www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
View file

@ -1,7 +1,7 @@
--- chrome/browser/metrics/power/process_monitor.h.orig 2022-12-02 17:56:32 UTC
--- chrome/browser/metrics/power/process_monitor.h.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/metrics/power/process_monitor.h
@@ -75,7 +75,7 @@ class ProcessMonitor : public content::BrowserChildPro
double cpu_usage = 0.0;
@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro
std::optional<double> cpu_usage;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)

4
www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -94,7 +94,7 @@
@ -163,7 +163,7 @@
if (!enabled) {
g_network_service_will_allow_gssapi_library_load = true;
}
@@ -1062,7 +1062,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
@@ -1055,7 +1055,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

8
www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/net/system_network_context_manager.h.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/net/system_network_context_manager.h.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/net/system_network_context_manager.h
@@ -204,7 +204,7 @@ class SystemNetworkContextManager {
@@ -200,7 +200,7 @@ class SystemNetworkContextManager {
class URLLoaderFactoryForSystem;
class NetworkProcessLaunchWatcher;
@ -9,7 +9,7 @@
class GssapiLibraryLoadObserver
: public network::mojom::GssapiLibraryLoadObserver {
public:
@@ -240,7 +240,7 @@ class SystemNetworkContextManager {
@@ -236,7 +236,7 @@ class SystemNetworkContextManager {
void UpdateExplicitlyAllowedNetworkPorts();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +18,7 @@
// Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
// pref to the enforcement state.
void UpdateEnforceLocalAnchorConstraintsEnabled();
@@ -290,7 +290,7 @@ class SystemNetworkContextManager {
@@ -286,7 +286,7 @@ class SystemNetworkContextManager {
std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_;

13
www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
View file

@ -1,6 +1,15 @@
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -670,7 +670,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
@@ -467,7 +467,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin
bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling(
device_reauth::DeviceAuthenticator* authenticator) {
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
return false;
}
@@ -690,7 +690,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
}
void ChromePasswordManagerClient::NotifyKeychainError() {

8
www/ungoogled-chromium/files/patch-chrome_browser_platform__util__linux.cc
View file

@ -1,8 +1,8 @@
--- chrome/browser/platform_util_linux.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/platform_util_linux.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/platform_util_linux.cc
@@ -300,7 +300,9 @@ void RunCommand(const std::string& command,
base::LaunchOptions options;
@@ -300,7 +300,9 @@ void OnLaunchOptionsCreated(const std::string& command
argv.push_back(command);
argv.push_back(arg);
options.current_directory = working_directory;
+#if !BUILDFLAG(IS_BSD)
options.allow_new_privs = true;

72
www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -226,19 +226,20 @@
@@ -231,19 +231,20 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -24,7 +24,7 @@
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ||
@@ -253,13 +254,13 @@
@@ -258,13 +259,13 @@
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -40,7 +40,7 @@
#include "components/search_engines/site_search_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -825,14 +826,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -839,14 +840,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -57,7 +57,7 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1605,7 +1606,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1625,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -66,7 +66,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1650,7 +1651,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1673,7 +1674,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@ -75,7 +75,7 @@
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
@@ -1676,18 +1677,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1699,12 +1700,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -90,6 +90,8 @@
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN },
@@ -1713,7 +1714,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
- || BUILDFLAG(IS_FUCHSIA)
@ -97,7 +99,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1700,7 +1701,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1726,7 +1727,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@ -106,7 +108,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1798,7 +1799,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1824,7 +1825,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -115,25 +117,16 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1896,7 +1897,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1454054): replace the
// kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
// matches the name of the new `getAllScreensMedia` API.
@@ -1905,7 +1906,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1931,7 +1932,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1930,7 +1931,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1956,7 +1957,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -142,7 +135,7 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1991,7 +1992,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2014,7 +2015,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -151,7 +144,7 @@
{ key::kTabDiscardingExceptions,
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
base::Value::Type::LIST },
@@ -2019,7 +2020,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2042,7 +2043,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN)
@ -160,7 +153,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -2042,7 +2043,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2068,7 +2069,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedPrivateNetworkAccessRestrictionsEnabled,
base::Value::Type::BOOLEAN },
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -169,7 +162,7 @@
{ key::kExtensionInstallTypeBlocklist,
extensions::pref_names::kExtensionInstallTypeBlocklist,
base::Value::Type::LIST},
@@ -2063,7 +2064,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -2089,7 +2090,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed,
base::Value::Type::INTEGER},
#endif
@ -178,7 +171,7 @@
{ key::kChromeForTestingAllowed,
prefs::kChromeForTestingAllowed,
base::Value::Type::BOOLEAN },
@@ -2178,7 +2179,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2208,7 +2209,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -187,7 +180,7 @@
handlers->AddHandler(
std::make_unique<performance_manager::MemorySaverPolicyHandler>());
// Note: This needs to be created after `DefaultSearchPolicyHandler`.
@@ -2186,7 +2187,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2216,7 +2217,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -195,8 +188,8 @@
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
handlers->AddHandler(
std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2362,7 +2363,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2405,7 +2406,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -205,7 +198,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2420,7 +2421,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2463,7 +2464,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -214,7 +207,16 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler(
@@ -2821,7 +2822,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2498,7 +2499,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)));
-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
handlers->AddHandler(
std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2875,7 +2876,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -223,7 +225,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2829,7 +2830,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2883,7 +2884,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -232,16 +234,16 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2846,7 +2847,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2900,7 +2901,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
/*new_policy_handler=*/std::make_unique<
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
policy::key::kRelatedWebsiteSetsOverrides, chrome_schema)));
key::kRelatedWebsiteSetsOverrides, chrome_schema)));
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2871,7 +2872,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2927,7 +2928,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
base::Value::Type::BOOLEAN)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

6
www/ungoogled-chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2023-07-21 09:49:17 UTC
--- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/policy/device_management_service_configuration.cc
@@ -22,7 +22,7 @@
@@ -24,7 +24,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/common.h"
#include "chrome/browser/enterprise/connectors/connectors_service.h"
#endif
@@ -100,7 +100,7 @@ DeviceManagementServiceConfiguration::GetReportingConn
@@ -102,7 +102,7 @@ DeviceManagementServiceConfiguration::GetReportingConn
content::BrowserContext* context) const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \

10
www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -486,18 +486,18 @@
@@ -485,18 +485,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -22,7 +22,7 @@
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#endif
@@ -532,7 +532,7 @@
@@ -531,7 +531,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -31,7 +31,7 @@
#include "ui/color/system_theme.h"
#endif
@@ -1681,7 +1681,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -1711,7 +1711,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true);
#endif
@ -40,7 +40,7 @@
registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
#endif
@@ -2024,12 +2024,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -2053,12 +2053,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
@@ -175,7 +175,7 @@ const char* const kPersistentPrefNames[] = {
@@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = {
prefs::kShowFullscreenToolbar,
#endif

6
www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -34,7 +34,7 @@
#include "printing/printing_context.h"
@ -9,7 +9,7 @@
#include "content/public/common/content_switches.h"
#endif
@@ -853,7 +853,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
@@ -861,7 +861,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
host.BindNewPipeAndPassReceiver(),
content::ServiceProcessHost::Options()
.WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
@ -18,7 +18,7 @@
.WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
#endif
.Pass());
@@ -1026,7 +1026,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
@@ -1038,7 +1038,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:

26
www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -316,7 +316,7 @@
@@ -320,7 +320,7 @@
#include "chromeos/constants/chromeos_features.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
#endif
@@ -407,18 +407,18 @@
@@ -411,18 +411,18 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -29,9 +29,9 @@
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -647,7 +647,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
#include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
@@ -657,7 +657,7 @@ void ChromeBrowserMainExtraPartsProfiles::
DiceBoundSessionCookieServiceFactory::GetInstance();
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
@ -40,7 +40,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
browser_sync::UserEventServiceFactory::GetInstance();
@@ -766,26 +766,26 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -780,26 +780,26 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -72,7 +72,7 @@
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -909,7 +909,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -923,7 +923,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -81,25 +81,25 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
@@ -1011,7 +1011,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1026,7 +1026,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
policy::UserPolicyOidcSigninServiceFactory::GetInstance();
#endif
policy::UserCloudPolicyInvalidatorFactory::GetInstance();
@@ -1052,7 +1052,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1068,7 +1068,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
ProfileStatisticsFactory::GetInstance();
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ProfileTokenWebSigninInterceptorFactory::GetInstance();
OidcAuthenticationSigninInterceptorFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_ANDROID)
@@ -1070,7 +1070,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1087,7 +1087,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
ReduceAcceptLanguageFactory::GetInstance();
RendererUpdaterFactory::GetInstance();

6
www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/profiles/profile_impl.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/profiles/profile_impl.cc.orig 2024-04-23 07:42:17 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -265,6 +265,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -596,7 +600,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
@@ -598,7 +602,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
#else
{
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -20,7 +20,7 @@
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileAttributesEntry* entry =
profile_manager->GetProfileAttributesStorage()
@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -880,7 +884,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {

Some files were not shown because too many files have changed in this diff Show more