sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/ungoogled-chromium: update to 117.0.5938.88

Browse source 
Security:	https://vuxml.freebsd.org/freebsd/88754d55-521a-11ee-8290-a8a1599412c6.html
This commit is contained in:
Robert Nagy 2023-09-17 19:51:44 +02:00
parent a31acf0826
commit e427079cbf
476 changed files with 3030 additions and 2746 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
www/ungoogled-chromium/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 116.0.5845.179
PORTREVISION= 1
PORTVERSION= 117.0.5938.88
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
@ -268,7 +267,7 @@ PLIST_SUB+= NOT_AARCH64=""
FFMPEG_TARGET= ia32
.endif
FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
FFMPEG_BDIR= ${WRKSRC}/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
# Allow relocations against read-only segments (override lld default)

14
www/ungoogled-chromium/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1694019777
SHA256 (chromium-116.0.5845.179.tar.xz) = 8bf9b56381bfeb960a2d8c0dd130253820701fb49c12e52fa4d697ac11896025
SIZE (chromium-116.0.5845.179.tar.xz) = 1599723164
SHA256 (ungoogled-chromium-116.0.5845.179-1.tar.gz) = 084c826dd62b008cdaef0c4bccb1403341715b62f0ef14fd9b37f10e1230654f
SIZE (ungoogled-chromium-116.0.5845.179-1.tar.gz) = 673676
SHA256 (chromium-116.0.5845.179-testdata.tar.xz) = e34c14e0aa04ce5870bf0345e9f117913c432cb671f7c0e18258b8b00a9972cd
SIZE (chromium-116.0.5845.179-testdata.tar.xz) = 266266312
TIMESTAMP = 1694973055
SHA256 (chromium-117.0.5938.88.tar.xz) = 4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906
SIZE (chromium-117.0.5938.88.tar.xz) = 3131921384
SHA256 (ungoogled-chromium-117.0.5938.88-1.tar.gz) = 97d67f4783702537355cdfcaad67024413102478ec5a431b2d51b454e8baea33
SIZE (ungoogled-chromium-117.0.5938.88-1.tar.gz) = 651903
SHA256 (chromium-117.0.5938.88-testdata.tar.xz) = c5256997647bcb05a4b829d99e9efcfa7e1bc46b44a9feceb67a91856ed54085
SIZE (chromium-117.0.5938.88-testdata.tar.xz) = 269473360
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

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

@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-08-18 10:26:52 UTC
--- BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -660,7 +668,7 @@ group("gn_all") {
@@ -663,7 +671,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@ -51,16 +51,16 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1084,7 +1092,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1087,7 +1095,7 @@ if (!is_ios && !is_cronet_build) {
]
}
- if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
+ if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1188,7 +1196,7 @@ if (!is_ios && !is_cronet_build) {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1177,7 +1185,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1197,7 +1205,7 @@ if (!is_ios && !is_cronet_build) {
@@ -1186,7 +1194,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1671,7 +1679,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-ash_display_mirror__window__controller.cc
View file

@ -1,6 +1,6 @@
--- ash/display/mirror_window_controller.cc.orig 2023-08-18 10:26:52 UTC
--- ash/display/mirror_window_controller.cc.orig 2023-09-17 07:59:53 UTC
+++ ash/display/mirror_window_controller.cc
@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
@@ -294,7 +294,11 @@ void MirrorWindowController::UpdateWindow(
if (!base::Contains(display_info_list, iter->first,
&display::ManagedDisplayInfo::id)) {
CloseAndDeleteHost(iter->second, true);

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

@ -1,4 +1,4 @@
--- base/BUILD.gn.orig 2023-08-18 10:26:52 UTC
--- base/BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ base/BUILD.gn
@@ -198,7 +198,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"
@@ -1150,11 +1150,23 @@ component("base") {
@@ -1112,11 +1112,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.
@ -32,18 +32,9 @@
+ }
+
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1185,7 +1197,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
- if (is_chromeos || is_linux) {
+ if (is_chromeos || (is_linux && !is_bsd)) {
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1226,7 +1238,7 @@ component("base") {
if (is_apple) {
sources += [ "allocator/early_zone_registration_mac.h" ]
@@ -1133,7 +1145,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -52,31 +43,10 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2185,6 +2197,43 @@ component("base") {
}
@@ -2075,6 +2087,22 @@ component("base") {
]
}
+ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_inotify.cc",
+ "files/scoped_file_linux.cc",
+ "process/process_linux.cc",
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_metrics_linux.cc",
+ "process/process_handle_linux.cc",
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+ "profiler/thread_delegate_posix.cc",
+ "profiler/thread_delegate_posix.h",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
+ "files/file_path_watcher_kqueue.h",
+ "files/file_path_watcher_bsd.cc",
+ ]
+ }
+
+ if (is_openbsd) {
+ sources += [
+ "process/process_handle_openbsd.cc",
@ -96,7 +66,37 @@
# iOS
if (is_ios) {
sources += [
@@ -2285,7 +2334,7 @@ component("base") {
@@ -2207,6 +2235,29 @@ component("base") {
}
}
+ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_inotify.cc",
+ "files/scoped_file_linux.cc",
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_linux.cc",
+ "process/process_metrics_linux.cc",
+ "process/process_handle_linux.cc",
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+ "profiler/thread_delegate_posix.cc",
+ "profiler/thread_delegate_posix.h",
+ "threading/platform_thread_linux.cc",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
+ "files/file_path_watcher_kqueue.h",
+ "files/file_path_watcher_bsd.cc",
+ "threading/platform_thread_bsd.cc",
+ ]
+ }
+
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2217,7 +2268,7 @@ component("base") {
}
if (dep_libevent) {
@ -105,7 +105,7 @@
}
if (use_libevent) {
@@ -3619,7 +3668,7 @@ test("base_unittests") {
@@ -3587,7 +3638,7 @@ test("base_unittests") {
]
}
@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3640,7 +3689,7 @@ test("base_unittests") {
@@ -3608,7 +3659,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3651,7 +3700,7 @@ test("base_unittests") {
@@ -3619,7 +3670,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3907,7 +3956,7 @@ test("base_unittests") {
@@ -3871,7 +3922,7 @@ test("base_unittests") {
}
}

11
www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_BUILD.gn Normal file
View file

@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/BUILD.gn
@@ -541,7 +541,7 @@ source_set("allocator_shim") {
]
configs += [ ":mac_no_default_new_delete_symbols" ]
}
- if (is_chromeos || is_linux) {
+ if ((is_chromeos || is_linux) && !is_bsd) {
sources += [
"shim/allocator_shim_override_cpp_symbols.h",
"shim/allocator_shim_override_glibc_weak_symbols.h",

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

@ -1,11 +1,11 @@
--- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-10 11:01:21 UTC
--- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
#if defined(ARCH_CPU_64_BITS)
- #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD)
+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD)
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-08-18 10:26:52 UTC
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/page_allocator.h
@@ -245,7 +245,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address,
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

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

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-05-05 12:12:41 UTC
--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/page_allocator_constants.h
@@ -25,7 +25,7 @@
// elimination.
@ -9,7 +9,7 @@
// This should work for all POSIX (if needed), but currently all other
// supported OS/architecture combinations use either hard-coded values
// (such as x86) or have means to determine these values without needing
@@ -81,7 +81,7 @@ PageAllocationGranularityShift() {
@@ -92,7 +92,7 @@ PageAllocationGranularityShift() {
return 14; // 16kB
#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
return static_cast<size_t>(vm_page_shift);
@ -18,7 +18,7 @@
// arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
// page sizes. Retrieve from or initialize cache.
size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
@@ -102,7 +102,7 @@ PageAllocationGranularity() {
@@ -113,7 +113,7 @@ PageAllocationGranularity() {
// This is literally equivalent to |1 << PageAllocationGranularityShift()|
// below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
return vm_page_size;
@ -27,7 +27,7 @@
// arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
// initialize cache.
size_t size = page_characteristics.size.load(std::memory_order_relaxed);
@@ -141,7 +141,7 @@ SystemPageShift() {
@@ -152,7 +152,7 @@ SystemPageShift() {
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
SystemPageSize() {
#if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-08-18 10:26:52 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -396,8 +396,12 @@ bool TryRecommitSystemPagesInternal(
@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-08-18 10:26:52 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -317,7 +317,7 @@ declare_args() {
@@ -332,7 +332,7 @@ declare_args() {
# pkeys support is explicitly disabled in all Cronet builds, as some test
# dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers.

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-10-01 07:40:07 UTC
--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) {
@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) {
if (getentropy(output, output_length) == 0) {
return;
}
@ -9,5 +9,5 @@
+ return;
+ }
#endif
// If the OS-specific mechanisms didn't work, fall through to reading from
// If getrandom(2) above returned with an error and the /dev/urandom fallback
// took place on Linux/ChromeOS bots, they would fail with a CHECK in

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

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-07-21 09:49:17 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
@ -9,7 +9,7 @@
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
@@ -234,7 +234,7 @@ constexpr bool kUseLazyCommit = false;
@@ -236,7 +236,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() \
@ -18,7 +18,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
@@ -283,7 +283,7 @@ constexpr bool kUseLazyCommit = false;
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \

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

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-07-21 09:49:17 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -92,7 +92,7 @@ PartitionPageShift() {
@@ -95,7 +95,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
@ -9,7 +9,7 @@
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \

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

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-08-18 10:26:52 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -46,7 +46,7 @@
#include "wow64apiset.h"
@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() {
@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -376,7 +376,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa
@@ -372,7 +372,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -853,7 +853,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
@@ -849,7 +849,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

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

@ -1,10 +1,10 @@
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-04-08 11:38:38 UTC
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-09-17 07:59:53 UTC
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
@@ -18,6 +18,10 @@
#include <pthread.h>
#endif
+#if defined(OS_BSD)
+#if BUILDFLAG(IS_BSD)
+#include <pthread_np.h>
+#endif
+

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

@ -1,6 +1,6 @@
--- base/base_switches.cc.orig 2023-05-05 12:12:41 UTC
--- base/base_switches.cc.orig 2023-09-17 07:59:53 UTC
+++ base/base_switches.cc
@@ -167,7 +167,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
@@ -162,7 +162,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
#endif

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

@ -1,6 +1,6 @@
--- base/base_switches.h.orig 2023-05-05 12:12:41 UTC
--- base/base_switches.h.orig 2023-09-17 07:59:53 UTC
+++ base/base_switches.h
@@ -57,7 +57,7 @@ extern const char kEnableIdleTracing[];
@@ -56,7 +56,7 @@ extern const char kEnableIdleTracing[];
extern const char kForceFieldTrialParams[];
#endif

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

@ -1,10 +1,10 @@
--- base/debug/elf_reader.cc.orig 2022-10-01 07:40:07 UTC
--- base/debug/elf_reader.cc.orig 2023-09-17 07:59:53 UTC
+++ base/debug/elf_reader.cc
@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
bool found = false;
while (current_section < section_end) {
current_note = reinterpret_cast<const Nhdr*>(current_section);
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
if (current_note->n_type == NT_GNU_BUILD_ID) {
StringPiece note_name(current_section + sizeof(Nhdr),
current_note->n_namesz);

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

@ -1,4 +1,4 @@
--- base/debug/stack_trace_posix.cc.orig 2023-07-21 09:49:17 UTC
--- base/debug/stack_trace_posix.cc.orig 2023-09-17 07:59:53 UTC
+++ base/debug/stack_trace_posix.cc
@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
@ -18,7 +18,53 @@
#include "base/debug/proc_maps_linux.h"
#endif
@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper {
@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) {
std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
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
@@ -317,7 +317,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
+#if BUILDFLAG(IS_BSD)
+ _exit(EXIT_FAILURE);
+#else
syscall(SYS_exit_group, EXIT_FAILURE);
+#endif
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
_exit(EXIT_FAILURE);
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Set an alarm to trigger in case the default handler does not terminate
// the process. See 'AlarmSignalHandler' for more details.
struct sigaction action;
@@ -559,6 +563,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().
+#if !BUILDFLAG(IS_BSD)
long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
info->si_signo, info);
if (retval == 0) {
@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
if (errno != EPERM) {
_exit(EXIT_FAILURE);
}
+#endif
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
@ -28,7 +74,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper {
@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;

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

@ -1,29 +1,29 @@
--- base/files/file_path_watcher_unittest.cc.orig 2023-07-21 09:49:17 UTC
--- base/files/file_path_watcher_unittest.cc.orig 2023-09-17 07:59:53 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvent());
@@ -586,7 +586,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
}
delegate.RunUntilEventsMatch(event_expecter);
-#if !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
// Mac implementation does not detect files modified in a directory.
+#if !BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD)
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
@@ -1281,7 +1281,7 @@ enum Permission {
Execute
};
// Mac implementation does not detect files modified in a directory.
// TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
@@ -1525,7 +1525,7 @@ namespace {
enum Permission { Read, Write, Execute };
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)
@@ -1559,7 +1559,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
} // namespace
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+#if BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD)
// Linux implementation of FilePathWatcher doesn't catch attribute changes.
// http://crbug.com/78043
// Windows implementation of FilePathWatcher catches attribute changes that

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

@ -1,4 +1,4 @@
--- base/i18n/icu_util.cc.orig 2023-02-11 09:11:04 UTC
--- base/i18n/icu_util.cc.orig 2023-09-17 07:59:53 UTC
+++ base/i18n/icu_util.cc
@@ -51,7 +51,7 @@
#include "third_party/icu/source/common/unicode/unistr.h"
@ -9,7 +9,7 @@
BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -340,7 +340,7 @@ void InitializeIcuTimeZone() {
@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));

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

@ -1,4 +1,4 @@
--- base/linux_util.cc.orig 2022-10-01 07:40:07 UTC
--- base/linux_util.cc.orig 2023-09-17 07:59:53 UTC
+++ base/linux_util.cc
@@ -15,6 +15,7 @@
@ -12,7 +12,7 @@
}
bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
+#if defined(OS_BSD)
+#if BUILDFLAG(IS_BSD)
+ return false;
+#else
// 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22

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

@ -1,6 +1,6 @@
--- base/process/process_metrics.h.orig 2023-07-21 09:49:17 UTC
--- base/process/process_metrics.h.orig 2023-09-17 07:59:53 UTC
+++ base/process/process_metrics.h
@@ -38,7 +38,7 @@
@@ -37,7 +37,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -9,16 +9,16 @@
#include <string>
#include <utility>
#include <vector>
@@ -53,7 +53,7 @@ struct IoCounters;
class ProcessMetricsAppleInternal;
@@ -50,7 +50,7 @@ namespace base {
// Full declaration is in process_metrics_iocounters.h.
struct IoCounters;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@ -27,7 +27,7 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -36,7 +36,7 @@
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of
@@ -226,7 +226,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -73,7 +73,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@ -82,7 +82,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -91,7 +91,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -100,7 +100,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -109,7 +109,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics {
@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

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

@ -1,4 +1,4 @@
--- base/process/process_metrics_openbsd.cc.orig 2023-03-10 11:01:21 UTC
--- base/process/process_metrics_openbsd.cc.orig 2023-09-17 07:59:53 UTC
+++ base/process/process_metrics_openbsd.cc
@@ -6,14 +6,23 @@
@ -83,13 +83,14 @@
size_t GetSystemCommitCharge() {
int mib[] = { CTL_VM, VM_METER };
int pagesize;
@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() {
@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() {
pagesize = getpagesize();
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+}
+
+int ProcessMetrics::GetOpenFdCount() const {
+#if 0
+ struct kinfo_file *files;
+ kvm_t *kd = NULL;
+ int total_count = 0;
@ -108,10 +109,13 @@
+
+out:
+ return total_count;
+#endif
+ return getdtablecount();
+}
+
+int ProcessMetrics::GetOpenFdSoftLimit() const {
+ return GetMaxFds();
+ return getdtablesize();
+// return GetMaxFds();
+}
+
+uint64_t ProcessMetrics::GetVmSwapBytes() const {

33
www/ungoogled-chromium/files/patch-base_process_process__posix.cc
View file

@ -1,4 +1,4 @@
--- base/process/process_posix.cc.orig 2023-04-08 11:38:38 UTC
--- base/process/process_posix.cc.orig 2023-09-17 07:59:53 UTC
+++ base/process/process_posix.cc
@@ -23,10 +23,15 @@
#include "base/trace_event/base_tracing.h"
@ -9,7 +9,7 @@
#include <sys/event.h>
#endif
+#if defined(OS_BSD)
+#if BUILDFLAG(IS_BSD)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
@ -35,21 +35,21 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const {
@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const {
int Process::GetPriority() const {
int Process::GetOSPriority() const {
DCHECK(IsValid());
+// avoid pledge(2) violation
+#if defined(OS_BSD)
+#if BUILDFLAG(IS_BSD)
+ return 0;
+#else
return getpriority(PRIO_PROCESS, static_cast<id_t>(process_));
+#endif
+}
}
+
+Time Process::CreationTime() const {
+// avoid ps pledge in the network process
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(),
+ sizeof(struct kinfo_proc), 0 };
+ struct kinfo_proc *info = nullptr;
@ -57,7 +57,7 @@
+#endif
+ Time ct = Time();
+
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
+ if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
+ goto out;
+
@ -77,17 +77,18 @@
+ return ct;
+}
+
+bool Process::IsProcessBackgrounded() const {
+#if BUILDFLAG(IS_BSD)
+Process::Priority Process::GetPriority() const {
+ return Priority::kUserBlocking;
+}
+
+bool Process::SetPriority(Priority priority) {
+ return false;
+}
+
+bool Process::SetProcessBackgrounded(bool value) {
+
+bool Process::CanSetPriority() {
+ return false;
+}
+
+// static
+bool Process::CanBackgroundProcesses() {
+ return false;
}
+#endif
} // namespace base

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

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

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

@ -1,6 +1,6 @@
--- base/system/sys_info.cc.orig 2023-07-21 09:49:17 UTC
--- base/system/sys_info.cc.orig 2023-09-17 07:59:53 UTC
+++ base/system/sys_info.cc
@@ -155,7 +155,7 @@ std::string SysInfo::HardwareModelName() {
@@ -166,7 +166,7 @@ std::string SysInfo::HardwareModelName() {
#endif
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {

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

@ -1,6 +1,6 @@
--- base/system/sys_info.h.orig 2023-08-18 10:26:52 UTC
--- base/system/sys_info.h.orig 2023-09-17 07:59:53 UTC
+++ base/system/sys_info.h
@@ -261,6 +261,8 @@ class BASE_EXPORT SysInfo {
@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo {
static void ResetCpuSecurityMitigationsEnabledForTesting();
#endif
@ -9,7 +9,7 @@
private:
friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
@@ -273,7 +275,7 @@ class BASE_EXPORT SysInfo {
@@ -276,7 +278,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

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

@ -1,10 +1,10 @@
--- base/test/test_file_util_linux.cc.orig 2022-10-01 07:40:07 UTC
--- base/test/test_file_util_linux.cc.orig 2023-09-17 07:59:53 UTC
+++ base/test/test_file_util_linux.cc
@@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const FilePath& file) {
return false;
if (fdatasync(fd.get()) != 0)
return false;
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0)
return false;
+#endif

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

@ -0,0 +1,34 @@
--- base/threading/platform_thread_bsd.cc.orig 2023-09-17 07:59:53 UTC
+++ base/threading/platform_thread_bsd.cc
@@ -0,0 +1,31 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+// Description: These are stubs for *BSD.
+
+#include "base/threading/platform_thread.h"
+
+namespace base {
+namespace internal {
+
+bool CanSetThreadTypeToRealtimeAudio() {
+ return false;
+}
+
+bool SetCurrentThreadTypeForPlatform(ThreadType thread_type,
+ MessagePumpType pump_type_hint) {
+ return false;
+}
+
+absl::optional<ThreadPriorityForTest>
+GetCurrentThreadPriorityForPlatformForTest() {
+ return absl::nullopt;
+}
+} // namespace internal
+
+// static
+void PlatformThreadBase::SetName(const std::string& name) {
+ SetNameCommon(name);
+}
+
+} // namespace base

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

@ -0,0 +1,11 @@
--- base/threading/platform_thread_internal_posix.cc.orig 2023-09-17 07:59:53 UTC
+++ base/threading/platform_thread_internal_posix.cc
@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
}
int GetCurrentThreadNiceValue() {
-#if BUILDFLAG(IS_NACL)
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
NOTIMPLEMENTED();
return 0;
#else

84
www/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc
View file

@ -1,84 +0,0 @@
--- base/threading/platform_thread_linux.cc.orig 2023-02-11 09:11:04 UTC
+++ base/threading/platform_thread_linux.cc
@@ -30,7 +30,9 @@
#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#include <pthread.h>
+#if !BUILDFLAG(IS_BSD)
#include <sys/prctl.h>
+#endif
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
@@ -139,7 +141,7 @@ long sched_setattr(pid_t pid,
#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#endif // BUILDFLAG(IS_CHROMEOS)
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
const FilePath::CharType kCgroupDirectory[] =
FILE_PATH_LITERAL("/sys/fs/cgroup");
@@ -313,7 +315,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th
namespace internal {
namespace {
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
const struct sched_param kRealTimePrio = {8};
#endif
} // namespace
@@ -340,7 +342,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue
};
bool CanSetThreadTypeToRealtimeAudio() {
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
// pthread_setschedparam in SetCurrentThreadTypeForPlatform().
struct rlimit rlim;
@@ -352,7 +354,7 @@ bool CanSetThreadTypeToRealtimeAudio() {
bool SetCurrentThreadTypeForPlatform(ThreadType thread_type,
MessagePumpType pump_type_hint) {
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
const PlatformThreadId tid = PlatformThread::CurrentId();
if (g_thread_type_delegate &&
@@ -378,7 +380,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread
absl::optional<ThreadPriorityForTest>
GetCurrentThreadPriorityForPlatformForTest() {
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
int maybe_sched_rr = 0;
struct sched_param maybe_realtime_prio = {0};
if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
@@ -397,7 +399,7 @@ GetCurrentThreadPriorityForPlatformForTest() {
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
-#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD)
// On linux we can get the thread names to show up in the debugger by setting
// the process name for the LWP. We don't want to do this for the main
// thread because that would rename the process, causing tools like killall
@@ -417,7 +419,7 @@ void PlatformThread::SetName(const std::string& name)
#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
}
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
// static
void PlatformThread::SetThreadTypeDelegate(ThreadTypeDelegate* delegate) {
// A component cannot override a delegate set by another component, thus
@@ -428,7 +430,7 @@ void PlatformThread::SetThreadTypeDelegate(ThreadTypeD
}
#endif
-#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD)
// static
void PlatformThread::SetThreadType(ProcessId process_id,
PlatformThreadId thread_id,

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

@ -1,6 +1,6 @@
--- base/threading/platform_thread_posix.cc.orig 2023-04-08 11:38:38 UTC
--- base/threading/platform_thread_posix.cc.orig 2023-09-17 07:59:53 UTC
+++ base/threading/platform_thread_posix.cc
@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) {
@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
@ -9,6 +9,21 @@
partition_alloc::internal::PCScan::NotifyThreadCreated(
partition_alloc::internal::GetStackPointer());
#endif
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_APPLE)
PlatformThread::SetCurrentThreadRealtimePeriodValue(
delegate->GetRealtimePeriod());
@@ -353,7 +353,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
// static
bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
-#if BUILDFLAG(IS_NACL)
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
return false;
#else
if (from >= to) {
@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
@ -19,3 +34,12 @@
#else
if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
return;
@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
// static
ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {
-#if BUILDFLAG(IS_NACL)
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
NOTIMPLEMENTED();
return ThreadPriorityForTest::kNormal;
#else

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

@ -1,4 +1,4 @@
--- base/threading/platform_thread_unittest.cc.orig 2023-07-21 09:49:17 UTC
--- base/threading/platform_thread_unittest.cc.orig 2023-09-17 07:59:53 UTC
+++ base/threading/platform_thread_unittest.cc
@@ -32,7 +32,7 @@
#include "base/time/time.h"
@ -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.
constexpr bool kCanIncreasePriority = false;
@@ -698,12 +698,16 @@ INSTANTIATE_TEST_SUITE_P(
@@ -695,12 +695,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)

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

@ -1,10 +1,10 @@
--- base/trace_event/malloc_dump_provider.cc.orig 2023-08-18 10:26:52 UTC
--- base/trace_event/malloc_dump_provider.cc.orig 2023-09-17 07:59:53 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -25,6 +25,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
+#elif defined(OS_BSD)
+#elif BUILDFLAG(IS_BSD)
+#include <stdlib.h>
#else
#include <malloc.h>
@ -22,7 +22,7 @@
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
+#elif defined(OS_BSD)
+#elif BUILDFLAG(IS_BSD)
+ total_virtual_size = 0;
+ allocated_objects_size = 0;
#else

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

@ -0,0 +1,16 @@
--- base/trace_event/trace_log.cc.orig 2023-09-17 07:59:53 UTC
+++ base/trace_event/trace_log.cc
@@ -2187,8 +2187,13 @@ void TraceLog::SetTraceBufferForTesting(
#if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
AutoLock lock(track_event_lock_);
+#if defined(__clang__) && (__clang_major__ >= 16)
track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
args.backend_type);
+#else
+ track_event_sessions_.emplace_back(TrackEventSession{args.internal_instance_index, *args.config,
+ args.backend_type});
+#endif
}
void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {

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

@ -1,6 +1,6 @@
--- build/config/compiler/BUILD.gn.orig 2023-08-18 10:26:52 UTC
--- build/config/compiler/BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ build/config/compiler/BUILD.gn
@@ -249,13 +249,16 @@ config("default_include_dirs") {
@@ -248,13 +248,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") {
@ -18,7 +18,7 @@
}
# compiler ---------------------------------------------------------------------
@@ -500,6 +503,10 @@ config("compiler") {
@@ -499,6 +502,10 @@ config("compiler") {
}
}
@ -29,7 +29,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
@@ -575,7 +582,7 @@ config("compiler") {
@@ -574,7 +581,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@ -38,7 +38,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
@@ -760,7 +767,7 @@ config("compiler") {
@@ -759,7 +766,7 @@ config("compiler") {
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
@ -47,7 +47,7 @@
# TODO(https://crbug.com/972449): turn on for ChromeOS when that
# toolchain has this flag.
# We only use one version of LLVM within a build so there's no need to
@@ -867,7 +874,7 @@ config("compiler") {
@@ -866,7 +873,7 @@ config("compiler") {
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
@ -56,7 +56,7 @@
cflags_cc += [ "-gsimple-template-names" ]
}
@@ -1109,7 +1116,7 @@ config("compiler_cpu_abi") {
@@ -1108,7 +1115,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -65,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -1124,7 +1131,7 @@ config("compiler_cpu_abi") {
@@ -1123,7 +1130,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -74,7 +74,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1459,7 +1466,7 @@ config("compiler_deterministic") {
@@ -1458,7 +1465,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.
@ -83,7 +83,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1511,7 +1518,7 @@ config("compiler_deterministic") {
@@ -1510,7 +1517,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@ -92,7 +92,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1759,7 +1766,7 @@ config("default_warnings") {
@@ -1764,7 +1771,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@ -101,7 +101,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1962,7 +1969,7 @@ config("no_chromium_code") {
@@ -1973,7 +1980,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -110,7 +110,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2472,7 +2479,7 @@ config("afdo_optimize_size") {
@@ -2483,7 +2490,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") {
@ -119,8 +119,8 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2491,7 +2498,7 @@ config("afdo") {
}
@@ -2510,7 +2517,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
- } else if (auto_profile_path != "" && is_a_target_toolchain) {
@ -128,7 +128,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2649,7 +2656,8 @@ config("symbols") {
@@ -2674,7 +2681,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}

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

@ -1,6 +1,6 @@
--- build/config/compiler/pgo/BUILD.gn.orig 2023-08-18 10:26:52 UTC
--- build/config/compiler/pgo/BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ build/config/compiler/pgo/BUILD.gn
@@ -128,13 +128,14 @@ config("pgo_optimization_flags") {
@@ -138,13 +138,14 @@ config("pgo_optimization_flags") {
# Enable basic block layout based on the extended TSP problem. This aims to
# improve icache utilization and reduce the binary size.

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

@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig 2023-08-18 10:26:52 UTC
--- build/toolchain/gcc_toolchain.gni.orig 2023-09-17 07:59:53 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -876,22 +883,12 @@ template("gcc_toolchain") {
@@ -874,22 +881,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {

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

@ -1,10 +1,10 @@
--- build/toolchain/toolchain.gni.orig 2023-08-18 10:26:52 UTC
--- build/toolchain/toolchain.gni.orig 2023-09-17 07:59:53 UTC
+++ build/toolchain/toolchain.gni
@@ -62,7 +62,7 @@ if (host_os == "mac") {
host_shlib_extension = ".dylib"
} else if (host_os == "win") {
host_shlib_extension = ".dll"
-} else if (host_os == "linux") {
-} else if (host_os == "linux" || host_os == "aix") {
+} else if (is_posix) {
host_shlib_extension = ".so"
} else {

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

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2023-08-18 10:26:52 UTC
--- cc/BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ cc/BUILD.gn
@@ -670,7 +670,7 @@ cc_test_static_library("test_support") {
@@ -671,7 +671,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
@@ -918,7 +918,6 @@ cc_test("cc_unittests") {
@@ -919,7 +919,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

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

@ -0,0 +1,11 @@
--- cc/base/features.cc.orig 2023-09-17 07:59:53 UTC
+++ cc/base/features.cc
@@ -71,7 +71,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding,
BASE_FEATURE(kUseDMSAAForTiles,
"UseDMSAAForTiles",
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT

4
www/ungoogled-chromium/files/patch-chrome_app_app__management__strings.grdp
View file

@ -1,6 +1,6 @@
--- chrome/app/app_management_strings.grdp.orig 2023-08-18 10:26:52 UTC
--- chrome/app/app_management_strings.grdp.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/app_management_strings.grdp
@@ -191,7 +191,7 @@
@@ -188,7 +188,7 @@
You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
</if>

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

@ -1,6 +1,6 @@
--- chrome/app/chrome_command_ids.h.orig 2023-08-18 10:26:52 UTC
--- chrome/app/chrome_command_ids.h.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/chrome_command_ids.h
@@ -69,12 +69,12 @@
@@ -68,12 +68,12 @@
#define IDC_TOGGLE_MULTITASK_MENU 34050
#endif

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

@ -1,4 +1,4 @@
--- chrome/app/chrome_main_delegate.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -139,7 +139,7 @@
#include "components/about_ui/credit_utils.h"
@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -183,16 +183,16 @@
@@ -182,16 +182,16 @@
#include "v8/include/v8.h"
#endif
@ -47,7 +47,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
@@ -529,7 +529,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -542,7 +542,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -56,7 +56,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
@@ -618,7 +618,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -632,7 +632,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -64,8 +64,8 @@
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -967,7 +967,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
@@ -959,7 +959,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
base::sequence_manager::internal::ThreadController::InitializeFeatures();
@ -92,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
@@ -1510,7 +1510,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1526,7 +1526,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -101,7 +101,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1612,7 +1612,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1628,7 +1628,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.

8
www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/chromium_strings.grd.orig 2023-08-18 10:26:52 UTC
--- chrome/app/chromium_strings.grd.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/chromium_strings.grd
@@ -315,7 +315,7 @@ If you update this file, be sure also to update google
Welcome to Chromium; new browser window opened
@ -9,7 +9,7 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Chromium
</message>
@@ -456,7 +456,7 @@ If you update this file, be sure also to update google
@@ -465,7 +465,7 @@ If you update this file, be sure also to update google
To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
</message>
</if>
@ -18,7 +18,7 @@
<message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
Chromium may not function correctly because it is no longer supported on this Linux distribution
</message>
@@ -860,7 +860,7 @@ Permissions you've already given to websites and apps
@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps
</message>
</if>
@ -27,7 +27,7 @@
<message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false">
Not used in Chromium. Placeholder to keep resource maps in sync.
</message>
@@ -1234,7 +1234,7 @@ Permissions you've already given to websites and apps
@@ -1255,7 +1255,7 @@ Permissions you've already given to websites and apps
</message>
</if>

22
www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-09-01 04:52:40 UTC
--- chrome/app/generated_resources.grd.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@ -9,7 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
@@ -3426,7 +3426,7 @@ You can send it to Google to check if it's unsafe. Sca
@@ -3575,7 +3575,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@ -18,7 +18,7 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
@@ -5172,7 +5172,7 @@ You can send it to Google to check if it's unsafe. Sca
@@ -5406,7 +5406,7 @@ are declared in tools/grit/grit_rule.gni.
Read information about your browser, OS, device, installed software, registry values and files
</message>
</if>
@ -27,7 +27,7 @@
<message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
Read information about your browser, OS, device, installed software and files
</message>
@@ -5845,7 +5845,7 @@ Keep your key file in a safe place. You will need it t
@@ -6095,7 +6095,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
</if>
@ -36,7 +36,7 @@
<message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
@@ -5891,7 +5891,7 @@ Keep your key file in a safe place. You will need it t
@@ -6141,7 +6141,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
</message>
</if>
@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
@@ -9902,7 +9902,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10361,7 +10361,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
Update
</message>
@ -54,7 +54,7 @@
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
Finish update
</message>
@@ -10238,7 +10238,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10700,7 +10700,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -63,16 +63,16 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
@@ -11211,7 +11211,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -11685,7 +11685,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>
<!-- Device Trust Consent dialog -->
- <if expr="is_win or is_macosx or is_linux or is_chromeos">
+ <if expr="is_win or is_macosx or is_posix or is_chromeos">
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share device signals?
Share information about your device?
</message>
@@ -11610,7 +11610,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -12084,7 +12084,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -81,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -13802,7 +13802,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -14306,7 +14306,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

4
www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd
View file

@ -1,4 +1,4 @@
--- chrome/app/google_chrome_strings.grd.orig 2023-08-18 10:26:52 UTC
--- chrome/app/google_chrome_strings.grd.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -301,7 +301,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
@ -27,7 +27,7 @@
<if expr="use_titlecase">
<message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item">
Relaunch to Update - Your tabs will reopen
@@ -1276,7 +1276,7 @@ Permissions you've already given to websites and apps
@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps
</message>
</if>

4
www/ungoogled-chromium/files/patch-chrome_app_profiles__strings.grdp
View file

@ -1,6 +1,6 @@
--- chrome/app/profiles_strings.grdp.orig 2023-06-05 19:39:05 UTC
--- chrome/app/profiles_strings.grdp.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/profiles_strings.grdp
@@ -60,7 +60,7 @@
@@ -54,7 +54,7 @@
Add Profile...
</message>
</if>

6
www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp
View file

@ -1,6 +1,6 @@
--- chrome/app/settings_strings.grdp.orig 2023-06-05 19:39:05 UTC
--- chrome/app/settings_strings.grdp.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/settings_strings.grdp
@@ -202,7 +202,7 @@
@@ -207,7 +207,7 @@
Theme
</message>
</if>
@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
@@ -222,7 +222,7 @@
@@ -227,7 +227,7 @@
Use Classic
</message>
</if>

12
www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd
View file

@ -1,6 +1,6 @@
--- chrome/app/theme/theme_resources.grd.orig 2023-03-10 11:01:21 UTC
--- chrome/app/theme/theme_resources.grd.orig 2023-09-17 07:59:53 UTC
+++ chrome/app/theme/theme_resources.grd
@@ -135,14 +135,14 @@
@@ -143,14 +143,14 @@
</if>
<if expr="_google_chrome">
<then>
@ -17,7 +17,7 @@
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
@@ -150,7 +150,7 @@
@@ -158,7 +158,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
</else>
@ -26,7 +26,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" />
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
@@ -162,7 +162,7 @@
@@ -170,7 +170,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@ -35,7 +35,7 @@
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" />
@@ -171,10 +171,10 @@
@@ -179,10 +179,10 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" />
</else>
@ -48,7 +48,7 @@
<then>
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
@@ -183,7 +183,7 @@
@@ -191,7 +191,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
</else>

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

@ -1,6 +1,6 @@
--- chrome/browser/BUILD.gn.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/BUILD.gn
@@ -6278,6 +6278,13 @@ static_library("browser") {
@@ -6347,6 +6347,13 @@ static_library("browser") {
}
}

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

@ -1,6 +1,6 @@
--- chrome/browser/about_flags.cc.orig 2023-09-01 04:52:40 UTC
--- chrome/browser/about_flags.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/about_flags.cc
@@ -224,7 +224,7 @@
@@ -222,7 +222,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
@@ -320,7 +320,7 @@
@@ -321,7 +321,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@ -18,7 +18,16 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -430,7 +430,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -335,7 +335,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"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -435,7 +435,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -27,7 +36,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1482,7 +1482,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
std::size(kChromeRefresh2023Level1), nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -36,7 +45,7 @@
const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = {
{"ShortcutBoostSearchScore", "1414"},
{"ShortcutBoostUrlScore", "1414"}};
@@ -4971,13 +4971,13 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5031,13 +5031,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -52,7 +61,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -5262,7 +5262,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5326,7 +5326,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -61,7 +70,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -5928,7 +5928,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6016,7 +6016,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -70,7 +79,7 @@
{"omnibox-domain-suggestions",
flag_descriptions::kOmniboxDomainSuggestionsName,
flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
@@ -6691,7 +6691,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6814,7 +6814,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@ -79,7 +88,16 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -8381,7 +8381,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7797,7 +7797,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)},
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
-#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,
@@ -8528,7 +8528,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -88,7 +106,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -8642,7 +8642,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8808,7 +8808,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -97,7 +115,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
@@ -8703,7 +8703,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8868,7 +8868,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -106,7 +124,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -9271,7 +9271,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9386,7 +9386,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -115,7 +133,7 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
@@ -9991,7 +9991,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10046,7 +10046,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
@ -124,7 +142,7 @@
{"webui-system-font", flag_descriptions::kWebUiSystemFontName,
flag_descriptions::kWebUiSystemFontDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
@@ -10176,7 +10176,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10232,7 +10232,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
@ -133,7 +151,7 @@
{"data-retention-policies-disable-sync-types-needed",
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
@@ -10584,7 +10584,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -10625,7 +10625,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -142,3 +160,12 @@
{"camera-mic-preview", flag_descriptions::kCameraMicPreviewName,
flag_descriptions::kCameraMicPreviewDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia),
@@ -10802,7 +10802,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll,
FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)},
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,

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

@ -1,6 +1,6 @@
--- chrome/browser/browser_features.cc.orig 2023-06-05 19:39:05 UTC
--- chrome/browser/browser_features.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/browser_features.cc
@@ -27,7 +27,7 @@ BASE_FEATURE(kClosedTabCache,
@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache,
BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose",
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/browser_process_impl.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -216,7 +216,7 @@
@@ -219,7 +219,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1190,7 +1190,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1212,7 +1212,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1427,7 +1427,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1448,7 +1448,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.h.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/browser_process_impl.h.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/browser_process_impl.h
@@ -370,7 +370,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -378,7 +378,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

16
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 2023-08-18 10:26:52 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -124,13 +124,13 @@
@@ -129,13 +129,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
@@ -208,7 +208,7 @@
@@ -217,7 +217,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -25,7 +25,7 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
@@ -915,7 +915,7 @@ void PopulateChromeFrameBinders(
@@ -949,7 +949,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -923,7 +923,7 @@ void PopulateChromeFrameBinders(
@@ -957,7 +957,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@ -43,7 +43,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
@@ -997,7 +997,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1031,7 +1031,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -52,7 +52,7 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
@@ -1011,7 +1011,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1046,7 +1046,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -61,7 +61,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1477,7 +1477,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1535,7 +1535,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,4 +1,4 @@
--- chrome/browser/chrome_browser_main.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -245,11 +245,11 @@
@ -31,7 +31,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"
@@ -1029,7 +1029,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1030,7 +1030,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -40,7 +40,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -1085,7 +1085,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1086,7 +1086,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -49,7 +49,7 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1321,7 +1321,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
@@ -1322,7 +1322,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -58,7 +58,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
@@ -1430,7 +1430,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
@@ -1428,7 +1428,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.

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

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -424,7 +424,7 @@
@@ -432,7 +432,7 @@
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -513,12 +513,12 @@
@@ -523,12 +523,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -527,14 +527,14 @@
@@ -537,14 +537,14 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -41,7 +41,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -563,11 +563,11 @@
@@ -571,11 +571,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -55,16 +55,16 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -1555,7 +1555,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true);
@@ -1564,7 +1564,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed,
true);
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
@@ -1676,7 +1676,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1688,7 +1688,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -73,7 +73,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1715,7 +1715,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1727,7 +1727,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -82,7 +82,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1748,7 +1748,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -91,7 +91,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -1755,7 +1755,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1767,7 +1767,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@ -100,7 +100,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2579,6 +2579,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2591,6 +2591,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#if(0)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -109,7 +109,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2984,7 +2986,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2998,7 +3000,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -118,7 +118,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4487,7 +4489,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4564,7 +4566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -127,7 +127,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -5003,7 +5005,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5086,7 +5088,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -136,7 +136,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
@@ -5013,7 +5015,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5096,7 +5098,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@ -145,7 +145,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -5044,7 +5046,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -5127,7 +5129,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
}
#endif
@ -154,7 +154,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -6843,7 +6845,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
@@ -6920,7 +6922,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {

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 2023-08-18 10:26:52 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -465,7 +465,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -471,7 +471,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

46
www/ungoogled-chromium/files/patch-chrome_browser_chrome__process__singleton.cc
View file

@ -1,46 +0,0 @@
--- chrome/browser/chrome_process_singleton.cc.orig 2023-08-18 10:26:52 UTC
+++ chrome/browser/chrome_process_singleton.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
#include "chrome/common/chrome_switches.h"
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/hash/hash.h"
#include "chrome/common/channel_info.h"
#include "components/version_info/channel.h"
@@ -22,7 +22,7 @@
#include "base/win/registry.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/files/file_util.h"
#endif
@@ -33,14 +33,14 @@ constexpr char kEarlySingletonEnabledGroup[] = "Enable
constexpr char kEarlySingletonDisabledMergeGroup[] = "Disabled_Merge3";
constexpr char kEarlySingletonDefaultGroup[] = "Default3";
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
constexpr char kEarlySingletonDisabledGroup[] = "Disabled3";
#endif // BUILDFLAG(IS_WIN)
const char* g_early_singleton_feature_group_ = nullptr;
ChromeProcessSingleton* g_chrome_process_singleton_ = nullptr;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
std::string GetMachineGUID() {
std::string machine_guid;
@@ -171,7 +171,7 @@ void ChromeProcessSingleton::SetupEarlySingletonFeatur
return;
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
g_early_singleton_feature_group_ = EnrollMachineInEarlySingletonFeature();
#else
g_early_singleton_feature_group_ = kEarlySingletonDefaultGroup;

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

@ -1,6 +1,6 @@
--- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/content_settings/one_time_permission_provider.cc
@@ -207,8 +207,13 @@ void OneTimePermissionProvider::OnSuspend() {
@@ -225,8 +225,13 @@ void OneTimePermissionProvider::OnSuspend() {
while (rule_iterator && rule_iterator->HasNext()) {
auto rule = rule_iterator->Next();
@ -14,7 +14,7 @@
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
setting_type,
permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
@@ -302,8 +307,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG
@@ -320,8 +325,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG
auto rule = rule_iterator->Next();
if (rule->primary_pattern.Matches(origin_gurl) &&
rule->secondary_pattern.Matches(origin_gurl)) {

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 2023-08-18 10:26:52 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1552,7 +1552,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1565,7 +1565,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
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();
}
@@ -1618,7 +1618,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1631,7 +1631,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) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/download/download_commands.h.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/download/download_commands.h.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/download/download_commands.h
@@ -58,7 +58,7 @@ class DownloadCommands {
@@ -60,7 +60,7 @@ class DownloadCommands {
void ExecuteCommand(Command command);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/download/download_item_model.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -761,7 +761,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -765,7 +765,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();
@@ -805,7 +805,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -811,7 +811,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked);
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);
@@ -1155,7 +1155,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1163,7 +1163,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 2023-07-21 09:49:17 UTC
--- chrome/browser/download/download_prefs.cc.orig 2023-09-17 07:59:53 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
@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -307,7 +312,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -473,7 +478,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -476,7 +481,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;
@@ -505,7 +510,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -508,7 +513,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();
@@ -536,7 +541,7 @@ void DownloadPrefs::SaveAutoOpenState() {
@@ -539,7 +544,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;
@@ -660,7 +665,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
@@ -663,7 +668,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_content__analysis__delegate.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -50,7 +50,7 @@
#include "ui/base/l10n/l10n_util.h"
@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck
#endif
@@ -555,7 +555,7 @@ void ContentAnalysisDelegate::PageRequestCallback(
@@ -557,7 +557,7 @@ void ContentAnalysisDelegate::PageRequestCallback(
bool ContentAnalysisDelegate::UploadData() {
upload_start_time_ = base::TimeTicks::Now();

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 2023-08-18 10:26:52 UTC
--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
@@ -498,7 +498,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
@@ -514,7 +514,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-08-18 10:26:52 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-09-17 07:59:53 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"
@ -9,7 +9,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h"
@@ -55,7 +55,7 @@ bool IsProfileManaged(Profile* profile) {
@@ -56,7 +56,7 @@ bool IsProfileManaged(Profile* profile) {
return management_service && management_service->IsManaged();
}
@ -18,7 +18,7 @@
policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) {
policy::CloudPolicyManager* user_policy_manager =
profile->GetUserCloudPolicyManager();
@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
DependsOn(policy::ManagementServiceFactory::GetInstance());

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

@ -0,0 +1,38 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -54,7 +54,7 @@
#include "base/strings/utf_string_conversions.h"
#endif
-#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/enterprise/signals/signals_aggregator_factory.h"
#include "components/device_signals/core/browser/signals_aggregator.h"
#include "components/device_signals/core/common/signals_constants.h"
@@ -139,7 +139,7 @@ void UploadSecurityEventReport(base::Value::Dict event
std::move(upload_callback));
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void PopulateSignals(base::Value::Dict event,
policy::CloudPolicyClient* client,
std::string name,
@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st
/*include_profile_user_name=*/false);
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void AddCrowdstrikeSignalsToEvent(
base::Value::Dict& event,
@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp
if (include_profile_user_name) {
event.Set(kKeyProfileUserName, GetProfileUserName());
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
Profile* profile = Profile::FromBrowserContext(context_);
device_signals::SignalsAggregator* signals_aggregator =
enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile);

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

@ -0,0 +1,20 @@
--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h
@@ -17,7 +17,7 @@
#include "components/keyed_service/core/keyed_service.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "components/device_signals/core/browser/signals_types.h"
#endif
@@ -194,7 +194,7 @@ class RealtimeReportingClient : public KeyedService,
base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this};
};
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Populate event dict with CrowdStrike signal values. If those signals are
// available in `response`, this function returns a Dict with the following
// fields added:

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

@ -0,0 +1,13 @@
--- 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
@@ -66,8 +66,8 @@ base::flat_map<std::string, SAMLProfileAttributes>& Ge
// TODO(crbug.com/1445072): Add actual domains with attribute names.
profile_attributes->insert(std::make_pair(
"supported.test",
- SAMLProfileAttributes("placeholderName", "placeholderDomain",
- "placeholderToken")));
+ SAMLProfileAttributes(SAMLProfileAttributes{"placeholderName", "placeholderDomain",
+ "placeholderToken"})));
// Extract domains and attributes from the command line switch.
const base::CommandLine& command_line =

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

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/enterprise/signals/device_info_fetcher_linux.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/enterprise/signals/device_info_fetcher_linux.cc
@@ -4,12 +4,23 @@
@ -10,11 +10,11 @@
#include <gio/gio.h>
#endif // defined(USE_GIO)
#include <sys/stat.h>
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
#include <sys/sysmacros.h>
+#endif
+#if defined(OS_BSD)
+#if BUILDFLAG(IS_BSD)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
@ -28,7 +28,7 @@
// Implements the logic from the native host installation script. First find the
// root device identifier, then locate its parent and get its type.
SettingValue GetDiskEncrypted() {
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
struct stat info;
// First figure out the device identifier. Fail fast if this fails.
if (stat("/", &info) != 0)
@ -42,7 +42,7 @@
std::vector<std::string> GetMacAddresses() {
std::vector<std::string> result;
+#if defined(OS_BSD)
+#if BUILDFLAG(IS_BSD)
+ struct ifaddrs* ifa = nullptr;
+
+ if (getifaddrs(&ifa) != 0)

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

@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/extensions/BUILD.gn.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/extensions/BUILD.gn
@@ -1346,6 +1346,10 @@ static_library("extensions") {
@@ -1351,6 +1351,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

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

@ -1,10 +1,10 @@
--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2023-02-11 09:11:04 UTC
--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
if (g_test_device_list.Get().get() != nullptr) {
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE,

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 2023-08-18 10:26:52 UTC
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -582,7 +582,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
@@ -593,7 +593,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {

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 2023-08-18 10:26:52 UTC
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -193,7 +193,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
(*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;

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 2023-08-18 10:26:52 UTC
--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -905,7 +905,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
@@ -901,7 +901,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
RequestExtensionApproval(contents);
return;
}

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 2023-07-21 09:49:17 UTC
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -316,7 +316,7 @@ const struct {
@@ -313,7 +313,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.cc.orig 2023-09-01 04:52:40 UTC
--- chrome/browser/flag_descriptions.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/flag_descriptions.cc
@@ -2519,7 +2519,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
@@ -2560,7 +2560,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
const char kWebUIOmniboxPopupDescription[] =
"If enabled, shows the omnibox suggestions popup in WebUI.";
@ -9,16 +9,16 @@
const char kWebUiSystemFontName[] = "WebUI System font";
const char kWebUiSystemFontDescription[] =
"If enabled, all WebUI surfaces will use the default UI font of the "
@@ -6839,7 +6839,7 @@ const char kLibAssistantV2MigrationDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -7044,7 +7044,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
@@ -7079,7 +7079,7 @@ const char kSearchWebInSidePanelDescription[] =
@@ -7258,7 +7258,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -27,7 +27,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -7088,7 +7088,7 @@ const char kQuickCommandsDescription[] =
@@ -7267,7 +7267,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -36,16 +36,16 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -7110,7 +7110,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
@@ -7282,7 +7282,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const char kUseOutOfProcessVideoDecodingName[] =
"Use out-of-process video decoding (OOP-VD)";
const char kUseOutOfProcessVideoDecodingDescription[] =
@@ -7128,7 +7128,7 @@ const char kWebShareDescription[] =
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
@@ -7306,7 +7306,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -54,7 +54,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -7148,7 +7148,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -7326,7 +7326,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -63,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -7162,7 +7162,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -7340,7 +7340,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -72,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -7263,7 +7263,7 @@ const char kElasticOverscrollDescription[] =
@@ -7447,7 +7447,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -81,7 +81,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
@@ -7292,7 +7292,7 @@ const char kSigninInterceptBubbleV2Description[] =
@@ -7459,7 +7459,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
@ -90,3 +90,12 @@
const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
"Data Retention Policies Disable Sync Types";
const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
@@ -7504,7 +7504,7 @@ const char kEnableAudioFocusEnforcementDescription[] =
"any one time. Requires #enable-media-session-service to be enabled too.";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
const char kThirdPartyProfileManagementName[] =
"Third party profile management";
const char kThirdPartyProfileManagementDescription[] =

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

@ -1,6 +1,6 @@
--- chrome/browser/flag_descriptions.h.orig 2023-09-01 04:52:40 UTC
--- chrome/browser/flag_descriptions.h.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/flag_descriptions.h
@@ -1418,7 +1418,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd
@@ -1455,7 +1455,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit
extern const char kWebUIOmniboxPopupName[];
extern const char kWebUIOmniboxPopupDescription[];
@ -9,7 +9,7 @@
extern const char kWebUiSystemFontName[];
extern const char kWebUiSystemFontDescription[];
#endif
@@ -3934,7 +3934,7 @@ extern const char kLacrosMergeIcuDataFileName[];
@@ -4039,7 +4039,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@ -18,7 +18,7 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -4064,14 +4064,14 @@ extern const char kSearchWebInSidePanelDescription[];
@@ -4169,14 +4169,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -35,7 +35,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -4081,7 +4081,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -4186,7 +4186,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -44,7 +44,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -4091,7 +4091,7 @@ extern const char kOzonePlatformHintName[];
@@ -4196,7 +4196,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -53,7 +53,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
@@ -4099,13 +4099,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -4204,13 +4204,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -69,16 +69,16 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -4121,7 +4121,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
@@ -4221,7 +4221,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
extern const char kUseOutOfProcessVideoDecodingName[];
extern const char kUseOutOfProcessVideoDecodingDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -4195,7 +4195,7 @@ extern const char kElasticOverscrollDescription[];
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
@@ -4303,7 +4303,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -87,7 +87,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
@@ -4213,7 +4213,7 @@ extern const char kSigninInterceptBubbleV2Description[
@@ -4312,7 +4312,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe
#endif
#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
@ -96,3 +96,12 @@
extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
#endif
@@ -4339,7 +4339,7 @@ extern const char kEnableAudioFocusEnforcementName[];
extern const char kEnableAudioFocusEnforcementDescription[];
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
extern const char kThirdPartyProfileManagementName[];
extern const char kThirdPartyProfileManagementDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)

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

@ -0,0 +1,20 @@
--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/gcm/gcm_profile_service_factory.cc
@@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle
// static
GCMProfileService* GCMProfileServiceFactory::GetForProfile(
content::BrowserContext* profile) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On desktop, incognito profiles are checked with IsIncognitoProfile().
// It's possible for non-incognito profiles to also be off-the-record.
bool is_profile_supported =
@@ -129,7 +129,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory()
KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
DCHECK(!profile->IsIncognitoProfile());
#else
DCHECK(!profile->IsOffTheRecord());

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

@ -0,0 +1,20 @@
--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
@@ -16,7 +16,7 @@ namespace instance_id {
// static
InstanceIDProfileService* InstanceIDProfileServiceFactory::GetForProfile(
content::BrowserContext* profile) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On desktop, the guest profile is actually the primary OTR profile of
// the "regular" guest profile. The regular guest profile is never used
// directly by users. Also, user are not able to create child OTR profiles
@@ -61,7 +61,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer
KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On desktop, incognito profiles are checked with IsIncognitoProfile().
// It's possible for non-incognito profiles to also be off-the-record.
bool is_incognito = profile->IsIncognitoProfile();

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

@ -1,4 +1,4 @@
--- chrome/browser/headless/headless_mode_util.cc.orig 2023-07-21 09:49:17 UTC
--- chrome/browser/headless/headless_mode_util.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/headless/headless_mode_util.cc
@@ -10,12 +10,12 @@
// New headless mode is available on Linux, Windows and Mac platforms.
@ -15,9 +15,9 @@
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
@@ -78,7 +78,7 @@ void SetUpCommandLine(const base::CommandLine* command
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableLazyLoading);
@@ -73,7 +73,7 @@ void SetUpCommandLine(const base::CommandLine* command
::switches::kNoErrorDialogs);
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

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

@ -1,10 +1,10 @@
--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
@@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
// Note that this initializes the delegate asynchronously, but since
// the delegate will only be used from the IO thread, it is guaranteed
// to be created before use of it expects it to be there.
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
CreateMTPDeviceAsyncDelegate(
device_location, read_only,
base::BindOnce(&MTPDeviceMapService::AddAsyncDelegate,

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

@ -1,4 +1,4 @@
--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc
@@ -9,7 +9,11 @@
#include <sys/socket.h>
@ -6,7 +6,7 @@
+#include "build/build_config.h"
+
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
#include <linux/wireless.h>
+#endif
@ -16,7 +16,7 @@
bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
DCHECK(ssid_out);
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
if (!ioctl_socket.is_valid()) {
// AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there

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

@ -1,4 +1,4 @@
--- chrome/browser/memory_details.cc.orig 2022-10-01 07:40:07 UTC
--- chrome/browser/memory_details.cc.orig 2023-09-17 07:59:53 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
@@ -329,7 +329,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
std::ref(process)));
}

37
www/ungoogled-chromium/files/patch-chrome_browser_memory__details__linux.cc
View file

@ -1,37 +0,0 @@
--- chrome/browser/memory_details_linux.cc.orig 2023-03-10 06:02:42 UTC
+++ chrome/browser/memory_details_linux.cc
@@ -12,6 +12,7 @@
#include <memory>
#include <set>
+#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
#include "base/process/process_iterator.h"
@@ -27,6 +28,7 @@
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/process_type.h"
+#include "sandbox/policy/switches.h"
#include "ui/base/l10n/l10n_util.h"
using base::ProcessEntry;
@@ -70,9 +72,18 @@ ProcessData GetProcessDataMemoryInformation(
std::unique_ptr<base::ProcessMetrics> metrics(
base::ProcessMetrics::CreateProcessMetrics(pid));
+
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ if (!command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
+ pmi.num_open_fds = 0;
+ pmi.open_fds_soft_limit = 0;
+ goto out;
+ }
+
pmi.num_open_fds = metrics->GetOpenFdCount();
pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit();
+out:
process_data.processes.push_back(pmi);
}
return process_data;

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

@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-09-01 04:52:40 UTC
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -78,8 +78,10 @@
@@ -79,8 +79,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -108,7 +110,7 @@
@@ -109,7 +111,7 @@
#include "chromeos/crosapi/cpp/crosapi_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -21,7 +21,7 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
@@ -117,7 +119,7 @@
@@ -118,7 +120,7 @@
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -30,7 +30,7 @@
#include "components/power_metrics/system_power_monitor.h"
#endif
@@ -539,7 +541,7 @@ void RecordStartupMetrics() {
@@ -931,7 +933,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,
@@ -860,11 +862,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
@@ -1260,11 +1262,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)

10
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 2023-08-18 10:26:52 UTC
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -183,7 +183,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
@ -18,7 +18,7 @@
#include "chrome/browser/metrics/family_link_user_metrics_provider.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID))
@@ -788,7 +788,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -809,7 +809,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -27,7 +27,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -983,7 +983,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -1007,7 +1007,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -45,7 +45,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1182,7 +1182,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1206,7 +1206,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

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

@ -1,6 +1,6 @@
--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-12-02 17:56:32 UTC
--- chrome/browser/metrics/power/process_monitor.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/metrics/power/process_monitor.cc
@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -9,7 +9,7 @@
metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
#endif
#if BUILDFLAG(IS_MAC)
@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
metrics->cpu_usage *= factor;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -18,7 +18,7 @@
metrics->idle_wakeups *= factor;
#endif
@@ -168,7 +168,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
@@ -174,7 +174,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
lhs.cpu_usage += rhs.cpu_usage;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

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

@ -1,4 +1,4 @@
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/net/system_network_context_manager.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -93,7 +93,7 @@
@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -178,7 +178,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
@@ -184,7 +184,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@ -18,7 +18,25 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -445,7 +445,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -242,7 +242,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
if (g_previously_failed_to_launch_sandboxed_service) {
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
auto* local_state = g_browser_process->local_state();
#endif
@@ -263,7 +263,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
}
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (local_state &&
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
@@ -494,7 +494,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -27,7 +45,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -492,7 +492,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -541,7 +541,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -36,7 +54,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -590,7 +590,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@ -45,7 +63,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -570,7 +570,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -619,7 +619,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -54,7 +72,16 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
@@ -977,7 +977,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
@@ -628,7 +628,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
}
@@ -980,7 +980,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,6 +1,6 @@
--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-04-08 11:38:38 UTC
--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/new_tab_page/modules/drive/drive_service.cc
@@ -28,7 +28,7 @@
@@ -32,7 +32,7 @@
#include "services/network/public/cpp/resource_request.h"
namespace {

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

@ -1,6 +1,6 @@
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-07-21 09:49:17 UTC
--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
@@ -106,7 +106,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic
@@ -115,7 +115,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

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

@ -1,10 +1,10 @@
--- chrome/browser/platform_util_linux.cc.orig 2023-03-10 11:01:21 UTC
--- chrome/browser/platform_util_linux.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/platform_util_linux.cc
@@ -298,7 +298,9 @@ void RunCommand(const std::string& command,
@@ -299,7 +299,9 @@ void RunCommand(const std::string& command,
base::LaunchOptions options;
options.current_directory = working_directory;
+#if !defined(OS_BSD)
+#if !BUILDFLAG(IS_BSD)
options.allow_new_privs = true;
+#endif
// xdg-open can fall back on mailcap which eventually might plumb through

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

@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -209,12 +209,12 @@
@@ -212,12 +212,12 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -15,7 +15,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -755,14 +755,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -771,14 +771,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -32,8 +32,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::INTEGER },
@@ -1466,7 +1466,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@ -41,7 +41,16 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1514,7 +1514,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
@@ -1540,18 +1540,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -63,7 +72,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1525,7 +1525,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1564,7 +1564,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@ -72,7 +81,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1626,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1665,7 +1665,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@ -81,7 +90,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
@@ -1713,7 +1713,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1752,7 +1752,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -90,7 +99,7 @@
// TODO(crbug.com/1454054): replace the
// kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
// matches the name of the new `getAllScreensMedia` API.
@@ -1722,7 +1722,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1761,7 +1761,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@ -99,7 +108,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1753,7 +1753,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1792,7 +1792,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -108,7 +117,7 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
@@ -1832,7 +1832,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1871,7 +1871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -117,7 +126,7 @@
{ key::kBatterySaverModeAvailability,
performance_manager::user_tuning::prefs::kBatterySaverModeState,
base::Value::Type::INTEGER },
@@ -1863,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1902,7 +1902,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN)
@ -126,7 +135,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
@@ -1968,7 +1968,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2016,7 +2016,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -135,7 +144,7 @@
handlers->AddHandler(
std::make_unique<performance_manager::HighEfficiencyPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2159,7 +2159,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2207,7 +2207,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -144,7 +153,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
@@ -2216,7 +2216,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2265,7 +2265,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -153,7 +162,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler(
@@ -2597,7 +2597,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2649,7 +2649,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -162,7 +171,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2605,7 +2605,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2657,7 +2657,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -171,7 +180,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
@@ -2618,7 +2618,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2670,7 +2670,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));

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

@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/prefs/browser_prefs.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/prefs/browser_prefs.cc
@@ -462,13 +462,13 @@
@@ -469,13 +469,13 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -16,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -501,7 +501,7 @@
@@ -508,7 +508,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@ -25,7 +25,7 @@
#include "ui/color/system_theme.h"
#endif
@@ -706,7 +706,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
@@ -713,7 +713,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@ -34,7 +34,7 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -949,7 +949,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
@@ -1004,7 +1004,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
@ -43,7 +43,7 @@
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1100,7 +1100,7 @@ void RegisterProfilePrefsForMigration(
@@ -1160,7 +1160,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@ -52,7 +52,7 @@
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
@@ -1855,12 +1855,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1957,12 +1957,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -67,7 +67,7 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -2013,7 +2013,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
@@ -2120,7 +2120,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023
@ -76,7 +76,7 @@
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -2178,7 +2178,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
@@ -2290,7 +2290,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif

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

@ -1,24 +1,24 @@
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-07-21 09:49:17 UTC
--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient(
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
@@ -960,7 +960,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
@@ -33,7 +33,7 @@
#include "printing/buildflags/buildflags.h"
#include "printing/printing_features.h"
case ClientType::kQueryWithUi:
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
@@ -1017,7 +1017,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
#include "content/public/common/content_switches.h"
#endif
@@ -851,7 +851,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
host.BindNewPipeAndPassReceiver(),
content::ServiceProcessHost::Options()
.WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
.WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
#endif
.Pass());
@@ -1024,7 +1024,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:

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

@ -1,6 +1,6 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-08-18 10:26:52 UTC
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-09-17 07:59:53 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -375,18 +375,18 @@
@@ -379,18 +379,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -22,31 +22,44 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
@@ -567,7 +567,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -589,7 +589,7 @@ void ChromeBrowserMainExtraPartsProfiles::
if (breadcrumbs::IsEnabled()) {
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
browser_sync::UserEventServiceFactory::GetInstance();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
BrowsingDataHistoryObserverService::Factory::GetInstance();
@@ -644,12 +644,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
DriveServiceFactory::GetInstance();
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
enterprise_signals::SignalsAggregatorFactory::GetInstance();
browser_sync::UserEventServiceFactory::GetInstance();
@@ -675,23 +675,23 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
enterprise::ProfileIdServiceFactory::GetInstance();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
enterprise_signals::UserPermissionServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
@@ -762,12 +762,12 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
enterprise_idle::IdleServiceFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_CHROMEOS_ASH)
enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance();
#endif
enterprise_reporting::LegacyTechServiceFactory::GetInstance();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
enterprise_signals::SignalsAggregatorFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
enterprise_signals::UserPermissionServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -794,7 +794,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -55,18 +68,21 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
enterprise_idle::IdleServiceFactory::GetInstance();
@@ -888,7 +888,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
policy::UserCloudPolicyInvalidatorFactory::GetInstance();
@@ -929,7 +929,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
ProfileThemeUpdateServiceFactory::GetInstance();
#endif
ModelTypeStoreServiceFactory::GetInstance();
@@ -841,7 +841,7 @@ void ChromeBrowserMainExtraPartsProfiles::
PredictionServiceFactory::GetInstance();
PrimaryAccountPolicyManagerFactory::GetInstance();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ProfileTokenWebSigninInterceptorFactory::GetInstance();
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_ANDROID)

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