sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 09:36:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/ungoogled-chromium: update to 126.0.6478.114

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/007e7e77-2f06-11ef-8a0f-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2024-06-22 19:07:28 +02:00
parent 4d25fc21be
commit 420e77c8e8
435 changed files with 2069 additions and 1850 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/ungoogled-chromium/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 125.0.6422.141
PORTREVISION= 1
PORTVERSION= 126.0.6478.114
UGVERSION= ${DISTVERSION}-1
PULSEMV= 16
PULSEV= ${PULSEMV}.1

14
www/ungoogled-chromium/distinfo
View file

@ -1,11 +1,11 @@
TIMESTAMP = 1717418110
SHA256 (chromium-125.0.6422.141.tar.xz) = 9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603
SIZE (chromium-125.0.6422.141.tar.xz) = 3470583616
SHA256 (ungoogled-chromium-125.0.6422.141-1.tar.gz) = c7b8ed60dacb22dde8ee69ca82ab9e92e0fa2f9372b7edb441ef6d20dc356f39
SIZE (ungoogled-chromium-125.0.6422.141-1.tar.gz) = 668658
TIMESTAMP = 1719046105
SHA256 (chromium-126.0.6478.114.tar.xz) = cf4aad7fccc2a6c2339691c23f4c46ef2818e2474a9f83292b237eaa958015ed
SIZE (chromium-126.0.6478.114.tar.xz) = 4167281776
SHA256 (ungoogled-chromium-126.0.6478.114-1.tar.gz) = ef62c96b0689f2df38636e84a3fffdb924fdcd51ad0b6ec611045ebf58d9f550
SIZE (ungoogled-chromium-126.0.6478.114-1.tar.gz) = 1258507
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
SHA256 (chromium-125.0.6422.141-testdata.tar.xz) = 96ff1038b1ac6a1679d72d137ec0558f6174f1f20c712f79bbc7ccedd5ee2fd0
SIZE (chromium-125.0.6422.141-testdata.tar.xz) = 280241644
SHA256 (chromium-126.0.6478.114-testdata.tar.xz) = 718c08b1ef3ea8a762b7a276071af9c7c728a2cf2b44721cc616687396d7ccbf
SIZE (chromium-126.0.6478.114-testdata.tar.xz) = 279963992
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

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

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2024-05-23 20:04:36 UTC
--- BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ BUILD.gn
@@ -65,7 +65,7 @@ declare_args() {
root_extra_deps = []
@ -60,7 +60,7 @@
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1175,7 +1183,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)" ]
}
@@ -1184,7 +1192,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)" ]
}
@@ -1644,7 +1652,7 @@ group("chromium_builder_perf") {
@@ -1646,7 +1654,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

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

@ -1,8 +1,8 @@
--- apps/ui/views/app_window_frame_view.cc.orig 2024-02-03 15:42:55 UTC
--- apps/ui/views/app_window_frame_view.cc.orig 2024-06-22 08:49:42 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
gfx::Rect window_bounds = client_bounds;
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
// complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)

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

@ -1,4 +1,4 @@
--- base/BUILD.gn.orig 2024-05-23 20:04:36 UTC
--- base/BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ base/BUILD.gn
@@ -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"
@@ -1141,11 +1141,23 @@ component("base") {
@@ -1142,11 +1142,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" ]
@@ -1165,7 +1177,7 @@ component("base") {
@@ -1166,7 +1178,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2125,6 +2137,22 @@ component("base") {
@@ -2126,6 +2138,22 @@ component("base") {
]
}
@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2270,6 +2298,33 @@ component("base") {
@@ -2271,6 +2299,33 @@ component("base") {
}
}
@ -100,7 +100,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2280,7 +2335,7 @@ component("base") {
@@ -2281,7 +2336,7 @@ component("base") {
}
if (dep_libevent) {
@ -109,7 +109,7 @@
}
if (use_libevent) {
@@ -3093,7 +3148,7 @@ if (is_apple) {
@@ -3094,7 +3149,7 @@ if (is_apple) {
}
}
@ -118,7 +118,7 @@
# This test must compile with -fstack-protector-all
source_set("stack_canary_linux_unittests") {
testonly = true
@@ -3745,7 +3800,7 @@ test("base_unittests") {
@@ -3743,7 +3798,7 @@ test("base_unittests") {
]
}
@ -127,7 +127,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3772,7 +3827,7 @@ test("base_unittests") {
@@ -3770,7 +3825,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -136,7 +136,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3783,7 +3838,7 @@ test("base_unittests") {
@@ -3781,7 +3836,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -145,7 +145,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -4051,7 +4106,7 @@ test("base_unittests") {
@@ -4049,7 +4104,7 @@ test("base_unittests") {
}
}

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

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-05-23 20:04:36 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-06-22 08:49:42 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -33,7 +33,7 @@ if (is_nacl) {
use_large_empty_slot_span_ring = is_mac
@ -9,7 +9,7 @@
declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
@@ -354,7 +354,7 @@ declare_args() {
@@ -373,7 +373,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-05-23 20:04:36 UTC
--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -850,7 +850,7 @@ if (is_clang_or_gcc) {
@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
}

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-05-23 20:04:36 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-06-22 08:49:42 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
@@ -231,7 +231,7 @@ constexpr bool kUseLazyCommit = false;
@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
@ -9,7 +9,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -278,7 +278,7 @@ constexpr bool kUseLazyCommit = false;
@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead
// to larger slot spans.

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

@ -1,11 +1,11 @@
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-05-23 20:04:36 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-06-22 08:49:42 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
@@ -316,7 +316,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
#if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
- BUILDFLAG(ENABLE_POINTER_COMPRESSION)
+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
- PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION)
+ PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;
#else
constexpr size_t kPoolMaxSize = 16 * kGiB;

4
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-05-23 20:04:36 UTC
--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-06-22 08:49:42 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -48,7 +48,7 @@
#include "wow64apiset.h"
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -954,7 +954,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
@@ -957,7 +957,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 2024-04-23 07:42:17 UTC
--- base/base_paths_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/base_paths_posix.cc
@@ -15,6 +15,7 @@
#include <ostream>
@ -23,7 +23,7 @@
#elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
#include <stdlib.h>
#endif
@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) {
@@ -49,8 +54,7 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = bin_dir;
return true;
#elif BUILDFLAG(IS_FREEBSD)
@ -31,9 +31,9 @@
- 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.";
NOTREACHED_IN_MIGRATION() << "Unable to resolve path.";
return false;
@@ -65,13 +69,65 @@ bool PathProviderPosix(int key, FilePath* result) {
@@ -67,13 +71,65 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = FilePath(bin_dir);
return true;
#elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)

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

@ -1,6 +1,6 @@
--- base/debug/debugger_posix.cc.orig 2024-04-23 07:42:17 UTC
--- base/debug/debugger_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/debug/debugger_posix.cc
@@ -36,6 +36,10 @@
@@ -41,6 +41,10 @@
#include <sys/sysctl.h>
#endif
@ -11,7 +11,7 @@
#if BUILDFLAG(IS_FREEBSD)
#include <sys/user.h>
#endif
@@ -95,32 +99,51 @@ bool BeingDebugged() {
@@ -100,32 +104,51 @@ bool BeingDebugged() {
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
// binary interfaces may change.

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

@ -1,6 +1,6 @@
--- base/debug/elf_reader.cc.orig 2024-04-23 07:42:17 UTC
--- base/debug/elf_reader.cc.orig 2024-06-22 08:49:42 UTC
+++ base/debug/elf_reader.cc
@@ -45,6 +45,10 @@ using Xword = Elf64_Xword;
@@ -50,6 +50,10 @@ using Xword = Elf64_Xword;
constexpr char kGnuNoteName[] = "GNU";

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

@ -1,6 +1,6 @@
--- base/debug/proc_maps_linux.cc.orig 2022-10-01 07:40:07 UTC
--- base/debug/proc_maps_linux.cc.orig 2024-06-22 08:49:42 UTC
+++ base/debug/proc_maps_linux.cc
@@ -13,7 +13,7 @@
@@ -18,7 +18,7 @@
#include "base/strings/string_split.h"
#include "build/build_config.h"

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

@ -1,6 +1,6 @@
--- base/debug/stack_trace.cc.orig 2024-05-23 20:04:36 UTC
--- base/debug/stack_trace.cc.orig 2024-06-22 08:49:42 UTC
+++ base/debug/stack_trace.cc
@@ -249,7 +249,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
@@ -254,7 +254,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
// Symbols are not expected to be reliable when gn args specifies
// symbol_level=0.
return false;
@ -9,7 +9,7 @@
// StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
// See https://crbug.com/706728
return false;
@@ -311,7 +311,7 @@ std::string StackTrace::ToString() const {
@@ -316,7 +316,7 @@ std::string StackTrace::ToString() const {
std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
std::stringstream stream;
@ -18,7 +18,7 @@
OutputToStreamWithPrefix(&stream, prefix_string);
#endif
return stream.str();
@@ -335,7 +335,7 @@ bool StackTrace::ShouldSuppressOutput() {
@@ -340,7 +340,7 @@ bool StackTrace::ShouldSuppressOutput() {
}
std::ostream& operator<<(std::ostream& os, const StackTrace& s) {

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

@ -1,6 +1,6 @@
--- base/debug/stack_trace_posix.cc.orig 2024-04-23 07:42:17 UTC
--- base/debug/stack_trace_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/debug/stack_trace_posix.cc
@@ -41,7 +41,7 @@
@@ -46,7 +46,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
// libc.
#if BUILDFLAG(IS_APPLE) || \
@ -9,7 +9,7 @@
#define HAVE_BACKTRACE
#include <execinfo.h>
#endif
@@ -59,8 +59,10 @@
@@ -64,8 +64,10 @@
#include <AvailabilityMacros.h>
#endif
@ -21,7 +21,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
@@ -301,7 +303,7 @@ void PrintToStderr(const char* output) {
@@ -306,7 +308,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
@@ -318,7 +320,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
@@ -323,7 +325,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)
@@ -535,7 +541,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -540,7 +546,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;
@@ -560,6 +566,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -565,6 +571,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) {
@@ -574,6 +581,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -579,6 +586,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)
@@ -763,6 +771,7 @@ class SandboxSymbolizeHelper {
@@ -768,6 +776,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.
@@ -855,11 +864,15 @@ class SandboxSymbolizeHelper {
@@ -860,11 +869,15 @@ class SandboxSymbolizeHelper {
r.base = cur_base;
}
}
@ -91,7 +91,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -877,6 +890,7 @@ class SandboxSymbolizeHelper {
@@ -882,6 +895,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;

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

@ -1,6 +1,6 @@
--- base/files/dir_reader_linux.h.orig 2022-10-01 07:40:07 UTC
--- base/files/dir_reader_linux.h.orig 2024-06-22 08:49:42 UTC
+++ base/files/dir_reader_linux.h
@@ -16,10 +16,16 @@
@@ -21,10 +21,16 @@
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
@ -17,7 +17,7 @@
struct linux_dirent {
uint64_t d_ino;
int64_t d_off;
@@ -27,6 +33,7 @@ struct linux_dirent {
@@ -32,6 +38,7 @@ struct linux_dirent {
unsigned char d_type;
char d_name[0];
};
@ -25,7 +25,7 @@
class DirReaderLinux {
public:
@@ -61,7 +68,11 @@ class DirReaderLinux {
@@ -66,7 +73,11 @@ class DirReaderLinux {
if (offset_ != size_)
return true;

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

@ -1,4 +1,4 @@
--- base/files/file_path_watcher_unittest.cc.orig 2024-02-25 20:22:18 UTC
--- base/files/file_path_watcher_unittest.cc.orig 2024-06-22 08:49:42 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -847,7 +847,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
}
@ -8,7 +8,7 @@
+#if !BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD)
ASSERT_TRUE(WriteFile(file1, "content v2"));
// Mac implementation does not detect files modified in a directory.
// TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
// TODO(crbug.com/40263777): Expect that no events are fired on Mac.
@@ -1783,7 +1783,7 @@ namespace {
enum Permission { Read, Write, Execute };

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-05-23 20:04:36 UTC
--- base/files/file_util_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/files/file_util_posix.cc
@@ -810,33 +810,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -819,33 +819,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-05-23 20:04:36 UTC
--- base/files/file_util_unittest.cc.orig 2024-06-22 08:49:42 UTC
+++ base/files/file_util_unittest.cc
@@ -3772,7 +3772,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3835,7 +3835,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";
@@ -4553,7 +4553,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4568,7 +4568,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =

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

@ -1,6 +1,6 @@
--- base/logging_unittest.cc.orig 2024-02-03 15:42:55 UTC
--- base/logging_unittest.cc.orig 2024-06-22 08:49:42 UTC
+++ base/logging_unittest.cc
@@ -32,7 +32,7 @@
@@ -41,7 +41,7 @@
#include "base/posix/eintr_wrapper.h"
#endif // BUILDFLAG(IS_POSIX)
@ -9,7 +9,7 @@
#include <ucontext.h>
#endif
@@ -570,14 +570,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
@@ -579,14 +579,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
// need the arch-specific boilerplate below, which is inspired by breakpad.
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
uintptr_t crash_addr = 0;

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

@ -1,6 +1,6 @@
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-06-05 19:39:05 UTC
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
@@ -311,6 +311,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@ -11,7 +11,7 @@
#if BUILDFLAG(IS_APPLE)
std::vector<char> vec(allocated_pages_);
#else
@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
@@ -326,6 +330,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
return false;
}
return true;

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

@ -1,6 +1,6 @@
--- base/posix/unix_domain_socket.cc.orig 2024-04-23 07:42:17 UTC
--- base/posix/unix_domain_socket.cc.orig 2024-06-22 08:49:42 UTC
+++ base/posix/unix_domain_socket.cc
@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
@@ -56,7 +56,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
// static
bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
@ -9,7 +9,7 @@
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,
@@ -82,7 +82,7 @@ bool UnixDomainSocket::SendMsg(int fd,
struct cmsghdr* cmsg;
msg.msg_control = control_buffer;
@ -18,7 +18,7 @@
msg.msg_controllen = checked_cast<socklen_t>(control_len);
#else
msg.msg_controllen = control_len;
@@ -85,7 +85,7 @@ bool UnixDomainSocket::SendMsg(int fd,
@@ -90,7 +90,7 @@ bool UnixDomainSocket::SendMsg(int fd,
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
@ -27,7 +27,7 @@
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,
@@ -154,7 +154,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
const size_t kControlBufferSize =
CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
@ -36,7 +36,7 @@
// macOS does not support ucred.
// macOS supports xucred, but this structure is insufficient.
+ CMSG_SPACE(sizeof(struct ucred))
@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
@@ -182,7 +182,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
wire_fds_len = payload_len / sizeof(int);
}
@ -45,7 +45,7 @@
// macOS does not support SCM_CREDENTIALS.
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDENTIALS) {
@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
@@ -216,6 +216,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
socklen_t pid_size = sizeof(pid);
if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0)
pid = -1;

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

@ -1,6 +1,6 @@
--- base/posix/unix_domain_socket_unittest.cc.orig 2023-03-10 11:01:21 UTC
--- base/posix/unix_domain_socket_unittest.cc.orig 2024-06-22 08:49:42 UTC
+++ base/posix/unix_domain_socket_unittest.cc
@@ -10,6 +10,8 @@
@@ -15,6 +15,8 @@
#include <sys/types.h>
#include <unistd.h>

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

@ -1,6 +1,6 @@
--- base/process/kill.h.orig 2024-02-25 20:22:18 UTC
--- base/process/kill.h.orig 2024-06-22 08:49:42 UTC
+++ base/process/kill.h
@@ -121,7 +121,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
@@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
ProcessHandle handle, int* exit_code);

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

@ -1,6 +1,6 @@
--- base/process/launch_posix.cc.orig 2024-02-25 20:22:18 UTC
--- base/process/launch_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/process/launch_posix.cc
@@ -61,6 +61,9 @@
@@ -66,6 +66,9 @@
#error "macOS should use launch_mac.cc"
#endif

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

@ -1,4 +1,4 @@
--- base/process/memory_linux.cc.orig 2024-02-03 15:42:55 UTC
--- base/process/memory_linux.cc.orig 2024-06-22 08:49:42 UTC
+++ base/process/memory_linux.cc
@@ -28,6 +28,7 @@ void __libc_free(void*);
@ -24,7 +24,7 @@
std::set_new_handler(&ReleaseReservationOrTerminate);
// If we're using glibc's allocator, the above functions will override
@@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() {
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
#if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
allocator_shim::SetCallNewHandlerOnMallocFailure(true);
#endif
+#endif
@ -41,4 +41,4 @@
+#endif
bool UncheckedMalloc(size_t size, void** result) {
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
#if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)

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

@ -1,4 +1,4 @@
--- base/process/process_metrics_freebsd.cc.orig 2024-05-23 20:04:36 UTC
--- base/process/process_metrics_freebsd.cc.orig 2024-06-22 08:49:42 UTC
+++ base/process/process_metrics_freebsd.cc
@@ -3,44 +3,58 @@
// found in the LICENSE file.
@ -67,7 +67,7 @@
-base::expected<TimeDelta, ProcessCPUUsageError>
-ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED();
- NOTREACHED_IN_MIGRATION();
- return base::unexpected(ProcessCPUUsageError::kNotImplemented);
-}
-

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

@ -1,4 +1,4 @@
--- base/process/process_metrics_openbsd.cc.orig 2024-05-23 20:04:36 UTC
--- base/process/process_metrics_openbsd.cc.orig 2024-06-22 08:49:42 UTC
+++ base/process/process_metrics_openbsd.cc
@@ -6,75 +6,50 @@
@ -79,7 +79,7 @@
-
-base::expected<TimeDelta, ProcessCPUUsageError>
-ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED();
- NOTREACHED_IN_MIGRATION();
- return base::unexpected(ProcessCPUUsageError::kNotImplemented);
-}
-

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-05-23 20:04:36 UTC
--- base/process/process_metrics_unittest.cc.orig 2024-06-22 08:49:42 UTC
+++ base/process/process_metrics_unittest.cc
@@ -57,7 +57,8 @@
@@ -62,7 +62,8 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \

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 2024-04-23 07:42:17 UTC
--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2024-06-22 08:49:42 UTC
+++ base/profiler/stack_sampling_profiler_test_util.cc
@@ -37,7 +37,7 @@
@@ -42,7 +42,7 @@
// Fortunately, it provides _alloca, which functions identically.
#include <malloc.h>
#define alloca _alloca

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

@ -1,6 +1,6 @@
--- base/profiler/thread_delegate_posix.cc.orig 2024-04-23 07:42:17 UTC
--- base/profiler/thread_delegate_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/profiler/thread_delegate_posix.cc
@@ -14,7 +14,7 @@
@@ -19,7 +19,7 @@
#include "base/process/process_handle.h"
#include "build/build_config.h"
@ -9,7 +9,7 @@
#include "base/profiler/stack_base_address_posix.h"
#endif
@@ -23,7 +23,7 @@ namespace base {
@@ -28,7 +28,7 @@ namespace base {
std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
SamplingProfilerThreadToken thread_token) {
std::optional<uintptr_t> base_address;

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

@ -1,6 +1,6 @@
--- base/rand_util.h.orig 2024-02-25 20:22:18 UTC
--- base/rand_util.h.orig 2024-06-22 08:49:42 UTC
+++ base/rand_util.h
@@ -149,7 +149,7 @@ void RandomShuffle(Itr first, Itr last) {
@@ -147,7 +147,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}

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

@ -1,6 +1,6 @@
--- base/rand_util_posix.cc.orig 2024-03-22 14:16:19 UTC
--- base/rand_util_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/rand_util_posix.cc
@@ -23,7 +23,7 @@
@@ -28,7 +28,7 @@
#include "base/time/time.h"
#include "build/build_config.h"
@ -8,8 +8,8 @@
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
#include "third_party/lss/linux_syscall_support.h"
#elif BUILDFLAG(IS_MAC)
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
@@ -40,6 +40,7 @@ namespace base {
// TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK.
@@ -45,6 +45,7 @@ namespace base {
namespace {
@ -17,7 +17,7 @@
#if BUILDFLAG(IS_AIX)
// AIX has no 64-bit support for O_CLOEXEC.
static constexpr int kOpenFlags = O_RDONLY;
@@ -64,10 +65,11 @@ class URandomFd {
@@ -69,10 +70,11 @@ class URandomFd {
private:
const int fd_;
};
@ -30,15 +30,15 @@
// TODO(pasko): Unify reading kernel version numbers in:
// mojo/core/channel_linux.cc
// chrome/browser/android/seccomp_support_detector.cc
@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() {
@@ -182,6 +184,7 @@ bool UseBoringSSLForRandBytes() {
namespace {
void RandBytes(span<uint8_t> output, bool avoid_allocation) {
void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
+#if !BUILDFLAG(IS_BSD)
#if !BUILDFLAG(IS_NACL)
// The BoringSSL experiment takes priority over everything else.
if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
@@ -215,6 +218,9 @@ void RandBytes(span<uint8_t> output, bool avoid_alloca
@@ -220,6 +223,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
const int urandom_fd = GetUrandomFD();
const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
CHECK(success);
@ -48,8 +48,8 @@
}
} // namespace
@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) {
RandBytes(make_span(static_cast<uint8_t*>(output), output_length));
@@ -239,9 +245,11 @@ void RandBytes(span<uint8_t> output) {
RandBytesInternal(output, /*avoid_allocation=*/false);
}
+#if !BUILDFLAG(IS_BSD)

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

@ -1,6 +1,6 @@
--- base/strings/safe_sprintf_unittest.cc.orig 2024-05-23 20:04:36 UTC
--- base/strings/safe_sprintf_unittest.cc.orig 2024-06-22 08:49:42 UTC
+++ base/strings/safe_sprintf_unittest.cc
@@ -735,6 +735,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
@@ -740,6 +740,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
#endif
}
@ -8,7 +8,7 @@
TEST(SafeSPrintfTest, EmitNULL) {
char buf[40];
#if defined(__GNUC__)
@@ -751,6 +752,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
@@ -756,6 +757,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
#pragma GCC diagnostic pop
#endif
}

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

@ -1,4 +1,4 @@
--- base/system/sys_info_freebsd.cc.orig 2022-10-01 07:40:07 UTC
--- base/system/sys_info_freebsd.cc.orig 2024-06-22 08:49:42 UTC
+++ base/system/sys_info_freebsd.cc
@@ -9,30 +9,106 @@
#include <sys/sysctl.h>
@ -35,7 +35,7 @@
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
+
+ if (r == -1) {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
}
- return static_cast<int64_t>(pages) * page_size;
@ -93,7 +93,7 @@
size_t size = sizeof(limit);
+
if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
}
+

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

@ -1,4 +1,4 @@
--- base/system/sys_info_openbsd.cc.orig 2024-02-25 20:22:18 UTC
--- base/system/sys_info_openbsd.cc.orig 2024-06-22 08:49:42 UTC
+++ base/system/sys_info_openbsd.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
@ -68,7 +68,7 @@
+ if (shmmax)
+ goto out;
if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) {
NOTREACHED();
NOTREACHED_IN_MIGRATION();
return 0;
}
- return static_cast<uint64_t>(limit);

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

@ -1,6 +1,6 @@
--- base/test/launcher/test_launcher.cc.orig 2024-02-03 15:42:55 UTC
--- base/test/launcher/test_launcher.cc.orig 2024-06-22 08:49:42 UTC
+++ base/test/launcher/test_launcher.cc
@@ -69,6 +69,7 @@
@@ -74,6 +74,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_POSIX)

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

@ -1,6 +1,6 @@
--- base/test/test_file_util_posix.cc.orig 2024-03-22 14:16:19 UTC
--- base/test/test_file_util_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/test/test_file_util_posix.cc
@@ -89,7 +89,7 @@ void SyncPageCacheToDisk() {
@@ -91,7 +91,7 @@ void SyncPageCacheToDisk() {
}
#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \

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

@ -1,6 +1,6 @@
--- base/threading/platform_thread.h.orig 2024-04-23 07:42:17 UTC
--- base/threading/platform_thread.h.orig 2024-06-22 08:49:42 UTC
+++ base/threading/platform_thread.h
@@ -46,6 +46,8 @@ typedef DWORD PlatformThreadId;
@@ -49,6 +49,8 @@ typedef DWORD PlatformThreadId;
typedef zx_koid_t PlatformThreadId;
#elif BUILDFLAG(IS_APPLE)
typedef mach_port_t PlatformThreadId;

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

@ -1,11 +1,11 @@
--- base/threading/platform_thread_posix.cc.orig 2024-05-23 20:04:36 UTC
--- base/threading/platform_thread_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ base/threading/platform_thread_posix.cc
@@ -77,11 +77,11 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
-#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD)
-#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD)
partition_alloc::internal::StackTopRegistry::Get().NotifyThreadCreated();
#endif

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

@ -1,6 +1,6 @@
--- base/threading/platform_thread_unittest.cc.orig 2024-05-23 20:04:36 UTC
--- base/threading/platform_thread_unittest.cc.orig 2024-06-22 08:49:42 UTC
+++ base/threading/platform_thread_unittest.cc
@@ -33,7 +33,7 @@
@@ -38,7 +38,7 @@
#include "base/time/time.h"
#endif
@ -9,7 +9,7 @@
#include <pthread.h>
#include <sys/syscall.h>
#include <sys/types.h>
@@ -424,7 +424,7 @@ TEST(PlatformThreadTest,
@@ -429,7 +429,7 @@ TEST(PlatformThreadTest,
// and hardcodes what we know. Please inform scheduler-dev@ch40m1um.qjz9zk if this
// proprerty changes for a given platform.
TEST(PlatformThreadTest, CanChangeThreadType) {
@ -18,7 +18,7 @@
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
// able to increase priority to any level unless we are root (euid == 0).
bool kCanIncreasePriority = false;
@@ -708,12 +708,16 @@ INSTANTIATE_TEST_SUITE_P(
@@ -713,12 +713,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)

12
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-04-23 07:42:17 UTC
--- base/trace_event/malloc_dump_provider.cc.orig 2024-06-22 08:49:42 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -24,6 +24,8 @@
@@ -29,6 +29,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
@ -9,16 +9,16 @@
#else
#include <malloc.h>
#endif
@@ -181,7 +183,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
@@ -187,7 +189,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) && \
#if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA))
+ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD))
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
@@ -366,6 +368,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
@@ -391,6 +393,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.

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

@ -1,6 +1,6 @@
--- base/trace_event/memory_dump_manager.cc.orig 2022-10-01 07:40:07 UTC
--- base/trace_event/memory_dump_manager.cc.orig 2024-06-22 08:49:42 UTC
+++ base/trace_event/memory_dump_manager.cc
@@ -82,7 +82,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP
@@ -87,7 +87,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP
#if defined(MALLOC_MEMORY_TRACING_SUPPORTED)
MallocDumpProvider::kAllocatedObjects;
#else

8
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-04-23 07:42:17 UTC
--- base/trace_event/process_memory_dump.cc.orig 2024-06-22 08:49:42 UTC
+++ base/trace_event/process_memory_dump.cc
@@ -113,7 +113,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
@@ -118,7 +118,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,12 +9,12 @@
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 @@ std::optional<size_t> ProcessMemoryDump::CountResident
@@ -140,7 +140,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
for (size_t i = 0; i < page_count; i++)
resident_page_count += vec[i].VirtualAttributes.Valid;
-#elif BUILDFLAG(IS_FUCHSIA)
+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/851760): Implement counting resident bytes.
// TODO(crbug.com/42050620): Implement counting resident bytes.
// For now, log and avoid unused variable warnings.
NOTIMPLEMENTED_LOG_ONCE();

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

@ -1,6 +1,6 @@
--- build/config/clang/BUILD.gn.orig 2024-05-23 20:04:36 UTC
--- build/config/clang/BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ build/config/clang/BUILD.gn
@@ -212,7 +212,7 @@ template("clang_lib") {
@@ -214,7 +214,7 @@ template("clang_lib") {
# Adds a dependency on the Clang runtime library clang_rt.builtins.
clang_lib("compiler_builtins") {

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

@ -1,6 +1,6 @@
--- build/config/compiler/BUILD.gn.orig 2024-05-23 20:04:36 UTC
--- build/config/compiler/BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ build/config/compiler/BUILD.gn
@@ -203,7 +203,7 @@ declare_args() {
@@ -199,7 +199,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
# debugging information which is required by some specialized
# debugging tools.
@ -9,7 +9,7 @@
}
declare_args() {
@@ -265,13 +265,16 @@ config("default_include_dirs") {
@@ -251,13 +251,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@ -27,7 +27,7 @@
}
# compiler ---------------------------------------------------------------------
@@ -512,6 +515,10 @@ config("compiler") {
@@ -499,6 +502,10 @@ config("compiler") {
}
}
@ -37,8 +37,8 @@
+
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -587,7 +594,7 @@ config("compiler") {
if (use_icf && (!is_apple || use_lld)) {
@@ -545,7 +552,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -47,7 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -1198,7 +1205,7 @@ config("compiler_cpu_abi") {
@@ -1173,7 +1180,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" ]
@@ -1213,7 +1220,7 @@ config("compiler_cpu_abi") {
@@ -1188,7 +1195,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" ]
@@ -1548,7 +1555,7 @@ config("compiler_deterministic") {
@@ -1523,7 +1530,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",
@@ -1600,7 +1607,7 @@ config("compiler_deterministic") {
@@ -1575,7 +1582,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -83,35 +83,26 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1914,9 +1921,6 @@ config("default_warnings") {
@@ -1889,9 +1896,6 @@ config("default_warnings") {
# TODO(crbug.com/1494809): Evaluate and possibly enable.
# TODO(crbug.com/40286317): Evaluate and possibly enable.
"-Wno-vla-extension",
-
- # TODO(https://crbug.com/1490607): Fix and re-enable.
- # TODO(crbug.com/40284799): Fix and re-enable.
- "-Wno-thread-safety-reference-return",
]
cflags_cc += [
@@ -1924,7 +1928,7 @@ config("default_warnings") {
@@ -1899,7 +1903,7 @@ config("default_warnings") {
"-Wenum-compare-conditional",
]
- if (!is_nacl) {
+ if (!is_nacl && !is_bsd) {
+ if (!is_nacl && !is_openbsd) {
cflags_cc += [
# TODO(https://crbug.com/1513724): Fix and re-enable.
# TODO(crbug.com/41486292): Fix and re-enable.
"-Wno-c++11-narrowing-const-reference",
@@ -2113,7 +2117,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
- if (!is_nacl) {
+ if (!is_nacl && !is_freebsd) {
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2638,7 +2642,7 @@ config("afdo_optimize_size") {
@@ -2616,7 +2620,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") {
@ -120,7 +111,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2665,7 +2669,7 @@ config("afdo") {
@@ -2643,7 +2647,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@ -129,7 +120,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2829,7 +2833,8 @@ config("symbols") {
@@ -2808,7 +2812,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
@ -137,5 +128,5 @@
+ if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos" &&
+ !is_bsd) {
if (is_apple) {
# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
# TODO(crbug.com/40117949): Investigate missing debug info on mac.
# Make sure we don't use constructor homing on mac.

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

@ -1,27 +0,0 @@
--- 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-build_toolchain_gcc__toolchain.gni
View file

@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig 2024-05-23 20:04:36 UTC
--- build/toolchain/gcc_toolchain.gni.orig 2024-06-22 08:49:42 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@ -14,8 +14,8 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -879,22 +886,12 @@ template("gcc_toolchain") {
# use_gold too.
@@ -878,22 +885,12 @@ template("gcc_toolchain") {
# actually just be doing a native compile.
template("clang_toolchain") {
gcc_toolchain(target_name) {
- _path = "$clang_base_path/bin"

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

@ -1,4 +1,4 @@
--- chrome/app/chrome_command_ids.h.orig 2023-09-17 07:59:53 UTC
--- chrome/app/chrome_command_ids.h.orig 2024-06-22 08:49:42 UTC
+++ chrome/app/chrome_command_ids.h
@@ -68,12 +68,12 @@
#define IDC_TOGGLE_MULTITASK_MENU 34050
@ -9,7 +9,7 @@
#define IDC_USE_SYSTEM_TITLE_BAR 34051
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete.
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#define IDC_RESTORE_WINDOW 34052

18
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-05-23 20:04:36 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -137,7 +137,7 @@
#include "components/about_ui/credit_utils.h"
@ -55,7 +55,7 @@
#endif
@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@ -98,7 +98,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -962,7 +962,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
@@ -957,7 +957,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
#if BUILDFLAG(IS_OZONE)
// Initialize Ozone platform and add required feature flags as per platform's
// properties.
@ -107,7 +107,7 @@
ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
#endif
ui::OzonePlatform::PreEarlyInitialization();
@@ -1155,7 +1155,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
@@ -1150,7 +1150,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
const bool is_canary_dev = IsCanaryDev();
const bool emit_crashes =
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -116,16 +116,16 @@
is_canary_dev;
#else
false;
@@ -1310,7 +1310,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1305,7 +1305,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1340,7 +1340,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
@@ -1335,7 +1335,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -134,7 +134,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1735,7 +1735,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1722,7 +1722,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -143,7 +143,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1836,7 +1836,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1821,7 +1821,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-05-23 20:04:36 UTC
--- chrome/browser/BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/BUILD.gn
@@ -6607,6 +6607,13 @@ static_library("browser") {
@@ -6688,6 +6688,13 @@ static_library("browser") {
}
}

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

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/about_flags.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/about_flags.cc
@@ -237,7 +237,7 @@
@@ -239,7 +239,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -325,7 +325,7 @@
@@ -329,7 +329,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)
@@ -334,7 +334,7 @@
@@ -338,7 +338,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)
@@ -492,7 +492,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -483,7 +483,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -36,25 +36,25 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1295,7 +1295,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
@@ -1266,7 +1266,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
};
#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)
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
{"AtKeywordAcceleration", "true"},
};
@@ -1425,7 +1425,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
nullptr}};
@@ -1329,7 +1329,7 @@ const FeatureEntry::FeatureVariation
};
#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)
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
{"ShortcutBoostSearchScore", "0"},
{"ShortcutBoostNonTopHitThreshold", "0"},
@@ -3794,7 +3794,7 @@ const flags_ui::FeatureEntry::FeatureVariation
@@ -3680,7 +3680,7 @@ const flags_ui::FeatureEntry::FeatureVariation
std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
};
@ -63,7 +63,7 @@
const flags_ui::FeatureEntry::FeatureParam
kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
const flags_ui::FeatureEntry::FeatureParam
@@ -4592,7 +4592,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4520,7 +4520,7 @@ const FeatureEntry kFeatureEntries[] = {
},
#endif // BUILDFLAG(IS_ANDROID)
@ -72,25 +72,25 @@
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
@@ -5047,7 +5047,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4956,7 +4956,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
#endif // !BUILDFLAG(IS_ANDROID)
#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)
{"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
flag_descriptions::kShortcutsNotAppsDescription,
kOsMac | kOsWin | kOsLinux | kOsFuchsia,
@@ -5172,7 +5172,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsLinux,
@@ -5083,7 +5083,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD)
{"pulseaudio-loopback-for-cast",
flag_descriptions::kPulseaudioLoopbackForCastName,
flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
@@ -5188,7 +5188,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5099,7 +5099,7 @@ const FeatureEntry kFeatureEntries[] = {
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
#endif // BUILDFLAG(IS_LINUX)
@ -99,34 +99,34 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -6096,7 +6096,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6020,7 +6020,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)
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6416,7 +6416,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6340,7 +6340,7 @@ const FeatureEntry kFeatureEntries[] = {
"OrganicRepeatableQueries")},
#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)
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
@@ -7959,7 +7959,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -7958,7 +7958,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kCooperativeSchedulingDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kCooperativeScheduling)},
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
@@ -7983,7 +7983,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7982,7 +7982,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
#endif
@ -135,7 +135,7 @@
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
@@ -8851,7 +8851,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8819,7 +8819,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -144,16 +144,16 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -8899,7 +8899,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8858,7 +8858,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9125,7 +9125,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9095,7 +9095,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -162,7 +162,7 @@
{"policy-indication-for-managed-default-search",
flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
@@ -9432,7 +9432,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9402,7 +9402,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -171,7 +171,7 @@
{"media-session-enter-picture-in-picture",
flag_descriptions::kMediaSessionEnterPictureInPictureName,
flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
@@ -10348,7 +10348,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10312,7 +10312,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@ -180,16 +180,16 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
@@ -10386,7 +10386,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10350,7 +10350,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"site-search-settings-policy",
flag_descriptions::kSiteSearchSettingsPolicyName,
flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
@@ -10499,7 +10499,7 @@ const FeatureEntry kFeatureEntries[] = {
{"show-featured-enterprise-site-search",
flag_descriptions::kShowFeaturedEnterpriseSiteSearchName,
flag_descriptions::kShowFeaturedEnterpriseSiteSearchDescription, kOsAll,
@@ -10465,7 +10465,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll,
FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)},
@ -198,7 +198,7 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
@@ -10845,7 +10845,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10814,7 +10814,7 @@ const FeatureEntry kFeatureEntries[] = {
trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
#endif
@ -207,7 +207,7 @@
{"restart-to-gain-access-to-keychain",
flag_descriptions::kRestartToGainAccessToKeychainName,
flag_descriptions::kRestartToGainAccessToKeychainDescription,
@@ -11123,7 +11123,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -11095,7 +11095,7 @@ const FeatureEntry kFeatureEntries[] = {
// Controls the view mode for (history) sync screen.
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \

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

@ -1,11 +0,0 @@
--- chrome/browser/accessibility/pdf_ocr_controller.cc.orig 2024-05-23 20:04:36 UTC
+++ chrome/browser/accessibility/pdf_ocr_controller.cc
@@ -111,7 +111,7 @@ void AnnounceToScreenReader(const int message_id) {
// TODO(crbug.com/333398721): Sending announcements results in a failure in
// `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and
// flaky fail when running Chrome.
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
const Browser* browser = BrowserList::GetInstance()->GetLastActive();
if (!browser) {
VLOG(2) << "Browser is not ready to announce";

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

@ -1,11 +1,11 @@
--- 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.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.h
@@ -39,7 +39,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
@@ -38,7 +38,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
content::WebContents* OpenExtensionApplicationTab(Profile* profile,
const std::string& app_id);
#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)
// Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and
// Chrome Apps are deprecated on the |profile|. Returns true if that was the
// case, or false otherwise.

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

@ -1,6 +1,6 @@
--- chrome/browser/browser_features.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/browser_features.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/browser_features.cc
@@ -78,7 +78,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
@@ -82,7 +82,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);
@@ -359,7 +359,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
@@ -354,7 +354,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
"SupportSearchSuggestionForPrerender2",
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/browser_process_impl.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -229,7 +229,7 @@
@@ -232,7 +232,7 @@
#include "chrome/browser/ui/profiles/profile_picker.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1273,7 +1273,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1289,7 +1289,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -18,9 +18,9 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1578,7 +1578,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1602,7 +1602,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
// complete.
-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)

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

@ -1,8 +1,8 @@
--- chrome/browser/browser_process_impl.h.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/browser_process_impl.h.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/browser_process_impl.h
@@ -393,7 +393,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -400,7 +400,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)

27
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-05-23 20:04:36 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -129,13 +129,13 @@
@@ -132,12 +132,12 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,13 +10,12 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
#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/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
@@ -226,7 +226,7 @@
@@ -228,7 +228,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,7 +24,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"
@@ -850,7 +850,7 @@ void BindScreen2xMainContentExtractor(
@@ -854,7 +854,7 @@ void BindScreen2xMainContentExtractor(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -34,7 +33,7 @@
void BindVisualSuggestionsModelProvider(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<
@@ -1046,7 +1046,7 @@ void PopulateChromeFrameBinders(
@@ -1050,7 +1050,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -43,7 +42,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
@@ -1128,7 +1128,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -52,16 +51,16 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1140,7 +1140,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1148,7 +1148,7 @@ void PopulateChromeWebUIFrameBinders(
policy::DlpInternalsUI>(map);
#endif
#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)
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1732,7 +1732,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1759,7 +1759,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,8 +1,8 @@
--- chrome/browser/chrome_browser_main.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -246,15 +246,15 @@
@@ -247,15 +247,15 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@ -19,12 +19,12 @@
#include "base/nix/xdg_util.h"
#endif
@@ -287,14 +287,14 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
@@ -288,14 +288,14 @@
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@ -36,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"
@@ -361,14 +361,14 @@
@@ -367,14 +367,14 @@
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -53,7 +53,7 @@
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
FILE_PATH_LITERAL("Media History");
@@ -523,7 +523,7 @@ void ProcessSingletonNotificationCallbackImpl(
@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl(
}
#endif
@ -62,7 +62,7 @@
// 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() {
@@ -1101,7 +1101,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -71,25 +71,25 @@
// 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 .
@@ -1138,7 +1138,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
@@ -1149,7 +1149,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1323,7 +1323,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1334,7 +1334,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Delete the media history database if it still exists.
// TODO(crbug.com/1198344): Remove this.
// TODO(crbug.com/40177301): Remove this.
base::ThreadPool::PostTask(
@@ -1372,7 +1372,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1383,7 +1383,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -98,7 +98,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1482,7 +1482,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1493,7 +1493,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.
@ -107,7 +107,7 @@
if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp();
}
@@ -2022,7 +2022,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
@@ -2039,7 +2039,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from
// a headless Chrome process.

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
@@ -24,7 +24,7 @@
@@ -25,7 +25,7 @@
#include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
#include "ui/base/l10n/l10n_util.h"
@ -9,7 +9,7 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -71,7 +71,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
#endif // BUILDFLAG(IS_CHROMEOS)
#if !BUILDFLAG(IS_CHROMEOS)
@ -19,7 +19,7 @@
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
}
@ -28,7 +28,7 @@
void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
@@ -135,7 +137,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
@@ -137,7 +139,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {

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

@ -1,8 +1,8 @@
--- chrome/browser/chrome_browser_main_posix.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/chrome_browser_main_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/chrome_browser_main_posix.cc
@@ -79,7 +79,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
} else {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)

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

@ -1,17 +1,17 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -466,7 +466,7 @@
@@ -467,7 +467,7 @@
#include "storage/browser/file_system/external_mount_points.h"
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#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)
@@ -576,12 +576,12 @@
@@ -577,12 +577,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -592,7 +592,7 @@
@@ -593,7 +593,7 @@
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
#endif
@ -33,7 +33,7 @@
#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"
@@ -600,7 +600,7 @@
@@ -601,7 +601,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -43,7 +43,7 @@
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -616,7 +616,7 @@
#include "components/lens/lens_features.h"
#include "chrome/browser/ui/lens/lens_side_panel_navigation_helper.h"
#endif
-#if BUILDFLAG(IS_LINUX)
@ -51,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"
@@ -1514,7 +1514,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
@@ -1519,7 +1519,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
#if BUILDFLAG(IS_CHROMEOS)
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
#endif // BUILDFLAG(IS_CHROMEOS)
@ -60,7 +60,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1638,7 +1638,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1643,7 +1643,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -69,16 +69,16 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1675,7 +1675,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1677,7 +1677,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1696,7 +1696,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1698,7 +1698,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -87,7 +87,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1715,7 +1715,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1717,7 +1717,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -96,8 +96,8 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2866,7 +2866,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
GetProfileParamsProcess(*command_line));
@@ -2871,7 +2871,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
}
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@ -105,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)) {
@@ -4618,7 +4618,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4636,7 +4636,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -114,7 +114,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5168,7 +5168,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5186,7 +5186,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -123,7 +123,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5182,7 +5182,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5200,7 +5200,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -132,7 +132,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5213,7 +5213,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5231,7 +5231,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@ -141,7 +141,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -7132,7 +7132,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -7165,7 +7165,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-05-23 20:04:36 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -503,7 +503,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -507,7 +507,7 @@ class ChromeContentBrowserClient : public content::Con
bool IsPluginAllowedToUseDevChannelAPIs(
content::BrowserContext* browser_context,
const GURL& url) override;

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

@ -1,4 +1,4 @@
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -41,7 +41,7 @@
#include "third_party/widevine/cdm/buildflags.h"
@ -27,7 +27,7 @@
// On Linux and ChromeOS the Widevine CDM is loaded at startup before the
// zygote is locked down. To locate the Widevine CDM at startup, a hint file
// is used. Update the hint file with the new Widevine CDM path.
@@ -388,7 +388,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
@@ -398,7 +398,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
return;
}

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

@ -1,9 +1,9 @@
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
local_state);
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);

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-05-23 20:04:36 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1678,7 +1678,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1685,7 +1685,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();
}
@@ -1777,7 +1777,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1784,7 +1784,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) || \

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

@ -1,11 +1,11 @@
--- chrome/browser/download/download_commands.cc.orig 2023-04-08 11:38:38 UTC
--- chrome/browser/download/download_commands.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/download/download_commands.cc
@@ -26,7 +26,7 @@
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
@ -13,8 +13,8 @@
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
Browser* DownloadCommands::GetBrowser() const {
if (!model_)

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

@ -1,11 +1,11 @@
--- chrome/browser/download/download_commands.h.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/download/download_commands.h.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/download/download_commands.h
@@ -66,7 +66,7 @@ class DownloadCommands {
void ExecuteCommand(Command command);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
bool IsDownloadPdf() const;
bool CanOpenPdfInSystemViewer() const;
Browser* GetBrowser() const;

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-05-23 20:04:36 UTC
--- chrome/browser/download/download_item_model.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -795,7 +795,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -796,7 +796,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();
@@ -843,7 +843,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -844,7 +844,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);
@@ -1191,7 +1191,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1192,7 +1192,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

12
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-04-23 07:42:17 UTC
--- chrome/browser/download/download_prefs.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
#include <vector>
@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
@@ -299,7 +304,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -297,7 +302,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)
@@ -462,7 +467,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -458,7 +463,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;
@@ -494,7 +499,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -490,7 +495,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();
@@ -534,7 +539,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -527,7 +532,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;
@@ -686,7 +691,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -679,7 +684,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.

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

@ -1,6 +1,6 @@
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-02-03 15:42:55 UTC
--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
const char* verification_key = kKeyWindowsVerification;
#elif BUILDFLAG(IS_MAC)
const char* verification_key = kKeyMacVerification;

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-05-23 20:04:36 UTC
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
@@ -524,7 +524,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
@@ -520,7 +520,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_);

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

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -23,7 +23,7 @@
#include "components/policy/core/common/management/management_service.h"
@ -17,8 +17,8 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) {
policy::CloudPolicyManager* user_policy_manager =
profile->GetUserCloudPolicyManager();
@@ -104,7 +104,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
profile->GetCloudPolicyManager();
@@ -101,7 +101,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
DependsOn(policy::ManagementServiceFactory::GetInstance());

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

@ -1,11 +1,11 @@
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
@@ -11,7 +11,7 @@ namespace enterprise_connectors {
BrowserCrashEventRouter::BrowserCrashEventRouter(
content::BrowserContext* context) {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-#if !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
Profile* profile = Profile::FromBrowserContext(context);
@ -13,8 +13,8 @@
}
BrowserCrashEventRouter::~BrowserCrashEventRouter() {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-#if !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
crash_reporting_context->RemoveProfile(this);

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

@ -1,11 +1,11 @@
--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-03-22 14:16:19 UTC
--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
@@ -18,7 +18,7 @@
namespace enterprise_connectors {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
-#if !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
namespace {

16
www/ungoogled-chromium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc
View file

@ -1,20 +1,20 @@
--- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig 2023-01-13 08:56:02 UTC
--- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc
@@ -12,7 +12,7 @@
@@ -13,7 +13,7 @@
#include "components/enterprise/browser/identifiers/identifiers_prefs.h"
#include "components/prefs/pref_service.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
#include "components/enterprise/browser/controller/browser_dm_token_storage.h"
#if BUILDFLAG(IS_WIN)
#include "base/strings/utf_string_conversions.h"
@@ -36,7 +36,7 @@ void CreateProfileGUID(PrefService* prefs) {
@@ -94,7 +94,7 @@ std::string ProfileIdDelegateImpl::GetDeviceId() {
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Gets the device ID from the BrowserDMTokenStorage.
std::string GetId() {
std::string ProfileIdDelegateImpl::GetId() {
std::string device_id =

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

@ -1,7 +1,7 @@
--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig 2023-09-17 07:59:53 UTC
--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
@@ -66,8 +66,8 @@ base::flat_map<std::string, SAMLProfileAttributes>& Ge
// TODO(crbug.com/1445072): Add actual domains with attribute names.
// TODO(crbug.com/40267996): Add actual domains with attribute names.
profile_attributes->insert(std::make_pair(
"supported.test",
- SAMLProfileAttributes("placeholderName", "placeholderDomain",

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1370,6 +1370,10 @@ static_library("extensions") {
@@ -1386,6 +1386,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

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

@ -1,8 +1,8 @@
--- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
@@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)

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-05-23 20:04:36 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -606,7 +606,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
@@ -610,7 +610,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

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

@ -1,4 +1,4 @@
--- 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.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
} else if (strcmp(os, "linux") == 0) {
@ -8,6 +8,6 @@
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
+ } else if (strcmp(os, "freebsd") == 0) {
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "fuchsia") == 0) {
info->os = extensions::api::runtime::PlatformOs::kFuchsia;
} else {
NOTREACHED() << "Platform not supported: " << os;
return false;

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-05-23 20:04:36 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -195,7 +195,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
@@ -213,7 +213,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// Appearance settings.
(*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
(*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;

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

@ -1,9 +1,9 @@
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-04-23 07:42:17 UTC
--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -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.
// TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
// TODO(crbug.com/40254339): Find a fix for wayland as well.
-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) {

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -880,7 +880,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
@@ -885,7 +885,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
#if BUILDFLAG(IS_CHROMEOS)
RequestExtensionApproval(contents);
return;

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

@ -1,15 +1,15 @@
--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -830,7 +830,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -831,7 +831,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -858,7 +858,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -859,7 +859,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.

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-04-23 07:42:17 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -316,7 +316,7 @@ const struct {
@@ -314,7 +314,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif

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

@ -1,8 +1,8 @@
--- chrome/browser/first_run/first_run_dialog.h.orig 2022-12-02 17:56:32 UTC
--- chrome/browser/first_run/first_run_dialog.h.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/first_run/first_run_dialog.h
@@ -12,7 +12,7 @@
// Hide this function on platforms where the dialog does not exist.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/flag_descriptions.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -2872,7 +2872,7 @@ const char kCbdTimeframeRequiredDescription[] =
@@ -2927,7 +2927,7 @@ const char kCbdTimeframeRequiredDescription[] =
"value to the list.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,16 @@
const char kPolicyIndicationForManagedDefaultSearchName[] =
"Enable policy indication for managed Default Search provider";
const char kPolicyIndicationForManagedDefaultSearchDescription[] =
@@ -3175,7 +3175,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
@@ -3224,7 +3224,7 @@ const char kShowAutofillTypePredictionsDescription[] =
"text.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kShowFeaturedEnterpriseSiteSearchName[] =
"Show featured Enterprise site search engines in Omnibox";
const char kShowFeaturedEnterpriseSiteSearchDescription[] =
@@ -3249,7 +3249,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 +27,7 @@
const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
const char kSiteSearchSettingsPolicyDescription[] =
"Allow site search engines to be defined by the SiteSearchSettings policy.";
@@ -7447,7 +7447,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
@@ -7489,7 +7489,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -27,7 +36,7 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7713,7 +7713,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
@@ -7757,7 +7757,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
// Linux -----------------------------------------------------------------------
@ -36,25 +45,24 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7761,7 +7761,7 @@ const char kZeroCopyVideoCaptureDescription[] =
@@ -7805,14 +7805,14 @@ const char kZeroCopyVideoCaptureDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7774,7 +7774,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"Calls to Classify URL RPC will use Protocol Buffer format in resposnes, "
"instead of JSON.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7806,7 +7806,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -7844,7 +7844,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -63,17 +71,17 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -7922,7 +7922,7 @@ const char kElementCaptureDescription[] =
@@ -7984,7 +7984,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -7979,7 +7979,7 @@ const char kComposeProactiveNudgeDescription[] =
"Enables proactive nudging for Compose";
@@ -8045,7 +8045,7 @@ const char kComposeNudgeAtCursorDescription[] =
"Shows the Compose proactive nudge at the cursor location";
#endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/flag_descriptions.h.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/flag_descriptions.h
@@ -1682,7 +1682,7 @@ extern const char kCbdTimeframeRequiredName[];
@@ -1705,7 +1705,7 @@ extern const char kCbdTimeframeRequiredName[];
extern const char kCbdTimeframeRequiredDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -9,7 +9,16 @@
extern const char kPolicyIndicationForManagedDefaultSearchName[];
extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
#endif
@@ -1857,7 +1857,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
@@ -1876,7 +1876,7 @@ extern const char kShowAutofillTypePredictionsName[];
extern const char kShowAutofillTypePredictionsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kShowFeaturedEnterpriseSiteSearchName[];
extern const char kShowFeaturedEnterpriseSiteSearchDescription[];
#endif
@@ -1891,7 +1891,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
extern const char kSiteInstanceGroupsForDataUrlsDescription[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -18,7 +27,7 @@
extern const char kSiteSearchSettingsPolicyName[];
extern const char kSiteSearchSettingsPolicyDescription[];
#endif
@@ -4320,7 +4320,7 @@ extern const char kLacrosMergeIcuDataFileName[];
@@ -4350,7 +4350,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -27,7 +36,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4471,7 +4471,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
@@ -4505,7 +4505,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
// Linux ---------------------------------------------------------------------
@ -36,7 +45,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4513,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4547,7 +4547,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -45,35 +54,33 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4525,7 +4525,7 @@ extern const char kRestartToGainAccessToKeychainDescri
@@ -4559,13 +4559,13 @@ extern const char kRestartToGainAccessToKeychainDescri
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4534,7 +4534,7 @@ extern const char kFollowingFeedSidepanelDescription[]
extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
// BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4611,7 +4611,7 @@ extern const char kElementCaptureDescription[];
@@ -4661,7 +4661,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4651,7 +4651,7 @@ extern const char kComposeProactiveNudgeName[];
extern const char kComposeProactiveNudgeDescription[];
@@ -4704,7 +4704,7 @@ extern const char kComposeNudgeAtCursorName[];
extern const char kComposeNudgeAtCursorDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)

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

@ -1,11 +1,11 @@
--- chrome/browser/intranet_redirect_detector.h.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/intranet_redirect_detector.h.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/intranet_redirect_detector.h
@@ -25,7 +25,7 @@ class SimpleURLLoader;
class PrefRegistrySimple;
#if !(BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA))
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
- BUILDFLAG(IS_CHROMEOS))
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
#error "IntranetRedirectDetector should only be built on Desktop platforms."
#endif

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

@ -1,4 +1,4 @@
--- chrome/browser/media/audio_service_util.cc.orig 2023-01-13 08:56:02 UTC
--- chrome/browser/media/audio_service_util.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/media/audio_service_util.cc
@@ -21,7 +21,7 @@
@ -11,7 +11,7 @@
const policy::PolicyMap& policies =
@@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
bool IsAudioServiceSandboxEnabled() {
// TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
// TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being
// built with OS_CHROMEOS instead of OS_LINUX.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/media/router/discovery/BUILD.gn.orig 2023-12-23 12:33:28 UTC
--- chrome/browser/media/router/discovery/BUILD.gn.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/media/router/discovery/BUILD.gn
@@ -81,7 +81,7 @@ static_library("discovery") {
@@ -82,7 +82,7 @@ static_library("discovery") {
]
configs += [ "//build/config/compiler:wexit_time_destructors" ]

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

@ -1,9 +1,9 @@
--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2024-02-25 20:22:18 UTC
--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc
@@ -92,7 +92,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur
} else {
return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare);
}
@@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur
#if BUILDFLAG(IS_MAC)
return request_source == Params::RequestSource::kCast ||
base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare);
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (request_source == Params::RequestSource::kCast) {

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

@ -1,8 +1,8 @@
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -101,7 +101,7 @@ std::string GetLogUploadProduct() {
const char product[] = "Chrome_Mac";
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)

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

@ -1,4 +1,4 @@
--- chrome/browser/memory_details.cc.orig 2024-02-03 15:42:55 UTC
--- chrome/browser/memory_details.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/memory_details.cc
@@ -38,7 +38,7 @@
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
@ -9,7 +9,7 @@
#include "content/public/browser/zygote_host/zygote_host_linux.h"
#endif
@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
});
}

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

@ -1,8 +1,8 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-05-11 05:39:22 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -80,8 +80,10 @@
@@ -81,8 +81,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
@ -30,7 +30,7 @@
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -860,7 +862,7 @@ void RecordStartupMetrics() {
@@ -862,7 +864,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,
@@ -1164,11 +1166,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -1154,11 +1156,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)

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

@ -1,4 +1,4 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -195,7 +195,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
@ -18,7 +18,7 @@
#include "chrome/browser/metrics/bluetooth_metrics_provider.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -574,7 +574,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
@@ -534,7 +534,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)
@@ -746,7 +746,7 @@ void ChromeMetricsServiceClient::Initialize() {
@@ -706,7 +706,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
@@ -797,7 +797,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -757,7 +757,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -45,8 +45,8 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -882,7 +882,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
@@ -842,7 +842,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
@ -54,7 +54,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
@@ -984,7 +984,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -944,7 +944,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -63,8 +63,8 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1167,7 +1167,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
@@ -1131,7 +1131,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
@ -72,7 +72,7 @@
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
@@ -1514,7 +1514,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
@@ -1465,7 +1465,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__monitor.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-05-23 20:04:36 UTC
--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/metrics/power/process_monitor.cc
@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
process_metrics.GetPlatformIndependentCPUUsage());
@ -18,7 +18,7 @@
metrics->idle_wakeups *= factor;
#endif
@@ -170,7 +170,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
}
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

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

@ -1,15 +1,15 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-04-23 07:42:17 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2024-06-22 08:49:42 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -94,7 +94,7 @@
@@ -97,7 +97,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/branded_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -139,7 +139,7 @@ SystemNetworkContextManager* g_system_network_context_
@@ -141,7 +141,7 @@ SystemNetworkContextManager* g_system_network_context_
// received a failed launch for a sandboxed network service.
bool g_previously_failed_to_launch_sandboxed_service = false;
@ -18,7 +18,7 @@
// Whether kerberos library loading will work in the network service due to the
// sandbox.
bool g_network_service_will_allow_gssapi_library_load = false;
@@ -147,7 +147,7 @@ bool g_network_service_will_allow_gssapi_library_load
@@ -149,7 +149,7 @@ bool g_network_service_will_allow_gssapi_library_load
const char* kGssapiDesiredPref =
#if BUILDFLAG(IS_CHROMEOS)
prefs::kKerberosEnabled;
@ -27,7 +27,7 @@
prefs::kReceivedHttpAuthNegotiateHeader;
#endif
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -193,7 +193,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -195,7 +195,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@ -36,7 +36,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -208,7 +208,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -210,7 +210,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
#endif // BUILDFLAG(IS_ANDROID)
@ -45,7 +45,7 @@
auth_dynamic_params->allow_gssapi_library_load =
local_state->GetBoolean(kGssapiDesiredPref);
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -218,7 +218,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -220,7 +220,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
void OnNewHttpAuthDynamicParams(
network::mojom::HttpAuthDynamicParamsPtr& params) {
@ -54,7 +54,7 @@
// The kerberos library is incompatible with the network service sandbox, so
// if library loading is now enabled, the network service needs to be
// restarted. It will be restarted unsandboxed because is
@@ -260,11 +260,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -262,11 +262,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
if (g_previously_failed_to_launch_sandboxed_service) {
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
}
@ -68,7 +68,7 @@
// The network service sandbox and the kerberos library are incompatible.
// If kerberos is enabled by policy, disable the network service sandbox.
if (g_network_service_will_allow_gssapi_library_load ||
@@ -280,7 +280,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
@@ -282,7 +282,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
}
#endif // BUILDFLAG(IS_WIN)
@ -77,7 +77,7 @@
if (local_state &&
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
@@ -510,7 +510,7 @@ void SystemNetworkContextManager::DeleteInstance() {
@@ -512,7 +512,7 @@ void SystemNetworkContextManager::DeleteInstance() {
g_system_network_context_manager = nullptr;
}
@ -86,7 +86,7 @@
SystemNetworkContextManager::GssapiLibraryLoadObserver::
GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
: owner_(owner) {}
@@ -568,7 +568,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -570,7 +570,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -95,7 +95,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -582,7 +582,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -584,7 +584,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
auth_pref_callback);
#endif // BUILDFLAG(IS_ANDROID)
@ -104,7 +104,7 @@
pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -608,7 +608,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -610,7 +610,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -113,7 +113,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -663,7 +663,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -665,7 +665,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -122,7 +122,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -687,7 +687,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -689,7 +689,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -131,7 +131,7 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
@@ -696,11 +696,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -698,11 +698,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
@ -145,7 +145,7 @@
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
@@ -753,7 +753,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
@@ -755,7 +755,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
@ -154,7 +154,7 @@
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
@@ -972,7 +972,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
break;
}
@ -163,7 +163,7 @@
if (!enabled) {
g_network_service_will_allow_gssapi_library_load = true;
}
@@ -1055,7 +1055,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
@@ -1059,7 +1059,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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