cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 107.0.5304.87

Browse Source
This commit is contained in:
robert 2022-10-29 05:01:33 +00:00
parent 7c01d45bae
commit e8a7acb2a2
313 changed files with 1851 additions and 1454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/ungoogled-chromium/Makefile
View File

@ -7,9 +7,8 @@ DPB_PROPERTIES= parallel parallel2
COMMENT= Chromium browser sans integration with Google
V= 106.0.5249.119
V= 107.0.5304.87
UGV= ${V}-1
REVISION= 2
DISTNAME= ungoogled-chromium-${V}
@ -43,7 +42,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/
MASTER_SITES0= http://nerd.hu/distfiles/
MODULES= lang/python
MODULES= lang/python x11/qt5
MODQT5_DEPS= No
COMPILER = base-clang ports-clang ports-gcc
@ -81,6 +81,7 @@ BUILD_DEPENDS= archivers/bzip2 \
sysutils/pciutils \
devel/ninja \
x11/py-xcbgen${MODPY_FLAVOR} \
x11/qt5/qtbase,-main \
${MODGCC4_CPPDEP} \
${RUN_DEPENDS}
LIB_DEPENDS= archivers/snappy \
@ -274,7 +275,7 @@ do-install:
${SUBST_PROGRAM} ${FILESDIR}/${DIST_TARGET_DIR} ${PREFIX}/bin/${DIST_TARGET_DIR}
${INSTALL_PROGRAM} ${BUILDDIR}/chromedriver ${PREFIX}/bin/ungoogled-chromedriver
${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in ${PREFIX}/man/man1/ungoogled-chromium.1
@perl -pi -e "s,\@\@PACKAGE\@\@,chromium,g;s,\@\@MENUNAME\@\@,Chromium Web Browser,g" \
@perl -pi -e "s,\@\@PACKAGE\@\@,ungoogled-chromium,g;s,\@\@MENUNAME\@\@,Ungoogled Chromium Web Browser,g" \
${PREFIX}/man/man1/ungoogled-chromium.1
${INSTALL_DATA} ${BUILDDIR}/*.pak ${PREFIX}/${DIST_TARGET_DIR}

12
www/ungoogled-chromium/distinfo
View File

@ -1,8 +1,8 @@
SHA256 (chromium-106.0.5249.119-testdata.tar.xz) = sH1XKcphkibafvbZs4BVTrJ0cI56hdCWRBm/gDhx8pk=
SHA256 (chromium-106.0.5249.119.tar.xz) = DwkbSVDhINXD4jqzkbrP22zo640KyrVena4ajCR90ZI=
SHA256 (chromium-107.0.5304.87-testdata.tar.xz) = m067TB1byrcPTrBzjMLMmmVFeA+bTY9+4au0cI+gmzU=
SHA256 (chromium-107.0.5304.87.tar.xz) = bA4AwYbiKhvikXfqQQukD/C/ZfPe1no0XrWxf3bJPFk=
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = osopYtr0gqj5QxY1QeHHO6SyaU+rzSUQmB8ttO2kk8g=
SHA256 (ungoogled-chromium-106.0.5249.119-1.tar.gz) = Az7jBVMwLWBq5ESXktu+KvXg/TS8y3PwKbbpiCZ26is=
SIZE (chromium-106.0.5249.119-testdata.tar.xz) = 265351916
SIZE (chromium-106.0.5249.119.tar.xz) = 1611067204
SHA256 (ungoogled-chromium-107.0.5304.87-1.tar.gz) = 3m+E+aHEn7MW9PTOHB/ejgcQpqGW8L8R3UA7mlP2XBI=
SIZE (chromium-107.0.5304.87-testdata.tar.xz) = 266527724
SIZE (chromium-107.0.5304.87.tar.xz) = 1688896996
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
SIZE (ungoogled-chromium-106.0.5249.119-1.tar.gz) = 664888
SIZE (ungoogled-chromium-107.0.5304.87-1.tar.gz) = 670222

25
www/ungoogled-chromium/patches/patch-BUILD_gn
View File

@ -1,7 +1,7 @@
Index: BUILD.gn
--- BUILD.gn.orig
+++ BUILD.gn
@@ -53,7 +53,7 @@ declare_args() {
@@ -59,7 +59,7 @@ declare_args() {
root_extra_deps = []
}
@ -10,7 +10,7 @@ Index: BUILD.gn
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -83,7 +83,6 @@ group("gn_all") {
@@ -89,7 +89,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
@ -18,7 +18,7 @@ Index: BUILD.gn
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -441,7 +440,7 @@ group("gn_all") {
@@ -447,7 +446,7 @@ group("gn_all") {
]
}
@ -27,7 +27,7 @@ Index: BUILD.gn
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -634,6 +633,15 @@ group("gn_all") {
@@ -640,6 +639,15 @@ group("gn_all") {
deps += [ "//gpu/tools/compositor_model_bench" ]
}
@ -43,7 +43,7 @@ Index: BUILD.gn
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
@@ -682,7 +690,7 @@ group("gn_all") {
@@ -688,7 +696,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@ -52,7 +52,16 @@ Index: BUILD.gn
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1194,7 +1202,7 @@ if (!is_ios) {
@@ -1115,7 +1123,7 @@ if (!is_ios) {
]
}
- 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") {
@@ -1210,7 +1218,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -61,7 +70,7 @@ Index: BUILD.gn
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1203,7 +1211,7 @@ if (!is_ios) {
@@ -1219,7 +1227,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -70,7 +79,7 @@ Index: BUILD.gn
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1646,7 +1654,7 @@ group("chromium_builder_perf") {
@@ -1660,7 +1668,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

6
www/ungoogled-chromium/patches/patch-ash_display_mirror_window_controller_cc
View File

@ -1,9 +1,9 @@
Index: ash/display/mirror_window_controller.cc
--- ash/display/mirror_window_controller.cc.orig
+++ ash/display/mirror_window_controller.cc
@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
return info.id() == iter->first;
}) == display_info_list.end()) {
@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
if (!base::Contains(display_info_list, iter->first,
&display::ManagedDisplayInfo::id)) {
CloseAndDeleteHost(iter->second, true);
+#if defined(__llvm__)
+ mirroring_host_info_map_.erase(iter++);

36
www/ungoogled-chromium/patches/patch-base_BUILD_gn
View File

@ -10,29 +10,31 @@ Index: base/BUILD.gn
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1031,7 +1031,7 @@ mixed_component("base") {
@@ -1035,7 +1035,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"profiler/stack_copier_signal.cc",
"profiler/stack_copier_signal.h",
@@ -1040,6 +1040,12 @@ mixed_component("base") {
"profiler/stack_base_address_posix.cc",
"profiler/stack_base_address_posix.h",
@@ -1046,6 +1046,14 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
+
+ if (is_bsd) {
+ sources += [
+ "profiler/stack_base_address_posix.cc",
+ "profiler/stack_base_address_posix.h",
+ "profiler/stack_sampler_posix.cc",
+ ]
+ }
}
if (is_win) {
@@ -1541,11 +1547,23 @@ mixed_component("base") {
@@ -1557,11 +1565,23 @@ mixed_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.
@ -56,17 +58,17 @@ Index: base/BUILD.gn
+
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
@@ -1573,7 +1591,7 @@ mixed_component("base") {
"allocator/partition_allocator/shim/allocator_shim.cc",
@@ -1589,7 +1609,7 @@ mixed_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/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
@@ -1629,7 +1647,7 @@ mixed_component("base") {
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1643,7 +1663,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -75,7 +77,7 @@ Index: base/BUILD.gn
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2211,6 +2229,42 @@ mixed_component("base") {
@@ -2216,6 +2236,42 @@ mixed_component("base") {
}
}
@ -118,7 +120,7 @@ Index: base/BUILD.gn
# iOS
if (is_ios) {
sources -= [
@@ -2310,7 +2364,7 @@ mixed_component("base") {
@@ -2313,7 +2369,7 @@ mixed_component("base") {
}
if (dep_libevent) {
@ -127,7 +129,7 @@ Index: base/BUILD.gn
}
if (use_libevent) {
@@ -3545,7 +3599,7 @@ test("base_unittests") {
@@ -3565,7 +3621,7 @@ test("base_unittests") {
}
}
@ -136,16 +138,16 @@ Index: base/BUILD.gn
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3593,7 +3647,7 @@ test("base_unittests") {
@@ -3613,7 +3669,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
"profiler/thread_delegate_posix_unittest.cc",
@@ -3603,7 +3657,7 @@ test("base_unittests") {
@@ -3624,7 +3680,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -154,7 +156,7 @@ Index: base/BUILD.gn
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3791,7 +3845,7 @@ test("base_unittests") {
@@ -3812,7 +3868,7 @@ test("base_unittests") {
}
}

2
www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_address_space_cc
View File

@ -1,7 +1,7 @@
Index: base/allocator/partition_allocator/partition_address_space.cc
--- base/allocator/partition_allocator/partition_address_space.cc.orig
+++ base/allocator/partition_allocator/partition_address_space.cc
@@ -238,7 +238,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
@@ -261,7 +261,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_ = 0;
}

5
www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_cc
View File

@ -1,18 +1,17 @@
Index: base/allocator/partition_allocator/partition_alloc.cc
--- base/allocator/partition_allocator/partition_alloc.cc.orig
+++ base/allocator/partition_allocator/partition_alloc.cc
@@ -63,8 +63,14 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
@@ -67,8 +67,13 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
"maximum direct mapped allocation");
// Check that some of our zanier calculations worked out as expected.
+#if defined(__i386__) && defined(OS_FREEBSD)
+ // alignof(std::max_align_t) is only 4 on FreeBSD/i386
+ static_assert(internal::kSmallestBucket >= internal::kAlignment,
+ "generic smallest bucket");
+#else
static_assert(internal::kSmallestBucket == internal::kAlignment,
"generic smallest bucket");
+#endif
static_assert(internal::kMaxBucketed == 917504, "generic max bucketed");
static_assert(internal::kMaxBucketed == 983040, "generic max bucketed");
STATIC_ASSERT_OR_PA_CHECK(
internal::MaxSystemPagesPerRegularSlotSpan() <= 16,

4
www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_config_h
View File

@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_alloc_config.h
#define PA_HAS_LINUX_KERNEL
#endif
@@ -195,7 +195,7 @@ constexpr bool kUseLazyCommit = false;
@@ -197,7 +197,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.
@ -19,7 +19,7 @@ Index: base/allocator/partition_allocator/partition_alloc_config.h
#define PA_HAS_ATFORK_HANDLER
#endif
@@ -235,7 +235,7 @@ constexpr bool kUseLazyCommit = false;
@@ -238,7 +238,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.

2
www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_alloc_constants_h
View File

@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_alloc_constants.h
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3;
@@ -272,7 +272,7 @@ constexpr size_t kNumPools = 3;
// Special-case Android and iOS, which incur test failures with larger
// GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is
// unrealistic as of 2022.

4
www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_page_h
View File

@ -1,7 +1,7 @@
Index: base/allocator/partition_allocator/partition_page.h
--- base/allocator/partition_allocator/partition_page.h.orig
+++ base/allocator/partition_allocator/partition_page.h
@@ -131,13 +131,14 @@ struct SlotSpanMetadata {
@@ -138,13 +138,14 @@ struct SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
@ -18,7 +18,7 @@ Index: base/allocator/partition_allocator/partition_page.h
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash).
@@ -151,7 +152,9 @@ struct SlotSpanMetadata {
@@ -158,7 +159,9 @@ struct SlotSpanMetadata {
#endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
// The maximum number of bits needed to cover all currently supported OSes.
static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;

12
www/ungoogled-chromium/patches/patch-base_allocator_partition_allocator_partition_root_cc
View File

@ -1,7 +1,7 @@
Index: base/allocator/partition_allocator/partition_root.cc
--- base/allocator/partition_allocator/partition_root.cc.orig
+++ base/allocator/partition_allocator/partition_root.cc
@@ -33,7 +33,7 @@
@@ -41,7 +41,7 @@
#include "wow64apiset.h"
#endif
@ -10,7 +10,7 @@ Index: base/allocator/partition_allocator/partition_root.cc
#include <pthread.h>
#endif
@@ -230,7 +230,7 @@ void PartitionAllocMallocInitOnce() {
@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() {
if (!g_global_init_called.compare_exchange_strong(expected, true))
return;
@ -19,16 +19,16 @@ Index: base/allocator/partition_allocator/partition_root.cc
// 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.
@@ -321,7 +321,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MaxPurgeableSlotSize();
MinPurgeableSlotSize();
-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
+#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64))
+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -709,7 +709,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -734,7 +734,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

6
www/ungoogled-chromium/patches/patch-base_debug_stack_trace_posix_cc
View File

@ -10,7 +10,7 @@ Index: base/debug/stack_trace_posix.cc
#include "base/debug/proc_maps_linux.h"
#endif
@@ -698,6 +698,9 @@ class SandboxSymbolizeHelper {
@@ -699,6 +699,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
@ -20,7 +20,7 @@ Index: base/debug/stack_trace_posix.cc
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -715,6 +718,7 @@ class SandboxSymbolizeHelper {
@@ -716,6 +719,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;
@ -28,7 +28,7 @@ Index: base/debug/stack_trace_posix.cc
}
// Opens all object files and caches their file descriptors.
@@ -871,7 +875,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
@@ -872,7 +876,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
// If we do not have unwind tables, then try tracing using frame pointers.
return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
count, 0);

2
www/ungoogled-chromium/patches/patch-base_files_file_path_watcher_bsd_cc
View File

@ -51,7 +51,7 @@ Index: base/files/file_path_watcher_bsd.cc
+} // namespace
+
+FilePathWatcher::FilePathWatcher() {
+ sequence_checker_.DetachFromSequence();
+ DETACH_FROM_SEQUENCE(sequence_checker_);
+ impl_ = std::make_unique<FilePathWatcherImpl>();
+}
+

4
www/ungoogled-chromium/patches/patch-base_files_file_util_unittest_cc
View File

@ -1,7 +1,7 @@
Index: base/files/file_util_unittest.cc
--- base/files/file_util_unittest.cc.orig
+++ base/files/file_util_unittest.cc
@@ -3522,7 +3522,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3549,7 +3549,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@ -10,7 +10,7 @@ Index: base/files/file_util_unittest.cc
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -4245,7 +4245,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4272,7 +4272,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =

2
www/ungoogled-chromium/patches/patch-base_i18n_icu_util_cc
View File

@ -10,7 +10,7 @@ Index: base/i18n/icu_util.cc
BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -325,7 +325,7 @@ void InitializeIcuTimeZone() {
@@ -344,7 +344,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));

2
www/ungoogled-chromium/patches/patch-base_native_library_unittest_cc
View File

@ -1,7 +1,7 @@
Index: base/native_library_unittest.cc
--- base/native_library_unittest.cc.orig
+++ base/native_library_unittest.cc
@@ -119,7 +119,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
@@ -134,7 +134,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
// versions with respect to symbol resolution scope.
// TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
#if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \

2
www/ungoogled-chromium/patches/patch-base_process_memory_cc
View File

@ -1,7 +1,7 @@
Index: base/process/memory.cc
--- base/process/memory.cc.orig
+++ base/process/memory.cc
@@ -29,7 +29,7 @@ namespace base {
@@ -28,7 +28,7 @@ namespace base {
// Defined in memory_mac.mm for macOS + use_allocator="none". In case of
// USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system
// default calloc of macOS.

17
www/ungoogled-chromium/patches/patch-base_process_process_metrics_cc
View File

@ -28,16 +28,23 @@ Index: base/process/process_metrics.cc
Value meminfo = memory_info_.ToValue();
Value vmstat = vmstat_info_.ToValue();
meminfo.MergeDictionary(&vmstat);
@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
@@ -99,7 +99,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX)
+#if !BUILDFLAG(IS_FREEBSD)
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
TimeDelta cumulative_cpu = GetCumulativeCPUUsage();
double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now();
@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
}
-#endif
#if BUILDFLAG(IS_WIN)
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

24
www/ungoogled-chromium/patches/patch-base_process_process_metrics_freebsd_cc
View File

@ -43,31 +43,37 @@ Index: base/process/process_metrics_freebsd.cc
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
@@ -26,17 +45,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
return WrapUnique(new ProcessMetrics(process));
}
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
struct kinfo_proc info;
- int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
- size_t length = sizeof(info);
+ size_t length = sizeof(struct kinfo_proc);
+ struct timeval tv;
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
+
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
+ return 0.0;
+ return TimeDelta();
- return (info.ki_pctcpu / FSCALE) * 100.0;
+ return static_cast<double>((info.ki_pctcpu * 100.0) / FSCALE);
+ return Microseconds(info.ki_runtime);
}
TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED();
+ NOTIMPLEMENTED();
return TimeDelta();
- return TimeDelta();
-}
-
bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
return false;
}
@@ -67,4 +87,221 @@ size_t GetSystemCommitCharge() {
@@ -67,4 +83,221 @@ size_t GetSystemCommitCharge() {
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
}

22
www/ungoogled-chromium/patches/patch-base_process_process_metrics_h
View File

@ -28,7 +28,7 @@ Index: base/process/process_metrics.h
// 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;
@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -165,7 +165,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -37,7 +37,7 @@ Index: base/process/process_metrics.h
// 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
@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -248,7 +248,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@ -46,7 +46,7 @@ Index: base/process/process_metrics.h
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -55,7 +55,7 @@ Index: base/process/process_metrics.h
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -280,7 +280,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -64,7 +64,7 @@ Index: base/process/process_metrics.h
CPU::CoreType GetCoreType(uint32_t core_index);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
@@ -284,9 +284,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -294,9 +294,7 @@ class BASE_EXPORT ProcessMetrics {
// Used to store the previous times and CPU usage counts so we can
// compute the CPU usage between calls.
TimeTicks last_cpu_time_;
@ -74,7 +74,7 @@ Index: base/process/process_metrics.h
#if BUILDFLAG(IS_WIN)
TimeTicks last_cpu_time_for_precise_cpu_usage_;
@@ -294,7 +292,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -304,7 +302,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -83,7 +83,7 @@ Index: base/process/process_metrics.h
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
@@ -337,7 +335,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
@@ -347,7 +345,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) || \
@ -92,7 +92,7 @@ Index: base/process/process_metrics.h
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
@@ -372,7 +370,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -382,7 +380,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -101,7 +101,7 @@ Index: base/process/process_metrics.h
// 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
@@ -387,7 +385,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -397,7 +395,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -110,7 +110,7 @@ Index: base/process/process_metrics.h
int buffers = 0;
int cached = 0;
int active_anon = 0;
@@ -424,7 +422,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
@@ -434,7 +432,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@ -119,7 +119,7 @@ Index: base/process/process_metrics.h
// 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.
@@ -611,7 +609,7 @@ class BASE_EXPORT SystemMetrics {
@@ -621,7 +619,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

21
www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_cc Normal file
View File

@ -0,0 +1,21 @@
Index: base/profiler/sampling_profiler_thread_token.cc
--- base/profiler/sampling_profiler_thread_token.cc.orig
+++ base/profiler/sampling_profiler_thread_token.cc
@@ -6,7 +6,7 @@
#include "build/build_config.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include <pthread.h>
#include "base/profiler/stack_base_address_posix.h"
@@ -19,7 +19,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent
PlatformThreadId id = PlatformThread::CurrentId();
#if BUILDFLAG(IS_ANDROID)
return {id, pthread_self()};
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
absl::optional<uintptr_t> maybe_stack_base =
GetThreadStackBaseAddress(id, pthread_self());
// GetThreadStackBaseAddress should only return nullopt on Android, so

21
www/ungoogled-chromium/patches/patch-base_profiler_sampling_profiler_thread_token_h Normal file
View File

@ -0,0 +1,21 @@
Index: base/profiler/sampling_profiler_thread_token.h
--- base/profiler/sampling_profiler_thread_token.h.orig
+++ base/profiler/sampling_profiler_thread_token.h
@@ -11,7 +11,7 @@
#if BUILDFLAG(IS_ANDROID)
#include <pthread.h>
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include <stdint.h>
#endif
@@ -25,7 +25,7 @@ struct SamplingProfilerThreadToken {
PlatformThreadId id;
#if BUILDFLAG(IS_ANDROID)
pthread_t pthread_id;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Due to the sandbox, we can only retrieve the stack base address for the
// current thread. We must grab it during
// GetSamplingProfilerCurrentThreadToken() and not try to get it later.

45
www/ungoogled-chromium/patches/patch-base_profiler_stack_base_address_posix_cc Normal file
View File

@ -0,0 +1,45 @@
Index: base/profiler/stack_base_address_posix.cc
--- base/profiler/stack_base_address_posix.cc.orig
+++ base/profiler/stack_base_address_posix.cc
@@ -15,6 +15,10 @@
#include "base/files/scoped_file.h"
#endif
+#if BUILDFLAG(IS_BSD)
+#include <pthread_np.h>
+#endif
+
#if BUILDFLAG(IS_CHROMEOS)
extern "C" void* __libc_stack_end;
#endif
@@ -42,15 +46,30 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas
#endif
uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
+#if BUILDFLAG(IS_OPENBSD)
+ stack_t ss;
+ void *address;
+ size_t size;
+ if (pthread_stackseg_np(pthread_id, &ss) != 0)
+ return 0;
+ size = ss.ss_size;
+ address = (void*)((size_t) ss.ss_sp - ss.ss_size);
+#else
pthread_attr_t attr;
+#if BUILDFLAG(IS_FREEBSD)
+ pthread_attr_init(&attr);
+ pthread_attr_get_np(pthread_id, &attr);
+#else
// This will crash on ChromeOS & Linux if we are in the sandbox and pthread_id
// refers to a different thread, due to the use of sched_getaffinity().
pthread_getattr_np(pthread_id, &attr);
// See crbug.com/617730 for limitations of this approach on Linux.
+#endif
void* address;
size_t size;
pthread_attr_getstack(&attr, &address, &size);
pthread_attr_destroy(&attr);
+#endif
const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
return base_address;
}

21
www/ungoogled-chromium/patches/patch-base_profiler_thread_delegate_posix_cc Normal file
View File

@ -0,0 +1,21 @@
Index: base/profiler/thread_delegate_posix.cc
--- base/profiler/thread_delegate_posix.cc.orig
+++ base/profiler/thread_delegate_posix.cc
@@ -13,7 +13,7 @@
#include "build/build_config.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
#include "base/profiler/stack_base_address_posix.h"
#endif
@@ -22,7 +22,7 @@ namespace base {
std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
SamplingProfilerThreadToken thread_token) {
absl::optional<uintptr_t> base_address;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base_address = thread_token.stack_base_address;
#else
base_address =

2
www/ungoogled-chromium/patches/patch-base_rand_util_h
View File

@ -1,7 +1,7 @@
Index: base/rand_util.h
--- base/rand_util.h.orig
+++ base/rand_util.h
@@ -80,7 +80,7 @@ void RandomShuffle(Itr first, Itr last) {
@@ -89,7 +89,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}

18
www/ungoogled-chromium/patches/patch-base_rand_util_posix_cc
View File

@ -10,7 +10,7 @@ Index: base/rand_util_posix.cc
#include "third_party/lss/linux_syscall_support.h"
#elif BUILDFLAG(IS_MAC)
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
@@ -39,6 +39,7 @@ static constexpr int kOpenFlags = O_RDONLY;
@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY;
static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC;
#endif
@ -18,7 +18,7 @@ Index: base/rand_util_posix.cc
// We keep the file descriptor for /dev/urandom around so we don't need to
// reopen it (which is expensive), and since we may not even be able to reopen
// it if we are later put in a sandbox. This class wraps the file descriptor so
@@ -56,10 +57,11 @@ class URandomFd {
@@ -63,10 +64,11 @@ class URandomFd {
private:
const int fd_;
};
@ -31,15 +31,15 @@ Index: base/rand_util_posix.cc
// TODO(pasko): Unify reading kernel version numbers in:
// mojo/core/channel_linux.cc
// chrome/browser/android/seccomp_support_detector.cc
@@ -144,6 +146,7 @@ void ConfigureRandBytesFieldTrial() {
// (https://chromium-review.9oo91esource.qjz9zk/c/chromium/src/+/1545096) and land
// it or some form of it.
@@ -172,6 +174,7 @@ bool UseBoringSSLForRandBytes() {
} // namespace internal
void RandBytes(void* output, size_t output_length) {
+#if !BUILDFLAG(IS_BSD)
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
BUILDFLAG(IS_ANDROID)) && \
!BUILDFLAG(IS_NACL)
@@ -172,11 +175,16 @@ void RandBytes(void* output, size_t output_length) {
#if !BUILDFLAG(IS_NACL)
// The BoringSSL experiment takes priority over everything else.
if (internal::UseBoringSSLForRandBytes()) {
@@ -210,11 +213,16 @@ void RandBytes(void* output, size_t output_length) {
const bool success =
ReadFromFD(urandom_fd, static_cast<char*>(output), output_length);
CHECK(success);

12
www/ungoogled-chromium/patches/patch-base_third_party_symbolize_symbolize_cc
View File

@ -1,12 +0,0 @@
Index: base/third_party/symbolize/symbolize.cc
--- base/third_party/symbolize/symbolize.cc.orig
+++ base/third_party/symbolize/symbolize.cc
@@ -114,7 +114,7 @@ _END_GOOGLE_NAMESPACE_
#if defined(HAVE_DLFCN_H)
#include <dlfcn.h>
#endif
-#if BUILDFLAG(IS_OPENBSD)
+#if defined(__OpenBSD__)
#include <sys/exec_elf.h>
#else
#include <elf.h>

12
www/ungoogled-chromium/patches/patch-base_threading_platform_thread_posix_cc
View File

@ -1,22 +1,22 @@
Index: base/threading/platform_thread_posix.cc
--- base/threading/platform_thread_posix.cc.orig
+++ base/threading/platform_thread_posix.cc
@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) {
@@ -77,7 +77,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(STARSCAN)
partition_alloc::internal::PCScan::NotifyThreadCreated(
partition_alloc::internal::GetStackPointer());
@@ -371,6 +371,9 @@ namespace internal {
void SetCurrentThreadTypeImpl(ThreadType thread_type,
@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
+ NOTIMPLEMENTED();
NOTIMPLEMENTED();
+// avoid pledge(2) violation
+#elif BUILDFLAG(IS_BSD)
NOTIMPLEMENTED();
+ NOTIMPLEMENTED();
#else
if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
return;

4
www/ungoogled-chromium/patches/patch-base_trace_event_malloc_dump_provider_cc
View File

@ -10,7 +10,7 @@ Index: base/trace_event/malloc_dump_provider.cc
#else
#include <malloc.h>
#endif
@@ -185,7 +187,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
@@ -186,7 +188,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
@ -19,7 +19,7 @@ Index: base/trace_event/malloc_dump_provider.cc
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
@@ -356,6 +358,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
@@ -357,6 +359,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.

31
www/ungoogled-chromium/patches/patch-build_config_compiler_BUILD_gn
View File

@ -39,7 +39,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
@@ -891,7 +898,7 @@ config("compiler_cpu_abi") {
@@ -909,7 +916,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@ -48,7 +48,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
@@ -906,7 +913,7 @@ config("compiler_cpu_abi") {
@@ -924,7 +931,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -57,7 +57,7 @@ Index: build/config/compiler/BUILD.gn
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
@@ -1234,7 +1241,7 @@ config("compiler_deterministic") {
@@ -1252,7 +1259,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.
@ -66,16 +66,25 @@ Index: build/config/compiler/BUILD.gn
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
@@ -1532,7 +1539,7 @@ config("default_warnings") {
]
}
@@ -1303,7 +1310,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
- if (is_clang && clang_base_path == default_clang_base_path) {
+ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path) {
update_args = [
"--print-revision",
"--verify-version=$clang_version",
@@ -1540,7 +1547,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
- if (!is_nacl) {
+ if (!is_nacl && !is_bsd) {
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
@@ -1705,7 +1712,7 @@ config("no_chromium_code") {
@@ -1723,7 +1730,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@ -84,7 +93,7 @@ Index: build/config/compiler/BUILD.gn
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -2219,7 +2226,7 @@ config("afdo_optimize_size") {
@@ -2245,7 +2252,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") {
@ -93,7 +102,7 @@ Index: build/config/compiler/BUILD.gn
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
@@ -2235,7 +2242,7 @@ config("afdo") {
@@ -2261,7 +2268,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@ -102,8 +111,8 @@ Index: build/config/compiler/BUILD.gn
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
@@ -2375,7 +2382,8 @@ config("symbols") {
}
@@ -2409,7 +2416,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
- if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos") {

2
www/ungoogled-chromium/patches/patch-cc_BUILD_gn
View File

@ -10,7 +10,7 @@ Index: cc/BUILD.gn
data_deps = [ "//third_party/mesa_headers" ]
}
}
@@ -891,7 +891,6 @@ cc_test("cc_unittests") {
@@ -892,7 +892,6 @@ cc_test("cc_unittests") {
data = [ "//components/viz/test/data/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

24
www/ungoogled-chromium/patches/patch-chrome_app_chrome_main_delegate_cc
View File

@ -1,7 +1,7 @@
Index: chrome/app/chrome_main_delegate.cc
--- chrome/app/chrome_main_delegate.cc.orig
+++ chrome/app/chrome_main_delegate.cc
@@ -126,7 +126,7 @@
@@ -128,7 +128,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/app/chrome_main_delegate.cc
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
@@ -169,16 +169,16 @@
@@ -171,16 +171,16 @@
#include "v8/include/v8.h"
#endif
@ -30,7 +30,7 @@ Index: chrome/app/chrome_main_delegate.cc
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
@@ -329,7 +329,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -336,7 +336,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@ -39,7 +39,7 @@ Index: chrome/app/chrome_main_delegate.cc
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -415,7 +415,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -48,7 +48,7 @@ Index: chrome/app/chrome_main_delegate.cc
// 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) ||
@@ -506,7 +506,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -513,7 +513,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -57,7 +57,7 @@ Index: chrome/app/chrome_main_delegate.cc
// 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.
@@ -589,7 +589,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -596,7 +596,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@ -66,7 +66,7 @@ Index: chrome/app/chrome_main_delegate.cc
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
@@ -767,6 +767,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -832,6 +832,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
// not always enabled on Linux/ChromeOS.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@ -75,7 +75,7 @@ Index: chrome/app/chrome_main_delegate.cc
#else
bool enable_gwp_asan = true;
#endif
@@ -826,7 +828,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
@@ -892,7 +894,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::internal::TimerBase::InitializeFeatures();
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
@ -84,7 +84,7 @@ Index: chrome/app/chrome_main_delegate.cc
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitializeOptimizedRealtimeThreadingFeature();
@@ -916,7 +918,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -982,7 +984,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@ -93,7 +93,7 @@ Index: chrome/app/chrome_main_delegate.cc
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -946,7 +948,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
@@ -1012,7 +1014,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@ -102,7 +102,7 @@ Index: chrome/app/chrome_main_delegate.cc
nacl::RegisterPathProvider();
#endif
@@ -1336,7 +1338,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1402,7 +1404,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -111,7 +111,7 @@ Index: chrome/app/chrome_main_delegate.cc
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
@@ -1412,7 +1414,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
@@ -1478,7 +1480,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.

14
www/ungoogled-chromium/patches/patch-chrome_app_generated_resources_grd
View File

@ -10,7 +10,7 @@ Index: chrome/app/generated_resources.grd
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
@@ -3069,7 +3069,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3081,7 +3081,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@ -19,7 +19,7 @@ Index: chrome/app/generated_resources.grd
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
@@ -4802,7 +4802,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -4811,7 +4811,7 @@ are declared in tools/grit/grit_rule.gni.
Read information about your browser, OS, device, installed software, registry values and files
</message>
</if>
@ -28,7 +28,7 @@ Index: chrome/app/generated_resources.grd
<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>
@@ -5439,7 +5439,7 @@ Keep your key file in a safe place. You will need it t
@@ -5469,7 +5469,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>
@ -37,7 +37,7 @@ Index: chrome/app/generated_resources.grd
<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>
@@ -5467,7 +5467,7 @@ Keep your key file in a safe place. You will need it t
@@ -5497,7 +5497,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>
@ -46,7 +46,7 @@ Index: chrome/app/generated_resources.grd
<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>
@@ -8964,7 +8964,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -8984,7 +8984,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@ -55,7 +55,7 @@ Index: chrome/app/generated_resources.grd
<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>
@@ -10148,7 +10148,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -10195,7 +10195,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@ -64,7 +64,7 @@ Index: chrome/app/generated_resources.grd
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -12211,7 +12211,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -12285,7 +12285,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

8
www/ungoogled-chromium/patches/patch-chrome_app_settings_strings_grdp
View File

@ -1,16 +1,16 @@
Index: chrome/app/settings_strings.grdp
--- chrome/app/settings_strings.grdp.orig
+++ chrome/app/settings_strings.grdp
@@ -134,7 +134,7 @@
@@ -137,7 +137,7 @@
Theme
</message>
</if>
- <if expr="is_linux">
+ <if expr="is_posix">
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
@@ -148,7 +148,7 @@
@@ -157,7 +157,7 @@
Use Classic
</message>
</if>

57
www/ungoogled-chromium/patches/patch-chrome_app_theme_chrome_unscaled_resources_grd
View File

@ -1,33 +1,30 @@
Index: chrome/app/theme/chrome_unscaled_resources.grd
--- chrome/app/theme/chrome_unscaled_resources.grd.orig
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -15,12 +15,12 @@
<release seq="1">
<includes>
<if expr="_google_chrome">
- <if expr="not is_linux">
+ <if expr="not is_posix">
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" />
</if>
- <if expr="is_linux">
+ <if expr="is_posix">
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/linux/product_logo_128_beta.png" type="BINDATA" />
@@ -53,12 +53,12 @@
</if>
</if>
<if expr="not _google_chrome">
- <if expr="not is_linux">
+ <if expr="not is_posix">
<include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_256" file="chromium/product_logo_256.png" type="BINDATA" />
</if>
- <if expr="is_linux">
+ <if expr="is_posix">
<include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_256" file="chromium/linux/product_logo_256.png" type="BINDATA" />
@@ -19,7 +19,7 @@
<include name="IDR_ASSISTANT_LOGO_MONOCHROME" file="google_chrome/google_assistant.svg" type="BINDATA" />
<if expr="_google_chrome_for_testing">
<then>
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
@@ -36,7 +36,7 @@
</if>
</then>
<else> <!-- not _google_chrome_for_testing -->
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
@@ -78,7 +78,7 @@
</if>
</then>
<else> <!-- not _google_chrome -->
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" />

71
www/ungoogled-chromium/patches/patch-chrome_app_theme_theme_resources_grd
View File

@ -1,35 +1,48 @@
Index: chrome/app/theme/theme_resources.grd
--- chrome/app/theme/theme_resources.grd.orig
+++ chrome/app/theme/theme_resources.grd
@@ -130,11 +130,11 @@
<structure type="chrome_scaled_image" name="IDR_PRERENDER" file="common/prerender_succeed_icon.png" />
</if>
<if expr="not _google_chrome">
- <if expr="not is_linux">
+ <if expr="not is_posix">
<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" />
</if>
- <if expr="is_linux">
+ <if expr="is_posix">
<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" />
</if>
@@ -142,7 +142,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" />
@@ -131,7 +131,7 @@
</if>
<if expr="_google_chrome">
- <if expr="not is_linux">
+ <if expr="not is_posix">
<then>
- <if expr="is_linux">
+ <if expr="is_posix">
<then>
<if expr="_google_chrome_for_testing">
<then>
@@ -148,7 +148,7 @@
</else>
</if> <!-- _google_chrome_for_testing -->
</then>
- <else> <!-- not is_linux -->
+ <else> <!-- not is_posix -->
<if expr="not is_android">
<if expr="_google_chrome_for_testing">
<then>
@@ -172,7 +172,7 @@
</else>
</if> <!-- _google_chrome_for_testing -->
</else>
- </if> <!-- is_linux -->
+ </if> <!-- is_posix -->
<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_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 @@
<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" />
</if>
- <if expr="is_linux">
+ <if expr="is_posix">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
@@ -182,7 +182,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" />
</then>
<else> <!-- not _google_chrome -->
- <if expr="is_linux">
+ <if expr="is_posix">
<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" />
@@ -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>
- </if> <!-- is_linux -->
+ </if> <!-- is_posix -->
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" />
</else>

32
www/ungoogled-chromium/patches/patch-chrome_browser_about_flags_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/about_flags.cc
--- chrome/browser/about_flags.cc.orig
+++ chrome/browser/about_flags.cc
@@ -213,7 +213,7 @@
@@ -215,7 +215,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
@ -10,7 +10,7 @@ Index: chrome/browser/about_flags.cc
#include "base/allocator/buildflags.h"
#endif
@@ -288,7 +288,7 @@
@@ -290,7 +290,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck
#endif // ENABLE_SUPERVISED_USERS
@ -19,7 +19,7 @@ Index: chrome/browser/about_flags.cc
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -393,7 +393,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
@@ -395,7 +395,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@ -28,7 +28,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -1263,7 +1263,7 @@ const FeatureEntry::FeatureVariation
@@ -1255,7 +1255,7 @@ const FeatureEntry::FeatureVariation
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@ -37,7 +37,7 @@ Index: chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
@@ -3930,7 +3930,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4079,7 +4079,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)},
#endif // BUILDFLAG(IS_CHROMEOS)
@ -46,7 +46,7 @@ Index: chrome/browser/about_flags.cc
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -4556,7 +4556,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4667,7 +4667,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -55,7 +55,7 @@ Index: chrome/browser/about_flags.cc
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
@@ -4575,7 +4575,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4686,7 +4686,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
#endif // BUILDFLAG(IS_LINUX)
@ -64,8 +64,8 @@ Index: chrome/browser/about_flags.cc
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
@@ -4829,7 +4829,7 @@ const FeatureEntry kFeatureEntries[] = {
"FeedCloseRefresh")},
@@ -4946,7 +4946,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@ -73,8 +73,8 @@ Index: chrome/browser/about_flags.cc
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
@@ -5343,7 +5343,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestPrefetchingOnWeb)},
@@ -5487,7 +5487,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@ -82,7 +82,7 @@ Index: chrome/browser/about_flags.cc
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
@@ -5880,7 +5880,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6025,7 +6025,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
@ -91,7 +91,7 @@ Index: chrome/browser/about_flags.cc
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
@@ -6798,7 +6798,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6969,7 +6969,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -100,7 +100,7 @@ Index: chrome/browser/about_flags.cc
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
@@ -7658,7 +7658,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7839,7 +7839,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -109,7 +109,7 @@ Index: chrome/browser/about_flags.cc
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
@@ -7957,7 +7957,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8154,7 +8154,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@ -118,7 +118,7 @@ Index: chrome/browser/about_flags.cc
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
@@ -8537,7 +8537,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8763,7 +8763,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \

6
www/ungoogled-chromium/patches/patch-chrome_browser_browser_process_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/browser_process_impl.cc
--- chrome/browser/browser_process_impl.cc.orig
+++ chrome/browser/browser_process_impl.cc
@@ -214,7 +214,7 @@
@@ -213,7 +213,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/browser_process_impl.cc
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
@@ -1172,7 +1172,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1165,7 +1165,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@ -19,7 +19,7 @@ Index: chrome/browser/browser_process_impl.cc
ChromeJsErrorReportProcessor::Create();
#endif
@@ -1411,7 +1411,7 @@ void BrowserProcessImpl::Unpin() {
@@ -1401,7 +1401,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.

12
www/ungoogled-chromium/patches/patch-chrome_browser_browser_resources_grd
View File

@ -1,12 +0,0 @@
Index: chrome/browser/browser_resources.grd
--- chrome/browser/browser_resources.grd.orig
+++ chrome/browser/browser_resources.grd
@@ -120,7 +120,7 @@
<if expr="chromeos_ash">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
</if>
- <if expr="is_linux or chromeos_lacros">
+ <if expr="is_posix or chromeos_lacros">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
</if>
<if expr="chromeos_ash">

14
www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_interface_binders_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_browser_interface_binders.cc
--- chrome/browser/chrome_browser_interface_binders.cc.orig
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -113,13 +113,13 @@
@@ -112,13 +112,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -26,7 +26,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
#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"
@@ -780,7 +780,7 @@ void PopulateChromeFrameBinders(
@@ -799,7 +799,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -35,16 +35,16 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -788,7 +788,7 @@ void PopulateChromeFrameBinders(
@@ -807,7 +807,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
render_frame_host->IsInPrimaryMainFrame()) {
map->Add<blink::mojom::SubAppsService>(
@@ -843,14 +843,14 @@ void PopulateChromeWebUIFrameBinders(
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
@@ -872,14 +872,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -61,7 +61,7 @@ Index: chrome/browser/chrome_browser_interface_binders.cc
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
@@ -1235,7 +1235,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -1270,7 +1270,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

6
www/ungoogled-chromium/patches/patch-chrome_browser_chrome_browser_main_cc
View File

@ -24,7 +24,7 @@ Index: chrome/browser/chrome_browser_main.cc
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@@ -1025,7 +1025,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1030,7 +1030,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@ -33,7 +33,7 @@ Index: chrome/browser/chrome_browser_main.cc
// 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 .
@@ -1038,7 +1038,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@ -42,7 +42,7 @@ Index: chrome/browser/chrome_browser_main.cc
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
@@ -1060,7 +1060,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -1079,7 +1079,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) || \

36
www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.cc
--- chrome/browser/chrome_content_browser_client.cc.orig
+++ chrome/browser/chrome_content_browser_client.cc
@@ -385,7 +385,7 @@
@@ -387,7 +387,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"
@ -10,7 +10,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -466,17 +466,17 @@
@@ -471,17 +471,17 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -31,12 +31,13 @@ Index: chrome/browser/chrome_content_browser_client.cc
#if !BUILDFLAG(IS_ANDROID)
#include "base/debug/leak_annotations.h"
#include "components/crash/core/app/breakpad_linux.h"
@@ -484,12 +484,12 @@
@@ -489,13 +489,13 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
#include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
#endif
@ -46,7 +47,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
@@ -513,11 +513,11 @@
@@ -524,11 +524,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -60,7 +61,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -930,7 +930,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
@@ -941,7 +941,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@ -69,7 +70,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
@@ -1450,7 +1450,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1504,7 +1504,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@ -78,7 +79,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
@@ -1489,7 +1489,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1543,7 +1543,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.
@ -87,7 +88,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -1510,7 +1510,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
@@ -1564,7 +1564,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@ -96,7 +97,16 @@ Index: chrome/browser/chrome_content_browser_client.cc
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -2279,6 +2279,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -1583,7 +1583,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
@@ -2352,6 +2352,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@ -105,7 +115,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -2628,7 +2630,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -2705,7 +2707,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@ -114,7 +124,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
@@ -4071,7 +4073,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -4155,7 +4157,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -123,7 +133,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -4510,14 +4512,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4595,14 +4597,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -140,7 +150,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
@@ -4542,7 +4544,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4631,7 +4633,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

2
www/ungoogled-chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/chrome_content_browser_client.h
--- chrome/browser/chrome_content_browser_client.h.orig
+++ chrome/browser/chrome_content_browser_client.h
@@ -436,7 +436,7 @@ class ChromeContentBrowserClient : public content::Con
@@ -439,7 +439,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;

13
www/ungoogled-chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/download/chrome_download_manager_delegate.cc
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1532,7 +1532,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1531,7 +1531,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -10,7 +10,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
@@ -1598,7 +1598,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1597,7 +1597,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) || \
@ -19,12 +19,3 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
@@ -1640,7 +1640,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
download::DownloadItem* download_item) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
download_item);
#else

2
www/ungoogled-chromium/patches/patch-chrome_browser_download_download_file_picker_cc
View File

@ -10,7 +10,7 @@ Index: chrome/browser/download/download_file_picker.cc
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "ui/aura/window.h"
@@ -84,7 +84,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
@@ -87,7 +87,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
// dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc).
// and windows.Here we make owning_window host to browser current active
// window if it is null. https://crbug.com/1301898

6
www/ungoogled-chromium/patches/patch-chrome_browser_download_download_item_model_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/download/download_item_model.cc
--- chrome/browser/download/download_item_model.cc.orig
+++ chrome/browser/download/download_item_model.cc
@@ -728,7 +728,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -735,7 +735,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -10,7 +10,7 @@ Index: chrome/browser/download/download_item_model.cc
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
@@ -770,7 +770,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -777,7 +777,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@ -19,7 +19,7 @@ Index: chrome/browser/download/download_item_model.cc
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
@@ -1086,7 +1086,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
@@ -1089,7 +1089,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}

6
www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_device_trust_connector_service_factory_cc
View File

@ -15,7 +15,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_connector_
#include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h"
#endif // BUILDFLAG(IS_MAC)
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi
@@ -44,7 +44,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi
bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext()
const {
@ -24,7 +24,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_connector_
return IsDeviceTrustConnectorFeatureEnabled();
#else
return false;
@@ -59,7 +59,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
@@ -75,7 +75,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
DeviceTrustConnectorService* service = nullptr;
@ -33,7 +33,7 @@ Index: chrome/browser/enterprise/connectors/device_trust/device_trust_connector_
if (IsDeviceTrustConnectorFeatureEnabled()) {
auto* key_manager = g_browser_process->browser_policy_connector()
->chrome_browser_cloud_management_controller()
@@ -67,7 +67,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
@@ -83,7 +83,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
#if BUILDFLAG(IS_MAC)
service = new MacDeviceTrustConnectorService(
key_manager, profile->GetPrefs(), g_browser_process->local_state());

8
www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_device_trust_key_management_browser_commands_key_rotation_command_factory_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig
+++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
@@ -13,7 +13,7 @@
@@ -14,7 +14,7 @@
#if BUILDFLAG(IS_WIN)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h"
@ -10,12 +10,12 @@ Index: chrome/browser/enterprise/connectors/device_trust/key_management/browser/
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h"
#elif BUILDFLAG(IS_MAC)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h"
@@ -45,7 +45,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
@@ -47,7 +47,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand
PrefService* local_prefs) {
#if BUILDFLAG(IS_WIN)
return std::make_unique<WinKeyRotationCommand>();
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return std::make_unique<LinuxKeyRotationCommand>(url_loader_factory);
#elif BUILDFLAG(IS_MAC)
return std::make_unique<MacKeyRotationCommand>(url_loader_factory);
return std::make_unique<MacKeyRotationCommand>(url_loader_factory,

2
www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser_crash_event_router_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
@@ -18,14 +18,14 @@
@@ -19,14 +19,14 @@
#include "chrome/common/chrome_paths.h"
#include "components/version_info/version_info.h"

15
www/ungoogled-chromium/patches/patch-chrome_browser_enterprise_connectors_reporting_browser_crash_event_router_h
View File

@ -1,7 +1,16 @@
Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h
--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h
@@ -22,7 +22,7 @@ class BrowserCrashEventRouter
@@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-#if !BUILDFLAG(IS_FUCHSIA)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#endif // !BUILDFLAG(IS_FUCHSIA)
namespace enterprise_connectors {
@@ -27,7 +27,7 @@ class BrowserCrashEventRouter
BrowserCrashEventRouter& operator=(const BrowserCrashEventRouter&) = delete;
~BrowserCrashEventRouter() override;
@ -9,8 +18,8 @@ Index: chrome/browser/enterprise/connectors/reporting/browser_crash_event_router
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
void OnCloudReportingLaunched(
enterprise_reporting::ReportScheduler* report_scheduler) override;
#endif // !BUILDFLAG(IS_FUCHSIA)
@@ -32,7 +32,7 @@ class BrowserCrashEventRouter
void UploadToReportingServer(
@@ -41,7 +41,7 @@ class BrowserCrashEventRouter
nullptr;
raw_ptr<policy::ChromeBrowserCloudManagementController> controller_ = nullptr;

2
www/ungoogled-chromium/patches/patch-chrome_browser_extensions_BUILD_gn
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/BUILD.gn
--- chrome/browser/extensions/BUILD.gn.orig
+++ chrome/browser/extensions/BUILD.gn
@@ -1326,6 +1326,10 @@ static_library("extensions") {
@@ -1325,6 +1325,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}

8
www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_enterprise_reporting_private_enterprise_reporting_private_api_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -31,7 +31,7 @@
@@ -32,7 +32,7 @@
#include "components/reporting/util/statusor.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_rep
#include "base/strings/string_util.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
#include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h"
@@ -111,7 +111,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
@@ -107,7 +107,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
return info;
}
@ -19,7 +19,7 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_rep
device_signals::SignalsAggregationRequest CreateAggregationRequest(
const std::string& user_id,
@@ -171,7 +171,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
@@ -167,7 +167,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
@ -28,7 +28,7 @@ Index: chrome/browser/extensions/api/enterprise_reporting_private/enterprise_rep
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
@@ -611,7 +611,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
@@ -592,7 +592,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif

4
www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig
+++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
@@ -21,6 +21,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -9,7 +9,7 @@ Index: chrome/browser/extensions/api/image_writer_private/removable_storage_prov
if (g_test_device_list.Get().get() != nullptr) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
std::move(callback));

12
www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_passwords_private_passwords_private_delegate_impl_cc Normal file
View File

@ -0,0 +1,12 @@
Index: chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -494,7 +494,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
-#if !BUILDFLAG(IS_LINUX)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
PasswordsPrivateEventRouter* router =
PasswordsPrivateEventRouterFactory::GetForProfile(profile_);
if (router)

16
www/ungoogled-chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -186,7 +186,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -190,7 +190,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,12 +10,12 @@ Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
@@ -200,7 +200,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
(*s_allowlist)[::prefs::kUsesSystemTheme] =
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
(*s_allowlist)[::prefs::kUsesSystemThemeDeprecated] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
(*s_allowlist)[::prefs::kSystemTheme] =

4
www/ungoogled-chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/extensions/external_provider_impl.cc
--- chrome/browser/extensions/external_provider_impl.cc.orig
+++ chrome/browser/extensions/external_provider_impl.cc
@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -10,7 +10,7 @@ Index: chrome/browser/extensions/external_provider_impl.cc
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders(
@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.

2
www/ungoogled-chromium/patches/patch-chrome_browser_file_system_access_chrome_file_system_access_permission_context_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -252,7 +252,7 @@ const struct {
@@ -254,7 +254,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif

14
www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/flag_descriptions.cc
--- chrome/browser/flag_descriptions.cc.orig
+++ chrome/browser/flag_descriptions.cc
@@ -6230,7 +6230,7 @@ const char kSideSearchDSESupportDescription[] =
@@ -6387,7 +6387,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
@@ -6239,7 +6239,7 @@ const char kQuickCommandsDescription[] =
@@ -6396,7 +6396,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -19,7 +19,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
@@ -6253,7 +6253,7 @@ const char kWebShareDescription[] =
@@ -6410,7 +6410,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@ -28,7 +28,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
@@ -6273,7 +6273,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
@@ -6430,7 +6430,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -37,7 +37,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
@@ -6286,7 +6286,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
@@ -6443,7 +6443,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@ -46,7 +46,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
@@ -6295,7 +6295,7 @@ const char kSkipUndecryptablePasswordsDescription[] =
@@ -6452,7 +6452,7 @@ const char kSkipUndecryptablePasswordsDescription[] =
"there are undecryptable ones.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@ -55,7 +55,7 @@ Index: chrome/browser/flag_descriptions.cc
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -6400,7 +6400,7 @@ const char kElasticOverscrollDescription[] =
@@ -6557,7 +6557,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

8
www/ungoogled-chromium/patches/patch-chrome_browser_flag_descriptions_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/flag_descriptions.h
--- chrome/browser/flag_descriptions.h.orig
+++ chrome/browser/flag_descriptions.h
@@ -3577,7 +3577,7 @@ extern const char kSideSearchDSESupportDescription[];
@@ -3664,7 +3664,7 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kQuickCommandsName[];
extern const char kQuickCommandsDescription[];
@@ -3594,7 +3594,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
@@ -3681,7 +3681,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@ -19,7 +19,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
@@ -3610,18 +3610,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
@@ -3697,18 +3697,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@ -41,7 +41,7 @@ Index: chrome/browser/flag_descriptions.h
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -3698,7 +3698,7 @@ extern const char kElasticOverscrollDescription[];
@@ -3785,7 +3785,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \

2
www/ungoogled-chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/media_galleries/media_file_system_registry.cc
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig
+++ chrome/browser/media_galleries/media_file_system_registry.cc
@@ -744,7 +744,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
@@ -585,7 +585,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
// Constructor in 'private' section because depends on private class definition.
MediaFileSystemRegistry::MediaFileSystemRegistry()
: file_system_context_(new MediaFileSystemContextImpl) {

2
www/ungoogled-chromium/patches/patch-chrome_browser_media_router_discovery_BUILD_gn
View File

@ -1,7 +1,7 @@
Index: chrome/browser/media/router/discovery/BUILD.gn
--- chrome/browser/media/router/discovery/BUILD.gn.orig
+++ chrome/browser/media/router/discovery/BUILD.gn
@@ -79,7 +79,7 @@ static_library("discovery") {
@@ -80,7 +80,7 @@ static_library("discovery") {
"media_sink_discovery_metrics.h",
]

4
www/ungoogled-chromium/patches/patch-chrome_browser_media_webrtc_webrtc_logging_controller_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/media/webrtc/webrtc_logging_controller.h
--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig
+++ chrome/browser/media/webrtc/webrtc_logging_controller.h
@@ -132,7 +132,7 @@ class WebRtcLoggingController
@@ -133,7 +133,7 @@ class WebRtcLoggingController
size_t web_app_id,
const StartEventLoggingCallback& callback);
@ -10,7 +10,7 @@ Index: chrome/browser/media/webrtc/webrtc_logging_controller.h
// Ensures that the WebRTC Logs directory exists and then grants render
// process access to the 'WebRTC Logs' directory, and invokes |callback| with
// the ids necessary to create a DirectoryEntry object.
@@ -191,7 +191,7 @@ class WebRtcLoggingController
@@ -192,7 +192,7 @@ class WebRtcLoggingController
bool success,
const std::string& error_message);

2
www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc
View File

@ -13,7 +13,7 @@ Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
#include "base/linux_util.h"
#include "base/strings/string_split.h"
@@ -516,7 +518,7 @@ void RecordStartupMetrics() {
@@ -491,7 +493,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.

10
www/ungoogled-chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/metrics/chrome_metrics_service_client.cc
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -174,7 +174,7 @@
@@ -175,7 +175,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
#include "components/metrics/motherboard_metrics_provider.h"
#endif
@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -722,7 +722,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@ -19,7 +19,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
@@ -798,7 +798,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -799,7 +799,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -28,7 +28,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
@@ -887,7 +887,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@ -37,7 +37,7 @@ Index: chrome/browser/metrics/chrome_metrics_service_client.cc
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
@@ -1070,7 +1070,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
@@ -1074,7 +1074,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

2
www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_cc
View File

@ -19,7 +19,7 @@ Index: chrome/browser/metrics/power/process_monitor.cc
metrics->idle_wakeups *= factor;
#endif
@@ -130,7 +130,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
@@ -147,7 +147,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
lhs.cpu_usage += rhs.cpu_usage;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

2
www/ungoogled-chromium/patches/patch-chrome_browser_metrics_power_process_monitor_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/metrics/power/process_monitor.h
--- chrome/browser/metrics/power/process_monitor.h.orig
+++ chrome/browser/metrics/power/process_monitor.h
@@ -70,7 +70,7 @@ class ProcessMonitor : public content::BrowserChildPro
@@ -71,7 +71,7 @@ class ProcessMonitor : public content::BrowserChildPro
double cpu_usage = 0.0;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \

4
www/ungoogled-chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc
View File

@ -19,7 +19,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -484,7 +484,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
@@ -451,7 +451,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@ -28,7 +28,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
@@ -556,7 +556,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
@@ -523,7 +523,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)

9
www/ungoogled-chromium/patches/patch-chrome_browser_new_tab_page_new_tab_page_util_cc
View File

@ -10,3 +10,12 @@ Index: chrome/browser/new_tab_page/new_tab_page_util.cc
return true;
#else
return false;
@@ -27,7 +27,7 @@ bool IsOsSupportedForCart() {
}
bool IsOsSupportedForDrive() {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return true;
#else
return false;

2
www/ungoogled-chromium/patches/patch-chrome_browser_policy_browser_signin_policy_handler_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/policy/browser_signin_policy_handler.cc
--- chrome/browser/policy/browser_signin_policy_handler.cc.orig
+++ chrome/browser/policy/browser_signin_policy_handler.cc
@@ -43,7 +43,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
@@ -44,7 +44,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
policies.GetValue(policy_name(), base::Value::Type::INTEGER);
switch (static_cast<BrowserSigninMode>(value->GetInt())) {
case BrowserSigninMode::kForced:

33
www/ungoogled-chromium/patches/patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -187,12 +187,12 @@
@@ -190,12 +190,12 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@ -16,7 +16,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
#include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
#endif
@@ -699,7 +699,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -705,7 +705,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@ -25,8 +25,8 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
prefs::kCertRevocationCheckingRequiredLocalAnchors,
base::Value::Type::BOOLEAN },
@@ -1304,7 +1304,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
@@ -1313,7 +1313,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@ -34,7 +34,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
@@ -1374,18 +1374,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1383,18 +1383,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@ -56,7 +56,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
@@ -1398,7 +1398,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1407,7 +1407,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) \
@ -65,7 +65,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
@@ -1580,7 +1580,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1592,7 +1592,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@ -74,7 +74,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
@@ -1639,7 +1639,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
@@ -1645,7 +1645,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \
@ -83,7 +83,16 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
@@ -1963,7 +1963,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -1702,7 +1702,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
{ key::kPrefixedStorageInfoEnabled,
storage::kPrefixedStorageInfoEnabled,
base::Value::Type::BOOLEAN },
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kHighEfficiencyModeEnabled,
performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
base::Value::Type::BOOLEAN },
@@ -1988,7 +1988,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@ -92,7 +101,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
@@ -2307,7 +2307,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2332,7 +2332,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
chrome_schema));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -101,7 +110,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
@@ -2320,7 +2320,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2345,7 +2345,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@ -110,7 +119,7 @@ Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
@@ -2328,7 +2328,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
@@ -2353,7 +2353,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)

33
www/ungoogled-chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/prefs/browser_prefs.cc
--- chrome/browser/prefs/browser_prefs.cc.orig
+++ chrome/browser/prefs/browser_prefs.cc
@@ -437,14 +437,14 @@
@@ -439,14 +439,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
@ -18,7 +18,25 @@ Index: chrome/browser/prefs/browser_prefs.cc
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
@@ -1211,7 +1211,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
@@ -474,7 +474,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/color/system_theme.h"
#endif
@@ -1008,7 +1008,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
@@ -1238,7 +1238,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@ -27,7 +45,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -1525,13 +1525,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
@@ -1555,13 +1555,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
@ -43,3 +61,12 @@ Index: chrome/browser/prefs/browser_prefs.cc
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
@@ -1975,7 +1975,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Added 08/2022.
if (profile_prefs->HasPrefPath(prefs::kUsesSystemThemeDeprecated)) {
auto migrated_theme =

4
www/ungoogled-chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -255,7 +255,7 @@
@@ -257,7 +257,7 @@
#include "chrome/browser/ui/cocoa/screentime/screentime_features.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/enterprise/idle/idle_service_factory.h"
#endif
@@ -435,11 +435,11 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -438,11 +438,11 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

4
www/ungoogled-chromium/patches/patch-chrome_browser_profiles_profile_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/profiles/profile_impl.cc
--- chrome/browser/profiles/profile_impl.cc.orig
+++ chrome/browser/profiles/profile_impl.cc
@@ -259,6 +259,10 @@
@@ -264,6 +264,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@ -12,7 +12,7 @@ Index: chrome/browser/profiles/profile_impl.cc
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
@@ -838,7 +842,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
@@ -851,7 +855,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {

6
www/ungoogled-chromium/patches/patch-chrome_browser_renderer_preferences_util_cc
View File

@ -10,14 +10,14 @@ Index: chrome/browser/renderer_preferences_util.cc
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/linux/linux_ui.h"
@@ -159,7 +159,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
#endif
-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
ui::LinuxUi* linux_ui = ui::LinuxUi::instance();
if (linux_ui) {
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
if (linux_ui_theme) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
@@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
#endif

32
www/ungoogled-chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json
View File

@ -1,32 +0,0 @@
Index: chrome/browser/resources/plugin_metadata/plugins_linux.json
--- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig
+++ chrome/browser/resources/plugin_metadata/plugins_linux.json
@@ -1,28 +1,5 @@
{
"x-version": 46,
- "adobe-flash-player": {
- "mime_types": [
- "application/futuresplash",
- "application/x-shockwave-flash"
- ],
- "matching_mime_types": [
- "application/futuresplash"
- ],
- "versions": [
- {
- "version": "32.0.0.445",
- "status": "up_to_date",
- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb20-58.html"
- }
- ],
- "lang": "en-US",
- "name": "Adobe Flash Player",
- "help_url": "https://support.9oo91e.qjz9zk/chrome/?p=plugin_flash",
- "url": "https://support.9oo91e.qjz9zk/chrome/answer/6258784",
- "displayurl": true,
- "group_name_matcher": "*Shockwave Flash*",
- "plugin_is_deprecated": true
- },
"google-chrome-pdf": {
"mime_types": [
],

14
www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_browser_proxy_ts
View File

@ -6,16 +6,16 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_browser_prox
useDefaultTheme(): void;
- // <if expr="is_linux">
+ // <if expr="is_bsd">
useSystemTheme(): void;
+ // <if expr="is_posix">
useGtkTheme(): void;
useQtTheme(): void;
// </if>
@@ -44,7 +44,7 @@ export class AppearanceBrowserProxyImpl implements App
@@ -45,7 +45,7 @@ export class AppearanceBrowserProxyImpl implements App
chrome.send('useDefaultTheme');
}
- // <if expr="is_linux">
+ // <if expr="is_bsd">
useSystemTheme() {
chrome.send('useSystemTheme');
+ // <if expr="is_posix">
useGtkTheme() {
chrome.send('useGtkTheme');
}

6
www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_html
View File

@ -9,7 +9,7 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html
+<if expr="not is_posix">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
<cr-button id="useDefault" on-click="onUseDefaultTap_">
<cr-button id="useDefault" on-click="onUseDefaultClick_">
@@ -35,7 +35,7 @@
</cr-button>
</template>
@ -18,8 +18,8 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.html
+<if expr="is_posix">
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]"
@@ -135,7 +135,7 @@
prefs.extensions.theme.id.value, systemTheme_)]]"
@@ -142,7 +142,7 @@
</div>
</template>

36
www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_appearance_page_appearance_page_ts
View File

@ -1,7 +1,16 @@
Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig
+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends
@@ -63,7 +63,7 @@ export interface SettingsAppearancePageElement {
export enum SystemTheme {
// Either classic or web theme.
DEFAULT = 0,
- // <if expr="is_linux">
+ // <if expr="is_posix">
GTK = 1,
QT = 2,
// </if>
@@ -155,7 +155,7 @@ export class SettingsAppearancePageElement extends
'prefs.autogenerated.theme.policy.color.controlledBy)',
},
@ -10,16 +19,16 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
/**
* Whether to show the "Custom Chrome Frame" setting.
*/
@@ -174,7 +174,7 @@ export class SettingsAppearancePageElement extends
@@ -184,7 +184,7 @@ export class SettingsAppearancePageElement extends
'themeChanged_(' +
'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)',
'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)',
- // <if expr="is_linux">
+ // <if expr="is_posix">
// NOTE: this pref only exists on Linux.
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)',
// </if>
@@ -194,7 +194,7 @@ export class SettingsAppearancePageElement extends
];
@@ -203,7 +203,7 @@ export class SettingsAppearancePageElement extends
private showReaderModeOption_: boolean;
private isForcedTheme_: boolean;
@ -28,22 +37,27 @@ Index: chrome/browser/resources/settings/appearance_page/appearance_page.ts
private showCustomChromeFrame_: boolean;
// </if>
@@ -272,7 +272,7 @@ export class SettingsAppearancePageElement extends
@@ -281,7 +281,7 @@ export class SettingsAppearancePageElement extends
this.appearanceBrowserProxy_.useDefaultTheme();
}
- // <if expr="is_linux">
+ // <if expr="is_posix">
private useSystemThemePrefChanged_(useSystemTheme: boolean) {
this.useSystemTheme_ = useSystemTheme;
private systemThemePrefChanged_(systemTheme: SystemTheme) {
this.systemTheme_ = systemTheme;
}
@@ -333,10 +333,10 @@ export class SettingsAppearancePageElement extends
@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends
}
let i18nId;
- // <if expr="is_linux">
+ // <if expr="is_posix">
i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
switch (this.systemTheme_) {
case SystemTheme.GTK:
i18nId = 'gtkTheme';
@@ -367,7 +367,7 @@ export class SettingsAppearancePageElement extends
break;
}
// </if>
- // <if expr="not is_linux">
+ // <if expr="not is_posix">

2
www/ungoogled-chromium/patches/patch-chrome_browser_resources_settings_autofill_page_passwords_shared_css
View File

@ -1,7 +1,7 @@
Index: chrome/browser/resources/settings/autofill_page/passwords_shared.css
--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig
+++ chrome/browser/resources/settings/autofill_page/passwords_shared.css
@@ -90,7 +90,7 @@ cr-input.password-input::part(input),
@@ -100,7 +100,7 @@ cr-input.password-input::part(input),
* necessary to prevent Chrome from using the operating system's font
* instead of the Material Design font.
* TODO(dbeam): why not font: inherit? */

4
www/ungoogled-chromium/patches/patch-chrome_browser_resources_signin_signin_shared_css
View File

@ -1,8 +1,8 @@
Index: chrome/browser/resources/signin/signin_shared.css
--- chrome/browser/resources/signin/signin_shared.css.orig
+++ chrome/browser/resources/signin/signin_shared.css
@@ -37,7 +37,7 @@ cr-button + cr-button {
margin-inline-start: 8px;
@@ -34,7 +34,7 @@ a {
padding: var(--action-container-padding);
}
-<if expr="is_macosx or is_linux or is_chromeos">

8
www/ungoogled-chromium/patches/patch-chrome_browser_resources_signin_sync_confirmation_sync_confirmation_app_html
View File

@ -1,7 +1,7 @@
Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig
+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
@@ -326,7 +326,7 @@
@@ -334,7 +334,7 @@
consent-confirmation autofocus>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
@ -10,7 +10,7 @@ Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.h
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -336,7 +336,7 @@
@@ -344,7 +344,7 @@
disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
@ -19,7 +19,7 @@ Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.h
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -379,7 +379,7 @@
@@ -387,7 +387,7 @@
consent-confirmation>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
@ -28,7 +28,7 @@ Index: chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.h
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
@@ -389,7 +389,7 @@
@@ -397,7 +397,7 @@
disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>

2
www/ungoogled-chromium/patches/patch-chrome_browser_safe_browsing_cloud_content_scanning_binary_upload_service_cc
View File

@ -10,7 +10,7 @@ Index: chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif
@@ -287,7 +287,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
@@ -297,7 +297,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.

4
www/ungoogled-chromium/patches/patch-chrome_browser_sharing_sharing_handler_registry_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/sharing/sharing_handler_registry_impl.cc
--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig
+++ chrome/browser/sharing/sharing_handler_registry_impl.cc
@@ -24,7 +24,7 @@
@@ -23,7 +23,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/sharing/sharing_handler_registry_impl.cc
#include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS)
@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

2
www/ungoogled-chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/sync/chrome_sync_client.cc
--- chrome/browser/sync/chrome_sync_client.cc.orig
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -437,7 +437,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
@@ -440,7 +440,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one.

12
www/ungoogled-chromium/patches/patch-chrome_browser_task_manager_sampling_task_group_sampler_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig
+++ chrome/browser/task_manager/sampling/task_group_sampler.cc
@@ -44,7 +44,7 @@ TaskGroupSampler::TaskGroupSampler(
@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler(
const OnCpuRefreshCallback& on_cpu_refresh,
const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
const OnIdleWakeupsCallback& on_idle_wakeups,
@ -10,7 +10,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
const OnOpenFdCountCallback& on_open_fd_count,
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
const OnProcessPriorityCallback& on_process_priority)
@@ -54,7 +54,7 @@ TaskGroupSampler::TaskGroupSampler(
@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler(
on_cpu_refresh_callback_(on_cpu_refresh),
on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
on_idle_wakeups_callback_(on_idle_wakeups),
@ -19,7 +19,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
on_open_fd_count_callback_(on_open_fd_count),
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
on_process_priority_callback_(on_process_priority) {
@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
@@ -87,7 +87,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
base::BindOnce(on_swapped_mem_refresh_callback_));
}
@ -28,7 +28,7 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
@@ -97,7 +97,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
}
#endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@ -37,12 +37,12 @@ Index: chrome/browser/task_manager/sampling/task_group_sampler.cc
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
@@ -146,7 +146,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
@@ -147,7 +147,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
return process_metrics_->GetIdleWakeupsPerSecond();
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
int TaskGroupSampler::RefreshOpenFdCount() {
DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
DCHECK_CALLED_ON_VALID_SEQUENCE(worker_pool_sequenced_checker_);

9
www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_helper_cc
View File

@ -10,12 +10,3 @@ Index: chrome/browser/themes/theme_helper.cc
#include "ui/linux/linux_ui.h"
#endif
@@ -172,7 +172,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
ui::NativeTheme const* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (const auto* linux_ui = ui::LinuxUi::instance()) {
// We rely on the fact that the system theme is in use iff `theme_supplier`
// is non-null, but this is cheating. In the future this might not hold

38
www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_aura_linux_cc
View File

@ -1,38 +1,12 @@
Index: chrome/browser/themes/theme_service_aura_linux.cc
--- chrome/browser/themes/theme_service_aura_linux.cc.orig
+++ chrome/browser/themes/theme_service_aura_linux.cc
@@ -13,7 +13,7 @@
#include "ui/gfx/image/image.h"
#include "ui/native_theme/native_theme_aura.h"
@@ -22,7 +22,7 @@ namespace {
ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) {
switch (system_theme) {
case ui::SystemTheme::kDefault:
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/linux/linux_ui.h"
#endif
@@ -53,14 +53,14 @@ void SystemThemeLinux::StartUsingTheme() {
void SystemThemeLinux::StopUsingTheme() {
pref_service_->SetBoolean(prefs::kUsesSystemTheme, false);
// Have the former theme notify its observers of change.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (auto* linux_ui = ui::LinuxUi::instance())
linux_ui->GetNativeTheme(nullptr)->NotifyOnNativeThemeUpdated();
#endif
}
bool SystemThemeLinux::GetColor(int id, SkColor* color) const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (auto* linux_ui = ui::LinuxUi::instance()) {
return linux_ui->GetColor(
id, color, pref_service_->GetBoolean(prefs::kUseCustomChromeFrame));
@@ -70,7 +70,7 @@ bool SystemThemeLinux::GetColor(int id, SkColor* color
}
bool SystemThemeLinux::GetDisplayProperty(int id, int* result) const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (auto* linux_ui = ui::LinuxUi::instance())
return linux_ui->GetDisplayProperty(id, result);
case ui::SystemTheme::kGtk:
case ui::SystemTheme::kQt:
#endif

9
www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_cc
View File

@ -13,15 +13,6 @@ Index: chrome/browser/themes/theme_service.cc
@@ -314,7 +314,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseSystemTheme() const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return profile_->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
#else
return false;
@@ -322,7 +322,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
}
bool ThemeService::ShouldUseCustomFrame() const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

24
www/ungoogled-chromium/patches/patch-chrome_browser_themes_theme_service_factory_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/themes/theme_service_factory.cc
--- chrome/browser/themes/theme_service_factory.cc.orig
+++ chrome/browser/themes/theme_service_factory.cc
@@ -25,11 +25,11 @@
@@ -23,11 +23,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -12,27 +12,27 @@ Index: chrome/browser/themes/theme_service_factory.cc
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/linux/linux_ui.h"
#include "ui/linux/linux_ui_factory.h"
#endif
@@ -85,7 +85,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
@@ -81,7 +81,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
using ThemeService = ThemeServiceAuraLinux;
#endif
@@ -99,9 +99,9 @@ void ThemeServiceFactory::RegisterProfilePrefs(
@@ -95,9 +95,9 @@ void ThemeServiceFactory::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
bool default_uses_system_theme = false;
ui::SystemTheme default_system_theme = ui::SystemTheme::kDefault;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const ui::LinuxUi* linux_ui = ui::LinuxUi::instance();
if (linux_ui)
default_uses_system_theme = linux_ui->GetDefaultUsesSystemTheme();
default_system_theme = ui::GetDefaultSystemTheme();
#endif
registry->RegisterIntegerPref(prefs::kSystemTheme,

8
www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/browser_command_controller.cc
--- chrome/browser/ui/browser_command_controller.cc.orig
+++ chrome/browser/ui/browser_command_controller.cc
@@ -95,7 +95,7 @@
@@ -97,7 +97,7 @@
#include "components/user_manager/user_manager.h"
#endif
@ -10,7 +10,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
#include "ui/linux/linux_ui.h"
#endif
@@ -280,7 +280,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -282,7 +282,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@ -19,7 +19,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
@@ -525,7 +525,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
@@ -527,7 +527,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -28,7 +28,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
@@ -1088,7 +1088,7 @@ void BrowserCommandController::InitCommandState() {
@@ -1093,7 +1093,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

12
www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_dialogs_h
View File

@ -1,12 +0,0 @@
Index: chrome/browser/ui/browser_dialogs.h
--- chrome/browser/ui/browser_dialogs.h.orig
+++ chrome/browser/ui/browser_dialogs.h
@@ -25,7 +25,7 @@
#include "ui/base/models/dialog_model.h"
#include "ui/gfx/native_widget_types.h"
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/web_applications/web_app_id.h"
#endif

2
www/ungoogled-chromium/patches/patch-chrome_browser_ui_browser_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/browser.h
--- chrome/browser/ui/browser.h.orig
+++ chrome/browser/ui/browser.h
@@ -283,7 +283,7 @@ class Browser : public TabStripModelObserver,
@@ -277,7 +277,7 @@ class Browser : public TabStripModelObserver,
int32_t restore_id = kDefaultRestoreId;
#endif

2
www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_cc
View File

@ -10,7 +10,7 @@ Index: chrome/browser/ui/chrome_pages.cc
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
@@ -580,7 +580,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -597,7 +597,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

2
www/ungoogled-chromium/patches/patch-chrome_browser_ui_chrome_pages_h
View File

@ -10,7 +10,7 @@ Index: chrome/browser/ui/chrome_pages.h
namespace web_app {
enum class AppSettingsPageEntryPoint;
} // namespace web_app
@@ -213,7 +213,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
@@ -218,7 +218,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

2
www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/signin_view_controller.cc
--- chrome/browser/ui/signin_view_controller.cc.orig
+++ chrome/browser/ui/signin_view_controller.cc
@@ -271,7 +271,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
@@ -273,7 +273,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
SkColor profile_color,
signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

2
www/ungoogled-chromium/patches/patch-chrome_browser_ui_signin_view_controller_delegate_h
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/signin_view_controller_delegate.h
--- chrome/browser/ui/signin_view_controller_delegate.h.orig
+++ chrome/browser/ui/signin_view_controller_delegate.h
@@ -81,7 +81,7 @@ class SigninViewControllerDelegate {
@@ -84,7 +84,7 @@ class SigninViewControllerDelegate {
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc
View File

@ -10,7 +10,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#endif
@@ -1017,7 +1017,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1006,7 +1006,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@ -19,7 +19,7 @@ Index: chrome/browser/ui/startup/startup_browser_creator.cc
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
@@ -1207,7 +1207,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
@@ -1196,7 +1196,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
<< "Failed launch with app: couldn't pick a profile";
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);

2
www/ungoogled-chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_impl_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig
+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -241,7 +241,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
@@ -257,7 +257,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
// at the state of the MessageLoop.
Browser::CreateParams params = Browser::CreateParams(profile_, false);
params.creation_source = Browser::CreationSource::kStartupCreator;

6
www/ungoogled-chromium/patches/patch-chrome_browser_ui_tab_helpers_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/tab_helpers.cc
--- chrome/browser/ui/tab_helpers.cc.orig
+++ chrome/browser/ui/tab_helpers.cc
@@ -200,7 +200,7 @@
@@ -211,7 +211,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@ -10,7 +10,7 @@ Index: chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/autofill_assistant/common_dependencies_chrome.h"
#include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h"
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
@@ -516,13 +516,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -545,13 +545,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -26,7 +26,7 @@ Index: chrome/browser/ui/tab_helpers.cc
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
@@ -537,7 +537,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
@@ -574,7 +574,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \

4
www/ungoogled-chromium/patches/patch-chrome_browser_ui_views_first_run_dialog_cc
View File

@ -1,7 +1,7 @@
Index: chrome/browser/ui/views/first_run_dialog.cc
--- chrome/browser/ui/views/first_run_dialog.cc.orig
+++ chrome/browser/ui/views/first_run_dialog.cc
@@ -34,7 +34,7 @@
@@ -35,7 +35,7 @@
namespace {
@ -10,7 +10,7 @@ Index: chrome/browser/ui/views/first_run_dialog.cc
void InitCrashReporterIfEnabled(bool enabled) {
if (!crash_reporter::IsCrashpadEnabled() && enabled)
breakpad::InitCrashReporter(std::string());
@@ -122,7 +122,7 @@ bool FirstRunDialog::Accept() {
@@ -129,7 +129,7 @@ bool FirstRunDialog::Accept() {
#if BUILDFLAG(IS_MAC)
ChangeMetricsReportingState(report_crashes_->GetChecked());

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