diff options
| author | Kai Knoblich <kai@FreeBSD.org> | 2023-04-23 16:35:04 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2023-07-26 04:28:56 +0000 |
| commit | 9a0a6ca38c78e60b3afc10152daad948a1f001c7 (patch) | |
| tree | 889b408a284d082f57da49a113dc89027087cb18 | |
| parent | 230148d80ee0fcc15579204a25c019c2b86a3efb (diff) | |
| download | ports-9a0a6ca38c78e60b3afc10152daad948a1f001c7.tar.gz ports-9a0a6ca38c78e60b3afc10152daad948a1f001c7.zip | |
www/qt6-webengine: Update to 6.5.0
Under the hood runs Chromium 108.0.5359.181 with security patches up to
Chromium 110.0.5481.104. Most of the patches were taken of from
Chromium 108.0.5359.124 (7ae5e0e6d6ee).
Build tests so far:
- 14.0-CURRENT@ amd64@df2fbbfa71
- 13.2-RELEASE amd64 ALSA
- 13.1-RELEASE amd64 ALSA
- 12.4-RELEASE amd64 + i386 (ALSA/PULSE/SNDIO)
Runtime tests with 12.4-RELEASE so far without issues.
PR: 272422
Exp-run by: antoine
435 files changed, 3307 insertions, 2463 deletions
diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index 2e4d8f546493..3a63b5385b55 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -15,7 +15,7 @@ PORTNAME= webengine DISTVERSION= ${QT6_VERSION} -PORTREVISION= 6 +PORTREVISION= 0 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -27,6 +27,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ + libdrm.so:graphics/libdrm \ libevent.so:devel/libevent \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ @@ -78,15 +79,8 @@ DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 $ BINARY_ALIAS= python=${PYTHON_CMD} -# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. -# Nested variable expansion avoids executing the test when not needed for -# expanding EXTRA_PATCHES. -# mempcpy was introduced in ee37f64cf875255338f917a9da76c643cf59786c -EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ - || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} - DISTINFO_FILE= ${.CURDIR}/distinfo -QT6_VERSION= 6.4.2 +QT6_VERSION= 6.5.0 OPTIONS_DEFAULT= ALSA OPTIONS_SINGLE= AUDIO diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo index f6a54f0fbaf2..db078bcd5dba 100644 --- a/www/qt6-webengine/distinfo +++ b/www/qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673107224 -SHA256 (KDE/Qt/6.4.2/qtwebengine-everywhere-src-6.4.2.tar.xz) = ffa945518d1cc8d9ee73523e8d9c2090844f5a2d9c7eac05c4ad079472a119c9 -SIZE (KDE/Qt/6.4.2/qtwebengine-everywhere-src-6.4.2.tar.xz) = 440538956 +TIMESTAMP = 1681646888 +SHA256 (KDE/Qt/6.5.0/qtwebengine-everywhere-src-6.5.0.tar.xz) = 2a10da34a71b307e9ff11ec086455dd20b83d5b0ee6bda499c4ba9221e306f07 +SIZE (KDE/Qt/6.5.0/qtwebengine-everywhere-src-6.5.0.tar.xz) = 411792556 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn index 2a0bae22b541..99ae7981be8a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/BUILD.gn.orig 2022-11-08 21:18:48 UTC +--- src/3rdparty/chromium/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/BUILD.gn -@@ -55,7 +55,7 @@ declare_args() { +@@ -60,7 +60,7 @@ declare_args() { qtwebengine_target = "//tools/gn" } @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -451,7 +451,7 @@ group("gn_all") { +@@ -435,7 +435,7 @@ if (!is_qtwebengine){ ] } @@ -18,8 +18,8 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -696,7 +696,7 @@ group("gn_all") { - host_os == "win" && !use_qt) { +@@ -697,7 +697,7 @@ if (!is_qtwebengine){ + host_os == "win" && !is_qtwebengine) { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } - } else if (!is_android && !is_ios && !is_fuchsia && !is_win) { @@ -27,7 +27,16 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1172,7 +1172,7 @@ if (!is_ios && !use_qt) { +@@ -1124,7 +1124,7 @@ if (!is_ios && !is_qtwebengine) { + ] + } + +- 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") { +@@ -1219,7 +1219,7 @@ if (!is_ios && !is_qtwebengine) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -36,7 +45,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1181,7 +1181,7 @@ if (!is_ios && !use_qt) { +@@ -1228,7 +1228,7 @@ if (!is_ios && !is_qtwebengine) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -45,12 +54,12 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1580,7 +1580,7 @@ group("chromium_builder_perf") { +@@ -1672,7 +1672,7 @@ group("chromium_builder_perf") { + data_deps += [ "//chrome/test:performance_browser_tests" ] + } - if (is_win) { - data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] -- } else { -+ } else if (!is_bsd) { +- if (!is_win) { ++ if (!is_win && !is_bsd) { data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn index 562495d3c1b5..e40cdedb3b6d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn @@ -1,28 +1,39 @@ ---- src/3rdparty/chromium/base/BUILD.gn.orig 2022-11-08 21:18:48 UTC +--- src/3rdparty/chromium/base/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/BUILD.gn -@@ -1000,7 +1000,7 @@ jumbo_component("base") { +@@ -164,7 +164,7 @@ buildflag_header("ios_cronet_buildflags") { + flags = [ "CRONET_BUILD=$is_cronet_build" ] + } + +-enable_message_pump_epoll = is_linux || is_chromeos || is_android ++enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd + buildflag_header("message_pump_buildflags") { + header = "message_pump_buildflags.h" + header_dir = "base/message_loop" +@@ -1050,7 +1050,7 @@ jumbo_component("base") { "timer/hi_res_timer_manager_posix.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "cpu_affinity_posix.cc", - "cpu_affinity_posix.h", -@@ -1011,6 +1011,12 @@ jumbo_component("base") { + "profiler/stack_base_address_posix.cc", + "profiler/stack_base_address_posix.h", +@@ -1061,6 +1061,14 @@ jumbo_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", + ] + } } jumbo_excluded_sources = [ -@@ -1360,7 +1366,6 @@ jumbo_component("base") { +@@ -1428,7 +1436,6 @@ jumbo_component("base") { "process/process_metrics_linux.cc", "threading/platform_thread_linux.cc", ] @@ -30,44 +41,25 @@ } if (is_linux || is_chromeos || is_android || is_fuchsia) { -@@ -1502,6 +1507,18 @@ jumbo_component("base") { - libs += [ "atomic" ] - } - -+ # *BSD needs libkvm -+ if (is_bsd) { -+ libs += [ "kvm" ] -+ } -+ -+ if (is_freebsd) { -+ libs += [ -+ "execinfo", -+ "util", -+ ] -+ } -+ - if (use_allocator_shim) { - sources += [ - "allocator/allocator_shim.cc", -@@ -1529,7 +1546,7 @@ jumbo_component("base") { +@@ -1604,7 +1611,7 @@ jumbo_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", -@@ -1585,7 +1602,7 @@ jumbo_component("base") { + "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", + "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", +@@ -1658,7 +1665,7 @@ jumbo_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings -- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { ++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2163,6 +2180,42 @@ jumbo_component("base") { +@@ -2236,6 +2243,42 @@ jumbo_component("base") { } } @@ -110,7 +102,16 @@ # iOS if (is_ios) { sources -= [ -@@ -3452,7 +3505,7 @@ test("base_unittests") { +@@ -2333,7 +2376,7 @@ jumbo_component("base") { + } + + if (dep_libevent) { +- deps += [ "//third_party/libevent" ] ++ public_deps += [ "//third_party/libevent" ] + } + + if (use_libevent) { +@@ -3601,7 +3644,7 @@ test("base_unittests") { } } @@ -119,25 +120,25 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3500,7 +3553,7 @@ test("base_unittests") { +@@ -3647,7 +3690,7 @@ test("base_unittests") { + "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", - "task/thread_pool/task_tracker_posix_unittest.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "cpu_affinity_posix_unittest.cc", + "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3511,7 +3564,7 @@ test("base_unittests") { +@@ -3658,7 +3701,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings -- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { ++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3673,7 +3726,7 @@ test("base_unittests") { +@@ -3850,7 +3893,7 @@ test("base_unittests") { } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h index 600707fc9f11..59531486585e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -121,7 +121,7 @@ AslrMask(uintptr_t bits) { +@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h index d478228c4770..07c269860248 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h -@@ -194,7 +194,7 @@ constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZe - // Whether decommitted memory is guaranteed to be zeroed when it is +@@ -231,7 +231,7 @@ constexpr PA_COMPONENT_EXPORT( // recommitted. Do not assume that this will not change over time. - constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() { + constexpr PA_COMPONENT_EXPORT( + PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h index 126aa403ea69..24bb1167dd4f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ // elimination. #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) @@ -9,16 +9,16 @@ // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing -@@ -79,7 +79,7 @@ PageAllocationGranularityShift() { +@@ -81,7 +81,7 @@ PageAllocationGranularityShift() { return 14; // 16kB #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) - return vm_page_shift; + return static_cast<size_t>(vm_page_shift); -#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16) // page sizes. Retrieve from or initialize cache. - int shift = page_characteristics.shift.load(std::memory_order_relaxed); -@@ -99,7 +99,7 @@ PageAllocationGranularity() { + size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); +@@ -102,7 +102,7 @@ PageAllocationGranularity() { // This is literally equivalent to |1 << PageAllocationGranularityShift()| // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. return vm_page_size; @@ -26,4 +26,13 @@ +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or // initialize cache. - int size = page_characteristics.size.load(std::memory_order_relaxed); + size_t size = page_characteristics.size.load(std::memory_order_relaxed); +@@ -141,7 +141,7 @@ SystemPageSize() { + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t + SystemPageSize() { + #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) + // This is literally equivalent to |1 << SystemPageShift()| below, but was + // separated out for 64-bit IS_APPLE and arm64 on Linux to avoid << on a + // non-constexpr. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h index 9af9d257cf60..c5f4c4fd503e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -352,8 +352,12 @@ void DiscardSystemPagesInternal(uintptr_t address, siz +@@ -356,8 +356,12 @@ void DiscardSystemPagesInternal(uintptr_t address, siz void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc index d5eb2f8e6ab8..00e9ceb91e9f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc -@@ -184,7 +184,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT - setup_.configurable_pool_ = 0; +@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT + setup_.configurable_pool_base_mask_ = 0; } -#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc deleted file mode 100644 index bcd2666febd2..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc.orig 2022-11-06 10:07:10 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc -@@ -63,8 +63,14 @@ 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_OR_PA_CHECK( - internal::MaxSystemPagesPerRegularSlotSpan() <= 16, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc new file mode 100644 index 000000000000..a76771eec9d5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc +@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) { + if (getentropy(output, output_length) == 0) { + return; + } ++#elif BUILDFLAG(IS_BSD) ++ if (getentropy(output, output_length) == 0) { ++ return; ++ } + #endif + + // If the OS-specific mechanisms didn't work, fall through to reading from diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h new file mode 100644 index 000000000000..d0992005bcf3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h +@@ -10,7 +10,7 @@ namespace partition_alloc::internal::base::internal { + + namespace partition_alloc::internal::base::internal { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Current thread id is cached in thread local storage for performance reasons. + // In some rare cases it's important to invalidate that cache explicitly (e.g. + // after going through clone() syscall which does not call pthread_atfork() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc new file mode 100644 index 000000000000..06ebd5c93efe --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc +@@ -17,7 +17,7 @@ + #include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <sys/syscall.h> + #include <atomic> + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h index bf2ddbcbaf2b..6a529fb2e456 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-11-06 10:11:11 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h -@@ -66,7 +66,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). @@ -9,7 +9,7 @@ #define PA_HAS_LINUX_KERNEL #endif -@@ -186,7 +186,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. @@ -18,12 +18,12 @@ #define PA_HAS_ATFORK_HANDLER #endif -@@ -225,7 +225,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. -#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) +#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) #define PA_PREFER_SMALLER_SLOT_SPANS - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h index ca9926dc66b4..a77622469f07 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,11 +1,20 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h -@@ -80,7 +80,7 @@ PartitionPageShift() { +@@ -91,7 +91,7 @@ PartitionPageShift() { return 18; // 256 KiB } #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ - (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) - PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; +@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3; + // Special-case Android and iOS, which incur test failures with larger + // pools. Regardless, allocating >8GiB with malloc() on these platforms is + // unrealistic as of 2022. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + constexpr size_t kPoolMaxSize = 8 * kGiB; + #else + constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h new file mode 100644 index 000000000000..50f2ba4814ff --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h +@@ -25,9 +25,13 @@ namespace internal { + // the second one 16. We could technically return something different for + // malloc() and operator new(), but this would complicate things, and most of + // our allocations are presumably coming from operator new() anyway. ++#if defined(__i386__) && defined(OS_FREEBSD) ++constexpr size_t kAlignment = 8; ++#else + constexpr size_t kAlignment = + std::max(alignof(max_align_t), + static_cast<size_t>(__STDCPP_DEFAULT_NEW_ALIGNMENT__)); ++#endif + static_assert(kAlignment <= 16, + "PartitionAlloc doesn't support a fundamental alignment larger " + "than 16 bytes."); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h index 3b40855b8424..e99b5bb0ef7e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h @@ -1,12 +1,11 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h -@@ -130,13 +130,14 @@ struct SlotSpanMetadata { +@@ -138,13 +138,13 @@ struct SlotSpanMetadata { PartitionBucket<thread_safe>* const bucket = nullptr; // CHECK()ed in AllocNewSlotSpan(). -#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) -+#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)) || \ -+ (BUILDFLAG(IS_FREEBSD) && defined(__i386__)) ++#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)) // System page size is not a constant on Apple OSes, but is either 4 or 16kiB // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And // PartitionPageSize() is 4 times the OS page size. @@ -17,13 +16,3 @@ // 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). -@@ -150,7 +151,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; -+#if !BUILDFLAG(IS_FREEBSD) && defined(__i386__) - static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), ""); -+#endif - - // |marked_full| isn't equivalent to being full. Slot span is marked as full - // iff it isn't on the active slot span list (or any other list). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc index 14f10c71b2fe..83802fc86d20 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc -@@ -29,7 +29,7 @@ +@@ -41,7 +41,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -226,7 +226,7 @@ void PartitionAllocMallocInitOnce() { +@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; @@ -18,16 +18,16 @@ // 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. -@@ -305,7 +305,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / - SystemPageSize(); + 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)) // 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 -@@ -648,7 +648,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))); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc index fe81f9d7a012..88dd101feaa5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc -@@ -17,7 +17,15 @@ +@@ -18,7 +18,15 @@ #if defined(PA_HAS_LINUX_KERNEL) #include <errno.h> @@ -16,7 +16,7 @@ #include <sys/syscall.h> #include <unistd.h> #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -116,8 +124,13 @@ void SpinningMutex::FutexWait() { +@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -30,7 +30,7 @@ if (err) { // These are programming error, check them. -@@ -129,8 +142,14 @@ void SpinningMutex::FutexWake() { +@@ -120,8 +133,14 @@ void SpinningMutex::FutexWake() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.h deleted file mode 100644 index 2b8db33decb3..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.h -@@ -114,7 +114,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex { - - #if defined(PA_HAS_FAST_MUTEX) - --#if defined(PA_HAS_LINUX_KERNEL) -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) - void FutexWait(); - void FutexWake(); - -@@ -166,7 +166,7 @@ inline constexpr SpinningMutex::SpinningMutex() = defa - - #if defined(PA_HAS_FAST_MUTEX) - --#if defined(PA_HAS_LINUX_KERNEL) -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) - - ALWAYS_INLINE bool SpinningMutex::Try() { - // Using the weak variant of compare_exchange(), which may fail spuriously. On diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc index e84dab8bab2c..9a0d716b5fd3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/base_switches.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/base_switches.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/base_switches.cc @@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Controls whether or not retired instruction counts are surfaced for threads - // in trace events on Linux. - // + // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when + // Crashpad is fully enabled on Linux. Indicates that Crashpad should be + // enabled. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h index 88e25386511c..5533d2a27058 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/base_switches.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/base_switches.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/base_switches.h @@ -60,7 +60,7 @@ extern const char kForceFieldTrialParams[]; extern const char kForceFieldTrialParams[]; @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kEnableThreadInstructionCount[]; - // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when + // Crashpad is fully enabled on Linux. + extern const char kEnableCrashpad[]; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_cpu.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_cpu.h index 0e2c617ae593..8bbfdc517838 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_cpu.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_cpu.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/cpu.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/cpu.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/cpu.h -@@ -108,7 +108,7 @@ class BASE_EXPORT CPU final { +@@ -115,7 +115,7 @@ class BASE_EXPORT CPU final { const std::string& cpu_brand() const { return cpu_brand_; } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc index 846019d17934..d642ce8536b9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/debug/elf_reader.cc -@@ -76,6 +76,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; while (current_section < section_end) { current_note = reinterpret_cast<const Nhdr*>(current_section); @@ -8,11 +8,11 @@ if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); -@@ -85,6 +86,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } +#endif - size_t section_size = bits::AlignUp(current_note->n_namesz, 4) + - bits::AlignUp(current_note->n_descsz, 4) + + size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) + + bits::AlignUp(current_note->n_descsz, 4u) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc index 58a3f6215c0c..a2273dc371e2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include <AvailabilityMacros.h> #endif @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -695,6 +695,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() { @@ -19,7 +19,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -712,6 +715,7 @@ class SandboxSymbolizeHelper { +@@ -716,6 +719,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,7 +27,7 @@ } // Opens all object files and caches their file descriptors. -@@ -868,7 +872,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); @@ -35,4 +35,4 @@ +#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) // Though the backtrace API man page does not list any possible negative // return values, we take no chance. - return base::saturated_cast<size_t>(backtrace(trace, count)); + return base::saturated_cast<size_t>( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h new file mode 100644 index 000000000000..b158034323d3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__linux.h @@ -0,0 +1,39 @@ +--- src/3rdparty/chromium/base/files/dir_reader_linux.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/base/files/dir_reader_linux.h +@@ -16,10 +16,16 @@ + #include "base/logging.h" + #include "base/posix/eintr_wrapper.h" + ++#include "build/build_config.h" ++ + // See the comments in dir_reader_posix.h about this. + + namespace base { + ++#if BUILDFLAG(IS_BSD) ++#include <dirent.h> ++typedef struct dirent linux_dirent; ++#else + struct linux_dirent { + uint64_t d_ino; + int64_t d_off; +@@ -27,6 +33,7 @@ struct linux_dirent { + unsigned char d_type; + char d_name[0]; + }; ++#endif + + class DirReaderLinux { + public: +@@ -61,7 +68,11 @@ class DirReaderLinux { + if (offset_ != size_) + return true; + ++#if BUILDFLAG(IS_BSD) ++ const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_)); ++#else + const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r < 0) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__posix.h new file mode 100644 index 000000000000..346c0b31951c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_dir__reader__posix.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/files/dir_reader_posix.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/base/files/dir_reader_posix.h +@@ -17,7 +17,7 @@ + // seems worse than falling back to enumerating all file descriptors so we will + // probably never implement this on the Mac. + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "base/files/dir_reader_linux.h" + #else + #include "base/files/dir_reader_fallback.h" +@@ -25,7 +25,7 @@ namespace base { + + namespace base { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + typedef DirReaderLinux DirReaderPosix; + #else + typedef DirReaderFallback DirReaderPosix; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc index 9007b633ff6e..d3094ca92b49 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__bsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher_bsd.cc.orig 2022-11-06 10:18:39 UTC +--- src/3rdparty/chromium/base/files/file_path_watcher_bsd.cc.orig 2023-04-16 12:42:58 UTC +++ src/3rdparty/chromium/base/files/file_path_watcher_bsd.cc @@ -0,0 +1,54 @@ +// Copyright 2021 The Chromium Authors. All rights reserved. @@ -50,7 +50,7 @@ +} // namespace + +FilePathWatcher::FilePathWatcher() { -+ sequence_checker_.DetachFromSequence(); ++ DETACH_FROM_SEQUENCE(sequence_checker_); + impl_ = std::make_unique<FilePathWatcherImpl>(); +} + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__freebsd.cc deleted file mode 100644 index 8939989c7f30..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__freebsd.cc +++ /dev/null @@ -1,64 +0,0 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher_freebsd.cc.orig 2022-08-20 09:01:54 UTC -+++ src/3rdparty/chromium/base/files/file_path_watcher_freebsd.cc -@@ -0,0 +1,61 @@ -+// Copyright (c) 2012 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// This file exists for Unix systems which don't have the inotify headers, and -+// thus cannot build file_watcher_inotify.cc -+ -+#include <memory> -+ -+#include "base/files/file_path_watcher.h" -+#include "base/files/file_path_watcher_kqueue.h" -+ -+#include "base/memory/ptr_util.h" -+#include "build/build_config.h" -+ -+namespace base { -+ -+namespace { -+ -+class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate { -+ public: -+ FilePathWatcherImpl() = default; -+ FilePathWatcherImpl(const FilePathWatcherImpl&) = delete; -+ FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete; -+ ~FilePathWatcherImpl() override = default; -+ -+ bool Watch(const FilePath& path, -+ Type type, -+ const FilePathWatcher::Callback& callback) override { -+ DCHECK(!impl_.get()); -+ -+ if (type == Type::kRecursive) { -+ return false; -+ } else { -+ impl_ = std::make_unique<FilePathWatcherKQueue>(); -+ } -+ -+ DCHECK(impl_.get()); -+ -+ return impl_->Watch(path, type, callback); -+ } -+ -+ void Cancel() override { -+ if (impl_.get()) -+ impl_->Cancel(); -+ -+ set_cancelled(); -+ } -+ -+ private: -+ std::unique_ptr<PlatformDelegate> impl_; -+}; -+ -+} // namespace -+ -+FilePathWatcher::FilePathWatcher() { -+ sequence_checker_.DetachFromSequence(); -+ impl_ = std::make_unique<FilePathWatcherImpl>(); -+} -+ -+} // namespace base diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc index f764ad545eaf..94890c1c97d7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/files/file_util_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/files/file_util_posix.cc -@@ -697,32 +697,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -700,32 +700,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc index f7f8264f0675..1130bbc4ebee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/i18n/icu_util.cc @@ -52,7 +52,7 @@ + #include "third_party/icu/source/common/unicode/unistr.h" #endif - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST)) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() { +@@ -347,7 +347,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST) +-#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. + // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc index 637d7079f110..956ed07fd09a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/linux_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/linux_util.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/linux_util.cc @@ -15,6 +15,7 @@ @@ -18,7 +18,7 @@ // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 char buf[25]; strings::SafeSPrintf(buf, "/proc/%d/task", pid); -@@ -154,6 +158,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t +@@ -152,6 +156,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t } return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc index d41879367807..77cb03561f88 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_discardable__memory.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/base/memory/discardable_memory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/memory/discardable_memory.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/memory/discardable_memory.cc -@@ -25,7 +25,7 @@ const base::Feature kMadvFreeDiscardableMemory{ - "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, + base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const base::Feature kDiscardableMemoryBackingTrial{ - "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; - -@@ -50,7 +50,7 @@ namespace { + BASE_FEATURE(kDiscardableMemoryBackingTrial, + "DiscardableMemoryBackingTrial", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -52,7 +52,7 @@ namespace { namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -69,7 +69,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -71,7 +71,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -99,7 +99,7 @@ DiscardableMemoryBacking GetDiscardableMemoryBacking() +@@ -101,7 +101,7 @@ DiscardableMemoryBacking GetDiscardableMemoryBacking() DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h index f6648ff714e6..f47f4dd4bfdb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/memory/platform_shared_memory_region.h -@@ -14,7 +14,7 @@ +@@ -16,7 +16,7 @@ #include <stdint.h> @@ -9,7 +9,7 @@ namespace content { class SandboxIPCHandler; } -@@ -81,7 +81,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc index 68f8a936c01f..348dcad52e36 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/message_loop/message_pump_glib.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/message_loop/message_pump_glib.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> @@ -10,9 +10,9 @@ +#endif + #include "base/logging.h" + #include "base/memory/raw_ptr.h" #include "base/notreached.h" - #include "base/numerics/safe_conversions.h" -@@ -50,9 +55,13 @@ bool RunningOnMainThread() { +@@ -51,9 +56,13 @@ bool RunningOnMainThread() { } bool RunningOnMainThread() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc index 4a312d8c3751..12d3e780a0a2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/posix/unix_domain_socket.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/posix/unix_domain_socket.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/posix/unix_domain_socket.cc -@@ -50,7 +50,7 @@ bool UnixDomainSocket::EnableReceiveProcessId(int fd) +@@ -51,7 +51,7 @@ bool UnixDomainSocket::EnableReceiveProcessId(int fd) // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -9,7 +9,7 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else -@@ -140,7 +140,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) @@ -18,7 +18,7 @@ // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) -@@ -168,7 +168,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } @@ -27,7 +27,7 @@ // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { -@@ -202,6 +202,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, socklen_t pid_size = sizeof(pid); if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) pid = -1; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h index a0fbe9719cf7..0c7747bafe9e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/launch.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/launch.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/launch.h -@@ -199,7 +199,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc index 30b12c83c093..ff9b3978d26a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/base/process/memory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/memory.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/memory.cc -@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) { - - } // namespace internal - -+#if !BUILDFLAG(IS_BSD) - void TerminateBecauseOutOfMemory(size_t size) { - internal::OnNoMemoryInternal(size); - } -+#endif - +@@ -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. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc index a5132295f05a..d31161157c33 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_metrics.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/process_metrics.cc -@@ -18,7 +18,7 @@ namespace { +@@ -17,7 +17,7 @@ namespace { namespace { #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ int CalculateEventsPerSecond(uint64_t event_count, uint64_t* last_event_count, base::TimeTicks* last_calculated) { -@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -18,7 +18,7 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const { +@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { Value res(Value::Type::DICTIONARY); res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); @@ -27,16 +27,23 @@ Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); -@@ -100,7 +100,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_BSD) || !BUILDFLAG(IS_POSIX) - double ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); + double ProcessMetrics::GetPlatformIndependentCPUUsage( + TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -151,7 +151,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) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h index 7886217cb2b3..00542d09acba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_metrics.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/process_metrics.h @@ -36,7 +36,7 @@ #endif @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -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) || \ @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -248,7 +248,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -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) || \ @@ -54,16 +54,26 @@ 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) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - CPU::CoreType GetCoreType(int core_index); + CPU::CoreType GetCoreType(uint32_t core_index); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -294,7 +294,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_; +-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) + TimeDelta last_cumulative_cpu_; +-#endif + + #if BUILDFLAG(IS_WIN) + TimeTicks last_cpu_time_for_precise_cpu_usage_; +@@ -304,7 +302,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -72,7 +82,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -337,7 +337,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) || \ @@ -81,7 +91,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -372,7 +372,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -382,7 +380,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -90,7 +100,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -387,7 +387,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -397,7 +395,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -99,7 +109,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -424,7 +424,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) || \ @@ -108,7 +118,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -611,7 +611,7 @@ class BASE_EXPORT SystemMetrics { +@@ -622,7 +620,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc index 54a392857c78..2955a234322d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/process_metrics_freebsd.cc @@ -3,20 +3,39 @@ // found in the LICENSE file. @@ -42,35 +42,41 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -26,17 +45,18 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -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); } -+int GetNumberOfThreads(ProcessHandle process) { ++int64_t GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + + kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc index 69d740c1093c..bd523db97e4f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/process_metrics_openbsd.cc @@ -6,14 +6,23 @@ @@ -24,17 +24,18 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( ProcessHandle process) { -@@ -24,49 +33,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun +@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun return false; } -static int GetProcessCPU(pid_t pid) { -+double ProcessMetrics::GetPlatformIndependentCPUUsage() { ++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, - sizeof(struct kinfo_proc), 0 }; + size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; - if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) - return -1; @@ -45,11 +46,12 @@ - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return 0; -+ return 0.0; ++ return TimeDelta(); - return info.p_pctcpu; -+ return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE); - } +-} ++ tv.tv_sec = info.p_rtime_sec; ++ tv.tv_usec = info.p_rtime_usec; -double ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); @@ -66,13 +68,14 @@ - double percentage = static_cast<double>((cpu * 100.0) / FSCALE); - - return percentage; --} -- - TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); - return TimeDelta(); ++ return Microseconds(TimeValToMicroseconds(tv)); } +-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +- NOTREACHED(); +- return TimeDelta(); +-} +- -ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -80,7 +83,7 @@ size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; int pagesize; -@@ -84,6 +68,129 @@ size_t GetSystemCommitCharge() { +@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc index 90464adcc5b8..a6fd4d5e5663 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_metrics_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_metrics_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc index 3b333a2497d5..4f95cb1be2a1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/process/process_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/process/process_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/process/process_posix.cc @@ -25,10 +25,15 @@ #include "build/build_config.h" @@ -17,7 +17,7 @@ #if BUILDFLAG(CLANG_PROFILING) #include "base/test/clang_profiling.h" #endif -@@ -97,7 +102,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, +@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, return ret_pid > 0; } @@ -26,7 +26,7 @@ // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -202,7 +207,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha +@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha const bool exited = (parent_pid < 0); if (!exited && parent_pid != our_pid) { @@ -35,7 +35,7 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -358,7 +363,55 @@ int Process::GetPriority() const { +@@ -392,7 +397,55 @@ int Process::GetPriority() const { int Process::GetPriority() const { DCHECK(IsValid()); @@ -43,7 +43,7 @@ +#if defined(OS_BSD) + return 0; +#else - return getpriority(PRIO_PROCESS, process_); + return getpriority(PRIO_PROCESS, static_cast<id_t>(process_)); +#endif +} + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc new file mode 100644 index 000000000000..95515e2d778f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/profiler/module_cache.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/base/profiler/module_cache.cc +@@ -34,7 +34,7 @@ std::string TransformModuleIDToBreakpadFormat(StringPi + + std::string TransformModuleIDToBreakpadFormat(StringPiece module_id) { + std::string mangled_id(module_id); +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Linux ELF module IDs are 160bit integers, which we need to mangle + // down to 128bit integers to match the id that Breakpad outputs. + // Example on version '66.0.3359.170' x64: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc new file mode 100644 index 000000000000..77661639ec48 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/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 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h new file mode 100644 index 000000000000..f0ee0b6b063b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/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. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc new file mode 100644 index 000000000000..a0b102dcb67f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__base__address__posix.cc @@ -0,0 +1,44 @@ +--- src/3rdparty/chromium/base/profiler/stack_base_address_posix.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/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 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr + #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; + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc new file mode 100644 index 000000000000..87cab01208a1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/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 @@ std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePos + 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 = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h index 1dbb4e2b7249..9407ed679042 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/rand_util.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/rand_util.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/rand_util.h -@@ -81,7 +81,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } -#if BUILDFLAG(IS_POSIX) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_BSD) BASE_EXPORT int GetUrandomFD(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc index dd0e937699e7..2e1dead06e24 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util__posix.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/base/rand_util_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/rand_util_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/rand_util_posix.cc -@@ -17,7 +17,7 @@ - #include "base/posix/eintr_wrapper.h" +@@ -22,7 +22,7 @@ + #include "base/time/time.h" #include "build/build_config.h" -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) @@ -9,31 +9,36 @@ #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. -@@ -34,6 +34,7 @@ static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC +@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; #endif -+#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) // 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 -@@ -51,6 +52,7 @@ class URandomFd { +@@ -63,10 +64,11 @@ class URandomFd { private: const int fd_; }; +#endif - } // namespace + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID)) && \ +- !BUILDFLAG(IS_NACL) ++ !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + // TODO(pasko): Unify reading kernel version numbers in: + // mojo/core/channel_linux.cc + // chrome/browser/android/seccomp_support_detector.cc +@@ -176,6 +178,7 @@ void RandBytes(void* output, size_t output_length, boo + namespace { -@@ -62,6 +64,7 @@ void RandBytes(void* output, size_t output_length) { - // (https://chromium-review.googlesource.com/c/chromium/src/+/1545096) and land - // it or some form of it. - void RandBytes(void* output, size_t output_length) { -+#if !BUILDFLAG(IS_OPENBSD) - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) - // We have to call `getrandom` via Linux Syscall Support, rather than through - // the libc wrapper, because we might not have an up-to-date libc (e.g. on -@@ -93,11 +96,16 @@ void RandBytes(void* output, size_t output_length) { + void RandBytes(void* output, size_t output_length, bool avoid_allocation) { ++#if !BUILDFLAG(IS_BSD) + #if !BUILDFLAG(IS_NACL) + // The BoringSSL experiment takes priority over everything else. + if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { +@@ -214,6 +217,9 @@ void RandBytes(void* output, size_t output_length, boo const bool success = ReadFromFD(urandom_fd, static_cast<char*>(output), output_length); CHECK(success); @@ -42,7 +47,12 @@ +#endif } -+#if !BUILDFLAG(IS_OPENBSD) + } // namespace +@@ -233,9 +239,11 @@ void RandBytes(void* output, size_t output_length) { + RandBytes(output, output_length, /*avoid_allocation=*/false); + } + ++#if !BUILDFLAG(IS_BSD) int GetUrandomFD() { static NoDestructor<URandomFd> urandom_fd; return urandom_fd->fd(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h index a673f132730a..fd2924bef935 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/synchronization/lock_impl.h -@@ -106,6 +106,10 @@ void LockImpl::Unlock() { +@@ -107,6 +107,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -126,6 +130,9 @@ void LockImpl::Unlock() { +@@ -127,6 +131,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc index 4ec78d9ee144..2fe203de668c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/system/sys_info.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/system/sys_info.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/system/sys_info.cc -@@ -104,7 +104,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync), - std::move(callback)); +@@ -101,7 +101,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( + #endif + + void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + constexpr base::TaskTraits kTraits = {base::MayBlock()}; + #else + constexpr base::TaskTraits kTraits = {}; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h index b0f7fee1d85b..5917259116fe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/base/system/sys_info.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/system/sys_info.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/system/sys_info.h -@@ -212,6 +212,8 @@ class BASE_EXPORT SysInfo { - // On Desktop this returns true when memory <= 2GB. - static bool IsLowEndDevice(); +@@ -233,6 +233,8 @@ class BASE_EXPORT SysInfo { + static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); + #endif + static uint64_t MaxSharedMemorySize(); + private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -222,7 +224,7 @@ class BASE_EXPORT SysInfo { +@@ -243,7 +245,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - static int64_t AmountOfAvailablePhysicalMemory( + static uint64_t AmountOfAvailablePhysicalMemory( const SystemMemoryInfoKB& meminfo); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc index 5620a30b517e..166701801e23 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc @@ -9,30 +9,106 @@ #include <sys/sysctl.h> @@ -9,6 +9,8 @@ namespace base { +-int64_t SysInfo::AmountOfPhysicalMemoryImpl() { +- int pages, page_size; +int SysInfo::NumberOfProcessors() { + int mib[] = {CTL_HW, HW_NCPU}; + int ncpu; @@ -20,8 +22,7 @@ + return ncpu; +} + - int64_t SysInfo::AmountOfPhysicalMemoryImpl() { -- int pages, page_size; ++uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { + int pages, page_size, r = 0; size_t size = sizeof(pages); - sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); @@ -37,11 +38,12 @@ NOTREACHED(); return 0; } +- return static_cast<int64_t>(pages) * page_size; + - return static_cast<int64_t>(pages) * page_size; ++ return static_cast<uint64_t>(pages) * page_size; } -+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { ++uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + int page_size, r = 0; + unsigned int pgfree, pginact, pgcache; + size_t size = sizeof(page_size); @@ -61,12 +63,12 @@ + return 0; + } + -+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); ++ return static_cast<uint64_t>((pgfree + pginact + pgcache) * page_size); +} + // static -+int64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { -+ int64_t res_kb = info.available != 0 ++uint64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { ++ uint64_t res_kb = info.available != 0 + ? info.available - info.active_file + : info.free + info.reclaimable + info.inactive_file; + return res_kb * 1024; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc index 57bba575c3fa..c64e27190053 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__openbsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/system/sys_info_openbsd.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/system/sys_info_openbsd.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/system/sys_info_openbsd.cc @@ -11,6 +11,7 @@ #include <sys/sysctl.h> @@ -8,7 +8,7 @@ namespace { -@@ -28,9 +29,15 @@ namespace base { +@@ -26,9 +27,15 @@ namespace base { namespace base { @@ -25,10 +25,10 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -42,10 +49,26 @@ int64_t SysInfo::AmountOfPhysicalMemoryImpl() { +@@ -40,10 +47,26 @@ uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { // static - int64_t SysInfo::AmountOfPhysicalMemoryImpl() { + uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { - return AmountOfMemory(_SC_PHYS_PAGES); + // pledge(2) + if (!aofpmem) @@ -50,10 +50,10 @@ +} + +// static - int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { // We should add inactive file-backed memory also but there is no such // information from OpenBSD unfortunately. -@@ -57,23 +80,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc index cfacfabfa35e..7520de47f3c9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc @@ -1,38 +1,21 @@ ---- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/system/sys_info_posix.cc -@@ -37,7 +37,7 @@ namespace { +@@ -182,12 +182,12 @@ absl::optional<int> NumberOfPhysicalProcessors() { - namespace { - --#if !BUILDFLAG(IS_OPENBSD) -+#if !BUILDFLAG(IS_BSD) - int NumberOfProcessors() { - // sysconf returns the number of "logical" (not "physical") processors on both - // Mac and Linux. So we get the number of max available "logical" processors. -@@ -77,7 +77,7 @@ base::LazyInstance<base::internal::LazySysInfoValue<in - - base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>:: - Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; --#endif // !BUILDFLAG(IS_OPENBSD) -+#endif // !BUILDFLAG(IS_BSD) - - int64_t AmountOfVirtualMemory() { - struct rlimit limit; -@@ -143,11 +143,11 @@ namespace base { - - namespace base { + } // namespace internal -#if !BUILDFLAG(IS_OPENBSD) +#if !BUILDFLAG(IS_BSD) int SysInfo::NumberOfProcessors() { - return g_lazy_number_of_processors.Get().value(); + static int number_of_processors = internal::NumberOfProcessors(); + return number_of_processors; } -#endif // !BUILDFLAG(IS_OPENBSD) +#endif // !BUILDFLAG(IS_BSD) // static - int64_t SysInfo::AmountOfVirtualMemory() { -@@ -239,6 +239,8 @@ std::string SysInfo::OperatingSystemArchitecture() { + uint64_t SysInfo::AmountOfVirtualMemory() { +@@ -277,6 +277,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; @@ -41,3 +24,10 @@ } else if (std::string(info.sysname) == "AIX") { arch = "ppc64"; } +@@ -300,4 +302,4 @@ void SysInfo::SetIsCpuSecurityMitigationsEnabled(bool + + #endif // BUILDFLAG(IS_MAC) + +-} // namespace base +\ No newline at end of file ++} // namespace base diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_third__party_libevent_event.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_third__party_libevent_event.h deleted file mode 100644 index 72ae1ebd39f9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_third__party_libevent_event.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/base/third_party/libevent/event.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/base/third_party/libevent/event.h -@@ -1,3 +1,6 @@ -+#if defined(USE_SYSTEM_LIBEVENT) -+#include <event.h> -+#else - /* - * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. -@@ -1210,3 +1213,4 @@ int evtag_unmarshal_timeval(struct evbuffer *evbuf, ev - #endif - - #endif /* _EVENT_H_ */ -+#endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_third__party_symbolize_symbolize.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_third__party_symbolize_symbolize.cc deleted file mode 100644 index 15f06fce2970..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_third__party_symbolize_symbolize.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/third_party/symbolize/symbolize.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/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> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h index 2b778b07c19a..dd787a6a4d6f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/threading/platform_thread.h -@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread { +@@ -253,7 +253,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by `delegate`. static TimeDelta GetRealtimePeriod(Delegate* delegate); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Toggles a specific thread's priority at runtime. This can be used to + // Toggles a specific thread's type at runtime. This can be used to // change the priority of a thread in a different process and will fail // if the calling process does not have proper permissions. The diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc index 99a5e12c9314..537aff5e4b60 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_linux.cc -@@ -30,7 +30,9 @@ +@@ -29,7 +29,9 @@ #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #include <pthread.h> @@ -10,16 +10,16 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -133,7 +135,7 @@ int sched_setattr(pid_t pid, +@@ -134,7 +136,7 @@ long sched_setattr(pid_t pid, #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_CHROMEOS) -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -287,7 +289,7 @@ namespace { +@@ -306,7 +308,7 @@ namespace { namespace internal { namespace { @@ -28,34 +28,34 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -300,7 +302,7 @@ bool CanSetThreadPriorityToRealtimeAudio() { +@@ -332,7 +334,7 @@ bool CanSetThreadTypeToRealtimeAudio() { }; - bool CanSetThreadPriorityToRealtimeAudio() { + bool CanSetThreadTypeToRealtimeAudio() { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke - // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). + // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -311,7 +313,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit - } +@@ -344,7 +346,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread - bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) { + bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, + MessagePumpType pump_type_hint) { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // For legacy schedtune interface - SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority); + SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); -@@ -329,7 +331,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit - } +@@ -363,7 +365,7 @@ GetCurrentThreadPriorityForPlatformForTest() { - absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() { + absl::optional<ThreadPriorityForTest> + GetCurrentThreadPriorityForPlatformForTest() { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -348,7 +350,7 @@ void PlatformThread::SetName(const std::string& name) +@@ -382,7 +384,7 @@ void PlatformThread::SetName(const std::string& name) void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,14 +64,14 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -378,8 +380,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce +@@ -412,8 +414,10 @@ void PlatformThread::SetThreadType(ProcessId process_i // priority. CHECK_NE(thread_id, process_id); +#if !BUILDFLAG(IS_BSD) // For legacy schedtune interface - SetThreadCgroupsForThreadPriority(thread_id, priority); + SetThreadCgroupsForThreadType(thread_id, thread_type); +#endif - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + #if BUILDFLAG(IS_CHROMEOS) // For upstream uclamp interface. We try both legacy (schedtune, as done diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc index 46dc460a2826..eeae01ef75bd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc @@ -1,21 +1,21 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_posix.cc -@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) { +@@ -78,7 +78,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) - internal::PCScan::NotifyThreadCreated(internal::GetStackPointer()); - #endif -@@ -365,6 +365,9 @@ void PlatformThread::SetCurrentThreadPriorityImpl(Thre - // static - void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) { + #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(STARSCAN) + partition_alloc::internal::PCScan::NotifyThreadCreated( + partition_alloc::internal::GetStackPointer()); +@@ -380,6 +380,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::SetCurrentThreadPriorityForPlatform(priority)) + if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) + return; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_thread__task__runner__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_thread__task__runner__handle.cc deleted file mode 100644 index 8ab2310d7a8b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_thread__task__runner__handle.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- src/3rdparty/chromium/base/threading/thread_task_runner_handle.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/base/threading/thread_task_runner_handle.cc -@@ -8,6 +8,7 @@ - #include <utility> - - #include "base/bind.h" -+#include "base/callback_helpers.h" - #include "base/check_op.h" - #include "base/dcheck_is_on.h" - #include "base/lazy_instance.h" -@@ -40,6 +41,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas - return current->task_runner_; - } - -+#if defined(OS_BSD) - // static - bool ThreadTaskRunnerHandle::IsSet() { - return !!thread_task_runner_tls.Pointer()->Get(); -@@ -89,6 +91,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle - std::make_unique<ScopedDisallowRunningRunLoop>(); - } - } -+#endif - - ThreadTaskRunnerHandleOverride::~ThreadTaskRunnerHandleOverride() { - if (task_runner_to_restore_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_time_time.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_time_time.cc deleted file mode 100644 index 0684ffe1d3b7..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_time_time.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/time/time.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/base/time/time.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // time.h is a widely included header and its size impacts build time. - // Try not to raise this limit unless necessary. See - // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc index 9a8738881caa..f04ae1389c8c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -@@ -23,6 +23,8 @@ +@@ -24,6 +24,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,17 +9,16 @@ #else #include <malloc.h> #endif -@@ -174,7 +176,8 @@ 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) && \ -- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA)) -+ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) && \ -+ !BUILDFLAG(IS_BSD)) +- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA)) ++ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)) void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -339,6 +342,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. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc index 48e7d1bed14f..9a7231973df2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/base/trace_event/process_memory_dump.cc -@@ -105,7 +105,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden #if BUILDFLAG(IS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); @@ -9,12 +9,12 @@ std::unique_ptr<char[]> vec(new char[max_vec_size]); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -130,7 +130,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -134,7 +134,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; -#elif BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(fuchsia): Port, see https://crbug.com/706592. - #elif BUILDFLAG(IS_APPLE) - // mincore in MAC does not fail with EAGAIN. + // TODO(crbug.com/851760): Implement counting resident bytes. + // For now, log and avoid unused variable warnings. + NOTIMPLEMENTED_LOG_ONCE(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn index 40ca1061af84..1288584c3620 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/config/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/build/config/BUILD.gn -@@ -222,13 +222,17 @@ config("default_libs") { +@@ -219,13 +219,17 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn index f981c9b725cb..829c2e111257 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn -@@ -237,13 +237,16 @@ config("no_unresolved_symbols") { +@@ -225,13 +225,16 @@ config("no_unresolved_symbols") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -487,6 +490,10 @@ config("compiler") { +@@ -494,6 +497,10 @@ config("compiler") { } } @@ -29,25 +29,25 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -952,7 +959,7 @@ config("compiler_cpu_abi") { +@@ -979,7 +986,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl) { -+ if (is_clang && !is_android && !is_nacl && !is_bsd) { +- if (is_clang && !is_android && !is_nacl && ++ if (is_clang && !is_android && !is_nacl && !is_bsd && + !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] - } -@@ -969,7 +976,7 @@ config("compiler_cpu_abi") { +@@ -997,7 +1004,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia && ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd && + !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1290,7 +1297,7 @@ config("compiler_deterministic") { +@@ -1335,7 +1342,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. @@ -56,16 +56,25 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1745,7 +1752,7 @@ config("default_warnings") { +@@ -1387,7 +1394,7 @@ config("clang_revision") { + } + + 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", +@@ -1792,7 +1799,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] - if (!is_nacl) { + if (!is_nacl && !is_bsd) { - # TODO(https://crbug.com/1300731) Clean up and enable. - cflags += [ "-Wno-unqualified-std-cast-call" ] - -@@ -1929,7 +1936,7 @@ config("no_chromium_code") { + cflags += [ + # TODO(crbug.com/1343975) Evaluate and possibly enable. + "-Wno-deprecated-builtins", +@@ -1971,7 +1978,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -74,7 +83,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2451,7 +2458,7 @@ config("afdo") { +@@ -2501,7 +2508,7 @@ config("afdo") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -83,7 +92,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2467,7 +2474,7 @@ config("afdo") { +@@ -2517,7 +2524,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_pgo.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_pgo.gni deleted file mode 100644 index b7dd46c109b1..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_pgo.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/build/config/compiler/pgo/pgo.gni.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/build/config/compiler/pgo/pgo.gni -@@ -16,7 +16,7 @@ declare_args() { - # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once - # target_os switch for lacros-chrome is completed. - (is_win || is_mac || -- (is_linux && !chromeos_is_browser_only && !is_chromecast))) { -+ (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) { - chrome_pgo_phase = 2 - } - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni index d1ab07b39a42..559d79420b16 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/ozone.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/config/ozone.gni.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/build/config/ozone.gni -@@ -94,7 +94,15 @@ declare_args() { +@@ -90,7 +90,15 @@ declare_args() { } else if (is_chromeos_lacros) { ozone_platform = "wayland" ozone_platform_wayland = true diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni index d614091daca2..fd99482f7381 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/config/rust.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/config/rust.gni.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/build/config/rust.gni -@@ -116,7 +116,7 @@ if (enable_rust) { +@@ -124,7 +124,7 @@ if (enable_rust) { rust_sysroot = "//third_party/rust-toolchain" use_unverified_rust_toolchain = false } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn deleted file mode 100644 index 72a4e8eea81e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn +++ /dev/null @@ -1,53 +0,0 @@ ---- src/3rdparty/chromium/build/linux/libpci/BUILD.gn.orig 2022-06-08 06:40:31 UTC -+++ src/3rdparty/chromium/build/linux/libpci/BUILD.gn -@@ -3,20 +3,36 @@ import("//tools/generate_library_loader/generate_libra - # found in the LICENSE file. - - import("//tools/generate_library_loader/generate_library_loader.gni") -+import("//build/config/linux/pkg_config.gni") - --# This generates a target named "libpci". --generate_library_loader("libpci") { -- name = "LibPciLoader" -- output_h = "libpci.h" -- output_cc = "libpci_loader.cc" -- header = "<pci/pci.h>" -+declare_args() { -+ use_system_libpci = is_bsd -+} - -- functions = [ -- "pci_alloc", -- "pci_init", -- "pci_cleanup", -- "pci_scan_bus", -- "pci_fill_info", -- "pci_lookup_name", -- ] -+if (use_system_libpci) { -+ pkg_config("system_libpci") { -+ packages = [ "libpci" ] -+ } -+ -+ source_set("libpci") { -+ public_configs = [ ":system_libpci" ] -+ } -+ -+} else { -+ # This generates a target named "libpci". -+ generate_library_loader("libpci") { -+ name = "LibPciLoader" -+ output_h = "libpci.h" -+ output_cc = "libpci_loader.cc" -+ header = "<pci/pci.h>" -+ -+ functions = [ -+ "pci_alloc", -+ "pci_init", -+ "pci_cleanup", -+ "pci_scan_bus", -+ "pci_fill_info", -+ "pci_lookup_name", -+ ] -+ } - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_strip__binary.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_strip__binary.gni deleted file mode 100644 index af46c4349269..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_strip__binary.gni +++ /dev/null @@ -1,15 +0,0 @@ ---- src/3rdparty/chromium/build/linux/strip_binary.gni.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/build/linux/strip_binary.gni -@@ -20,7 +20,11 @@ template("strip_binary") { - "testonly", - ]) - action("${target_name}") { -- eu_strip_binary = "//buildtools/third_party/eu-strip/bin/eu-strip" -+ if (is_bsd) { -+ eu_strip_binary = "//buildtools/freebsd/strip" -+ } else { -+ eu_strip_binary = "//buildtools/third_party/eu-strip/bin/eu-strip" -+ } - script = "//build/linux/strip_binary.py" - - if (defined(invoker.stripped_binary_output)) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn deleted file mode 100644 index db89d1303669..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn +++ /dev/null @@ -1,10 +0,0 @@ ---- src/3rdparty/chromium/build/linux/unbundle/libxml.gn.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/build/linux/unbundle/libxml.gn -@@ -19,6 +19,7 @@ static_library("libxml_utils") { - ":xml_reader", - ":xml_writer", - "//base/test:test_support", -+ "//services/data_decoder:lib", - "//services/data_decoder:xml_parser_fuzzer_deps", - ] - sources = [ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py index 2bb34ce4835a..fc819618c82b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_replace__gn__files.py @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py -@@ -25,6 +25,7 @@ REPLACEMENTS = { - 'libevent': 'base/third_party/libevent/BUILD.gn', +@@ -53,6 +53,7 @@ REPLACEMENTS = { 'libjpeg': 'third_party/libjpeg.gni', + 'libjxl' : 'third_party/libjxl/BUILD.gn', 'libpng': 'third_party/libpng/BUILD.gn', + 'libusb': 'third_party/libusb/BUILD.gn', 'libvpx': 'third_party/libvpx/BUILD.gn', diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni index 0007b0b902b1..ccf71aebb539 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,11 +14,20 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -786,13 +793,12 @@ template("clang_toolchain") { +@@ -786,22 +793,12 @@ template("clang_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +- _path = "$clang_base_path/bin" +- _is_path_absolute = get_path_info(_path, "abspath") == _path +- +- # Preserve absolute paths for tools like distcc. +- if (_is_path_absolute && filter_include([ _path ], [ "//*" ]) == []) { +- prefix = _path +- } else { +- prefix = rebase_path(_path, root_build_dir) +- } +- - cc = "${prefix}/clang" - cxx = "${prefix}/clang++" + cc = "cc" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h index fd0a77569dcb..5c35dc7bfde4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h -@@ -136,7 +136,7 @@ class WebRtcLoggingController +@@ -137,7 +137,7 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -9,7 +9,7 @@ // 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. -@@ -195,7 +195,7 @@ class WebRtcLoggingController +@@ -196,7 +196,7 @@ class WebRtcLoggingController bool success, const std::string& error_message); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index ac345f793822..3552614669fa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -310,7 +310,7 @@ +@@ -320,7 +320,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -335,17 +335,17 @@ +@@ -346,17 +346,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -701,7 +701,7 @@ bool IsAboutUI(const GURL& url) { +@@ -713,7 +713,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,8 +39,8 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1131,7 +1131,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - return &NewWebUI<ash::SampleSystemWebAppUI>; +@@ -1150,7 +1150,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + #endif // !defined(USE_REAL_DBUS_CLIENTS) #endif // !defined(OFFICIAL_BUILD) #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1189,7 +1189,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1211,7 +1211,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1247,27 +1247,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1273,27 +1273,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -87,6 +87,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kDesktopPWAsWebAppSettingsPage) && - url.host_piece() == chrome::kChromeUIWebAppSettingsHost) { + if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc index fc76080783bb..1eec33618c04 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc -@@ -455,18 +455,18 @@ const char kOsUIVersionURL[] = "os://version"; +@@ -483,18 +483,18 @@ const char kOsUIVersionURL[] = "os://version"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -481,14 +481,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -509,14 +509,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -503,7 +503,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta +@@ -532,7 +532,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -578,7 +578,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -610,7 +610,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -796,7 +796,7 @@ const char* const kChromeDebugURLs[] = { +@@ -831,7 +831,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h index 9c89875359fe..c61e67d36445 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.h -@@ -382,24 +382,24 @@ extern const char kOsUIVersionURL[]; +@@ -409,24 +409,24 @@ extern const char kOsUIVersionURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -414,14 +414,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -441,14 +441,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -433,7 +433,7 @@ extern const char kChromeUIProfilePickerStartupQuery[] +@@ -461,7 +461,7 @@ extern const char kChromeUIProfilePickerStartupQuery[] extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_content_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_content_browser_BUILD.gn deleted file mode 100644 index a556b9181da5..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_content_browser_BUILD.gn +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/components/crash/content/browser/BUILD.gn.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/components/crash/content/browser/BUILD.gn -@@ -21,7 +21,7 @@ source_set("browser") { - "//content/public/common", - ] - -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux && !is_bsd) || is_chromeos || is_android) { - # Want this file on both Linux and Android. - sources += [ - "crash_handler_host_linux.cc", -@@ -37,7 +37,7 @@ source_set("browser") { - - # This is not in the GYP build but this target includes breakpad client - # headers, so add the dependency here. -- if ((is_posix && !is_ios) || is_fuchsia) { -+ if ((is_posix && !is_ios && !is_bsd) || is_fuchsia) { - configs += [ "//third_party/breakpad:client_config" ] - public_configs = [ "//third_party/breakpad:client_config" ] - } -@@ -59,7 +59,7 @@ source_set("browser") { - "//components/crash/android:jni_headers", - "//mojo/public/cpp/bindings", - ] -- } else { -+ } else if (!is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn index ee9be5a1b0a4..fc385aca5ed6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/components/crash/core/app/BUILD.gn @@ -52,7 +52,7 @@ static_library("app") { "crashpad.h", @@ -6,10 +6,10 @@ - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "breakpad_linux.cc", - "breakpad_linux.h", -@@ -61,6 +61,10 @@ static_library("app") { + sources += [ "crashpad_linux.cc" ] + } + +@@ -65,6 +65,10 @@ static_library("app") { ] } @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -88,7 +92,7 @@ static_library("app") { +@@ -96,7 +100,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,16 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -96,7 +100,7 @@ static_library("app") { - ] - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } - -@@ -216,11 +220,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc index 7ed0d65f6033..c304b9c6a721 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc @@ -1,6 +1,16 @@ ---- src/3rdparty/chromium/components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/components/crash/core/browser/crash_upload_list_crashpad.cc -@@ -51,9 +51,13 @@ void CrashUploadListCrashpad::ClearUploadList(const ba +@@ -37,7 +37,9 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra + + std::vector<UploadList::UploadInfo> CrashUploadListCrashpad::LoadUploadList() { + std::vector<crash_reporter::Report> reports; ++#if !defined(OS_BSD) + crash_reporter::GetReports(&reports); ++#endif + + std::vector<UploadInfo> uploads; + for (const crash_reporter::Report& report : reports) { +@@ -51,9 +53,13 @@ void CrashUploadListCrashpad::ClearUploadList(const ba void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, const base::Time& end) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn index 5b401e0b3290..47db051503ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn @@ -8,7 +8,7 @@ declare_args() { @@ -9,12 +9,3 @@ } group("common") { -@@ -190,7 +190,7 @@ source_set("unit_tests") { - sources += [ "crash_key_breakpad_ios_unittest.cc" ] - deps += [ "//third_party/breakpad:client" ] - include_dirs = [ "//third_party/breakpad/breakpad/src/" ] -- } else if (!is_mac && !is_win && !is_fuchsia && !is_android) { -+ } else if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) { - include_dirs = [ "//third_party/breakpad/breakpad/src/" ] - sources += [ "crash_key_breakpad_unittest.cc" ] - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc index d05f72be5377..c3cf9b4cb53b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc -@@ -101,13 +101,13 @@ bool LibsecretLoader::LoadLibsecret() { +@@ -102,13 +102,13 @@ bool LibsecretLoader::LoadLibsecret() { if (libsecret_loaded_) return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h index c4eccefe84f5..24b1e83d064d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/os_crypt/os_crypt.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/os_crypt/os_crypt.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/components/os_crypt/os_crypt.h -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ #include "build/build_config.h" #include "build/chromecast_buildflags.h" @@ -9,7 +9,16 @@ class KeyStorageLinux; #endif // BUILDFLAG(IS_LINUX) -@@ -30,7 +30,7 @@ namespace OSCrypt { +@@ -24,7 +24,7 @@ class PrefService; + class PrefService; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + namespace crypto { + class SymmetricKey; + } +@@ -37,7 +37,7 @@ namespace OSCrypt { // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions // of what each function does. namespace OSCrypt { @@ -18,30 +27,46 @@ COMPONENT_EXPORT(OS_CRYPT) void SetConfig(std::unique_ptr<os_crypt::Config> config); #endif // BUILDFLAG(IS_LINUX) -@@ -75,7 +75,7 @@ COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting() +@@ -82,7 +82,7 @@ COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting() COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy); COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); #endif // BUILDFLAG(IS_WIN) --#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST)) +-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyStorageForTesting( - std::unique_ptr<KeyStorageLinux> (*get_key_storage_mock)()); -@@ -95,7 +95,7 @@ class OSCryptImpl { - OSCryptImpl(const OSCryptImpl&) = delete; - OSCryptImpl& operator=(const OSCryptImpl&) = delete; + base::OnceCallback<std::unique_ptr<KeyStorageLinux>()> +@@ -109,7 +109,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { + // Returns singleton instance of OSCryptImpl. + static OSCryptImpl* GetInstance(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -200,7 +200,7 @@ class OSCryptImpl { - static void ResetStateForTesting(); +@@ -201,7 +201,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { + void ResetStateForTesting(); #endif --#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST)) +-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) // For unit testing purposes, inject methods to be used. - // |get_key_storage_mock| provides the desired |KeyStorage| implementation. - // If the provider returns |nullptr|, a hardcoded password will be used. + // |storage_provider_factory| provides the desired |KeyStorage| + // implementation. If the provider returns |nullptr|, a hardcoded password +@@ -226,13 +226,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { + crypto::SymmetricKey* GetEncryptionKey(); + #endif // BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + // This lock is used to make the GetEncryptionKey and + // GetRawEncryptionKey methods thread-safe. + static base::Lock& GetLock(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Create the KeyStorage. Will be null if no service is found. A Config must + // be set before every call to this method. + std::unique_ptr<KeyStorageLinux> CreateKeyStorage(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc index ad14ec155f6c..0f98a6d4ffa7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc -@@ -35,6 +35,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi - VLOG(2) << "Screen AI library loaded pre-sandboxing:" << library_path; +@@ -36,6 +36,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi } + screen_ai::StoreComponentBinaryPath(library_path); +#if !BUILDFLAG(IS_BSD) auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -46,6 +47,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -59,6 +60,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc index e79b246274a8..0a1f73221cd8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/app/content_main.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/app/content_main.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/app/content_main.cc -@@ -262,7 +262,7 @@ RunContentProcess(ContentMainParams params, +@@ -228,7 +228,7 @@ RunContentProcess(ContentMainParams params, base::EnableTerminationOnOutOfMemory(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc index adb1ea00ea29..2939640226a5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/app/content_main_runner_impl.cc -@@ -129,13 +129,13 @@ +@@ -135,13 +135,13 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -16,30 +16,39 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -172,6 +172,13 @@ +@@ -165,6 +165,11 @@ + #include "content/public/common/content_client.h" #endif - #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -+#if BUILDFLAG(IS_BSD) -+#include "base/system/sys_info.h" ++//XXX +#if BUILDFLAG(ENABLE_WEBRTC) +#include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck +#endif ++ + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + + #if BUILDFLAG(USE_ZYGOTE_HANDLE) +@@ -183,6 +188,10 @@ + #endif + #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) + ++#if BUILDFLAG(IS_BSD) ++#include "base/system/sys_info.h" +#endif + #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -344,7 +351,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -388,7 +397,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(ENABLE_PLUGINS) + #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -380,7 +387,7 @@ void PreloadLibraryCdms() { +@@ -424,7 +433,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -48,8 +57,8 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -398,6 +405,11 @@ void PreSandboxInit() { - InitializeWebRtcModule(); +@@ -449,6 +458,11 @@ void PreSandboxInit() { + } #endif +#if BUILDFLAG(IS_BSD) @@ -60,7 +69,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -567,7 +579,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -631,7 +645,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -69,7 +78,7 @@ PreSandboxInit(); #endif -@@ -753,11 +765,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -825,11 +839,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -83,7 +92,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -936,6 +947,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1017,6 +1030,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -100,8 +109,8 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -991,7 +1012,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { - mojo::core::InitFeatures(); +@@ -1080,7 +1103,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { + process_type); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -109,7 +118,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1024,6 +1045,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1113,6 +1136,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn index e2c19106a181..ac87d89386e8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/BUILD.gn -@@ -2406,6 +2406,13 @@ jumbo_source_set("browser") { - } +@@ -2499,6 +2499,13 @@ jumbo_source_set("browser") { + ] } + if (is_bsd) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc index def30c13d22c..2f1c82b88a0c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc -@@ -292,6 +292,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -316,6 +316,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc index 6510fc159366..d908feb5ac68 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/browser_main_loop.cc @@ -247,6 +247,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -554,6 +560,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -531,6 +537,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,17 +26,8 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -581,7 +593,7 @@ int BrowserMainLoop::EarlyInitialization() { - - // Up the priority of the UI thread unless it was already high (since Mac - // and recent versions of Android (O+) do this automatically). --#if !BUILDFLAG(IS_MAC) -+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - features::kBrowserUseDisplayThreadPriority) && - base::PlatformThread::GetCurrentThreadPriority() < -@@ -592,7 +604,7 @@ int BrowserMainLoop::EarlyInitialization() { - #endif // !BUILDFLAG(IS_MAC) +@@ -562,7 +574,7 @@ int BrowserMainLoop::EarlyInitialization() { + base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc index 9e70e6311243..e17e6744a9e4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc -@@ -19,7 +19,9 @@ +@@ -20,7 +20,9 @@ #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "content/public/common/zygote/sandbox_support_linux.h" @@ -10,15 +10,15 @@ #include "sandbox/policy/linux/sandbox_linux.h" namespace content { -@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -74,6 +76,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; - + Process process; +#if !BUILDFLAG(IS_BSD) ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -87,7 +90,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -26,22 +26,26 @@ if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; -@@ -90,13 +92,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -96,15 +98,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr oom_score = content::kLowestRendererOomScore; ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score); } -#endif - Process process; process.process = base::Process(handle); process.zygote = zygote_handle; - return process; + } else { ++#endif + process.process = base::LaunchProcess(*command_line(), options); + *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS + : LAUNCH_RESULT_FAILURE; ++#if !BUILDFLAG(IS_BSD) } +#endif - Process process; - process.process = base::LaunchProcess(*command_line(), options); -@@ -114,10 +116,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper + #if BUILDFLAG(IS_CHROMEOS) + if (GetProcessType() == switches::kRendererProcess) { +@@ -124,10 +128,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -56,7 +60,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -141,13 +147,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -151,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc index 1dac85b61e2f..6e46723b4a88 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc -@@ -112,7 +112,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -118,7 +118,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compute__pressure_cpu__probe.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compute__pressure_cpu__probe.cc deleted file mode 100644 index 0fe20f478d0d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compute__pressure_cpu__probe.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/3rdparty/chromium/content/browser/compute_pressure/cpu_probe.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/content/browser/compute_pressure/cpu_probe.cc -@@ -53,6 +53,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - return CpuProbeLinux::Create(); - #else -+ NOTIMPLEMENTED(); - return std::make_unique<NullCpuProbe>(); - #endif // BUILDFLAG(IS_ANDROID) - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_download_download__manager__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_download_download__manager__impl.cc index c0b99924a6c1..eae10fecc726 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_download_download__manager__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_download_download__manager__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/download/download_manager_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/download/download_manager_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/download/download_manager_impl.cc -@@ -90,7 +90,7 @@ +@@ -92,7 +92,7 @@ #include "third_party/blink/public/common/storage_key/storage_key.h" #include "url/origin.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -218,7 +218,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; @@ -18,7 +18,7 @@ base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -654,7 +654,7 @@ base::FilePath DownloadManagerImpl::GetDefaultDownload +@@ -655,7 +655,7 @@ base::FilePath DownloadManagerImpl::GetDefaultDownload base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc index ab6cd18a276b..f99cde31d1cc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc @@ -1,23 +1,14 @@ ---- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc -@@ -100,7 +100,7 @@ - #include "ui/ozone/public/ozone_switches.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/gfx/switches.h" - #endif - -@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = { +@@ -257,6 +257,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, + switches::kDisableUnveil, switches::kEnableDeJelly, switches::kDeJellyScreenWidth, - switches::kDocumentTransitionSlowdownFactor, -@@ -291,7 +292,7 @@ static const char* const kSwitchNames[] = { + switches::kDoubleBufferCompositing, +@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc index 5ce1367e692e..5babd3a55a1d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "media/mojo/mojom/renderer_extensions.mojom.h" #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" @@ -9,12 +9,12 @@ #include "content/public/browser/stable_video_decoder_factory.h" #include "media/base/media_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -64,7 +64,7 @@ void FramelessMediaInterfaceProxy::CreateVideoDecoder( +@@ -67,7 +67,7 @@ void FramelessMediaInterfaceProxy::CreateVideoDecoder( mojo::PendingRemote<media::stable::mojom::StableVideoDecoder> oop_video_decoder; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) { - // TODO(b/195769334): for now, we're using the same - // StableVideoDecoderFactory. However, we should be using a separate + if (!render_process_host_) { + if (!stable_vd_factory_remote_.is_bound()) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h new file mode 100644 index 000000000000..c45505395d1b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.h +@@ -19,7 +19,7 @@ + #include "mojo/public/cpp/bindings/receiver_set.h" + #include "mojo/public/cpp/bindings/remote.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -100,7 +100,7 @@ class FramelessMediaInterfaceProxy final + // Connections to the renderer. + mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Connection to the StableVideoDecoderFactory that lives in a utility + // process. This is only used for out-of-process video decoding and only when + // the FramelessMediaInterfaceProxy is created without a RenderProcessHost diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc index 6f671f32b7e2..4b83c959e344 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc @@ -73,7 +73,7 @@ #include "media/mojo/services/mojo_renderer_service.h" // nogncheck @@ -9,12 +9,12 @@ #include "content/public/browser/stable_video_decoder_factory.h" #include "media/base/media_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -293,7 +293,7 @@ void MediaInterfaceProxy::CreateVideoDecoder( +@@ -286,7 +286,7 @@ void MediaInterfaceProxy::CreateVideoDecoder( mojo::PendingRemote<media::stable::mojom::StableVideoDecoder> oop_video_decoder; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) { - // TODO(b/195769334): for now, we're using the same - // StableVideoDecoderFactory. However, we should be using a separate + render_frame_host().GetProcess()->CreateStableVideoDecoder( + oop_video_decoder.InitWithNewPipeAndPassReceiver()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.cc index 978457ea8cf3..10091c345c4d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc @@ -66,7 +66,7 @@ #if BUILDFLAG(IS_MAC) @@ -9,21 +9,21 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -128,7 +128,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( - std::move(callback).Run(routing_id, frame_token, devtools_frame_token); +@@ -130,7 +130,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( + document_token); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadPriorityOnFileThread( + void RenderMessageFilter::SetThreadTypeOnWorkerThread( base::PlatformThreadId ns_tid, - base::ThreadPriority priority) { -@@ -149,7 +149,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea + base::ThreadType thread_type) { +@@ -151,7 +151,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadPriority(int32_t ns_tid, - base::ThreadPriority priority) { + void RenderMessageFilter::SetThreadType(int32_t ns_tid, + base::ThreadType thread_type) { constexpr base::TaskTraits kTraits = { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.h index 47765494309b..922fc458ba21 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__message__filter.h @@ -1,19 +1,18 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h -@@ -78,14 +78,14 @@ class RenderMessageFilter +@@ -78,13 +78,13 @@ class RenderMessageFilter void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadPriority(int32_t ns_tid, - base::ThreadPriority priority) override; + void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override; #endif void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid, - base::ThreadPriority priority); + void SetThreadTypeOnWorkerThread(base::PlatformThreadId ns_tid, + base::ThreadType thread_type); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc index 2b62f8bb38bf..f627cbaa3b5c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc -@@ -208,7 +208,7 @@ +@@ -210,7 +210,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1184,7 +1184,7 @@ size_t GetPlatformProcessLimit() { +@@ -1140,7 +1140,7 @@ size_t GetPlatformProcessLimit() { // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1271,7 +1271,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1227,7 +1227,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,16 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -3283,6 +3283,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -2132,7 +2132,7 @@ void RenderProcessHostImpl::ReinitializeLogging( + } + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void RenderProcessHostImpl::CreateStableVideoDecoder( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { + if (!stable_video_decoder_factory_remote_.is_bound()) { +@@ -3294,6 +3294,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -35,3 +44,12 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, +@@ -4778,7 +4779,7 @@ void RenderProcessHostImpl::ResetIPC() { + coordinator_connector_receiver_.reset(); + tracing_registration_.reset(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + stable_video_decoder_factory_remote_.reset(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h index 9556395fb557..e467621b530b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h -@@ -466,7 +466,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -83,7 +83,7 @@ + #include "content/public/browser/android/child_process_importance.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -485,7 +485,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -9,3 +18,21 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) +@@ -684,7 +684,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) + override; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void CreateStableVideoDecoder( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) + override; +@@ -1144,7 +1144,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + // RenderProcessHost. This is destroyed early in ResetIPC() method. + std::unique_ptr<PermissionServiceContext> permission_service_context_; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Connection to the StableVideoDecoderFactory that lives in a utility + // process. This is only used for out-of-process video decoding. + mojo::Remote<media::stable::mojom::StableVideoDecoderFactory> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc index e9d24acd38a2..edd16277024d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc -@@ -259,7 +259,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -253,7 +253,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc index 3603b1d059dd..a9f4919da1b0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,24 +1,24 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -114,7 +114,7 @@ +@@ -118,7 +118,7 @@ #include "ui/gfx/gdi_util.h" #endif --#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) #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -439,7 +439,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge - if (manager) - return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); + #include "ui/linux/linux_ui.h" +@@ -451,7 +451,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge + return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) + ->GetCOM(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); - if (manager && manager->GetRoot()) -@@ -1596,7 +1596,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { + if (manager && manager->GetBrowserAccessibilityRoot()) +@@ -1589,7 +1589,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2408,7 +2408,7 @@ bool RenderWidgetHostViewAura::NeedsMouseCapture() { +@@ -2415,7 +2415,7 @@ bool RenderWidgetHostViewAura::NeedsMouseCapture() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,12 +36,12 @@ return NeedsInputGrab(); #else return false; -@@ -2585,7 +2585,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2592,7 +2592,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = - ui::GetTextEditKeyBindingsDelegate(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; + if (!event.skip_in_browser && linux_ui && event.os_event && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h index 4d8514dea5f2..32e4b62bb3aa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h -@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -245,7 +245,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc index 4d1785cc3fd5..430519fa0889 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc -@@ -62,10 +62,10 @@ UtilitySandboxedProcessLauncherDelegate:: - #if BUILDFLAG(ENABLE_PLUGINS) +@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate:: + #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif -#if BUILDFLAG(IS_FUCHSIA) @@ -13,16 +13,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -75,7 +75,7 @@ UtilitySandboxedProcessLauncherDelegate:: - sandbox_type_ == sandbox::mojom::Sandbox::kLibassistant || - #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI || - #endif - sandbox_type_ == sandbox::mojom::Sandbox::kAudio || -@@ -108,7 +108,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: +@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: // unsandboxed zygote and then apply their actual sandboxes in the forked // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || @@ -31,12 +22,3 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -122,7 +122,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: - #if BUILDFLAG(ENABLE_OOP_PRINTING) - sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend || - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI || - #endif - sandbox_type_ == sandbox::mojom::Sandbox::kSpeechRecognition) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc index 7751ff34eb07..78286805e88a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc -@@ -159,7 +159,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -242,7 +242,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -259,7 +259,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1333,7 +1333,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1366,7 +1366,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc index 50c28dbd544e..b6caefbcabad 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc @@ -13,7 +13,7 @@ #include "content/public/browser/navigation_handle.h" @@ -18,16 +18,16 @@ // Remove the pieces of the URL we don't want to send back with the error // reports. In particular, do not send query or fragments as those can have // privacy-sensitive information in them. -@@ -67,7 +67,7 @@ void WebUIMainFrameObserver::DidFinishNavigation( - web_ui_->DisallowJavascriptOnAllHandlers(); - } +@@ -55,7 +55,7 @@ WebUIMainFrameObserver::~WebUIMainFrameObserver() = de + + WebUIMainFrameObserver::~WebUIMainFrameObserver() = default; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void WebUIMainFrameObserver::OnDidAddMessageToConsole( RenderFrameHost* source_frame, blink::mojom::ConsoleMessageLevel log_level, -@@ -175,7 +175,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( +@@ -163,7 +163,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h index 6a52a6aa4695..f022dc0e77d6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.h -@@ -45,7 +45,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W +@@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. @@ -9,7 +9,7 @@ // On official Google builds, capture and report JavaScript error messages on // WebUI surfaces back to Google. This allows us to fix JavaScript errors and // exceptions. -@@ -61,7 +61,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W +@@ -60,7 +60,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override; private: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc index ddcf9e7a1273..eed42e5dae6b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,17 @@ ---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -28,6 +28,7 @@ namespace { +@@ -19,8 +19,10 @@ + #include "build/chromeos_buildflags.h" + #include "content/common/zygote/zygote_commands_linux.h" + #include "content/common/zygote/zygote_communication_linux.h" ++#if !BUILDFLAG(IS_BSD) + #include "content/common/zygote/zygote_handle_impl_linux.h" + #include "content/public/common/zygote/zygote_handle.h" ++#endif + #include "sandbox/linux/services/credentials.h" + #include "sandbox/linux/services/namespace_sandbox.h" + #include "sandbox/linux/suid/client/setuid_sandbox_host.h" +@@ -38,6 +40,7 @@ namespace { namespace { @@ -8,7 +19,7 @@ // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, -@@ -49,6 +50,7 @@ bool ReceiveFixedMessage(int fd, +@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -16,7 +27,7 @@ } // namespace -@@ -58,9 +60,13 @@ ZygoteHostImpl::ZygoteHostImpl() +@@ -68,9 +72,13 @@ ZygoteHostImpl::ZygoteHostImpl() } ZygoteHostImpl::ZygoteHostImpl() @@ -30,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -73,6 +79,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -83,6 +91,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -38,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -123,6 +130,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -133,6 +142,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -46,7 +57,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -147,6 +155,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -157,6 +167,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -54,7 +65,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -214,9 +223,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -224,9 +235,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h index 91cc8dee59e5..8df40557f39d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,21 +1,25 @@ ---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.h.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.h -@@ -42,8 +42,10 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos +@@ -47,12 +47,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) void AdjustRendererOOMScore(base::ProcessHandle process_handle, int score) override; + #if BUILDFLAG(IS_CHROMEOS_ASH) + void ReinitializeLogging(uint32_t logging_dest, + base::PlatformFile log_file_fd) override; + #endif +#endif + bool HasZygote() { return !zygote_pids_.empty(); } - private: -@@ -57,9 +59,11 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos +@@ -67,9 +69,11 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos int renderer_sandbox_status_; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) bool use_namespace_sandbox_; bool use_suid_sandbox_; bool use_suid_sandbox_for_adj_oom_score_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn index fb884f15b550..60f91715af3c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/common/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/common/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/common/BUILD.gn -@@ -420,6 +420,9 @@ if (is_linux || is_chromeos) { +@@ -447,6 +447,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc index fa90509a1f94..8f25e0f1b6dd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/common/user_agent.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/common/user_agent.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/common/user_agent.cc -@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() { +@@ -41,7 +41,7 @@ std::string GetUserAgentPlatform() { return ""; #elif BUILDFLAG(IS_MAC) return "Macintosh; "; @@ -9,7 +9,16 @@ return "X11; "; // strange, but that's what Firefox uses #elif BUILDFLAG(IS_ANDROID) return "Linux; "; -@@ -260,6 +260,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -63,7 +63,7 @@ std::string GetUnifiedPlatform() { + return "Windows NT 10.0; Win64; x64"; + #elif BUILDFLAG(IS_FUCHSIA) + return "Fuchsia"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "X11; Linux x86_64"; + #else + #error Unsupported platform +@@ -275,6 +275,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons "Android %s", os_version.c_str() #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc deleted file mode 100644 index df8236658d70..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/content/common/zygote/sandbox_support_linux.cc.orig 2022-11-20 10:46:46 UTC -+++ src/3rdparty/chromium/content/common/zygote/sandbox_support_linux.cc -@@ -8,7 +8,11 @@ - #include "base/posix/global_descriptors.h" - #include "base/posix/unix_domain_socket.h" - #include "content/public/common/content_descriptors.h" -+#if defined(OS_BSD) -+#include "sandbox/policy/openbsd/sandbox_openbsd.h" -+#else - #include "sandbox/policy/linux/sandbox_linux.h" -+#endif - - namespace content { - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc index ca6bee71d1fc..778068f004dc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2022-11-08 21:18:48 UTC +--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/gpu/gpu_main.cc @@ -87,7 +87,7 @@ #include "sandbox/win/src/sandbox.h" @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -267,7 +267,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -268,7 +268,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -410,7 +410,7 @@ namespace { +@@ -403,7 +403,7 @@ namespace { namespace { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc index e616a50fcd3c..4b38f3bb7f48 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc -@@ -104,6 +104,7 @@ constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | R - - constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE; +@@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions( + permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath)); + } +#if !defined(OS_BSD) void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -420,8 +421,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -445,8 +446,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -463,6 +466,7 @@ void LoadArmGpuLibraries() { +@@ -488,6 +491,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -528,12 +532,14 @@ void LoadChromecastV4L2Libraries() { +@@ -555,12 +559,14 @@ void LoadChromecastV4L2Libraries() { } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -560,6 +566,7 @@ bool LoadLibrariesForGpu( +@@ -588,6 +594,7 @@ bool LoadLibrariesForGpu( return true; } @@ -50,7 +50,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const sandbox::policy::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -582,13 +589,17 @@ bool BrokerProcessPreSandboxHook( +@@ -610,13 +617,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h index 8791dd503421..d34dc52e4d2d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -12,7 +12,7 @@ #include "build/build_config.h" @@ -9,8 +9,8 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -39,11 +39,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp - blink::WebThemeEngine* ThemeEngine() override; +@@ -38,11 +38,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp + blink::WebString DefaultLocale() override; private: -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc index a7c0857e6d78..69f7e9530ccc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc @@ -53,6 +53,11 @@ #include "gin/v8_initializer.h" @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -136,7 +141,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -146,7 +151,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h new file mode 100644 index 000000000000..cc3c7d8a00df --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/public/browser/render_process_host.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/content/public/browser/render_process_host.h +@@ -53,7 +53,7 @@ + #include "content/public/browser/android/child_process_importance.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -620,7 +620,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S + const blink::StorageKey& storage_key, + mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + virtual void CreateStableVideoDecoder( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> + receiver) = 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h index e9e816703857..1be6cf6f4185 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_zygote__host_zygote__host__linux.h @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/content/public/browser/zygote_host/zygote_host_linux.h.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/content/public/browser/zygote_host/zygote_host_linux.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/public/browser/zygote_host/zygote_host_linux.h -@@ -30,11 +30,13 @@ class ZygoteHost { +@@ -35,11 +35,13 @@ class ZygoteHost { // after the first render has been forked. virtual int GetRendererSandboxStatus() = 0; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) // Adjust the OOM score of the given renderer's PID. The allowed // range for the score is [0, 1000], where higher values are more // likely to be killed by the OOM killer. virtual void AdjustRendererOOMScore(base::ProcessHandle process_handle, int score) = 0; +#endif - }; - } // namespace content + #if BUILDFLAG(IS_CHROMEOS_ASH) + // Reinitialize logging for the Zygote processes. Needed on ChromeOS, which diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h index 17caafe266de..612513bfeddb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h -@@ -128,7 +128,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) +@@ -125,7 +125,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc index 45cf50c9124f..187136c364a0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc @@ -1,50 +1,50 @@ ---- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/public/common/content_features.cc -@@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess { - "AudioServiceOutOfProcess", +@@ -46,7 +46,7 @@ CONSTINIT const base::Feature kAudioServiceOutOfProces + "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -55,7 +55,7 @@ const base::Feature kAudioServiceSandbox { +@@ -58,7 +58,7 @@ CONSTINIT const base::Feature kAudioServiceSandbox( // kAudioServiceOutOfProcess feature is enabled. - const base::Feature kAudioServiceSandbox { - "AudioServiceSandbox", + CONSTINIT const base::Feature kAudioServiceSandbox( + "AudioServiceSandbox", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -1055,7 +1055,7 @@ const base::Feature kWebAssemblyCodeProtection{ - const base::Feature kWebAssemblyCodeProtection{ - "WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT +@@ -1236,7 +1236,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, + "WebAssemblyCodeProtection", + base::FEATURE_DISABLED_BY_DEFAULT); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1085,7 +1085,7 @@ const base::Feature kWebAssemblyTrapHandler { - const base::Feature kWebAssemblyTrapHandler { - "WebAssemblyTrapHandler", +@@ -1278,7 +1278,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler( + CONSTINIT const base::Feature kWebAssemblyTrapHandler( + "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC)) && \ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) - base::FEATURE_ENABLED_BY_DEFAULT -@@ -1166,7 +1166,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ + base::FEATURE_ENABLED_BY_DEFAULT +@@ -1353,7 +1353,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb +#if BUILDFLAG(IS_BSD) -+const base::Feature kWebUsb{"WebUSB", base::FEATURE_DISABLED_BY_DEFAULT}; ++BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_DISABLED_BY_DEFAULT); +#else - const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT}; + BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_ENABLED_BY_DEFAULT); +#endif // Controls whether the WebXR Device API is enabled. - const base::Feature kWebXr{"WebXR", base::FEATURE_ENABLED_BY_DEFAULT}; + BASE_FEATURE(kWebXr, "WebXR", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h index 46dd3e342882..3858bdd934fa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/public/common/content_features.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/public/common/content_features.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/public/common/content_features.h -@@ -264,7 +264,7 @@ CONTENT_EXPORT extern const base::Feature kWebAssembly - CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; - CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; - CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; +@@ -273,7 +273,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodePr + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAppWindowControlsOverlay); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyBaseline); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtection); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtectionPku; + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtectionPku); #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && // defined(ARCH_CPU_X86_64) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc index 4bc8645aa857..d41d34162e7d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.cc -@@ -370,6 +370,8 @@ const char kEnableLogging[] = "enable- +@@ -367,6 +367,8 @@ const char kEnableLogging[] = "enable- // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -983,7 +985,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -996,7 +998,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h index bf2c064e788c..cf1b4f593902 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.h -@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableLogging[]; +@@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableLogging[]; CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -271,7 +272,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_render__media__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_render__media__client.cc index 6b49c5b69b8c..93ae87847818 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_render__media__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_render__media__client.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/content/renderer/media/render_media_client.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/renderer/media/render_media_client.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/renderer/media/render_media_client.cc -@@ -21,7 +21,7 @@ namespace { - // it asynchronously ahead of time, but can fallback to a blocking call +@@ -22,7 +22,7 @@ namespace { // when it's needed synchronously. - #if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \ -- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) -+ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \ + (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_MAC)) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) #define NEEDS_PROFILE_UPDATER 1 #else #define NEEDS_PROFILE_UPDATER 0 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc index dd024d7592e0..be57763d1d59 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/renderer/render_process_impl.cc -@@ -47,7 +47,7 @@ +@@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -146,7 +146,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -154,7 +154,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, "--no-wasm-write-protect-code-memory"); @@ -18,12 +18,12 @@ SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -229,7 +229,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, "--no-wasm-dynamic-tiering"); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - if (command_line->HasSwitch(switches::kEnableCrashpad) || - command_line->HasSwitch(switches::kEnableCrashReporter) || + base::CommandLine* const command_line = + base::CommandLine::ForCurrentProcess(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc index 3153e3ac4e75..f2c1fb4e1831 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc -@@ -189,7 +189,7 @@ +@@ -193,7 +193,7 @@ #if BUILDFLAG(IS_MAC) #include <malloc/malloc.h> @@ -9,25 +9,16 @@ #include <malloc.h> #endif -@@ -716,7 +716,7 @@ void RenderThreadImpl::Init() { - DCHECK(parsed_num_raster_threads) << string_value; - DCHECK_GT(num_raster_threads, 0); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - categorized_worker_pool_->SetBackgroundingCallback( - main_thread_scheduler_->DefaultTaskRunner(), - base::BindOnce( -@@ -739,7 +739,7 @@ void RenderThreadImpl::Init() { +@@ -658,7 +658,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - blink::features::kBlinkCompositorUseDisplayThreadPriority)) { - render_message_filter()->SetThreadPriority( -@@ -1098,7 +1098,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + render_message_filter()->SetThreadType( + ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); + #endif +@@ -1029,7 +1029,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_decode_accelerator = @@ -36,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1109,7 +1109,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1040,7 +1040,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc index e4ea7ccc534b..fe5ae23de6cc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc -@@ -109,7 +109,7 @@ +@@ -110,7 +110,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -180,7 +180,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -190,7 +190,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,18 +27,17 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -283,7 +283,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -261,7 +261,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+// pledge -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) - void RendererBlinkPlatformImpl::SetDisplayThreadPriority( - base::PlatformThreadId thread_id) { ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id, + base::ThreadType thread_type) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -298,7 +299,7 @@ blink::WebSandboxSupport* RendererBlinkPlatformImpl::G - } +@@ -272,7 +272,7 @@ blink::WebSandboxSupport* RendererBlinkPlatformImpl::G + #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h index 1795deb5753e..5633753e49cd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h @@ -1,15 +1,24 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h -@@ -31,7 +31,7 @@ +@@ -30,7 +30,7 @@ + #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" - #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -280,7 +280,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -175,7 +175,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + const blink::WebURL& top_document_web_url) override; + gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; + blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void SetThreadType(base::PlatformThreadId thread_id, + base::ThreadType) override; + #endif +@@ -241,7 +241,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -18,7 +27,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -308,7 +308,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -261,7 +261,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mutable base::WaitableEvent io_thread_id_ready_event_; base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn index a6b8e5a8c701..fbcae9772a76 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/shell/BUILD.gn -@@ -882,7 +882,7 @@ group("content_shell_crash_test") { +@@ -905,7 +905,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc index f51c3385beb3..f46ea0661c09 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc -@@ -211,7 +211,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -213,7 +213,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc index 54591637bb1e..faaa52d7aef3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_utility_shell__content__utility__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/shell/utility/shell_content_utility_client.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/shell/utility/shell_content_utility_client.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/shell/utility/shell_content_utility_client.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "sandbox/policy/sandbox.h" #include "services/test/echo/echo_service.h" @@ -9,7 +9,7 @@ #include "content/test/sandbox_status_service.h" #endif -@@ -142,7 +142,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -146,7 +146,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), base::ThreadTaskRunnerHandle::Get()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn index 20c989ba6d3d..09d34533521a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/test/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/test/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/test/BUILD.gn -@@ -1969,7 +1969,7 @@ static_library("run_all_unittests") { +@@ -2120,7 +2120,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3000,7 +3000,7 @@ test("content_unittests") { +@@ -3182,7 +3182,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc index 4b3c159cdb70..50bbf0bf81b0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/utility/services.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/utility/services.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/utility/services.cc -@@ -67,7 +67,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -66,7 +66,7 @@ extern sandbox::TargetServices* g_utility_target_servi extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,16 @@ #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" #include "sandbox/policy/sandbox_type.h" -@@ -205,7 +205,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -88,7 +88,7 @@ extern sandbox::TargetServices* g_utility_target_servi + #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || + // BUILDFLAG(USE_V4L2_CODEC)) + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ + (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && +@@ -211,7 +211,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -18,3 +27,21 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { +@@ -326,7 +326,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( + #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || + // BUILDFLAG(USE_V4L2_CODEC)) + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ + (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + auto RunStableVideoDecoderFactoryService( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory> +@@ -380,7 +380,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || + // BUILDFLAG(USE_V4L2_CODEC)) + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ + (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + services.Add(RunStableVideoDecoderFactoryService); + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc index e2d5df0b4819..30518135a4a3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc @@ -1,12 +1,11 @@ ---- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/utility/utility_main.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/utility/utility_main.cc -@@ -32,18 +32,20 @@ +@@ -31,17 +31,19 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" #if BUILDFLAG(ENABLE_PRINTING) #include "printing/sandbox/print_backend_sandbox_hook_linux.h" @@ -23,7 +22,7 @@ #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" -@@ -52,6 +54,10 @@ +@@ -50,6 +52,10 @@ #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -33,8 +32,8 @@ + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/services/ime/ime_sandbox_hook.h" - #include "chromeos/assistant/buildflags.h" -@@ -139,7 +145,7 @@ int UtilityMain(MainFunctionParams parameters) { + #include "chromeos/ash/components/assistant/buildflags.h" +@@ -130,7 +136,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -43,16 +42,16 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -169,7 +175,7 @@ int UtilityMain(MainFunctionParams parameters) { - pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); +@@ -162,7 +168,7 @@ int UtilityMain(MainFunctionParams parameters) { #endif break; + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -192,10 +198,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -185,10 +191,11 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -65,7 +64,7 @@ if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) { // The kHardwareVideoDecoding sandbox needs to know the GPU type in order // to select the right policy. -@@ -208,6 +215,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -201,6 +208,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc index 6cd4191954c6..d1b0f33ac909 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ - // Copyright (c) 2012 The Chromium Authors. All rights reserved. + // Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if 0 #include "content/zygote/zygote_linux.h" -@@ -654,3 +655,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick +@@ -696,3 +697,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc index cc069e09bc24..41130f218cc3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <unistd.h> -@@ -40,7 +42,9 @@ +@@ -41,7 +43,9 @@ #include "sandbox/linux/services/thread_helpers.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" #include "sandbox/policy/linux/sandbox_debug_handling_linux.h" @@ -20,7 +20,7 @@ #include "sandbox/policy/sandbox.h" #include "sandbox/policy/switches.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -@@ -49,6 +53,7 @@ namespace { +@@ -50,6 +54,7 @@ namespace { namespace { @@ -28,7 +28,7 @@ void CloseFds(const std::vector<int>& fds) { for (const auto& it : fds) { PCHECK(0 == IGNORE_EINTR(close(it))); -@@ -66,9 +71,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo +@@ -67,9 +72,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo }, std::move(one), std::move(two)); } @@ -40,7 +40,7 @@ // This function triggers the static and lazy construction of objects that need // to be created before imposing the sandbox. static void ZygotePreSandboxInit() { -@@ -175,9 +182,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand +@@ -176,9 +183,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand CHECK(!using_layer1_sandbox); } } @@ -52,7 +52,7 @@ sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); -@@ -243,6 +252,9 @@ bool ZygoteMain( +@@ -244,6 +253,9 @@ bool ZygoteMain( // This function call can return multiple times, once per fork(). return zygote.ProcessRequests(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc new file mode 100644 index 000000000000..ee6fbbb315bd --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc +@@ -74,7 +74,7 @@ const char kReceivingEndDoesntExistError[] = + const char kReceivingEndDoesntExistError[] = + "Could not establish connection. Receiving end does not exist."; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kMissingPermissionError[] = + "Access to native messaging requires nativeMessaging permission."; + const char kProhibitedByPoliciesError[] = +@@ -442,7 +442,7 @@ void MessageService::OpenChannelToNativeApp( + return; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool has_permission = extension->permissions_data()->HasAPIPermission( + mojom::APIPermissionID::kNativeMessaging); + if (!has_permission) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc new file mode 100644 index 000000000000..b93b80ded361 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc +@@ -14,7 +14,7 @@ + #include "extensions/browser/api/networking_private/networking_private_chromeos.h" + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + #include "extensions/browser/api/networking_private/networking_private_lacros.h" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "extensions/browser/api/networking_private/networking_private_linux.h" + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + #include "components/wifi/wifi_service.h" +@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS + delegate = new NetworkingPrivateChromeOS(browser_context); + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + delegate = new NetworkingPrivateLacros(browser_context); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + delegate = new NetworkingPrivateLinux(); + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc new file mode 100644 index 000000000000..9c1c3f0670d0 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc +@@ -99,7 +99,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() + #endif // !defined(TOOLKIT_QT) + ManagementAPI::GetFactoryInstance(); + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + NetworkingPrivateEventRouterFactory::GetInstance(); + #endif + OffscreenDocumentManager::GetFactory(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc new file mode 100644 index 000000000000..cda2bc3a19d8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/browser/extension_prefs.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/browser/extension_prefs.cc +@@ -2289,7 +2289,7 @@ void ExtensionPrefs::RegisterProfilePrefs( + registry->RegisterDictionaryPref(kInstallSignature); + registry->RegisterListPref(kExternalUninstalls); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false); + #endif + registry->RegisterBooleanPref(pref_names::kU2fSecurityKeyApiEnabled, false); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc new file mode 100644 index 000000000000..5b8919326279 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/browser/pref_names.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/browser/pref_names.cc +@@ -48,7 +48,7 @@ const char kDeletedComponentExtensions[] = + const char kDeletedComponentExtensions[] = + "extensions.deleted_component_extensions"; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled"; + #endif + const char kU2fSecurityKeyApiEnabled[] = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h new file mode 100644 index 000000000000..db6a2c871ee3 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/browser/pref_names.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/browser/pref_names.h +@@ -98,7 +98,7 @@ extern const char kDeletedComponentExtensions[]; + extern const char kDeletedComponentExtensions[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // A preference for whether Chrome Apps should be allowed. The default depends + // on the ChromeAppsDeprecation feature flag, and this pref can extend support + // for Chrome Apps by enterprise policy. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json new file mode 100644 index 000000000000..d83e7355f3ee --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/extensions/common/api/_permission_features.json.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/common/api/_permission_features.json +@@ -134,7 +134,7 @@ + { + "channel": "stable", + "extension_types": ["platform_app"], +- "platforms": ["chromeos", "win", "mac", "linux"], ++ "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"], + "allowlist": [ + "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 + "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 +@@ -433,7 +433,7 @@ + }, { + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app", "platform_app"], +- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"], ++ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], + "allowlist": [ + "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 + "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 +@@ -475,7 +475,7 @@ + "networkingPrivate": { + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app", "platform_app"], +- "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia"], ++ "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], + "allowlist": [ + // DO NOT ADD ANY MORE ENTRIES HERE. + // networkingPrivate is being migrated to networking.onc. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json new file mode 100644 index 000000000000..8cc9e3c5abda --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/extensions/common/api/runtime.json.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/common/api/runtime.json +@@ -86,7 +86,8 @@ + "cros", + "linux", + "openbsd", +- "fuchsia" ++ "fuchsia", ++ "freebsd" + ] + }, + { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc new file mode 100644 index 000000000000..8d1749ea8ffe --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/common/command.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/common/command.cc +@@ -280,7 +280,7 @@ std::string Command::CommandPlatform() { + return values::kKeybindingPlatformMac; + #elif BUILDFLAG(IS_CHROMEOS) + return values::kKeybindingPlatformChromeOs; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return values::kKeybindingPlatformLinux; + #elif BUILDFLAG(IS_FUCHSIA) + // TODO(crbug.com/1312215): Change this once we decide what string should be diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc new file mode 100644 index 000000000000..ae39dc90f94f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/common/features/feature.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/common/features/feature.cc +@@ -34,6 +34,8 @@ Feature::Platform Feature::GetCurrentPlatform() { + return WIN_PLATFORM; + #elif BUILDFLAG(IS_FUCHSIA) + return FUCHSIA_PLATFORM; ++#elif defined(OS_BSD) ++ return LINUX_PLATFORM; + #else + return UNSPECIFIED_PLATFORM; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc new file mode 100644 index 000000000000..bacd111e5b41 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_api__binding__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/renderer/bindings/api_binding_util.cc +@@ -132,7 +132,7 @@ std::string GetPlatformString() { + return "lacros"; + #elif BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) + return "chromeos"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "linux"; + #elif BUILDFLAG(IS_MAC) + return "mac"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_argument__spec.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_argument__spec.cc new file mode 100644 index 000000000000..40e732d5e633 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_renderer_bindings_argument__spec.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/renderer/bindings/argument_spec.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/renderer/bindings/argument_spec.cc +@@ -18,6 +18,8 @@ + #include "gin/data_object_builder.h" + #include "gin/dictionary.h" + ++#include <cmath> ++ + namespace extensions { + + namespace { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc new file mode 100644 index 000000000000..a3223665bcd1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_app_shell__main__delegate.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/shell/app/shell_main_delegate.cc +@@ -42,7 +42,7 @@ + + #if BUILDFLAG(IS_WIN) + #include "base/base_paths_win.h" +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #elif BUILDFLAG(IS_MAC) + #include "base/base_paths_mac.h" +@@ -61,7 +61,7 @@ base::FilePath GetDataPath() { + return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); + + base::FilePath data_dir; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::unique_ptr<base::Environment> env(base::Environment::Create()); + data_dir = base::nix::GetXDGDirectory( + env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc new file mode 100644 index 000000000000..134fac4ecc86 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc +@@ -45,7 +45,7 @@ bool ShellRuntimeAPIDelegate::GetPlatformInfo(Platform + bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { + #if BUILDFLAG(IS_CHROMEOS_ASH) + info->os = api::runtime::PLATFORM_OS_CROS; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + info->os = api::runtime::PLATFORM_OS_LINUX; + #endif + return true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__browser__main__parts.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__browser__main__parts.cc new file mode 100644 index 000000000000..a688fed8a4bb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__browser__main__parts.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/shell/browser/shell_browser_main_parts.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/shell/browser/shell_browser_main_parts.cc +@@ -150,7 +150,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( + switches::kAppShellAllowRoaming)) { + network_controller_->SetCellularAllowRoaming(true); + } +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // app_shell doesn't need GTK, so the fake input method context can work. + // See crbug.com/381852 and revision fb69f142. + // TODO(michaelpg): Verify this works for target environments. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc new file mode 100644 index 000000000000..0b54715f96d5 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.cc +@@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() + + // 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) + FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() { + if (!file_system_delegate_) + file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h new file mode 100644 index 000000000000..8ae5507fbc65 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_shell__extensions__api__client.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/extensions/shell/browser/shell_extensions_api_client.h +@@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC + const override; + // 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) + FileSystemDelegate* GetFileSystemDelegate() override; + #endif + MessagingDelegate* GetMessagingDelegate() override; +@@ -45,7 +45,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC + private: + // 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) + std::unique_ptr<FileSystemDelegate> file_system_delegate_; + #endif + std::unique_ptr<MessagingDelegate> messaging_delegate_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc index 07ef55870733..5181fb9c566c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -134,7 +134,7 @@ uint32_t GetPlatformSpecificTextureTarget() { +@@ -144,7 +144,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) return macos_specific_texture_target; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_FUCHSIA) return GL_TEXTURE_2D; -@@ -166,7 +166,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -176,7 +176,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc deleted file mode 100644 index c6bfae8b0cbe..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc -@@ -30,7 +30,7 @@ - #include "ui/gl/gl_version_info.h" - #include "ui/gl/scoped_binders.h" - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" - #endif - -@@ -570,7 +570,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager - MemoryTypeTracker* tracker, - WGPUDevice wgpuDevice, - WGPUBackendType backend_type) { --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - auto wgpu_format = viz::ToWGPUFormat(format()); - - if (wgpu_format == WGPUTextureFormat_Undefined) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__factory.cc deleted file mode 100644 index 65db6c5ad394..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__factory.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image_factory.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image_factory.cc -@@ -46,7 +46,7 @@ - #include "ui/ozone/public/ozone_platform.h" - #endif - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ - BUILDFLAG(ENABLE_VULKAN) - #include "gpu/command_buffer/service/external_vk_image_factory.h" - #elif BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_VULKAN) -@@ -81,7 +81,7 @@ namespace gpu { - - namespace gpu { - --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ - !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \ - BUILDFLAG(ENABLE_VULKAN) - -@@ -325,7 +325,7 @@ SharedImageFactory::SharedImageFactory( - factories_.push_back(std::move(external_vk_image_factory)); - } - #elif defined(USE_OZONE) --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ - !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) - // Desktop Linux, not ChromeOS. - if (gr_context_type_ == GrContextType::kVulkan && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index e28a8677b571..340c77aee7cb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc -@@ -577,7 +577,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc +@@ -94,7 +94,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr auto kSupportedUsages = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc new file mode 100644 index 000000000000..d693169cc12b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc +@@ -32,7 +32,7 @@ + #include "ui/gl/gl_version_info.h" + #include "ui/gl/scoped_binders.h" + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" + #endif + +@@ -570,7 +570,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma + MemoryTypeTracker* tracker, + WGPUDevice wgpuDevice, + WGPUBackendType backend_type) { +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + auto wgpu_format = viz::ToWGPUFormat(format()); + + if (wgpu_format == WGPUTextureFormat_Undefined) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__backing__gl__texture.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc index f0f0baf8fcae..975aac44a50c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__backing__gl__texture.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image_backing_gl_texture.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image_backing_gl_texture.cc -@@ -257,7 +257,7 @@ void SharedImageBackingGLTexture::CreateEGLImage() { +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc +@@ -345,7 +345,7 @@ void GLTextureImageBacking::CreateEGLImage() { } - void SharedImageBackingGLTexture::CreateEGLImage() { + void GLTextureImageBacking::CreateEGLImage() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) SharedContextState* shared_context_state = factory()->GetSharedContextState(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc index d7dcd43690fd..5888e1fac79a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image_backing_factory_gl_texture.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image_backing_factory_gl_texture.cc -@@ -145,7 +145,7 @@ bool SharedImageBackingFactoryGLTexture::IsSupported( +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc +@@ -164,7 +164,7 @@ bool GLTextureImageBackingFactory::IsSupported( // Linux and ChromeOS support WebGPU/Compat on GL. All other platforms // do not support WebGPU on GL. if (usage & SHARED_IMAGE_USAGE_WEBGPU) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc new file mode 100644 index 000000000000..ed4390a2a4fb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc +@@ -238,7 +238,7 @@ class WrappedSkImage : public ClearTrackingSharedImage + : GrMipMapped::kNo; + const std::string label = "WrappedSkImageBackingFactory_Initialize" + + CreateLabelForSharedImageUsage(usage()); +-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) ++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // Initializing to bright green makes it obvious if the pixels are not + // properly set before they are displayed (e.g. https://crbug.com/956555). + // We don't do this on release builds because there is a slight overhead. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc index 1d6e7c549946..e85cc52aae02 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1536,7 +1536,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( +@@ -1199,7 +1199,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - SendAdapterProperties(request_adapter_serial, -1, nullptr, - "WebGPU on Linux requires command-line flag " - "--enable-features=Vulkan,UseSkiaRenderer"); + callback(WGPURequestAdapterStatus_Unavailable, nullptr, + "WebGPU on Linux requires command-line flag " + "--enable-features=Vulkan", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc index 51c1889b9e9e..12fdc081ae8a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/gpu/config/gpu_control_list.cc -@@ -261,7 +261,7 @@ GpuControlList::GLType GpuControlList::More::GetDefaul +@@ -302,7 +302,7 @@ GpuControlList::GLType GpuControlList::More::GetDefaul GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -784,7 +784,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -844,7 +844,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc new file mode 100644 index 000000000000..f17bcf3a5c1d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc @@ -0,0 +1,21 @@ +--- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/gpu/config/gpu_finch_features.cc +@@ -57,7 +57,7 @@ CONSTINIT const base::Feature kUseGles2ForOopR( + CONSTINIT const base::Feature kUseGles2ForOopR( + "UseGles2ForOopR", + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT + #else + base::FEATURE_ENABLED_BY_DEFAULT +@@ -135,7 +135,8 @@ CONSTINIT const base::Feature kDefaultEnableGpuRasteri + CONSTINIT const base::Feature kDefaultEnableGpuRasterization( + "DefaultEnableGpuRasterization", + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ ++ BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc index b67ea1e5de6c..c92b383e4005 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc -@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -355,7 +355,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -367,7 +367,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -391,7 +391,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -416,7 +416,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -440,7 +440,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { @@ -27,7 +27,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -449,7 +449,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -491,7 +491,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -508,7 +508,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -551,7 +551,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -631,7 +631,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -679,7 +679,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,7 +54,25 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -861,7 +861,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -731,7 +731,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + gl_use_swiftshader_ = true; + } + } +-#if BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) + if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { + // https://rr-project.org/ is a Linux-only record-and-replay debugger that +@@ -873,7 +873,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + } + bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; + +-#if BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) + if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { + // https://rr-project.org/ is a Linux-only record-and-replay debugger that +@@ -936,7 +936,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc index 5133bbab9a2f..0cce4d8e39e9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc -@@ -85,7 +85,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -89,7 +89,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h index deff78d5f36d..1765533099f8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h -@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { +@@ -158,7 +158,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { bool allow_protected_memory_ = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc new file mode 100644 index 000000000000..d7c5cc07605f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc +@@ -195,7 +195,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan + } + } + +-#if BUILDFLAG(IS_LINUX) && !defined(OZONE_PLATFORM_IS_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(OZONE_PLATFORM_IS_X11) + // Vulkan is only supported with X11 on Linux for now. + return false; + #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn index e7b8de6b4d1d..75ced7794ecf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/BUILD.gn -@@ -78,6 +78,9 @@ config("media_config") { +@@ -86,6 +86,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn index 5ab4cc096214..e765496ad281 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/audio/BUILD.gn -@@ -241,9 +241,20 @@ source_set("audio") { +@@ -257,9 +257,20 @@ source_set("audio") { ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__features.cc deleted file mode 100644 index 438f0dad207e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/audio/audio_features.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/media/audio/audio_features.cc -@@ -19,7 +19,7 @@ const base::Feature kAudioServiceOutOfProcessKillAtHan - const base::Feature kAudioServiceOutOfProcessKillAtHang{ - "AudioServiceOutOfProcessKillAtHang", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc index a0ddc3373d0b..dbea102e5656 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/audio/audio_input_device.cc -@@ -260,7 +260,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -259,7 +259,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc index bfb7bc24b37d..04c631ea436e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_audio__manager__sndio.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc.orig 2022-11-14 07:13:48 UTC +--- src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc.orig 2023-04-16 16:16:00 UTC +++ src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc @@ -0,0 +1,181 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -75,7 +75,7 @@ + user_buffer_size : kDefaultInputBufferSize; + + return AudioParameters( -+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, ChannelLayoutConfig::Stereo(), + kDefaultSampleRate, buffer_size); +} + @@ -128,12 +128,12 @@ + DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; + static const int kDefaultOutputBufferSize = 2048; + -+ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; ++ ChannelLayoutConfig channel_layout_config = ChannelLayoutConfig::Stereo(); + int sample_rate = kDefaultSampleRate; + int buffer_size = kDefaultOutputBufferSize; + if (input_params.IsValid()) { + sample_rate = input_params.sample_rate(); -+ channel_layout = input_params.channel_layout(); ++ channel_layout_config = input_params.channel_layout_config(); + buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); + } + @@ -142,8 +142,8 @@ + buffer_size = user_buffer_size; + + return AudioParameters( -+ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, -+ sample_rate, buffer_size); ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, ++ channel_layout_config, sample_rate, buffer_size); +} + +AudioInputStream* AudioManagerSndio::MakeInputStream( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc index 9962ed8a3df7..5bf2853c1d8f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/audio_latency.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/base/audio_latency.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/base/audio_latency.cc -@@ -135,7 +135,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc index f845c3906848..3aef872fb739 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/base/media_switches.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/base/media_switches.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/base/media_switches.cc @@ -10,7 +10,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" @@ -9,34 +9,34 @@ #include "base/cpu.h" #endif -@@ -416,7 +416,7 @@ const base::Feature kGlobalMediaControls { - const base::Feature kGlobalMediaControls { - "GlobalMediaControls", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT +@@ -485,7 +485,7 @@ CONSTINIT const base::Feature kGlobalMediaControls( + // Show toolbar button that opens dialog for controlling media sessions. + CONSTINIT const base::Feature kGlobalMediaControls( + "GlobalMediaControls", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -448,7 +448,7 @@ const base::Feature kGlobalMediaControlsPictureInPictu - const base::Feature kGlobalMediaControlsPictureInPicture { - "GlobalMediaControlsPictureInPicture", + base::FEATURE_DISABLED_BY_DEFAULT +@@ -526,7 +526,7 @@ CONSTINIT const base::Feature kGlobalMediaControlsPict + CONSTINIT const base::Feature kGlobalMediaControlsPictureInPicture( + "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -489,7 +489,7 @@ const base::Feature kUnifiedAutoplay{"UnifiedAutoplay" - const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT +@@ -570,7 +570,7 @@ BASE_FEATURE(kUnifiedAutoplay, + "UnifiedAutoplay", + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. - const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -863,7 +863,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod + BASE_FEATURE(kVaapiVideoDecodeLinux, +@@ -1061,14 +1061,14 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_CHROMEOS) @@ -45,3 +45,11 @@ // Spawn utility processes to perform hardware decode acceleration instead of // using the GPU process. const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoDecoding{ + "UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Spawn utility processes to perform hardware encode acceleration instead of + // using the GPU process. + const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoEncoding{ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h index 40139bd29a3a..ecc1109cab7a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h @@ -1,20 +1,25 @@ ---- src/3rdparty/chromium/media/base/media_switches.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/base/media_switches.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/base/media_switches.h -@@ -195,7 +195,7 @@ MEDIA_EXPORT extern const base::Feature kUseR16Texture - MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream; - MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; - MEDIA_EXPORT extern const base::Feature kUseR16Texture; +@@ -214,7 +214,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux; - MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux; - #endif // BUILDFLAG(IS_LINUX) -@@ -278,7 +278,7 @@ MEDIA_EXPORT extern const base::Feature kDeprecateLowU - MEDIA_EXPORT extern const base::Feature kDeprecateLowUsageCodecs; + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiIgnoreDriverChecks); +@@ -319,11 +319,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kDeprecateLowUsageCo + MEDIA_EXPORT BASE_DECLARE_FEATURE(kDeprecateLowUsageCodecs); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT extern const base::Feature kUseOutOfProcessVideoDecoding; + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoEncoding); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_supported__types.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_supported__types.cc index 248c3ee643de..346a0b6c5998 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_supported__types.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_supported__types.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/media/base/supported_types.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/base/supported_types.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/base/supported_types.cc -@@ -205,7 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) { - return false; +@@ -206,7 +206,7 @@ bool IsHevcProfileSupported(const VideoType& type) { #if BUILDFLAG(ENABLE_PLATFORM_HEVC) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return GetSupplementalProfileCache()->IsProfileSupported(type.profile); - #else - return true; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS_LACROS) + // TODO(b/171813538): For Lacros, the supplemental profile cache will be + // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_vector__math.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_vector__math.cc deleted file mode 100644 index b742496b605f..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_vector__math.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/base/vector_math.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/media/base/vector_math.cc -@@ -18,7 +18,7 @@ - // better, which is anywhere clang is used. - // TODO(pcc): Linux currently uses ThinLTO which has broken auto-vectorization - // in clang, so use our intrinsic version for now. http://crbug.com/738085 --#if !defined(__clang__) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if !defined(__clang__) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #define FMAC_FUNC FMAC_SSE - #define FMUL_FUNC FMUL_SSE - #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc index 296d14ed0b9b..f5a8ed8b48ff 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/base/video_frame.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/base/video_frame.cc -@@ -72,7 +72,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -75,7 +75,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -89,7 +89,7 @@ bool VideoFrame::IsStorageTypeMappable(VideoFrame::Sto +@@ -90,7 +90,7 @@ bool VideoFrame::IsStorageTypeMappable(VideoFrame::Sto // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -624,7 +624,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -625,7 +625,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -670,7 +670,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -671,7 +671,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -894,7 +894,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -888,7 +888,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1265,7 +1265,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1275,7 +1275,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1377,7 +1377,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1387,7 +1387,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h index 47a80f518cad..81d36499e9b2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/base/video_frame.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/base/video_frame.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/base/video_frame.h @@ -41,7 +41,7 @@ #include "base/mac/scoped_cftyperef.h" @@ -9,16 +9,16 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -83,7 +83,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -84,7 +84,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. - STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. + STORAGE_SHMEM = 4, // Backed by read-only shared memory. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -281,7 +281,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -279,7 +279,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -540,7 +540,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -548,7 +548,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -36,7 +36,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -744,7 +744,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -755,7 +755,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc index 308bf7e62656..45c07f80bb18 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc -@@ -425,7 +425,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -426,7 +426,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc index e902f61ccb70..36c5fe7e9180 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -25,10 +27,10 @@ using media::mojom::MeteringMode; +@@ -28,10 +30,10 @@ using media::mojom::MeteringMode; using media::mojom::MeteringMode; @@ -24,7 +24,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -660,7 +662,7 @@ V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; +@@ -667,7 +669,7 @@ V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -33,7 +33,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -670,7 +672,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -677,7 +679,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h index e90c66a4ae99..3ecb106388ff 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h -@@ -85,10 +85,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -86,10 +86,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // device file descriptor or (re)starting streaming, can fail but works after // retrying (https://crbug.com/670262). Returns false if the |request| ioctl // fails too many times. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__pool__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__pool__impl.cc deleted file mode 100644 index 452c10bc3b4b..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__pool__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_buffer_pool_impl.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/media/capture/video/video_capture_buffer_pool_impl.cc -@@ -74,7 +74,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi - int buffer_id) { - // This requires platforms where base::SharedMemoryHandle is backed by a - // file descriptor. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::AutoLock lock(lock_); - - VideoCaptureBufferTracker* tracker = GetTracker(buffer_id); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc index c747b19e4001..7921f196e4b7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc -@@ -320,7 +320,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -317,7 +317,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc index e288c77b0686..071185233c89 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc -@@ -647,7 +647,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -767,7 +767,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -9,12 +9,12 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -669,7 +669,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -789,7 +789,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif --#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) // viable_candidate should always be set unless using L1 protected content, - // which isn't an option on linux or lacros. + // which isn't an option on linux. CHECK(viable_candidate); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc index a59574b145fc..f06c45e21a93 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -96,7 +96,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -111,7 +111,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 3b8c3033803a..29cdb49ddab6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -14,12 +14,15 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -16,7 +16,7 @@ sandbox::syscall_broker::BrokerCommandSet command_set; std::vector<BrokerFilePermission> permissions; -@@ -121,6 +124,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -126,6 +129,7 @@ bool HardwareVideoDecodingPreSandboxHook( dlopen("/usr/lib/libv4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); #endif // defined(__aarch64__) #endif // BUILDFLAG(USE_VAAPI) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc index 1be04efbdcef..3911eacbfc64 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc -@@ -772,7 +772,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -767,7 +767,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc deleted file mode 100644 index 62b5e7e118b3..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc -@@ -582,7 +582,7 @@ bool VADisplayState::Initialize() { - bool VADisplayState::Initialize() { - base::AutoLock auto_lock(va_lock_); - --#if defined(USE_OZONE) && BUILDFLAG(IS_LINUX) -+#if defined(USE_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on - // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi - // for more details. This will also require revisiting everything that's diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni index 6152ed4a6e5f..825c17b49f3b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni @@ -1,21 +1,24 @@ ---- src/3rdparty/chromium/media/media_options.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/media_options.gni.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/media_options.gni -@@ -133,9 +133,12 @@ declare_args() { +@@ -175,12 +175,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false + # Enable runtime selection of sndio(7) + use_sndio = false + - # Alsa should be used on non-Android, non-Mac POSIX systems. - # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. + # Alsa should be used on all non-Android, non-Mac POSIX systems - with the + # exception of CastOS desktop builds. + # + # TODO(crbug.com/1336055): Remove legacy target_cpu hack used for targeting + # desktop Chromecast builds. - if (is_posix && !is_android && !is_mac && + if (is_posix && !is_android && !is_mac && !is_bsd && - (!is_chromecast || is_cast_desktop_build || is_cast_audio_only)) { + (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || + is_cast_audio_only)) { use_alsa = true - -@@ -150,6 +153,10 @@ declare_args() { - if (!use_cras && !is_chromecast && !is_asan && !is_tsan) { +@@ -196,6 +199,10 @@ declare_args() { + if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index 4180a9205e30..7081ca7369b7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc @@ -42,7 +42,7 @@ media::stable::mojom::VideoFrameDataPtr MakeVideoFrame gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle = @@ -9,7 +9,7 @@ CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP); CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty()); #else -@@ -749,7 +749,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -747,7 +747,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -18,7 +18,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -770,7 +770,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -768,7 +768,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index 31baa0aee9b8..94bb55d4b74e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -620,7 +620,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem +@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem static const gfx::GpuMemoryBufferId& id( const gfx::GpuMemoryBufferHandle& input); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc index 24a6fe0bf3df..c365ea3d17a6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc index 29699ad098ad..2c3f95cea897 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -795,7 +795,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -732,7 +732,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,3 +9,21 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif +@@ -1160,7 +1160,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + is_webgpu_compatible = (gpu_memory_buffer != nullptr); + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + is_webgpu_compatible = (gpu_memory_buffer != nullptr); + if (is_webgpu_compatible) { + is_webgpu_compatible &= +@@ -1179,7 +1179,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | + gpu::SHARED_IMAGE_USAGE_SCANOUT; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1241537): Always add the flag once the + // OzoneImageBacking is by default turned on. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc index 98b35e2767f6..2f731a97e7ce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc @@ -1,17 +1,17 @@ ---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc -@@ -98,7 +98,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -130,7 +130,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (storage_type == VideoFrame::STORAGE_DMABUFS || - storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { - if (is_rgb) -@@ -239,7 +239,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal - auto vea_config = - SetUpVeaConfig(profile_, options_, format, first_frame->storage_type()); + if (format != PIXEL_FORMAT_I420 || + !VideoFrame::IsStorageTypeMappable(storage_type)) { + // ChromeOS/Linux hardware video encoders supports I420 on-memory +@@ -441,7 +441,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal + SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), + supported_rc_modes_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc index 3d400efd4352..d36c75ef98ff 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc -@@ -378,7 +378,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -435,7 +435,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes + CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); - vea()->SetEncodingCallback(base::BindLambdaForTesting( - [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) { + VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - EXPECT_EQ(frame->format(), - IsYuvPlanar(pixel_format) ? pixel_format : PIXEL_FORMAT_I420); - #else + if (pixel_format != PIXEL_FORMAT_I420 || !small_frame->IsMappable()) + expected_input_format = PIXEL_FORMAT_NV12; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc index 80efbf8917d2..93935a42d72e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/webrtc/audio_processor.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/webrtc/audio_processor.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/webrtc/audio_processor.cc -@@ -466,7 +466,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -487,7 +487,7 @@ absl::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__features.cc index 491b15df3672..1f36939968c9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__features.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/webrtc/webrtc_features.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/media/webrtc/webrtc_features.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/media/webrtc/webrtc_features.cc @@ -9,7 +9,7 @@ namespace { @@ -9,3 +9,12 @@ constexpr base::FeatureState kWebRtcHybridAgcState = base::FEATURE_ENABLED_BY_DEFAULT; #else +@@ -19,7 +19,7 @@ constexpr base::FeatureState kWebRtcHybridAgcState = + } // namespace + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr base::FeatureState kWebRtcAnalogAgcClippingControlState = + base::FEATURE_ENABLED_BY_DEFAULT; + #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn index 91b7b7f893cf..f076eb5c7ea3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/BUILD.gn -@@ -108,7 +108,7 @@ net_configs = [ +@@ -107,7 +107,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,16 +9,8 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1092,6 +1092,7 @@ component("net") { - "//net/dns:mdns_client", - "//net/dns/public", - "//net/third_party/quiche", -+ "//sandbox/policy", - ] - - allow_circular_includes_from = [ -@@ -1218,6 +1219,15 @@ component("net") { - ] +@@ -1218,6 +1218,15 @@ component("net") { + deps += [ "//third_party/xdg_shared_mime_info" ] } + if (is_bsd) { @@ -33,16 +25,16 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1348,7 +1358,7 @@ component("net") { +@@ -1352,7 +1361,7 @@ component("net") { } } -- if (is_android || is_chromeos_ash) { -+ if (is_android || is_chromeos_ash || is_bsd) { +- if (is_android || is_chromeos) { ++ if (is_android || is_chromeos || is_bsd) { sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1381,7 +1391,7 @@ component("net") { +@@ -1385,7 +1394,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -51,7 +43,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4369,7 +4379,7 @@ test("net_unittests") { +@@ -4397,7 +4406,7 @@ test("net_unittests") { ] } @@ -60,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4443,6 +4453,10 @@ test("net_unittests") { +@@ -4473,6 +4482,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -68,19 +60,19 @@ + deps += [ "//sandbox/policy" ] + } + - allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ] - if (enable_websockets) { -@@ -4513,7 +4527,7 @@ test("net_unittests") { + deps += [ "//net/server:tests" ] + } +@@ -4540,7 +4553,7 @@ test("net_unittests") { ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "quic/platform/impl/quic_flags_test.cc", - "tools/quic/quic_http_proxy_backend_stream_test.cc", -@@ -4660,7 +4674,7 @@ test("net_unittests") { + sources += [ "tools/quic/quic_simple_server_test.cc" ] + } + +@@ -4680,7 +4693,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc index bd8ed9741162..6a19e9a29a3b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/base/network_change_notifier.cc -@@ -39,7 +39,7 @@ +@@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) #include "net/base/network_change_notifier_mac.h" --#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "net/base/network_change_notifier_posix.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -331,6 +331,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -321,6 +321,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); @@ -18,4 +18,4 @@ + /*dns_config_notifier*/nullptr); #else NOTIMPLEMENTED(); - return NULL; + return nullptr; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc index 926794028d0d..74dfb5aa761a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/net/base/network_change_notifier_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/base/network_change_notifier_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/base/network_change_notifier_posix.cc @@ -92,7 +92,7 @@ NetworkChangeNotifierPosix::NetworkChangeCalculatorPar NetworkChangeNotifier::NetworkChangeCalculatorParams NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() { NetworkChangeCalculatorParams params; --#if BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Delay values arrived at by simple experimentation and adjusted so as to // produce a single signal when switching between network connections. params.ip_address_offline_delay_ = base::Milliseconds(4000); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_unix__domain__client__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc index 854ea3c723a5..4b8b327217ad 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_unix__domain__client__socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_sockaddr__util__posix.cc @@ -1,11 +1,12 @@ ---- src/3rdparty/chromium/net/socket/unix_domain_client_socket_posix.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/net/socket/unix_domain_client_socket_posix.cc -@@ -60,7 +60,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st +--- src/3rdparty/chromium/net/base/sockaddr_util_posix.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/net/base/sockaddr_util_posix.cc +@@ -41,7 +41,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; } -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ++ // XXX ? // Convert the path given into abstract socket name. It must start with // the '\0' character, so we are adding it. |addr_len| must specify the // length of the structure exactly, as potentially the socket name may diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc index dcf807fd7a4f..a8e5f60dfa0f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/net/cert/cert_verifier.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/cert/cert_verifier.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/cert/cert_verifier.cc -@@ -78,7 +78,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa - std::unique_ptr<CertVerifier> CertVerifier::CreateDefaultWithoutCaching( - scoped_refptr<CertNetFetcher> cert_net_fetcher) { - scoped_refptr<CertVerifyProc> verify_proc; +@@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa + } + #endif + if (!verify_proc) { -#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - verify_proc = - CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); - #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) + verify_proc = + CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); + #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc index b6bf9f2fd23e..1711302d27c0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/cert/cert_verify_proc.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/cert/cert_verify_proc.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/cert/cert_verify_proc.cc -@@ -552,7 +552,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -506,7 +506,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h index c10d7b73b457..a202df5dc700 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/cert/cert_verify_proc.h -@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc +@@ -81,7 +81,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kOther }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h index 37a419e90fab..9266e4b0d094 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h -@@ -149,7 +149,9 @@ struct RankingsNode { +@@ -153,7 +153,9 @@ struct RankingsNode { }; #pragma pack(pop) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc index acd7a2044b99..7d11de1a1d73 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/disk_cache/simple/simple_file_tracker.cc -@@ -28,7 +28,17 @@ SimpleFileTracker::SimpleFileTracker(int file_limit) +@@ -29,7 +29,17 @@ SimpleFileTracker::SimpleFileTracker(int file_limit) } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn index 7a6f2ae74bd4..7f6c5db13047 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/dns/BUILD.gn -@@ -112,7 +112,7 @@ source_set("dns") { +@@ -116,7 +116,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -153,6 +153,7 @@ source_set("dns") { +@@ -157,6 +157,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -413,9 +414,9 @@ source_set("tests") { +@@ -418,9 +419,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc index a2d6b1fdd7fb..5ef3e9152f98 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/dns_config_service_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/dns_config_service_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/dns/dns_config_service_posix.cc -@@ -33,6 +33,11 @@ +@@ -34,6 +34,11 @@ #include "net/dns/dns_config_watcher_mac.h" #endif @@ -12,7 +12,7 @@ namespace net { namespace internal { -@@ -129,6 +134,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi +@@ -130,6 +135,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi bool Watch() override { CheckOnCorrectSequence(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.h index 8ebc1433e9f8..4cdd254cb2fb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/dns_reloader.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/dns_reloader.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/dns/dns_reloader.h @@ -7,7 +7,7 @@ @@ -9,3 +9,11 @@ namespace net { // Call on the network thread before calling DnsReloaderMaybeReload() anywhere. +@@ -18,6 +18,6 @@ void DnsReloaderMaybeReload(); + void DnsReloaderMaybeReload(); + + } // namespace net +-#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) ++#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) + + #endif // NET_DNS_DNS_RELOADER_H_ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__manager.cc deleted file mode 100644 index 7b4b3e8345c8..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/net/dns/host_resolver_manager.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/net/dns/host_resolver_manager.cc -@@ -3157,7 +3157,7 @@ HostResolverManager::HostResolverManager( - } - if (system_dns_config_notifier_) - system_dns_config_notifier_->AddObserver(this); --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ - !BUILDFLAG(IS_ANDROID) - EnsureDnsReloaderInit(); - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc index e5d710d9c5a6..41903d3bf3ef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__proc.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/net/dns/host_resolver_proc.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/host_resolver_proc.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/dns/host_resolver_proc.cc -@@ -19,10 +19,6 @@ - #include "net/dns/dns_util.h" - #include "net/dns/host_resolver.h" +@@ -15,10 +15,6 @@ + #include "net/base/net_errors.h" + #include "net/dns/host_resolver_system_task.h" -#if BUILDFLAG(IS_OPENBSD) -#define AI_ADDRCONFIG 0 @@ -11,12 +11,3 @@ namespace net { HostResolverProc* HostResolverProc::default_proc_ = nullptr; -@@ -192,7 +188,7 @@ int SystemHostResolverCall(const std::string& host, - base::BlockingType::WILL_BLOCK); - - #if BUILDFLAG(IS_POSIX) && \ -- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) -+ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_ANDROID)) - DnsReloaderMaybeReload(); - #endif - auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__system__task.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__system__task.cc new file mode 100644 index 000000000000..535261422915 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_host__resolver__system__task.cc @@ -0,0 +1,22 @@ +--- src/3rdparty/chromium/net/dns/host_resolver_system_task.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/net/dns/host_resolver_system_task.cc +@@ -310,8 +310,8 @@ void EnsureSystemHostResolverCallReady() { + } + + void EnsureSystemHostResolverCallReady() { +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ +- !BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ ++ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) + EnsureDnsReloaderInit(); + #elif BUILDFLAG(IS_WIN) + EnsureWinsockInit(); +@@ -397,7 +397,7 @@ int SystemHostResolverCall(const std::string& host, + base::BlockingType::WILL_BLOCK); + + #if BUILDFLAG(IS_POSIX) && \ +- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) ++ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) + DnsReloaderMaybeReload(); + #endif + auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn index 3627bd7d4282..403b7b608822 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_public_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/dns/public/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/dns/public/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/dns/public/BUILD.gn -@@ -74,7 +74,7 @@ source_set("tests") { +@@ -76,7 +76,7 @@ source_set("tests") { "doh_provider_entry_unittest.cc", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc index b32721624e6a..1ba24c0c86a2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc -@@ -369,8 +369,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -368,8 +368,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if BUILDFLAG(IS_APPLE) "/System/Library/Frameworks/GSS.framework/GSS" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h index 4219250951e4..a8acc18ab658 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.h -@@ -20,6 +20,9 @@ +@@ -21,6 +21,9 @@ #if BUILDFLAG(IS_APPLE) #include <GSS/gssapi.h> #elif BUILDFLAG(IS_FREEBSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_configured__proxy__resolution__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service.cc index cd44ddbddc4d..1c86a83317ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_configured__proxy__resolution__service.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service.cc @@ -1,29 +1,35 @@ ---- src/3rdparty/chromium/net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -53,7 +53,7 @@ +--- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/net/proxy_resolution/proxy_config_service.cc +@@ -18,20 +18,20 @@ + #include "net/proxy_resolution/proxy_config_service_ios.h" #elif BUILDFLAG(IS_MAC) #include "net/proxy_resolution/proxy_config_service_mac.h" - #include "net/proxy_resolution/proxy_resolver_mac.h" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config_service_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" -@@ -65,7 +65,7 @@ namespace { + #endif - namespace { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "net/traffic_annotation/network_traffic_annotation.h" + #endif + namespace net { + + namespace { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1423,7 +1423,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon +@@ -108,7 +108,7 @@ ProxyConfigService::CreateSystemProxyConfigService( << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<ProxyConfigServiceLinux> linux_config_service( - new ProxyConfigServiceLinux()); + std::make_unique<ProxyConfigServiceLinux>()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc index 0e2ed9b59011..bbe230e0940e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -506,6 +508,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -502,6 +504,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1007,6 +1010,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1030,6 +1033,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr<base::SequencedTaskRunner> file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1223,9 +1227,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1246,9 +1250,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: @@ -36,5 +36,5 @@ break; +#endif case base::nix::DESKTOP_ENVIRONMENT_XFCE: + case base::nix::DESKTOP_ENVIRONMENT_LXQT: case base::nix::DESKTOP_ENVIRONMENT_OTHER: - break; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc index c9d478eb6825..86258b032d58 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_socket__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/socket/socket_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/socket/socket_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/socket/socket_posix.cc -@@ -519,7 +519,7 @@ int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { +@@ -516,7 +516,7 @@ int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc index 4e4c20292589..f12635a534f0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/socket/tcp_socket_posix.cc -@@ -97,6 +97,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { - PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; - return false; - } +@@ -100,6 +100,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { + PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; + return false; + } +#elif BUILDFLAG(IS_FREEBSD) + // Set seconds until first TCP keep alive. + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) { + PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd; + return false; + } -+ // Set seconds between TCP keep alives. ++ // Set seconds between TCP keep alives. + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) { + PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd; + return false; + } #endif - return true; - } + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc index 33506490f28f..15bb82606589 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/socket/udp_socket_posix.cc -@@ -621,7 +621,7 @@ void UDPSocketPosix::SetMsgConfirm(bool confirm) { +@@ -558,7 +558,7 @@ void UDPSocketPosix::SetMsgConfirm(bool confirm) { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -642,7 +642,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -579,7 +579,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -955,7 +955,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -892,7 +892,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn index 26fa095907d0..1487847c8380 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_BUILD.gn @@ -1,33 +1,11 @@ ---- src/3rdparty/chromium/net/third_party/quiche/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/third_party/quiche/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/third_party/quiche/BUILD.gn -@@ -713,7 +713,7 @@ proto_library("net_quic_test_tools_proto") { - extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] - } +@@ -28,7 +28,7 @@ import("//third_party/protobuf/proto_library.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + import("//third_party/protobuf/proto_library.gni") --if (is_linux || is_chromeos) { -+if ((is_linux || is_chromeos) && !is_bsd) { - source_set("epoll_server") { - sources = [ - "overrides/quiche_platform_impl/epoll_bug_impl.h", -@@ -1104,7 +1104,7 @@ source_set("quic_test_tools_core") { - "//third_party/quic_trace:quic_trace_proto", - ] +-build_epoll_based_tools = is_linux || is_chromeos ++build_epoll_based_tools = (is_linux && !is_bsd) || is_chromeos -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "src/quiche/epoll_server/fake_simple_epoll_server.cc", - "src/quiche/epoll_server/fake_simple_epoll_server.h", -@@ -1564,10 +1564,10 @@ source_set("quiche_tests") { - ] - public_deps = [] - -- if (is_linux || is_chromeos_lacros) { -+ if ((is_linux || is_chromeos_lacros) && !is_bsd) { - public_deps += [ ":epoll_quic_tools" ] - } -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "overrides/quiche_platform_impl/quiche_command_line_flags_test.cc", - "src/quiche/epoll_server/simple_epoll_server_test.cc", + config("quiche_internal_config") { + cflags = [] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc index 2f567ca00e34..10fd90e07a06 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc @@ -35,7 +35,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -51,7 +51,7 @@ void SetUpOnNetworkThread( +@@ -55,7 +55,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -123,7 +123,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr +@@ -127,7 +127,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc index 8d521b51d33f..8a7a765f2b79 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc @@ -30,7 +30,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -56,7 +56,7 @@ void SetUpOnNetworkThread( +@@ -60,7 +60,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -206,7 +206,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr +@@ -217,7 +217,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher, RootStoreType root_store_type) { @@ -27,7 +27,7 @@ if (impl_name == "platform") { if (root_store_type != RootStoreType::kSystem) { std::cerr << "WARNING: platform verifier not supported with " -@@ -463,7 +463,7 @@ int main(int argc, char** argv) { +@@ -474,7 +474,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_quic_quic__http__proxy__backend.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_quic_quic__http__proxy__backend.cc deleted file mode 100644 index 3e9c54b40f78..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_quic_quic__http__proxy__backend.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/net/tools/quic/quic_http_proxy_backend.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/net/tools/quic/quic_http_proxy_backend.cc -@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext - // Enable HTTP2, but disable QUIC on the backend - context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux, use a fixed ProxyConfigService, since the default one - // depends on glib. - context_builder.set_proxy_config_service( diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h index d6759f64a79d..d179e5d2a70e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/traffic_annotation/network_traffic_annotation.h -@@ -371,7 +371,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,7 +9,7 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -385,7 +385,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -387,7 +387,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.cc deleted file mode 100644 index 0ca86aecfb7d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/net/url_request/url_fetcher.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/net/url_request/url_fetcher.cc -@@ -26,7 +26,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if !BUILDFLAG(IS_WIN) && \ -- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - // static - std::unique_ptr<URLFetcher> URLFetcher::Create( - const GURL& url, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.h deleted file mode 100644 index 679bf4a26cd7..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__fetcher.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/net/url_request/url_fetcher.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/net/url_request/url_fetcher.h -@@ -344,7 +344,7 @@ class NET_EXPORT URLFetcher { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if (!BUILDFLAG(IS_WIN) && \ -- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) || \ -+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))) || \ - BUILDFLAG(IS_CHROMEOS) - // |url| is the URL to send the request to. It must be valid. - // |request_type| is the type of request to make. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc index 63c2aecb4f83..f7b2c74f9b86 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context.cc -@@ -91,7 +91,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -110,7 +110,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h index aab24b57c0c5..738a9a1f2d0e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context.h -@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext { +@@ -87,7 +87,7 @@ class NET_EXPORT URLRequestContext final { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc index 689e1b6393d1..20960ca1a473 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/net/url_request/url_request_context_builder.cc -@@ -498,7 +498,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -443,7 +443,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) // TODO(willchan): Switch to using this code when - // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s + // ProxyConfigService::CreateSystemProxyConfigService()'s // signature doesn't suck. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc index 621048d4934f..d3d7739b1506 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h" #include "ui/gfx/geometry/size.h" @@ -9,7 +9,7 @@ #include "mojo/public/mojom/base/values.mojom.h" #endif -@@ -162,7 +162,7 @@ bool StructTraits< +@@ -147,7 +147,7 @@ bool StructTraits< } out->set_pages_per_sheet(data.pages_per_sheet()); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h index 9b6d5eee5433..3097e1c3f685 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h -@@ -168,7 +168,7 @@ struct StructTraits<printing::mojom::PrintSettingsData +@@ -158,7 +158,7 @@ struct StructTraits<printing::mojom::PrintSettingsData return s.pages_per_sheet(); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc index 3c6436546431..2f214f2c04dd 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/printing/print_settings_conversion.cc -@@ -215,7 +215,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -256,7 +256,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc new file mode 100644 index 000000000000..0607527c038b --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/printing/printing_context_linux.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/printing/printing_context_linux.cc +@@ -19,7 +19,7 @@ + #include "printing/units.h" + + // Avoid using LinuxUi on Fuchsia. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -68,7 +68,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett + + ResetSettings(); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!ui::LinuxUi::instance()) + return mojom::ResultCode::kSuccess; + +@@ -81,7 +81,7 @@ gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceU + } + + gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (ui::LinuxUi::instance()) + return ui::LinuxUi::instance()->GetPdfPaperSize(this); + #endif +@@ -94,7 +94,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS + DCHECK(!printer_settings.show_system_dialog); + DCHECK(!in_print_job_); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!ui::LinuxUi::instance()) + return mojom::ResultCode::kSuccess; + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.cc deleted file mode 100644 index ad6dc88d9202..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/printing/printing_features.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/printing/printing_features.cc -@@ -8,7 +8,7 @@ - #include "printing/buildflags/buildflags.h" - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/metrics/field_trial_params.h" - #endif - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn index e017bd43a166..8d1bacfa2508 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/BUILD.gn -@@ -36,7 +36,7 @@ group("sandbox") { +@@ -49,7 +49,7 @@ group("sandbox") { "//sandbox/mac:system_services", "//sandbox/mac/mojom", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc index 576210991328..0578081e9409 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc -@@ -11,7 +11,9 @@ +@@ -12,7 +12,9 @@ #include <stddef.h> #include <stdint.h> #include <string.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -161,7 +163,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn index da36531bca38..096bbf1db18d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2022-11-08 21:18:48 UTC +--- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/policy/BUILD.gn @@ -5,6 +5,8 @@ import("//build/config/chromeos/ui_mode.gni") import("//build/buildflag_header.gni") import("//build/config/chromecast_build.gni") import("//build/config/chromeos/ui_mode.gni") -+# Required for QtPDF to get a successful build ++# Import ozone_platform_x11, required for QtPDF to get a successful build +import("//build/config/ozone.gni") import("//build/config/sanitizers/sanitizers.gni") - import("//chromeos/assistant/assistant.gni") - import("//printing/buildflags/buildflags.gni") -@@ -34,7 +36,7 @@ component("policy") { + import("//chromeos/ash/components/assistant/assistant.gni") + import("//components/services/screen_ai/buildflags/features.gni") +@@ -35,7 +37,7 @@ component("policy") { "//sandbox/policy/mojom", ] public_deps = [ "//sandbox:common" ] @@ -18,7 +18,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -89,6 +91,28 @@ component("policy") { +@@ -94,6 +96,28 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", @@ -35,7 +35,7 @@ + ] + libs = [ "util" ] + } -+ # Required to avoid assertion errors during build of QtPDF ++ # The use of ozone_platform_x11 is required to avoid assertion errors during build of QtPDF + if (is_freebsd && ozone_platform_x11) { + sources += [ + "freebsd/sandbox_freebsd.cc", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc index 890af8ab2fd3..c06e5c1afb75 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc @@ -1,13 +1,13 @@ ---- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/policy/features.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/policy/features.cc -@@ -14,7 +14,11 @@ const base::Feature kNetworkServiceSandbox{"NetworkSer - // Enables network service sandbox. +@@ -15,7 +15,11 @@ BASE_FEATURE(kNetworkServiceSandbox, // (Only causes an effect when feature kNetworkService is enabled.) - const base::Feature kNetworkServiceSandbox{"NetworkServiceSandbox", + BASE_FEATURE(kNetworkServiceSandbox, + "NetworkServiceSandbox", +#if BUILDFLAG(IS_BSD) -+ base::FEATURE_ENABLED_BY_DEFAULT}; ++ base::FEATURE_ENABLED_BY_DEFAULT); +#else - base::FEATURE_DISABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT); +#endif #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_FUCHSIA) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h index 643c1b01998d..2a94ace5ef8e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig 2022-11-07 19:58:12 UTC +--- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig 2023-04-16 15:58:20 UTC +++ src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h @@ -0,0 +1,278 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -16,7 +16,7 @@ +#include "sandbox/policy/export.h" +#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h" +#include "sandbox/policy/mojom/sandbox.mojom.h" -+#include "sandbox/policy/sanitizer_buildflags.h" ++#include "base/sanitizer_buildflags.h" + +#if BUILDFLAG(USING_SANITIZER) +#include <sanitizer/common_interface_defs.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h index 69cd9b21dd2f..dac2d242e687 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.h.orig 2022-11-07 19:53:29 UTC +--- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.h.orig 2023-04-16 15:58:20 UTC +++ src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.h @@ -0,0 +1,282 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -16,7 +16,7 @@ +#include "sandbox/policy/export.h" +#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h" +#include "sandbox/policy/mojom/sandbox.mojom.h" -+#include "sandbox/policy/sanitizer_buildflags.h" ++#include "base/sanitizer_buildflags.h" + +#if BUILDFLAG(USING_SANITIZER) +#include <sanitizer/common_interface_defs.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc index e285a9b7ef04..804129ecd7a9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox.cc -@@ -17,6 +17,10 @@ +@@ -18,6 +18,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" #endif // BUILDFLAG(IS_MAC) -@@ -30,7 +34,7 @@ namespace policy { +@@ -31,7 +35,7 @@ namespace policy { namespace sandbox { namespace policy { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc index ca051cc58cba..743d8f71b1b1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/policy/sandbox_type.cc -@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif case Sandbox::kAudio: return false; @@ -9,7 +9,7 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kMirroring: case Sandbox::kNaClLoader: #endif @@ -18,19 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -72,8 +72,10 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { - case Sandbox::kLibassistant: - #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) - #endif // // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) -+#if !BUILDFLAG(IS_BSD) - case Sandbox::kZygoteIntermediateSandbox: -+#endif - case Sandbox::kScreenAI: - #endif - case Sandbox::kSpeechRecognition: -@@ -125,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -126,7 +126,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -39,7 +27,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -136,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -137,7 +137,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -48,16 +36,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -149,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi - #if BUILDFLAG(IS_MAC) - case Sandbox::kMirroring: - #endif // BUILDFLAG(IS_MAC) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - case Sandbox::kScreenAI: - #endif - case Sandbox::kSpeechRecognition: -@@ -255,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -256,7 +256,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -66,16 +45,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -265,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb - return switches::kServiceSandboxWithJit; - case Sandbox::kSpeechRecognition: - return switches::kSpeechRecognitionSandbox; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - case Sandbox::kScreenAI: - return switches::kScreenAISandbox; - #endif -@@ -285,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -286,7 +286,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -84,12 +54,7 @@ case Sandbox::kHardwareVideoDecoding: return switches::kHardwareVideoDecodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -369,15 +371,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( - return Sandbox::kAudio; - if (sandbox_string == switches::kSpeechRecognitionSandbox) - return Sandbox::kSpeechRecognition; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -374,11 +374,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc index fb9472e363fb..bf2dd097369d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/switches.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.cc -@@ -52,7 +52,7 @@ const char kMirroringSandbox[] = "mirroring"; +@@ -54,7 +54,7 @@ const char kMirroringSandbox[] = "mirroring"; const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -99,7 +99,9 @@ const char kNoSandbox[] = "no-sandbox"; +@@ -101,7 +101,9 @@ const char kNoSandbox[] = "no-sandbox"; // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h index 90f0efac16cf..2858fcfbc2b4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/sandbox/policy/switches.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/sandbox/policy/switches.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/sandbox/policy/switches.h -@@ -53,7 +53,7 @@ SANDBOX_POLICY_EXPORT extern const char kMirroringSand +@@ -56,7 +56,7 @@ SANDBOX_POLICY_EXPORT extern const char kMirroringSand SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -75,7 +75,8 @@ SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; +@@ -78,7 +78,8 @@ SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc index ae88f9af8384..3945428be32d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc @@ -1,30 +1,28 @@ ---- src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc -@@ -86,7 +86,7 @@ scoped_refptr<net::CertVerifyProc> CreateOldDefaultWit - scoped_refptr<net::CertVerifyProc> CreateOldDefaultWithoutCaching( - scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { - scoped_refptr<net::CertVerifyProc> verify_proc; +@@ -12,7 +12,7 @@ + #include "net/cert_net/cert_net_fetcher_url_request.h" + #include "net/net_buildflags.h" + -#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - verify_proc = - net::CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); + #include "net/cert/cert_verify_proc_builtin.h" + #include "net/cert/internal/system_trust_store.h" + #endif +@@ -89,7 +89,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce + user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( + user_slot_restriction_.get())) + : nullptr)); +-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + verify_proc = net::CreateCertVerifyProcBuiltin( + std::move(cert_net_fetcher), net::CreateSslSystemTrustStore()); #else -@@ -104,7 +104,7 @@ scoped_refptr<net::CertVerifyProc> CreateNewDefaultWit - scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { - scoped_refptr<net::CertVerifyProc> verify_proc; - #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) - verify_proc = net::CreateCertVerifyProcBuiltin( - std::move(cert_net_fetcher), net::CreateSslSystemTrustStoreChromeRoot()); - #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) -@@ -122,7 +122,8 @@ bool IsUsingCertNetFetcher() { +@@ -212,6 +212,7 @@ bool IsUsingCertNetFetcher() { + bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ ++ BUILDFLAG(IS_BSD) || \ BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ -- BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) -+ BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \ -+ BUILDFLAG(IS_BSD) + BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) return true; - #else - return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index edc6b237d64c..5980bb3ad6ee 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -52,7 +52,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO +@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -91,7 +91,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -270,7 +270,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -261,7 +261,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -285,7 +285,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -276,7 +276,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -331,7 +331,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -322,7 +322,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -382,7 +382,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -372,7 +372,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -444,7 +444,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -434,7 +434,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h index 6c44edbe6cba..388a93a87803 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h -@@ -448,7 +448,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -460,7 +460,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // POSIX.1-2001. #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set @@ -10,7 +10,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -463,7 +464,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -475,7 +476,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 2e39cae41890..26cdd5cba645 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,7 +30,7 @@ #include <sys/syscall.h> @@ -9,7 +9,7 @@ #include <sys/sysctl.h> #endif -@@ -308,9 +308,11 @@ static double GetNominalCPUFrequency() { +@@ -310,9 +310,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index 0a49d4a13d26..af41c292182a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,12 +1,11 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h -@@ -32,7 +32,8 @@ - #endif +@@ -33,7 +33,7 @@ - #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ -- !defined(__native_client__) && !defined(__asmjs__) && !defined(__wasm__) -+ !defined(__native_client__) && !defined(__asmjs__) && !defined(__wasm__) && \ -+ !defined(__FreeBSD__) + #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ + !defined(__native_client__) && !defined(__asmjs__) && \ +- !defined(__wasm__) && !defined(__HAIKU__) ++ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__FreeBSD__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc index f7e6d6fc09fc..f67870ae705a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc @@ -19,7 +19,7 @@ #endif #if defined(HAS_STRPTIME) && HAS_STRPTIME --#if !defined(_XOPEN_SOURCE) +-#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) +#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__) #define _XOPEN_SOURCE // Definedness suffices for strptime. #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn index ee728b89f622..da8e39441588 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -213,7 +213,6 @@ config("extra_warnings") { +@@ -265,7 +265,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -391,7 +390,7 @@ angle_static_library("angle_common") { +@@ -443,7 +442,7 @@ angle_static_library("angle_common") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -512,6 +511,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -574,6 +573,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -25,5 +25,23 @@ + libs += [ "GL" ] + } } + + if (angle_use_wayland && angle_has_build) { +@@ -1094,12 +1096,12 @@ if (angle_use_wayland) { + "wayland-client", + "wayland-egl", + ] ++ } else { ++ include_dirs = [ ++ "$wayland_dir/egl", ++ "$wayland_dir/src", ++ ] + } +- +- include_dirs = [ +- "$wayland_dir/egl", +- "$wayland_dir/src", +- ] } + group("angle_wayland") { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils__posix.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils__posix.cpp deleted file mode 100644 index 8dd1d060107c..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_system__utils__posix.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/3rdparty/chromium/third_party/angle/src/common/system_utils_posix.cpp.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/angle/src/common/system_utils_posix.cpp -@@ -201,7 +201,9 @@ void *OpenSystemLibraryWithExtensionAndGetError(const - int extraFlags = 0; - if (searchType == SearchType::AlreadyLoaded) - { -+#if !defined(__OpenBSD__) - extraFlags = RTLD_NOLOAD; -+#endif - } - - std::string fullPath = directory + libraryName; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_vulkan_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_vulkan_BUILD.gn new file mode 100644 index 000000000000..19c3b7997a88 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_vulkan_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/angle/src/common/vulkan/BUILD.gn.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/angle/src/common/vulkan/BUILD.gn +@@ -33,7 +33,7 @@ if (angle_enable_vulkan || angle_build_vulkan_system_i + if (angle_shared_libvulkan) { + defines = [ "ANGLE_SHARED_LIBVULKAN=1" ] + } +- if (angle_use_wayland) { ++ if (angle_use_wayland && !use_system_libwayland) { + include_dirs = [ "$wayland_dir/src" ] + } + configs = [ "$angle_root:angle_vulkan_wayland_config" ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp index 795a672c5df2..519ace30ae35 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS) # include "libANGLE/renderer/gl/apple/DisplayApple_api.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_GBM) # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -328,7 +328,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -331,7 +331,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -373,7 +373,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -374,7 +374,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,16 +27,16 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -424,7 +424,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -425,7 +425,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) - # if defined(ANGLE_USE_X11) - if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) + # if defined(ANGLE_USE_GBM) + if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -1932,7 +1932,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2011,7 +2011,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp index 1a13ed134a25..59b9be4805ae 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp -@@ -1393,7 +1393,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1466,7 +1466,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h index 1a055e7b9b83..689450279265 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -179,7 +179,7 @@ inline bool IsLinux() +@@ -200,7 +200,7 @@ inline bool IsLinux() inline bool IsLinux() { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h index 4eba9fd1c93e..b7a8469a75c8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h @@ -23,7 +23,7 @@ DisplayImpl *CreateVulkanWin32Display(const egl::Displ DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); @@ -6,6 +6,6 @@ -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) - bool IsVulkanXcbDisplayAvailable(); - DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state); + bool IsVulkanWaylandDisplayAvailable(); + DisplayImpl *CreateVulkanWaylandDisplay(const egl::DisplayState &state); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_third__party_volk_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_third__party_volk_BUILD.gn new file mode 100644 index 000000000000..8882c027c537 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_third__party_volk_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/angle/src/third_party/volk/BUILD.gn.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/angle/src/third_party/volk/BUILD.gn +@@ -20,7 +20,7 @@ source_set("volk") { + public_configs = [ ":volk_config" ] + configs += [ "$angle_root:angle_no_cfi_icall" ] + public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] +- if (angle_use_wayland) { ++ if (angle_use_wayland && !use_system_libwayland) { + include_dirs = [ "$wayland_dir/src" ] + } + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn index 9bfff5b95763..b1372e7ea709 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/angle/util/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/angle/util/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/angle/util/BUILD.gn -@@ -203,7 +203,7 @@ foreach(is_shared_library, +@@ -246,7 +246,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc new file mode 100644 index 000000000000..f67952920b0a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/common/privacy_budget/active_sampling.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/blink/common/privacy_budget/active_sampling.cc +@@ -24,7 +24,7 @@ bool IdentifiabilityActiveSampler::IsFontFamilyAvailab + bool IdentifiabilityActiveSampler::IsFontFamilyAvailable(const char* family, + SkFontMgr* fm) { + base::ScopedAllowBaseSyncPrimitives allow; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return !!fm->legacyMakeTypeface(family, SkFontStyle()); + #else + sk_sp<SkFontStyleSet> set(fm->matchFamily(family)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h new file mode 100644 index 000000000000..5a88876f07d4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/public/platform/platform.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/blink/public/platform/platform.h +@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform { + return nullptr; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // This is called after the thread is created, so the embedder + // can initiate an IPC to change its thread type (on Linux we can't + // increase the nice value, so we need to ask the browser process). This diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc index 3f0884353d26..3283c4703a2e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc -@@ -71,12 +71,12 @@ +@@ -73,12 +73,12 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -156,7 +156,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -173,7 +173,7 @@ void InitializeCommon(Platform* platform, mojo::Binder #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -24,12 +24,12 @@ // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) UserLevelMemoryPressureSignalGenerator::Instance(); -@@ -227,7 +227,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder - main_thread->GetTaskRunner()); +@@ -244,7 +244,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder + main_thread_task_runner); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - binders.Add(ConvertToBaseRepeatingCallback( - CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), - main_thread->GetTaskRunner()); + binders.Add<mojom::blink::MemoryUsageMonitorLinux>( + ConvertToBaseRepeatingCallback( + CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 8fe1f999c908..744fc9eb5de9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::SetProcFiles(base::File +@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::SetProcFiles(base::File void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_execution__context_navigator__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_execution__context_navigator__base.cc new file mode 100644 index 000000000000..73184081789d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_execution__context_navigator__base.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/core/execution_context/navigator_base.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/core/execution_context/navigator_base.cc +@@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() { + return "Win32"; + #elif BUILDFLAG(IS_FUCHSIA) + return ""; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return "Linux x86_64"; + #else + #error Unsupported platform diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc index cc722a5992a7..3acd798d6018 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -405,7 +405,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3168,7 +3168,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3278,7 +3278,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc index f9cd1f215aac..43bc3cf53d8e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,17 +1,17 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6281,7 +6281,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { - EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); - } - +@@ -6414,7 +6414,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { + MoveCaretStaysHorizontallyAlignedWhenMoved + #endif + // TODO(crbug.com/1317375): Build these tests on all platforms. -#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { + TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6660,7 +6660,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGTextWithFragm - TEST_F(CompositedSelectionBoundsTest, SVGTextWithFragments) { - RunTest("composited_selection_bounds_svg_text_with_fragments.html"); +@@ -6811,7 +6811,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionNo + TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { + RunTest("composited_selection_bounds_large_selection_noscroll.html"); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index c7b11b3e875e..5f39573e7d76 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -186,7 +186,7 @@ Vector<String> InspectorMemoryAgent::Symbolize( +@@ -190,7 +190,7 @@ Vector<String> InspectorMemoryAgent::Symbolize( Vector<String> InspectorMemoryAgent::Symbolize( const WebVector<void*>& addresses) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc index 29022e2e70ab..06cfdde6302f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc -@@ -65,7 +65,7 @@ +@@ -68,7 +68,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -360,7 +360,7 @@ void LayoutView::UpdateLayout() { +@@ -367,7 +367,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc index f52409381dd0..79e796f786c4 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc -@@ -108,7 +108,7 @@ namespace { +@@ -112,7 +112,7 @@ namespace { namespace { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 0a23f1e97075..71dad65679ce 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -151,7 +151,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ return false; #else return true; -@@ -326,7 +326,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -329,7 +329,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc index 9ebae390cd40..9a74f99961ef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__device__factory.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc -@@ -34,7 +34,7 @@ namespace { - namespace { +@@ -35,7 +35,7 @@ AudioDeviceFactory* g_factory_override = nullptr; + AudioDeviceFactory* g_factory_override = nullptr; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index bcf5176682c5..d373fc47e553 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -678,7 +678,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -722,7 +722,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index f39e35e78fa1..5128061b5a32 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -288,7 +288,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS +@@ -278,7 +278,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 8df21daa30e7..f2bf2f7eb4ca 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc @@ -379,7 +379,7 @@ class AudioWorkletThreadPriorityTest @@ -6,6 +6,6 @@ // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (expected_priority == base::ThreadPriority::REALTIME_AUDIO || - expected_priority == base::ThreadPriority::DISPLAY) { - EXPECT_EQ(actual_priority, base::ThreadPriority::NORMAL); + if (expected_priority == base::ThreadPriorityForTest::kRealtimeAudio || + expected_priority == base::ThreadPriorityForTest::kDisplay) { + EXPECT_EQ(actual_priority, base::ThreadPriorityForTest::kNormal); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 5849e7bc0d5e..8144a1e009b6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6070,7 +6070,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6165,7 +6165,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc index ecada3803ac6..f34c0fb9de9b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -100,7 +100,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin +@@ -101,7 +101,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn index 650788b59d57..9e8742478e81 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn -@@ -1922,7 +1922,7 @@ jumbo_static_library("test_support") { +@@ -1942,7 +1942,7 @@ jumbo_static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc index 95bbc487112a..c218d06050a8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -75,7 +75,7 @@ SkFontMgr* FontCache::static_font_manager_ = nullptr; +@@ -72,7 +72,7 @@ SkFontMgr* FontCache::static_font_manager_ = nullptr; SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,12 +9,12 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -120,7 +120,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( +@@ -139,7 +139,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (family.IsEmpty() || family == font_family_names::kSystemUi) + if (family.empty() || family == font_family_names::kSystemUi) return nullptr; #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h index 1bea5fa13e7e..485eca3ccd4a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h @@ -57,7 +57,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -184,7 +184,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -181,7 +181,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -267,7 +267,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -265,7 +265,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -347,7 +347,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -345,7 +345,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -389,7 +389,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -387,7 +387,7 @@ class PLATFORM_EXPORT FontCache final { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // BUILDFLAG(IS_WIN) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc index 7b405fbc9a3b..8b3e80f5d33d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -262,7 +262,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -270,7 +270,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc new file mode 100644 index 000000000000..a8bb26ef0e76 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc +@@ -51,7 +51,7 @@ namespace { + namespace blink { + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Getting the system font render style takes a significant amount of time on + // Linux because looking up fonts using fontconfig can be very slow. We fetch + // the render style for each font family and text size, while it's very +@@ -160,7 +160,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t + style_ = WebFontRenderStyle::GetDefault(); + #if !BUILDFLAG(IS_WIN) + WebFontRenderStyle system_style; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool override_font_name_and_size = + base::FeatureList::IsEnabled(kOptimizeLinuxFonts); + #else diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc index 885c7c6f35de..3685e650683a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc @@ -1,13 +1,14 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc -@@ -75,7 +75,11 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe +@@ -76,8 +76,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe - // Once we are using RAF, this thread is driving Display updates. Update - // priority accordingly. + // Once we are using RAF, this thread is driving user interactive display + // updates. Update priority accordingly. + // pledge(2) + // stop this baloney +#if !defined(OS_OPENBSD) - base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY); + base::PlatformThread::SetCurrentThreadType( + base::ThreadType::kDisplayCritical); +#endif mojo::Remote<mojom::blink::EmbeddedFrameSinkProvider> provider; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 30eacd345779..9c92b2f4835d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -329,7 +329,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -347,7 +347,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc new file mode 100644 index 000000000000..514cd7f0b68f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -0,0 +1,17 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc +@@ -174,12 +174,12 @@ SupportedFormats GetSupportedFormatsInternal( + supported_formats.scalability_modes.push_back(profile.scalability_modes); + supported_formats.sdp_formats.push_back(std::move(*format)); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) + const bool kShouldAddH264Cbp = + media::IsMediaFoundationH264CbpEncodingEnabled() && + profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const bool kShouldAddH264Cbp = + profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 index 5e6eb16d8e37..217e80816681 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -33,7 +33,7 @@ +@@ -36,7 +36,7 @@ // shipped stable can have its runtime flag removed soon after. status: { valid_values: ["stable", "experimental", "test"], @@ -9,16 +9,16 @@ }, // "implied_by" or "depends_on" specifies relationship to other features: -@@ -1098,7 +1098,7 @@ - depends_on: ["FileSystemAccess"], - status: {"Android": "test", "default": "experimental"}, +@@ -1205,7 +1205,7 @@ + depends_on: ["FileSystemAccessLocal"], + status: {"Android": "test", "default": "stable"}, origin_trial_feature_name: "FileHandling", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], +- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + base_feature: "FileHandlingAPI", }, { - name: "FileHandlingIcons", -@@ -2366,7 +2366,7 @@ +@@ -2671,7 +2671,7 @@ { name: "U2FSecurityKeyAPI", origin_trial_feature_name: "U2FSecurityKeyAPI", @@ -27,25 +27,25 @@ origin_trial_type: "deprecation", }, { -@@ -2385,7 +2385,7 @@ +@@ -2686,7 +2686,7 @@ { name: "UnrestrictedSharedArrayBuffer", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], +- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], }, { - name: "URLPattern", -@@ -2411,7 +2411,7 @@ + name: "URLPatternCompareComponent", +@@ -2706,7 +2706,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. - origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win"], + origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win", "openbsd", "freebsd"], + base_feature: "ReduceUserAgent", }, { - name: "UUID", -@@ -2537,12 +2537,12 @@ +@@ -2834,12 +2834,12 @@ name: "WebAppUrlHandling", status: "experimental", origin_trial_feature_name: "WebAppUrlHandling", @@ -57,6 +57,6 @@ origin_trial_feature_name: "WebAppWindowControlsOverlay", - origin_trial_os: ["win", "mac", "linux", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - status: "experimental", + status: "stable", }, { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc index 4d23994aba3a..b0b8b6553c4a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,12 +1,11 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -99,7 +99,8 @@ void Thread::CreateAndSetCompositorThread() { +@@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() { std::make_unique<scheduler::CompositorThread>(params); compositor_thread->Init(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+// pledge(2) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD) - if (base::FeatureList::IsEnabled( - features::kBlinkCompositorUseDisplayThreadPriority)) { - compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult( + compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&base::PlatformThread::CurrentId), + base::BindOnce([](base::PlatformThreadId compositor_thread_id) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc new file mode 100644 index 000000000000..23f2b54b6b02 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc +@@ -241,7 +241,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre + "CompositorTileWorkerBackground", thread_options, this, + background_thread_prio_categories, + &has_task_for_background_priority_thread_cv_); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + thread->SetBackgroundingCallback( + Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted()), + base::BindOnce([](base::PlatformThreadId thread_id) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h index 074a828b5dca..d977fb1573d0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h @@ -1,6 +1,17 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h -@@ -134,6 +134,9 @@ inline float RoundHalfTowardsPositiveInfinity(float va +@@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) { + return g * (1.0f / 400.0f); + } + ++#if defined(OS_FREEBSD) ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Winvalid-constexpr" ++#endif + inline double RoundHalfTowardsPositiveInfinity(double value) { + return std::floor(value + 0.5); + } +@@ -135,6 +139,9 @@ inline float RoundHalfTowardsPositiveInfinity(float va inline float RoundHalfTowardsPositiveInfinity(float value) { return std::floor(value + 0.5f); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni index bf3f823921b2..3c69f1cc9b04 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni @@ -1,17 +1,14 @@ ---- src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni.orig 2022-12-12 18:53:13 UTC +--- src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni -@@ -81,8 +81,10 @@ crypto_sources = [ +@@ -78,6 +78,7 @@ crypto_sources = [ "src/crypto/cpu_aarch64_apple.c", "src/crypto/cpu_aarch64_fuchsia.c", "src/crypto/cpu_aarch64_linux.c", + "src/crypto/cpu_aarch64_openbsd.c", "src/crypto/cpu_aarch64_win.c", "src/crypto/cpu_arm.c", -+ "src/crypto/cpu_arm_freebsd.c", "src/crypto/cpu_arm_linux.c", - "src/crypto/cpu_arm_linux.h", - "src/crypto/cpu_intel.c", -@@ -186,6 +188,7 @@ crypto_sources = [ +@@ -184,6 +185,7 @@ crypto_sources = [ "src/crypto/rand_extra/deterministic.c", "src/crypto/rand_extra/forkunsafe.c", "src/crypto/rand_extra/fuchsia.c", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h index 7df52d666181..8b8b3bd51d08 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h -@@ -26,7 +26,8 @@ extern "C" { +@@ -27,7 +27,8 @@ extern "C" { #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c index bb1ce7d6b90f..0b6485d245fc 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c -@@ -24,6 +24,9 @@ - - #include <openssl/type_check.h> +@@ -22,6 +22,9 @@ + #include <stdatomic.h> + #include <stdlib.h> +#if !defined(__cplusplus) && !defined(static_assert) +#define static_assert _Static_assert diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h index 083052550ca9..fc7ce7529efa 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h -@@ -153,6 +153,11 @@ extern "C" { +@@ -154,6 +154,11 @@ extern "C" { #define OPENSSL_FUCHSIA #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc index 1f4fa61e7621..284d8ae60c37 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc -@@ -119,6 +119,10 @@ std::string MinidumpMiscInfoDebugBuildString() { +@@ -159,6 +159,10 @@ std::string MinidumpMiscInfoDebugBuildString() { static constexpr char kOS[] = "win"; #elif BUILDFLAG(IS_FUCHSIA) static constexpr char kOS[] = "fuchsia"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc index c60c1f1c78ac..53dc37af150e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals.cc @@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) @@ -18,7 +18,7 @@ SIGIO, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) }; -@@ -232,8 +232,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi +@@ -251,8 +251,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_generator_dawn__version__generator.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_generator_dawn__version__generator.py deleted file mode 100644 index 24711ef651cd..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_generator_dawn__version__generator.py +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/third_party/dawn/generator/dawn_version_generator.py.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/dawn/generator/dawn_version_generator.py -@@ -27,11 +27,14 @@ def get_gitHash(dawnDir): - - - def get_gitHash(dawnDir): -- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'], -- stdout=subprocess.PIPE, -- cwd=dawnDir) -- if result.returncode == 0: -- return result.stdout.decode('utf-8').strip() -+ try: -+ result = subprocess.run([get_git(), "rev-parse", "HEAD"], -+ stdout=subprocess.PIPE, -+ cwd=dawnDir) -+ if result.returncode == 0: -+ return result.stdout.decode("utf-8").strip() -+ except Exception: -+ return "" - # No hash was available (possibly) because the directory was not a git checkout. Dawn should - # explicitly handle its absenece and disable features relying on the hash, i.e. caching. - return '' diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h index 1bc7f7ead991..2bd15367f315 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h -@@ -69,7 +69,7 @@ namespace dawn::native::vulkan { - }; +@@ -82,7 +82,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport + }; - // Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome + // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome -#ifdef __linux__ +#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - // Common properties of external images represented by FDs. On successful import the file - // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be + // Common properties of external images represented by FDs. On successful import the file + // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h index e1210da3cac9..62486c8381be 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_common_Platform.h @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/dawn/src/dawn/common/Platform.h -@@ -26,6 +26,11 @@ - # error "Unsupported Windows platform." - # endif +@@ -45,6 +45,11 @@ + #error "Unsupported Windows platform." + #endif +#elif defined(__OpenBSD__) || defined(__FreeBSD__) -+# define DAWN_PLATFORM_BSD 1 -+# define DAWN_PLATFORM_LINUX 1 -+# define DAWN_PLATFORM_POSIX 1 ++#define DAWN_PLATFORM_IS_LINUX 1 ++#define DAWN_PLATFORM_IS_BSD 1 ++#define DAWN_PLATFORM_IS_POSIX 1 + #elif defined(__linux__) - # define DAWN_PLATFORM_LINUX 1 - # define DAWN_PLATFORM_POSIX 1 + #define DAWN_PLATFORM_IS_LINUX 1 + #define DAWN_PLATFORM_IS_POSIX 1 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp index c16aa3245b22..25e9b392976a 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp -@@ -37,7 +37,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha +@@ -42,7 +42,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif - #if defined(DAWN_PLATFORM_LINUX) --# if defined(DAWN_PLATFORM_ANDROID) -+# if defined(DAWN_PLATFORM_ANDROID) || defined(DAWN_PLATFORM_BSD) + #if DAWN_PLATFORM_IS(LINUX) +-#if DAWN_PLATFORM_IS(ANDROID) ++#if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(BSD) constexpr char kVulkanLibName[] = "libvulkan.so"; - # else + #else constexpr char kVulkanLibName[] = "libvulkan.so.1"; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_harfbuzz-ng_harfbuzz.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_harfbuzz-ng_harfbuzz.gni deleted file mode 100644 index 4058f931abab..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_harfbuzz-ng_harfbuzz.gni +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/third_party/harfbuzz-ng/harfbuzz.gni.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/third_party/harfbuzz-ng/harfbuzz.gni -@@ -3,12 +3,13 @@ declare_args() { - # found in the LICENSE file. - - declare_args() { -- # Blink uses a cutting-edge version of Harfbuzz; most Linux distros do not -- # contain a new enough version of the code to work correctly. However, -- # ChromeOS chroots (i.e, real ChromeOS builds for devices) do contain a -- # new enough version of the library, and so this variable exists so that -- # ChromeOS can build against the system lib and keep binary sizes smaller. -- use_system_harfbuzz = false -+ # Blink uses a cutting-edge version of Harfbuzz (version listed in -+ # third_party/harfbuzz-ng/README.chromium); most Linux distros do not contain -+ # a new enough version of the code to work correctly. However, ChromeOS -+ # chroots (i.e. real ChromeOS builds for devices) do contain a new enough -+ # version of the library, and so this variable exists so that ChromeOS can -+ # build against the system lib and keep binary sizes smaller. -+ use_system_harfbuzz = true - use_qt_harfbuzz = false - qt_harfbuzz_config = "" - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn new file mode 100644 index 000000000000..ed22b6e751bb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/third_party/nasm/BUILD.gn.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/nasm/BUILD.gn +@@ -59,6 +59,13 @@ config("nasm_config") { + + defines = [ "HAVE_CONFIG_H" ] + ++ _string_h_lines = ++ read_file("/usr/include/string.h", "list lines") ++ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) ++ if (_mempcpy != []) { ++ defines += [ "HAVE_MEMPCPY=1" ] ++ } ++ + if (is_clang) { + cflags = [ + # The inline functions in NASM's headers flag this. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h index 31ce9110fa66..9743c202f927 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/nasm/config/config-linux.h @@ -139,7 +139,7 @@ #define HAVE_ACCESS 1 @@ -9,6 +9,15 @@ /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ /* #undef HAVE_CPU_TO_LE16 */ +@@ -160,7 +160,7 @@ + + /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you + don't. */ +-#define HAVE_DECL_STRLCPY 0 ++#define HAVE_DECL_STRLCPY 1 + + /* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you + don't. */ @@ -183,7 +183,7 @@ #define HAVE_DECL_STRSEP 1 @@ -18,6 +27,44 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 +@@ -327,16 +327,16 @@ + #define HAVE_ISASCII 1 + + /* Define to 1 if you have the `iscntrl' function. */ +-/* #undef HAVE_ISCNTRL */ ++#define HAVE_ISCNTRL 1 + + /* Define to 1 if you have the <machine/endian.h> header file. */ +-/* #undef HAVE_MACHINE_ENDIAN_H */ ++#define HAVE_MACHINE_ENDIAN_H 1 + + /* Define to 1 if you have the <memory.h> header file. */ + #define HAVE_MEMORY_H 1 + + /* Define to 1 if you have the `mempcpy' function. */ +-#define HAVE_MEMPCPY 1 ++/* #undef HAVE_MEMPCPY */ + + /* Define to 1 if you have a working `mmap' system call. */ + #define HAVE_MMAP 1 +@@ -357,7 +357,7 @@ + #define HAVE_STDARG_H 1 + + /* Define to 1 if stdbool.h conforms to C99. */ +-/* #undef HAVE_STDBOOL_H */ ++#define HAVE_STDBOOL_H 1 + + /* Define to 1 if your compiler supports C99 extern inline */ + #define HAVE_STDC_INLINE 1 +@@ -384,7 +384,7 @@ + #define HAVE_STRING_H 1 + + /* Define to 1 if you have the `strlcpy' function. */ +-/* #undef HAVE_STRLCPY */ ++#define HAVE_STRLCPY 1 + + /* Define to 1 if you have the `strncasecmp' function. */ + #define HAVE_STRNCASECMP 1 @@ -411,7 +411,7 @@ #define HAVE_SYSCONF 1 @@ -27,3 +74,38 @@ /* Define to 1 if you have the <sys/mman.h> header file. */ #define HAVE_SYS_MMAN_H 1 +@@ -486,13 +486,13 @@ + /* #undef HAVE__STATI64 */ + + /* Define to 1 if you have the `__bswap_16' intrinsic function. */ +-#define HAVE___BSWAP_16 1 ++/* #undef HAVE___BSWAP_16 */ + + /* Define to 1 if you have the `__bswap_32' intrinsic function. */ +-#define HAVE___BSWAP_32 1 ++/* #undef HAVE___BSWAP_32 */ + + /* Define to 1 if you have the `__bswap_64' intrinsic function. */ +-#define HAVE___BSWAP_64 1 ++/* #undef HAVE___BSWAP_64 */ + + /* Define to 1 if you have the `__builtin_bswap16' intrinsic function. */ + #define HAVE___BUILTIN_BSWAP16 1 +@@ -620,7 +620,7 @@ + /* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is + supported directly. */ +-#define restrict __restrict ++#define restrict __restrict__ + /* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the +@@ -637,7 +637,7 @@ + /* Define if your snprintf function is not named snprintf. */ + /* #undef snprintf */ + +-/* Define if your typeof operator is not named typeof. */ ++/* Define if your typeof operator is not named `typeof'. */ + #define typeof __typeof + + /* Define to the type of an unsigned integer type wide enough to hold a diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxcrt_cfx__datetime.cpp deleted file mode 100644 index f4e0ae197555..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxcrt_cfx__datetime.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2022-11-06 22:18:10 UTC -+++ src/3rdparty/chromium/third_party/pdfium/core/fxcrt/cfx_datetime.cpp -@@ -11,7 +11,7 @@ - #include "third_party/base/check.h" - - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) -+ BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) || BUILDFLAG(IS_BSD) - #include <sys/time.h> - #include <time.h> - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp index ca05b5eb307f..63ad5c741177 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -155,7 +155,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index a1e96860d1e2..5c6714ebc431 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp @@ -18,7 +18,7 @@ - #include "third_party/base/cxx17_backports.h" + #include "third_party/base/check.h" #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \ - !defined(OS_ASMJS) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp index 1c237135e8d0..6ff22dd92a2e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -36,6 +36,11 @@ double GetLocalTZA() { +@@ -37,6 +37,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if BUILDFLAG(IS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -44,6 +49,7 @@ double GetLocalTZA() { +@@ -45,6 +50,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif return (double)(-(timezone * 1000)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h index 826f0ccc97a0..73c4439ce2ba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -34,6 +34,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre +@@ -35,6 +35,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre #include <sys/syscall.h> #include <sys/types.h> #include <unistd.h> @@ -8,7 +8,7 @@ #else #include <pthread.h> #endif -@@ -45,6 +46,11 @@ inline PlatformThreadId GetThreadId() { +@@ -46,6 +47,11 @@ inline PlatformThreadId GetThreadId() { using PlatformThreadId = pid_t; inline PlatformThreadId GetThreadId() { return gettid(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto new file mode 100644 index 000000000000..a61b25508784 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto @@ -0,0 +1,56 @@ +--- src/3rdparty/chromium/third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto +@@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent { + optional uint32 field = 2; + optional uint32 flags = 3; + optional uint32 index = 4; +- optional int32 minor = 5; ++ optional int32 gminor = 5; + optional uint32 sequence = 6; + optional uint32 timecode_flags = 7; + optional uint32 timecode_frames = 8; +@@ -30,7 +30,7 @@ message V4l2DqbufFtraceEvent { + optional uint32 field = 2; + optional uint32 flags = 3; + optional uint32 index = 4; +- optional int32 minor = 5; ++ optional int32 gminor = 5; + optional uint32 sequence = 6; + optional uint32 timecode_flags = 7; + optional uint32 timecode_frames = 8; +@@ -48,7 +48,7 @@ message Vb2V4l2BufQueueFtraceEvent { + message Vb2V4l2BufQueueFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -65,7 +65,7 @@ message Vb2V4l2BufDoneFtraceEvent { + message Vb2V4l2BufDoneFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -82,7 +82,7 @@ message Vb2V4l2QbufFtraceEvent { + message Vb2V4l2QbufFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -99,7 +99,7 @@ message Vb2V4l2DqbufFtraceEvent { + message Vb2V4l2DqbufFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc index d65116d4acfb..0a46253fce8d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc @@ -42,7 +42,7 @@ #include <unistd.h> @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -791,9 +791,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -803,9 +803,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { return; PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 2f0481d12314..d31670b1636b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3040,7 +3040,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3037,7 +3037,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc new file mode 100644 index 000000000000..7469465e2cfc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_arenastring.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/arenastring.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/arenastring.cc +@@ -64,7 +64,9 @@ constexpr size_t kStringAlign = alignof(std::string); + #endif + constexpr size_t kStringAlign = alignof(std::string); + ++#if !(defined(__FreeBSD__) && defined(__i386__)) + static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); ++#endif + static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); + + } // namespace diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h new file mode 100644 index 000000000000..828e4f129821 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/stubs/platform_macros.h +@@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR + + #undef GOOGLE_PROTOBUF_PLATFORM_ERROR + +-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__) ++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) + // Android ndk does not support the __thread keyword very well yet. Here + // we use pthread_key_create()/pthread_getspecific()/... methods for + // TLS support on android. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni new file mode 100644 index 000000000000..0d86574c08a6 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_tflite_features.gni @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/tflite/features.gni.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/third_party/tflite/features.gni +@@ -7,7 +7,7 @@ declare_args() { + declare_args() { + # This enables building TFLite with XNNPACK. Currently only available for + # Linux or Windows on x64. +- build_tflite_with_xnnpack = (is_win || is_linux) && current_cpu == "x64" ++ build_tflite_with_xnnpack = ((is_win || is_linux) && current_cpu == "x64") && !is_bsd + + # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp. + build_tflite_with_ruy = true diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_features.gni index 121069e96681..21fdfaface62 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_features.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_features.gni @@ -1,17 +1,20 @@ ---- src/3rdparty/chromium/third_party/wayland/features.gni.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/wayland/features.gni.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/wayland/features.gni -@@ -13,8 +13,12 @@ declare_args() { - default_toolchain != "//build/toolchain/cros:target" +@@ -21,12 +21,15 @@ declare_args() { - # Path to wayland-scanner. Has effect only when the system libwayland is used. + declare_args() { + # Path to the wayland-scanner in the sysroot. - assert(host_os == "linux") -- system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ assert(host_os == "linux" || host_os == "freebsd") -+ if (is_bsd) { -+ system_wayland_scanner_path = "%%LOCALBASE%%/bin/wayland-scanner" -+ } else { -+ system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ } - - # This may be set by Chromium packagers who do not wish to use the bundled - # wayland scanner. + if (use_system_wayland_scanner) { + if (use_sysroot) { + system_wayland_scanner_path = "$sysroot/usr/bin/wayland-scanner" + } else { +- system_wayland_scanner_path = "/usr/bin/wayland-scanner" ++ if (is_bsd) { ++ system_wayland_scanner_path = "%%LOCALBASE%%/bin/wayland-scanner" ++ } else { ++ system_wayland_scanner_path = "/usr/bin/wayland-scanner" ++ } + } + } + } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn index bd3d065bd2b1..0ac7ded83309 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/webrtc/BUILD.gn -@@ -203,6 +203,9 @@ config("common_inherited_config") { +@@ -205,6 +205,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn index f8456ef34e81..94b9abcbb690 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn -@@ -287,7 +287,7 @@ rtc_library("audio_device_impl") { +@@ -299,7 +299,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn index 3d214c128a9a..e1d689e05f76 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/BUILD.gn -@@ -1106,7 +1106,7 @@ rtc_library("rtc_base") { +@@ -1244,7 +1244,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc index 9f3f2cc8f46f..0f8b2704207d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc -@@ -261,7 +261,12 @@ AdapterType GetAdapterTypeFromName(const char* network +@@ -286,7 +286,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif @@ -12,4 +12,4 @@ +#endif } - NetworkManager::NetworkManager() {} + NetworkManager::EnumerationPermission NetworkManager::enumeration_permission() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc index 6f7a6d61b585..3818d17d430b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -51,7 +51,7 @@ +@@ -53,7 +53,7 @@ #include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" @@ -9,7 +9,7 @@ #include <linux/sockios.h> #endif -@@ -70,7 +70,7 @@ typedef void* SockOptArg; +@@ -72,7 +72,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -298,7 +298,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -300,7 +300,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -316,7 +316,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -318,7 +318,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -344,7 +344,7 @@ int PhysicalSocket::Send(const void* pv, size_t cb) { +@@ -346,7 +346,7 @@ int PhysicalSocket::Send(const void* pv, size_t cb) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -373,7 +373,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -375,7 +375,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -564,7 +564,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -566,7 +566,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h index e3b24c94ae52..97c6d48addf2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig 2022-06-08 06:40:31 UTC +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h -@@ -11,7 +11,7 @@ - #ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ +@@ -12,7 +12,7 @@ #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ + #include "api/units/time_delta.h" -#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) +#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) #include <sys/epoll.h> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_generate__stubs_rules.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_generate__stubs_rules.gni new file mode 100644 index 000000000000..67d01d9556cb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_generate__stubs_rules.gni @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/tools/generate_stubs/rules.gni.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/tools/generate_stubs/rules.gni +@@ -110,7 +110,6 @@ template("generate_stubs") { + "${target_gen_dir}/${invoker.output_name}.cc", + "${target_gen_dir}/${invoker.output_name}.h", + ] +- libs = [ "dl" ] + include_dirs = [ target_gen_dir ] + if (defined(invoker.configs)) { + configs += invoker.configs diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py new file mode 100644 index 000000000000..5b56c013e103 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_cpp__bundle__generator.py @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/tools/json_schema_compiler/cpp_bundle_generator.py +@@ -153,7 +153,7 @@ class CppBundleGenerator(object): + # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). + ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') + elif platform == Platforms.LINUX: +- ifdefs.append('BUILDFLAG(IS_LINUX)') ++ ifdefs.append('BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)') + elif platform == Platforms.MAC: + ifdefs.append('BUILDFLAG(IS_MAC)') + elif platform == Platforms.WIN: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py new file mode 100644 index 000000000000..64b4f521d4b1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py +@@ -268,6 +268,8 @@ FEATURE_GRAMMAR = ({ + 'mac': 'Feature::MACOSX_PLATFORM', + 'win': 'Feature::WIN_PLATFORM', + 'fuchsia': 'Feature::FUCHSIA_PLATFORM', ++ 'openbsd': 'Feature::LINUX_PLATFORM', ++ 'freebsd': 'Feature::LINUX_PLATFORM', + } + } + }, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h new file mode 100644 index 000000000000..e25abd6c3c26 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_memory_partition__allocator_inspect__utils.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/tools/memory/partition_allocator/inspect_utils.h +@@ -60,7 +60,7 @@ class RemoteProcessMemoryReader { + const pid_t pid_; + bool is_valid_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::ScopedFD mem_fd_; + #elif BUILDFLAG(IS_MAC) + task_t task_; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn new file mode 100644 index 000000000000..5dc27a39e593 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn +@@ -45,7 +45,7 @@ group("telemetry_chrome_test") { + data_deps += [ "//chrome:reorder_imports" ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + + # CrOS currently has issues with the locally compiled version of +@@ -186,7 +186,7 @@ group("telemetry_chrome_test_without_chrome") { + ] + + # Cr-Fuchsia doesn't support breakpad. +- if (!is_win && !is_fuchsia) { ++ if (!is_win && !is_fuchsia && !is_bsd) { + data_deps += [ + # This is defined for Windows, but is unused by Telemetry on + # Windows, and including it can have issues when cross-compiling diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py new file mode 100644 index 000000000000..b907356a2219 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py @@ -0,0 +1,24 @@ +--- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py +@@ -182,15 +182,19 @@ def main(argv): + if not options.exclude_imports: + protoc_cmd += ["--include_imports"] + ++ nenv = os.environ.copy() ++ nenv["PATH"] = "${WRKOBJDIR}/bin:" + nenv["PATH"] ++ nenv["LD_LIBRARY_PATH"] = "${WRKSRC}/out/Release" ++ + dependency_file_data = None + if options.descriptor_set_out and options.descriptor_set_dependency_file: + protoc_cmd += ['--dependency_out', options.descriptor_set_dependency_file] +- ret = subprocess.call(protoc_cmd) ++ ret = subprocess.call(protoc_cmd, env=nenv) + + with open(options.descriptor_set_dependency_file, 'rb') as f: + dependency_file_data = f.read().decode('utf-8') + +- ret = subprocess.call(protoc_cmd) ++ ret = subprocess.call(protoc_cmd, env=nenv) + if ret != 0: + if ret <= -100: + # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py new file mode 100644 index 000000000000..bc1e3ab30806 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/tools/variations/fieldtrial_to_struct.py.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/tools/variations/fieldtrial_to_struct.py +@@ -41,6 +41,8 @@ _platforms = [ + 'linux', + 'mac', + 'windows', ++ 'openbsd', ++ 'freebsd', + ] + + _form_factors = [ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc index 78b0ac2ae310..d513425044e2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/aura/screen_ozone.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.cc -@@ -99,7 +99,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -109,7 +109,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } -#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool ScreenOzone::SetScreenSaverSuspended(bool suspend) { - return platform_screen_->SetScreenSaverSuspended(suspend); - } + ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone( + std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender> suspender) + : suspender_(std::move(suspender)) {} diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h index 104da22e6b15..ee8ff2565e0b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_aura_screen__ozone.h @@ -1,11 +1,20 @@ ---- src/3rdparty/chromium/ui/aura/screen_ozone.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/aura/screen_ozone.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/aura/screen_ozone.h -@@ -62,7 +62,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen - protected: - ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } - +@@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen + display::Display GetDisplayMatching( + const gfx::Rect& match_rect) const override; + display::Display GetPrimaryDisplay() const override; -#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool SetScreenSaverSuspended(bool suspend) override; + std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() + override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen + ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } + private: +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class ScreenSaverSuspenderOzone + : public display::Screen::ScreenSaverSuspender { + public: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc index 0a8b9d7018f9..ceabb6d7aa85 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.cc -@@ -151,7 +151,7 @@ bool DummyTextInputClient::ShouldDoLearning() { +@@ -159,7 +159,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h index 7a8666a450cf..e6ad5a23b39d 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_dummy__text__input__client.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/ime/dummy_text_input_client.h -@@ -63,7 +63,7 @@ class DummyTextInputClient : public TextInputClient { +@@ -65,7 +65,7 @@ class DummyTextInputClient : public TextInputClient { ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc index 70fc696f4e39..33dd7cf61f45 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc -@@ -161,7 +161,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -163,7 +163,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h index e08df4542036..c3ffc1507878 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h -@@ -69,7 +69,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -71,7 +71,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc deleted file mode 100644 index fa43fbbece7e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_init_input__method__initializer.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc -@@ -10,7 +10,7 @@ - #include "build/chromeos_buildflags.h" - - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "base/check.h" - #include "ui/base/ime/linux/fake_input_method_context_factory.h" - #elif BUILDFLAG(IS_WIN) -@@ -20,7 +20,7 @@ namespace { - - namespace { - --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const ui::LinuxInputMethodContextFactory* - g_linux_input_method_context_factory_for_testing; - #endif -@@ -43,7 +43,7 @@ void InitializeInputMethodForTesting() { - - void InitializeInputMethodForTesting() { - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - if (!g_linux_input_method_context_factory_for_testing) - g_linux_input_method_context_factory_for_testing = - new FakeInputMethodContextFactory(); -@@ -61,7 +61,7 @@ void ShutdownInputMethodForTesting() { - - void ShutdownInputMethodForTesting() { - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const LinuxInputMethodContextFactory* factory = - LinuxInputMethodContextFactory::instance(); - CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_linux_linux__input__method__context__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_linux_linux__input__method__context__factory.cc new file mode 100644 index 000000000000..71d6c9034455 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_linux_linux__input__method__context__factory.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context_factory.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context_factory.cc +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + #include "ui/base/ime/linux/fake_input_method_context.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #include "ui/linux/linux_ui_delegate.h" + #endif +@@ -32,7 +32,7 @@ std::unique_ptr<LinuxInputMethodContext> CreateLinuxIn + if (auto factory = GetInputMethodContextFactoryForTest()) + return factory.Run(delegate); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Give the toolkit a chance to create the context. + if (auto* linux_ui = LinuxUi::instance()) { + if (auto context = linux_ui->CreateInputMethodContext(delegate)) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h index 1f6c0fd076d4..5ffceff19630 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/ime/text_input_client.h -@@ -238,7 +238,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { +@@ -242,7 +242,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc index 61b47d47d48e..2add172727fe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/resource/resource_bundle.cc -@@ -882,7 +882,7 @@ ResourceScaleFactor ResourceBundle::GetMaxResourceScal +@@ -884,7 +884,7 @@ ResourceScaleFactor ResourceBundle::GetMaxResourceScal } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc index 5c62456db617..0e1fdc228118 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/ui_base_features.cc -@@ -179,7 +179,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -205,7 +205,7 @@ CONSTINIT const base::Feature kExperimentalFlingAnimat + "ExperimentalFlingAnimation", + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || \ +-#if BUILDFLAG(IS_WIN) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -- !BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -275,7 +275,7 @@ const base::Feature kEyeDropper { + !BUILDFLAG(IS_CHROMEOS_LACROS)) + base::FEATURE_ENABLED_BY_DEFAULT +@@ -310,7 +310,7 @@ CONSTINIT const base::Feature kEyeDropper( // milestones. - const base::Feature kEyeDropper { - "EyeDropper", + CONSTINIT const base::Feature kEyeDropper( + "EyeDropper", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h new file mode 100644 index 000000000000..d15d201fa18a --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__types.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/base/ui_base_types.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/base/ui_base_types.h +@@ -32,7 +32,7 @@ enum WindowShowState { + SHOW_STATE_END = 6 // The end of show state enum. + }; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Specifies which edges of the window are tiled. + // + // Wayland can notify the application if certain edge of the window is diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc index 5bc841afdf75..303d88287a79 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/webui/web_ui_util.cc -@@ -228,7 +228,7 @@ std::string GetFontFamily() { +@@ -220,7 +220,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc new file mode 100644 index 000000000000..a2090fc82615 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc +@@ -56,7 +56,7 @@ void X11CursorFactory::ObserveThemeChanges() { + } + + void X11CursorFactory::ObserveThemeChanges() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* linux_ui = LinuxUi::instance(); + DCHECK(linux_ui); + cursor_theme_observation_.Observe(linux_ui); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h new file mode 100644 index 000000000000..a290982e4ead --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h +@@ -16,7 +16,7 @@ + #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h" + #include "ui/linux/cursor_theme_manager_observer.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -59,7 +59,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory + + std::map<mojom::CursorType, scoped_refptr<X11Cursor>> default_cursors_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::ScopedObservation<LinuxUi, + CursorThemeManagerObserver, + &LinuxUi::AddCursorThemeObserver, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc index 9af5e6b9ce9c..f8748776a8f9 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc -@@ -136,7 +136,11 @@ std::string CursorPathFromLibXcursor() { +@@ -32,7 +32,7 @@ + #include "ui/gfx/x/xproto.h" + #include "ui/gfx/x/xproto_util.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -138,7 +138,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -12,3 +21,21 @@ if (!lib) return ""; +@@ -249,7 +253,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( + const std::string& rm_xcursor_theme) { + constexpr const char kDefaultTheme[] = "default"; + std::string themes[] = { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The toolkit theme has the highest priority. + LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() + : std::string(), +@@ -443,7 +447,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const + if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0) + return size; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Let the toolkit have the next say. + auto* linux_ui = LinuxUi::instance(); + size = linux_ui ? linux_ui->GetCursorThemeSize() : 0; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h index 884fb83c5ebf..c9ad00ed0c6b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/color/color_id.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/color/color_id.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/color/color_id.h -@@ -198,7 +198,7 @@ +@@ -351,7 +351,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define PLATFORM_SPECIFIC_COLOR_IDS \ - E_CPONLY(kColorNativeButtonBackground) \ - E_CPONLY(kColorNativeButtonBackgroundDisabled) \ + E_CPONLY(kColorNativeButtonBorder)\ + E_CPONLY(kColorNativeHeaderButtonBorderActive) \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc new file mode 100644 index 000000000000..b0536e5b1000 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__provider__utils.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/color/color_provider_utils.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/color/color_provider_utils.cc +@@ -88,7 +88,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst + switch (system_theme) { + case ui::SystemTheme::kDefault: + return "kDefault"; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case ui::SystemTheme::kGtk: + return "kGtk"; + case ui::SystemTheme::kQt: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_native__color__mixers.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_native__color__mixers.cc deleted file mode 100644 index 2df8d1615c79..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_native__color__mixers.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- src/3rdparty/chromium/ui/color/native_color_mixers.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/color/native_color_mixers.cc -@@ -10,12 +10,12 @@ namespace ui { - namespace ui { - - #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && \ -- !BUILDFLAG(IS_WIN) -+ !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) - void AddNativeCoreColorMixer(ColorProvider* provider, - const ColorProviderManager::Key& key) {} - #endif - --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) - void AddNativeUiColorMixer(ColorProvider* provider, - const ColorProviderManager::Key& key) {} - #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_system__theme.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_system__theme.h new file mode 100644 index 000000000000..e40b4047befc --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_system__theme.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/color/system_theme.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/color/system_theme.h +@@ -15,7 +15,7 @@ enum class SystemTheme { + enum class SystemTheme { + // Classic theme, used in the default or users' chosen theme. + kDefault = 0, +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + kGtk = 1, + kQt = 2, + kMaxValue = kQt, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc index a5cd8beecdf5..5d9ec98b3105 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.cc -@@ -852,7 +852,7 @@ void Compositor::OnResume() { +@@ -868,7 +868,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h index 5a0954635bbb..0fb6327a4fc8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/compositor/compositor.h -@@ -409,7 +409,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -420,7 +420,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc index e7208657e6dc..ac0f3b9e0d06 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/display/screen.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/display/screen.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/display/screen.cc -@@ -72,7 +72,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i +@@ -85,7 +85,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; } -#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default; + std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() { - SetScreenSaverSuspended(true); - screen_saver_suspension_count_++; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h index 7086b20c342b..f8881813e3c7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_display_screen.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/display/screen.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/display/screen.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/display/screen.h -@@ -119,7 +119,7 @@ class DISPLAY_EXPORT Screen { +@@ -130,7 +130,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; @@ -9,16 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -191,7 +191,7 @@ class DISPLAY_EXPORT Screen { - const gfx::GpuExtraInfo& gpu_extra_info); - - protected: --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Suspends or un-suspends the platform-specific screensaver, and returns - // whether the operation was successful. - virtual bool SetScreenSaverSuspended(bool suspend); -@@ -210,7 +210,7 @@ class DISPLAY_EXPORT Screen { +@@ -220,7 +220,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc index 683593820d99..696be4597c3f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/event.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/events/event.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/events/event.cc -@@ -453,7 +453,7 @@ MouseEvent::MouseEvent(const PlatformEvent& native_eve +@@ -419,7 +419,7 @@ MouseEvent::MouseEvent(const PlatformEvent& native_eve MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -935,7 +935,7 @@ void KeyEvent::InitializeNative() { +@@ -918,7 +918,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc index e2175e22f666..988a3ef1b480 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/events/event_switches.cc -@@ -14,7 +14,7 @@ const char kCompensateForUnstablePinchZoom[] = - const char kCompensateForUnstablePinchZoom[] = - "compensate-for-unstable-pinch-zoom"; +@@ -21,7 +21,7 @@ const char kTouchSlopDistance[] = "touch-slop-distance + // value is a floating point number that is interpreted as a distance in pixels. + const char kTouchSlopDistance[] = "touch-slop-distance"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h index 54e737c1b7a8..95b6bfff3814 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/ui/events/event_switches.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/events/event_switches.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/events/event_switches.h -@@ -12,7 +12,7 @@ EVENTS_BASE_EXPORT extern const char kCompensateForUns - +@@ -13,7 +13,7 @@ EVENTS_BASE_EXPORT extern const char kTouchSlopDistanc EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; + EVENTS_BASE_EXPORT extern const char kTouchSlopDistance[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn index 8e9835640013..18ff151aa813 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/BUILD.gn -@@ -586,7 +586,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -594,7 +594,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc index fb806f488409..7938afc956db 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc -@@ -25,6 +25,8 @@ +@@ -26,6 +26,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc new file mode 100644 index 000000000000..138030cd7192 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params__linux.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/gfx/font_render_params_linux.cc +@@ -25,7 +25,7 @@ + #include "ui/gfx/linux/fontconfig_util.h" + #include "ui/gfx/switches.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -212,7 +212,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP + + // Start with the delegate's settings, but let Fontconfig have the final say. + FontRenderParams params; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (const auto* linux_ui = ui::LinuxUi::instance()) + params = linux_ui->GetDefaultFontRenderParams(); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h index f9b210f354c2..81b2186e4e83 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.h @@ -1,18 +1,18 @@ ---- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ + #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gfx_export.h" - #include "ui/gfx/hdr_metadata.h" -#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_MAC) #include "ui/gfx/mac/io_surface.h" -@@ -78,7 +78,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; - int32_t stride = 0; + uint32_t stride = 0; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) NativePixmapHandle native_pixmap_handle; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h deleted file mode 100644 index fa8fe471f7f9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h +++ /dev/null @@ -1,44 +0,0 @@ ---- src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h -@@ -18,7 +18,7 @@ - #include "ui/gfx/selection_bound.h" - #include "ui/gfx/swap_result.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "ui/gfx/native_pixmap_handle.h" - #endif - -@@ -48,7 +48,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) - IPC_STRUCT_TRAITS_MEMBER(region) - IPC_STRUCT_TRAITS_MEMBER(offset) - IPC_STRUCT_TRAITS_MEMBER(stride) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) - #elif BUILDFLAG(IS_APPLE) - IPC_STRUCT_TRAITS_MEMBER(io_surface) -@@ -63,12 +63,12 @@ IPC_STRUCT_TRAITS_END() - IPC_STRUCT_TRAITS_MEMBER(id) - IPC_STRUCT_TRAITS_END() - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane) - IPC_STRUCT_TRAITS_MEMBER(stride) - IPC_STRUCT_TRAITS_MEMBER(offset) - IPC_STRUCT_TRAITS_MEMBER(size) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_MEMBER(fd) - #elif BUILDFLAG(IS_FUCHSIA) - IPC_STRUCT_TRAITS_MEMBER(vmo) -@@ -77,7 +77,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) - - IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) - IPC_STRUCT_TRAITS_MEMBER(planes) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_MEMBER(modifier) - #endif - #if BUILDFLAG(IS_FUCHSIA) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc index 77786b4273c2..c84ab7ebb494 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( @@ -16,5 +16,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: - NATIVE_PIXMAP_HANDLE: + kNativePixmapHandle: out->type = gfx::NATIVE_PIXMAP; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc index 390c9be6f293..21c64952bd95 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.cc @@ -8,11 +8,11 @@ namespace mojo { @@ -30,5 +30,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) out->modifier = data.modifier(); - #endif - + out->supports_zero_copy_webgpu_import = + data.supports_zero_copy_webgpu_import(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h index 112eb97be4c9..cefe97738be1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -15,7 +15,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" @@ -18,7 +18,7 @@ template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, -@@ -53,7 +53,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -53,13 +53,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED return pixmap_handle.planes; } @@ -27,3 +27,10 @@ static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.modifier; } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + static bool supports_zero_copy_webgpu_import( + const gfx::NativePixmapHandle& pixmap_handle) { + return pixmap_handle.supports_zero_copy_webgpu_import; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc index 0fe062a25724..6fba7ffdfa7e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc -@@ -9,7 +9,7 @@ - #include "base/logging.h" - #include "build/build_config.h" +@@ -11,7 +11,7 @@ + #include "ui/gfx/buffer_format_util.h" + #include "ui/gfx/geometry/size.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if !defined(TOOLKIT_QT) + #if __has_include(<drm_fourcc.h>) #include <drm_fourcc.h> - #endif -@@ -23,6 +23,10 @@ + #else +@@ -27,9 +27,13 @@ #include "base/fuchsia/fuchsia_logging.h" #endif @@ -19,8 +19,12 @@ + namespace gfx { - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !defined(TOOLKIT_QT) -@@ -36,7 +40,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, + "gfx::NativePixmapHandle::kNoModifier should be an alias for" + "DRM_FORMAT_MOD_INVALID"); +@@ -40,7 +44,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, NativePixmapPlane::NativePixmapPlane(int stride, int offset, uint64_t size @@ -29,7 +33,7 @@ , base::ScopedFD fd #elif BUILDFLAG(IS_FUCHSIA) -@@ -47,7 +51,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, +@@ -51,7 +55,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, : stride(stride), offset(offset), size(size) @@ -38,7 +42,7 @@ , fd(std::move(fd)) #elif BUILDFLAG(IS_FUCHSIA) -@@ -75,7 +79,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma +@@ -79,7 +83,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; for (auto& plane : handle.planes) { @@ -47,7 +51,7 @@ DCHECK(plane.fd.is_valid()); // Combining the HANDLE_EINTR and ScopedFD's constructor causes the compiler // to emit some very strange assembly that tends to cause FD ownership -@@ -105,7 +109,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma +@@ -117,7 +121,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma #endif } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h index f8d55cad76a5..50f8846ee9d3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h -@@ -15,7 +15,7 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" +@@ -16,7 +16,7 @@ + #include "ui/gfx/buffer_types.h" #include "ui/gfx/gfx_export.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif -@@ -32,7 +32,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -35,7 +35,7 @@ struct GFX_EXPORT NativePixmapPlane { NativePixmapPlane(int stride, int offset, uint64_t size @@ -18,7 +18,7 @@ , base::ScopedFD fd #elif BUILDFLAG(IS_FUCHSIA) -@@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -56,7 +56,7 @@ struct GFX_EXPORT NativePixmapPlane { // This is necessary to map the buffers. uint64_t size; @@ -27,7 +27,7 @@ // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; #elif BUILDFLAG(IS_FUCHSIA) -@@ -82,7 +82,7 @@ struct GFX_EXPORT NativePixmapHandle { +@@ -85,7 +85,7 @@ struct GFX_EXPORT NativePixmapHandle { std::vector<NativePixmapPlane> planes; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc new file mode 100644 index 000000000000..ce684743743c --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_platform__font__skia.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/gfx/platform_font_skia.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/gfx/platform_font_skia.cc +@@ -28,7 +28,7 @@ + #include "ui/gfx/system_fonts_win.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -166,7 +166,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized + weight = system_font.GetWeight(); + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, LinuxUi is used to query the native toolkit (e.g. + // GTK) for the default UI font. + if (const auto* linux_ui = ui::LinuxUi::instance()) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc index dbafc823749f..3bfe85857e9f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__api__fuzzer.cc @@ -1,29 +1,20 @@ ---- src/3rdparty/chromium/ui/gfx/render_text_api_fuzzer.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gfx/render_text_api_fuzzer.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gfx/render_text_api_fuzzer.cc -@@ -21,7 +21,7 @@ - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_ANDROID) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "base/test/test_discardable_memory_allocator.h" - #endif +@@ -20,7 +20,7 @@ + #include "ui/gfx/font_util.h" + #include "ui/gfx/render_text.h" -@@ -44,7 +44,7 @@ struct Environment { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_ANDROID) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - // Some platforms require discardable memory to use bitmap fonts. - base::DiscardableMemoryAllocator::SetInstance( - &discardable_memory_allocator); -@@ -56,7 +56,7 @@ struct Environment { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_ANDROID) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - base::TestDiscardableMemoryAllocator discardable_memory_allocator; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" #endif +@@ -47,7 +47,7 @@ struct Environment { + + CHECK(base::i18n::InitializeICU()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + test_fonts::SetUpFontconfig(); + #endif + gfx::InitializeFonts(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__fuzzer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__fuzzer.cc new file mode 100644 index 000000000000..ddce6efb07c8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text__fuzzer.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/gfx/render_text_fuzzer.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/gfx/render_text_fuzzer.cc +@@ -14,7 +14,7 @@ + #include "ui/gfx/font_util.h" + #include "ui/gfx/render_text.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" + #endif + +@@ -37,7 +37,7 @@ struct Environment { + + CHECK(base::i18n::InitializeICU()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + test_fonts::SetUpFontconfig(); + #endif + gfx::InitializeFonts(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn index b41cfb9676cf..893ed575274b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gl/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gl/BUILD.gn -@@ -165,8 +165,6 @@ jumbo_component("gl") { +@@ -167,8 +167,6 @@ jumbo_component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -183,7 +181,6 @@ jumbo_component("gl") { +@@ -185,7 +183,6 @@ jumbo_component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -437,7 +434,6 @@ jumbo_component("gl") { +@@ -441,7 +438,6 @@ jumbo_component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -693,7 +689,6 @@ test("gl_unittests") { +@@ -697,7 +693,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_generate__bindings.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_generate__bindings.py index ba6ceef6d517..966e4cf36b6e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_generate__bindings.py +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/generate_bindings.py.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gl/generate_bindings.py.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gl/generate_bindings.py -@@ -2951,6 +2951,9 @@ GLX_FUNCTIONS = [ +@@ -3000,6 +3000,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc index da3ed89f7aae..934b12d2d9c1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gl/gl_context.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gl/gl_context.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gl/gl_context.cc -@@ -415,7 +415,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -414,7 +414,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__features.cc index 824f4675046a..4dc53e44d3a5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__features.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__features.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/gl/gl_features.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gl/gl_features.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gl/gl_features.cc -@@ -83,7 +83,7 @@ const base::Feature kDefaultPassthroughCommandDecoder - const base::Feature kDefaultPassthroughCommandDecoder { - "DefaultPassthroughCommandDecoder", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ -- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ - !defined(CHROMECAST_BUILD)) || \ - BUILDFLAG(IS_MAC) - base::FEATURE_ENABLED_BY_DEFAULT +@@ -86,7 +86,7 @@ CONSTINIT const base::Feature kDefaultPassthroughComma + "DefaultPassthroughCommandDecoder", + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__image__glx__native__pixmap.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__image__glx__native__pixmap.cc index 23cf97989148..cd774139ff79 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__image__glx__native__pixmap.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__image__glx__native__pixmap.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gl/gl_image_glx_native_pixmap.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gl/gl_image_glx_native_pixmap.cc -@@ -16,6 +16,8 @@ +@@ -12,6 +12,8 @@ #include "ui/gl/buffer_format_utils.h" - #include "ui/gl/gl_bindings.h" + #include "ui/gl/glx_util.h" +#include <unistd.h> + namespace gl { - namespace { + GLImageGLXNativePixmap::GLImageGLXNativePixmap(const gfx::Size& size, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc new file mode 100644 index 000000000000..1a847bc58c6f --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/gl/gl_implementation.cc +@@ -293,7 +293,7 @@ GetRequestedGLImplementationFromCommandLine( + *fallback_to_software_gl = false; + bool overrideUseSoftwareGL = + command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); +-#if BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) + if (std::getenv("RUNNING_UNDER_RR")) { + // https://rr-project.org/ is a Linux-only record-and-replay debugger that diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc new file mode 100644 index 000000000000..19d077eb3035 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/gl/gl_switches.cc +@@ -12,7 +12,7 @@ + #include "base/android/build_info.h" + #endif + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(ENABLE_VULKAN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(ENABLE_VULKAN) + #include <vulkan/vulkan_core.h> + #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck + #endif +@@ -287,7 +287,7 @@ bool IsDefaultANGLEVulkan() { + base::android::SDK_VERSION_Q) + return false; + #endif // BUILDFLAG(IS_ANDROID) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + angle::SystemInfo system_info; + if (!angle::GetSystemInfoVulkan(&system_info)) + return false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc index c9eec2f60a6e..5586e275d2d2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc -@@ -394,7 +394,7 @@ void PrintDialogGtk::ShowDialog( +@@ -400,7 +400,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc index 266bae42d07f..960fdf283f6f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/message_center/views/message_popup_view.cc -@@ -123,7 +123,7 @@ void MessagePopupView::Show() { +@@ -118,7 +118,7 @@ void MessagePopupView::Show() { params.z_order = ui::ZOrderLevel::kFloatingWindow; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc index a522d2d04285..5e1937a31e6f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_egl__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/common/egl_util.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/ozone/common/egl_util.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/ozone/common/egl_util.cc -@@ -36,9 +36,9 @@ const base::FilePath::CharType kDefaultEglSoname[] = +@@ -26,9 +26,9 @@ const base::FilePath::CharType kDefaultEglSoname[] = FILE_PATH_LITERAL("libGLESv2.so"); #else // BUILDFLAG(IS_FUCHSIA) const base::FilePath::CharType kDefaultEglSoname[] = diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc index 1356e0c5e364..356fe45539e0 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.cc @@ -34,7 +34,7 @@ #include "ui/ozone/platform/headless/headless_window_manager.h" #include "ui/ozone/public/surface_ozone_canvas.h" --#if BUILDFLAG(ENABLE_VULKAN) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) +-#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) ++#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" #endif -@@ -280,7 +280,7 @@ void HeadlessSurfaceFactory::CheckBasePath() const { - PLOG(FATAL) << "Unable to write to output location"; - } - --#if BUILDFLAG(ENABLE_VULKAN) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - std::unique_ptr<gpu::VulkanImplementation> +@@ -282,7 +282,7 @@ HeadlessSurfaceFactory::CreateVulkanImplementation( HeadlessSurfaceFactory::CreateVulkanImplementation( bool use_swiftshader, + bool allow_protected_memory) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return std::make_unique<VulkanImplementationHeadless>(use_swiftshader); + #else + return nullptr; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.h deleted file mode 100644 index fb6045a0be43..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_headless__surface__factory.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/ozone/platform/headless/headless_surface_factory.h -@@ -26,7 +26,7 @@ class HeadlessSurfaceFactory : public SurfaceFactoryOz - // SurfaceFactoryOzone: - std::vector<gl::GLImplementationParts> GetAllowedGLImplementations() override; - GLOzone* GetGLOzone(const gl::GLImplementationParts& implementation) override; --#if BUILDFLAG(ENABLE_VULKAN) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - std::unique_ptr<gpu::VulkanImplementation> CreateVulkanImplementation( - bool use_swiftshader, - bool allow_protected_memory) override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc index a4eaa14c2337..e036732d217b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_ozone__platform__headless.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/ozone/platform/headless/ozone_platform_headless.cc @@ -102,7 +102,7 @@ class OzonePlatformHeadless : public OzonePlatform { } - // Desktop Linux, not ChromeOS. --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ - !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) + // Desktop Linux, not CastOS. +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) const PlatformProperties& GetPlatformProperties() override { static base::NoDestructor<OzonePlatform::PlatformProperties> properties; + static bool initialized = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc new file mode 100644 index 000000000000..431bb3df0963 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc +@@ -155,7 +155,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory + VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | + VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + auto tiling = VK_IMAGE_TILING_OPTIMAL; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (gmb_handle.native_pixmap_handle.modifier != + gfx::NativePixmapHandle::kNoModifier) { + tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc index 29919d33b205..1be1d1afecbb 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -204,7 +204,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -195,7 +195,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h index 44cbb207afd5..59a8aea742e5 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/ozone/public/ozone_platform.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/ozone/public/ozone_platform.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/ozone/public/ozone_platform.h -@@ -151,7 +151,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h new file mode 100644 index 000000000000..7bf49c085e69 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_test_mock__platform__window__delegate.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/ozone/test/mock_platform_window_delegate.h +@@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind + MOCK_METHOD2(OnWindowStateChanged, + void(PlatformWindowState old_state, + PlatformWindowState new_state)); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + MOCK_METHOD1(OnWindowTiledStateChanged, + void(WindowTiledEdges new_tiled_edges)); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc new file mode 100644 index 000000000000..a64cd5090dd4 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc +@@ -16,7 +16,7 @@ PlatformWindowDelegate::~PlatformWindowDelegate() = de + + PlatformWindowDelegate::~PlatformWindowDelegate() = default; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void PlatformWindowDelegate::OnWindowTiledStateChanged( + WindowTiledEdges new_tiled_edges) {} + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h new file mode 100644 index 000000000000..8ae97161299e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h +@@ -96,7 +96,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow + virtual void OnWindowStateChanged(PlatformWindowState old_state, + PlatformWindowState new_state) = 0; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Notifies the delegate that the tiled state of the window edges has changed. + virtual void OnWindowTiledStateChanged(WindowTiledEdges new_tiled_edges); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h index b0e518341445..9b3cbe6590e3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h -@@ -54,7 +54,7 @@ class ScenicWindowDelegate; +@@ -56,7 +56,7 @@ class ScenicWindowDelegate; class ScenicWindowDelegate; #endif @@ -9,12 +9,12 @@ class X11ExtensionDelegate; #endif -@@ -114,7 +114,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -118,7 +118,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool prefer_dark_theme = false; - gfx::ImageSkia* icon = nullptr; - absl::optional<int> background_color; + raw_ptr<gfx::ImageSkia> icon = nullptr; + absl::optional<SkColor> background_color; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd index dc70ed2e78b2..13f32446fcba 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_app__locale__settings.grd @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/app_locale_settings.grd.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/app_locale_settings.grd.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/app_locale_settings.grd @@ -218,7 +218,7 @@ 75% </message> </if> -- <if expr="(is_linux or is_android or is_bsd or is_fuchsia) and not (chromeos_ash or chromeos_lacros)"> -+ <if expr="(is_posix or is_android or is_bsd or is_fuchsia) and not (chromeos_ash or chromeos_lacros)"> +- <if expr="is_linux or is_android or is_bsd or is_fuchsia"> ++ <if expr="is_posix or is_android or is_bsd or is_fuchsia"> <!-- The font used in Web UI (e.g. History). Note that these are only backups. We try to use the system font if possible. --> <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb index ceb339841113..7bb3c9deb094 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__bn.xtb @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_bn.xtb.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_bn.xtb.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_bn.xtb @@ -10,7 +10,7 @@ <translation id="IDS_WEB_FONT_FAMILY">Vrinda</translation> <translation id="IDS_WEB_FONT_FAMILY_XP">Vrinda</translation> </if> --<if expr="is_linux and not chromeos_ash or chromeos_lacros"> -+<if expr="is_posix and not chromeos_ash or chromeos_lacros"> +-<if expr="is_linux"> ++<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Lohit Bengali</translation> </if> - <if expr="chromeos_ash"> + <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb index f8860fb76871..3b4495b5c200 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ja.xtb @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ja.xtb.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ja.xtb.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ja.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> <translation id="IDS_WEB_FONT_FAMILY">Helvetica,Hiragino Kaku Gothic ProN,sans-serif</translation> </if> --<if expr="is_linux and not chromeos_ash or chromeos_lacros"> -+<if expr="is_posix and not chromeos_ash or chromeos_lacros"> +-<if expr="is_linux"> ++<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">VL PGothic,Sazanami Gothic,Kochi Gothic,sans-serif</translation> </if> - <if expr="chromeos_ash"> + <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb index c7ff348d672e..b53a3bc08fc1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ko.xtb @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ko.xtb.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ko.xtb.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ko.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> <translation id="IDS_WEB_FONT_FAMILY">Helvetica,Apple SD Gothic Neo,AppleGothic,sans-serif</translation> </if> --<if expr="is_linux and not chromeos_ash or chromeos_lacros"> -+<if expr="is_posix and not chromeos_ash or chromeos_lacros"> +-<if expr="is_linux"> ++<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK KR,NanumGothic,UnDotum,Baekmuk Gulim,sans-serif</translation> </if> - <if expr="chromeos_ash"> + <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb index b81f24b6f49c..960304e2bc21 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__ml.xtb @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ml.xtb.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ml.xtb.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_ml.xtb @@ -9,7 +9,7 @@ <translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,AnjaliOldLipi,Rachana,Kartika</translation> <translation id="IDS_WEB_FONT_FAMILY_XP">Arial,AnjaliOldLipi,Rachana,Kartika</translation> </if> --<if expr="is_linux and not chromeos_ash or chromeos_lacros"> -+<if expr="is_posix and not chromeos_ash or chromeos_lacros"> +-<if expr="is_linux"> ++<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Arial,AnjaliOldLipi,Rachana,Kartika,sans-serif</translation> </if> - <if expr="chromeos_ash"> + <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb index 60f0d5f3625a..7e537f24a84c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__th.xtb @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_th.xtb.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_th.xtb.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_th.xtb @@ -6,7 +6,7 @@ <translation id="IDS_WEB_FONT_FAMILY">Tahoma,sans-serif</translation> <translation id="IDS_WEB_FONT_FAMILY_XP">Tahoma,sans-serif</translation> </if> --<if expr="is_linux and not chromeos_ash or chromeos_lacros"> -+<if expr="is_posix and not chromeos_ash or chromeos_lacros"> +-<if expr="is_linux"> ++<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Norasi,Waree,Garuda,Loma,sans-serif</translation> </if> - <if expr="chromeos_ash"> + <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb index 095a1162e50a..8b4edd0def82 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-CN.xtb @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-CN.xtb.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-CN.xtb.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-CN.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> <translation id="IDS_WEB_FONT_FAMILY">Helvetica,PingFang SC,STHeiti,sans-serif</translation> </if> --<if expr="is_linux and not chromeos_ash or chromeos_lacros"> -+<if expr="is_posix and not chromeos_ash or chromeos_lacros"> +-<if expr="is_linux"> ++<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> </if> - <if expr="chromeos_ash"> + <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb index a416216dfa31..9dd766cc0d52 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_strings_translations_app__locale__settings__zh-TW.xtb @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/strings/translations/app_locale_settings_zh-TW.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> <translation id="IDS_WEB_FONT_FAMILY">Helvetica,PingFang TC,Heiti TC,sans-serif</translation> </if> --<if expr="is_linux and not chromeos_ash or chromeos_lacros"> -+<if expr="is_posix and not chromeos_ash or chromeos_lacros"> - <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> </if> - <if expr="chromeos_ash"> + <if expr="is_chromeos"> diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc index aa241eb75b8f..b22ca0cbb2a1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/controls/prefix_selector.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/controls/prefix_selector.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/controls/prefix_selector.cc -@@ -171,7 +171,7 @@ bool PrefixSelector::ShouldDoLearning() { +@@ -174,7 +174,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h index f9e8e9bdf785..2bbd090fcecf 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_prefix__selector.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/controls/prefix_selector.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/controls/prefix_selector.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/controls/prefix_selector.h -@@ -81,7 +81,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp +@@ -83,7 +83,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc index 442a91790737..5377705b5035 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc -@@ -73,7 +73,7 @@ +@@ -71,7 +71,7 @@ + #include "base/win/win_util.h" + #endif - // 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) #include "ui/base/ime/linux/text_edit_command_auralinux.h" - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #include "ui/linux/linux_ui.h" #endif -@@ -166,7 +166,7 @@ bool IsControlKeyModifier(int flags) { +@@ -164,7 +164,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,25 +18,25 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -720,7 +720,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -707,7 +707,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event + if (!textfield) + return handled; - // 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) - ui::TextEditKeyBindingsDelegateAuraLinux* delegate = - ui::GetTextEditKeyBindingsDelegate(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -866,7 +866,7 @@ bool Textfield::SkipDefaultKeyEventProcessing(const ui + if (!handled && linux_ui && +@@ -851,7 +851,7 @@ bool Textfield::SkipDefaultKeyEventProcessing(const ui + } + bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { - // 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) // Skip any accelerator handling that conflicts with custom keybindings. - ui::TextEditKeyBindingsDelegateAuraLinux* delegate = - ui::GetTextEditKeyBindingsDelegate(); -@@ -1728,7 +1728,7 @@ bool Textfield::ShouldDoLearning() { + auto* linux_ui = ui::LinuxUi::instance(); + std::vector<ui::TextEditCommandAuraLinux> commands; +@@ -1721,7 +1721,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2227,14 +2227,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2220,14 +2220,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h index 11459d89dab5..9bb8855fcd43 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.h -@@ -443,7 +443,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -42,7 +42,7 @@ + #include "ui/views/view.h" + #include "ui/views/word_lookup_client.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <vector> + #endif + +@@ -448,7 +448,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc index 677f197f6d6e..5ffde5157e09 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc -@@ -50,7 +50,7 @@ bool CanUseTranslucentTooltipWidget() { +@@ -53,7 +53,7 @@ bool CanUseTranslucentTooltipWidget() { bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc index 9e83ee3a994d..6c93c10fba91 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/examples/widget_example.cc -@@ -49,7 +49,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container) modal_button->SetCallback( base::BindRepeating(&WidgetExample::CreateDialogWidget, base::Unretained(this), modal_button, true)); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc index f8afacda86c5..ff6d14e25ae6 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/focus/focus_manager.cc -@@ -635,7 +635,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -622,7 +622,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -652,7 +652,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -639,7 +639,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_linux__ui_linux__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_linux__ui_linux__ui.cc deleted file mode 100644 index 42a5768d367e..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_linux__ui_linux__ui.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/views/linux_ui/linux_ui.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/views/linux_ui/linux_ui.cc -@@ -21,7 +21,7 @@ void LinuxUI::SetInstance(std::unique_ptr<LinuxUI> ins - g_linux_ui = instance.release(); - - SkiaFontDelegate::SetInstance(g_linux_ui); --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) - ShellDialogLinux::SetInstance(g_linux_ui); - #endif - ui::SetTextEditKeyBindingsDelegate(g_linux_ui); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_linux__ui_linux__ui.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_linux__ui_linux__ui.h deleted file mode 100644 index 47633ed2a9f9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_linux__ui_linux__ui.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/ui/views/linux_ui/linux_ui.h.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/views/linux_ui/linux_ui.h -@@ -21,7 +21,7 @@ - #include "ui/views/controls/button/button.h" - #include "ui/views/views_export.h" - --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) - #include "ui/shell_dialogs/shell_dialog_linux.h" - #endif - -@@ -57,7 +57,7 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMeth - // project that wants to do linux desktop native rendering. - class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory, - public gfx::SkiaFontDelegate, --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) - public ui::ShellDialogLinux, - #endif - public ui::TextEditKeyBindingsDelegateAuraLinux, diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc index 7e7427b900dd..bc6fdb1ddd2f 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc @@ -1,5 +1,14 @@ ---- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/style/platform_style.cc +@@ -17,7 +17,7 @@ + #include "ui/views/controls/focusable_border.h" + #include "ui/views/controls/scrollbar/scroll_bar_views.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" + #endif + @@ -52,7 +52,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = const bool PlatformStyle::kAdjustBubbleIfOffscreen = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -9,12 +18,12 @@ false; #else true; -@@ -82,7 +82,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const - #endif // !BUILDFLAG(IS_MAC) +@@ -60,7 +60,7 @@ std::unique_ptr<ScrollBar> PlatformStyle::CreateScroll - #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \ -- (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) -+ (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) // static - std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( - LabelButton* button) { + std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return std::make_unique<OverlayScrollBar>(is_horizontal); + #else + return std::make_unique<ScrollBarViews>(is_horizontal); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc deleted file mode 100644 index 9c85b68ad81d..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_test_ui__controls__factory__desktop__aura__ozone.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/views/test/ui_controls_factory_desktop_aura_ozone.cc -@@ -25,7 +25,7 @@ - #include "ui/ozone/public/ozone_ui_controls_test_helper.h" - #include "ui/views/test/test_desktop_screen_ozone.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" - #else - #include "ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h" -@@ -157,7 +157,7 @@ class UIControlsDesktopOzone : public UIControlsAura { - - private: - aura::Window* RootWindowForPoint(const gfx::Point& point) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Most interactive_ui_tests run inside of the aura_test_helper - // environment. This means that we can't rely on display::Screen and several - // other things to work properly. Therefore we hack around this by diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h new file mode 100644 index 000000000000..8809f6450c71 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h +@@ -68,7 +68,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone + // The offset of |drag_widget_| relative to the mouse position. + gfx::Vector2d offset; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The last received drag location. The drag widget is moved asynchronously + // so its position is updated when the UI thread has time for that. When + // the first change to the location happens, a call to UpdateDragWidget() diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc index d41f8b144a86..73d6973ad26e 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__screen__ozone.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_screen_ozone.cc @@ -25,7 +25,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF widget); } --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) std::unique_ptr<display::Screen> CreateDesktopScreen() { - auto screen = std::make_unique<aura::ScreenOzone>(); + auto screen = std::make_unique<DesktopScreenOzone>(); screen->Initialize(); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 01e601b9a105..9fab196c8f52 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,33 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -907,7 +907,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -41,7 +41,7 @@ + #include "ui/wm/core/window_util.h" + #include "ui/wm/public/window_move_client.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" + #endif + +@@ -257,7 +257,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: + if (params.type == Widget::InitParams::TYPE_WINDOW) + GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); + +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + const bool requires_accelerated_widget = params.requires_accelerated_widget; + #else + const bool requires_accelerated_widget = false; +@@ -329,7 +329,7 @@ DesktopWindowTreeHostPlatform::CreateDragDropClient() + DesktopWindowTreeHostPlatform::CreateDragDropClient() { + ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); + std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); + #else + std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); +@@ -1017,7 +1017,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc new file mode 100644 index 000000000000..5ebcdea09038 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc +@@ -22,7 +22,7 @@ + #include "ui/views/widget/widget_delegate.h" + #include "ui/views/window/native_frame_view.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" + #include "ui/views/widget/desktop_aura/window_event_filter_linux.h" + using DesktopWindowTreeHostPlatformImpl = views::DesktopWindowTreeHostLinux; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc deleted file mode 100644 index 709094f8aa12..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/3rdparty/chromium/ui/views/widget/native_widget_aura.cc.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/views/widget/native_widget_aura.cc -@@ -69,7 +69,7 @@ - #endif - - #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" - #endif - -@@ -1154,7 +1154,7 @@ namespace { - - namespace { - #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - void CloseWindow(aura::Window* window) { - if (window) { - Widget* widget = Widget::GetWidgetForNativeView(window); -@@ -1185,7 +1185,7 @@ void Widget::CloseAllSecondaryWidgets() { - #endif - - #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); - #endif - } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc index f6a24102bae1..7cc03a0114db 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc @@ -1,20 +1,20 @@ ---- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/widget/widget.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/widget/widget.cc -@@ -48,7 +48,7 @@ +@@ -50,7 +50,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/views/linux_ui/linux_ui.h" + #include "ui/linux/linux_ui.h" #endif -@@ -1821,7 +1821,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1871,7 +1871,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (const views::LinuxUI* linux_ui = views::LinuxUI::instance()) { - if (auto* native_theme = linux_ui->GetNativeTheme(GetNativeWindow())) - return native_theme; + if (auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) + return linux_ui_theme->GetNativeTheme(); + #endif diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h new file mode 100644 index 000000000000..62760152fc54 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/views/widget/widget.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/ui/views/widget/widget.h +@@ -402,7 +402,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid + // If set, the widget was created in headless mode. + bool headless_mode = false; + +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + // Indicates whether the desktop native widget is required for the widget. + // This may enforce changing the type of the underlying platform window. + // See crbug.com/1280332 diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc index b5a6c807b390..8fb5918bb9a1 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/ui/views/window/custom_frame_view.cc -@@ -265,7 +265,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -266,7 +266,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js deleted file mode 100644 index d045b7ec4129..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/ui/webui/resources/js/cr.js.orig 2022-09-26 10:05:50 UTC -+++ src/3rdparty/chromium/ui/webui/resources/js/cr.js -@@ -438,6 +438,11 @@ var cr = cr || function(global) { - return returnValue; - }, - -+ /** Whether this is on *BSD. */ -+ get isBSD() { -+ return /BSD/.test(navigator.userAgent); -+ }, -+ - /** Whether this is on vanilla Linux (not chromeOS). */ - get isLinux() { - return /Linux/.test(navigator.userAgent); diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn index bcf762a18a1f..a5b89f017cc8 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/BUILD.gn.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/BUILD.gn.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/BUILD.gn -@@ -1227,6 +1227,14 @@ config("toolchain") { +@@ -1243,6 +1243,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5275,7 +5283,7 @@ v8_component("v8_libbase") { +@@ -5518,7 +5526,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5285,6 +5293,18 @@ v8_component("v8_libbase") { +@@ -5529,6 +5537,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h new file mode 100644 index 000000000000..0d7dccdc516d --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/v8/include/v8-internal.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/v8/include/v8-internal.h +@@ -174,7 +174,7 @@ using SandboxedPointer_t = Address; + #ifdef V8_ENABLE_SANDBOX + + // Size of the sandbox, excluding the guard regions surrounding it. +-#ifdef V8_TARGET_OS_ANDROID ++#if defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD) + // On Android, most 64-bit devices seem to be configured with only 39 bits of + // virtual address space for userspace. As such, limit the sandbox to 128GB (a + // quarter of the total available address space). diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc index e1d2b9d94486..6dfc1aa2ef25 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/v8/src/api/api.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/api/api.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/src/api/api.cc -@@ -138,7 +138,7 @@ +@@ -140,7 +140,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY -#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD +#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD #include <signal.h> - #include "include/v8-wasm-trap-handler-posix.h" - #include "src/trap-handler/handler-inside-posix.h" -@@ -6064,7 +6064,7 @@ bool v8::V8::Initialize(const int build_config) { + + #if V8_ENABLE_WEBASSEMBLY +@@ -6206,7 +6206,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h index be9244b095eb..7f180c40d2a3 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/base/atomicops.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/base/atomicops.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/src/base/atomicops.h @@ -57,10 +57,10 @@ using Atomic32 = int32_t; using Atomic8 = char; @@ -13,7 +13,7 @@ using Atomic64 = int64_t; #else using Atomic64 = intptr_t; -@@ -257,7 +257,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p +@@ -258,7 +258,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p std::memory_order_seq_cst); } @@ -22,12 +22,3 @@ inline Atomic64 Relaxed_CompareAndSwap(volatile Atomic64* ptr, Atomic64 old_value, Atomic64 new_value) { -@@ -468,7 +468,7 @@ inline int Relaxed_Memcmp(volatile const Atomic8* s1, - - // On some platforms we need additional declarations to make - // AtomicWord compatible with our other Atomic* types. --#if defined(V8_OS_DARWIN) || defined(V8_OS_OPENBSD) || defined(V8_OS_AIX) -+#if defined(V8_OS_DARWIN) || defined(V8_OS_AIX) - #include "src/base/atomicops_internals_atomicword_compat.h" - #endif - diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h new file mode 100644 index 000000000000..50e64192b7c8 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_memory.h @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/v8/src/base/platform/memory.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/v8/src/base/platform/memory.h +@@ -19,11 +19,11 @@ + + #if V8_OS_DARWIN + #include <malloc/malloc.h> +-#else // !V8_OS_DARWIN ++#elif !V8_OS_BSD // !V8_OS_DARWIN + #include <malloc.h> + #endif // !V8_OS_DARWIN + +-#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_BSD) || V8_OS_WIN + #define V8_HAS_MALLOC_USABLE_SIZE 1 + #endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc index b0678edf5faf..4a37a3b17f47 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc -@@ -68,7 +68,7 @@ +@@ -53,7 +53,7 @@ + #if V8_OS_DARWIN + #include <mach/mach.h> + #include <malloc/malloc.h> +-#else ++#elif !V8_OS_BSD + #include <malloc.h> + #endif + +@@ -71,7 +71,7 @@ #include <sys/syscall.h> #endif @@ -9,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -294,8 +294,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -297,8 +297,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -25,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -386,6 +393,7 @@ void* OS::GetRandomMmapAddr() { +@@ -393,6 +400,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -33,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -612,7 +620,7 @@ bool OS::HasLazyCommits() { +@@ -650,7 +658,7 @@ bool OS::HasLazyCommits() { // static bool OS::HasLazyCommits() { @@ -42,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1231,7 +1239,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1227,7 +1235,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_small-vector.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_small-vector.h new file mode 100644 index 000000000000..3db3b819247e --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_small-vector.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/v8/src/base/small-vector.h.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/v8/src/base/small-vector.h +@@ -22,7 +22,7 @@ class SmallVector { + class SmallVector { + // Currently only support trivially copyable and trivially destructible data + // types, as it uses memcpy to copy elements and never calls destructors. +- ASSERT_TRIVIALLY_COPYABLE(T); ++ // XXX FREEBSD ASSERT_TRIVIALLY_COPYABLE(T); + static_assert(std::is_trivially_destructible<T>::value); + + public: diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc index 438b59d08639..2dbe37762323 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -3021,6 +3021,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node +@@ -3034,6 +3034,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); } @@ -8,7 +8,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) { InstructionCode op = kIA32I8x16Swizzle; -@@ -3074,6 +3075,9 @@ void InstructionSelector::VisitF32x4Pmin(Node* node) { +@@ -3087,6 +3088,9 @@ void InstructionSelector::VisitF32x4Pmin(Node* node) { void InstructionSelector::VisitF32x4Pmin(Node* node) { VisitMinOrMax(this, node, kIA32Minps, true); } diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc index 423773cf5978..6cb7fc3b3fef 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc @@ -30,7 +30,7 @@ #include "src/common/assert-scope.h" - // Only compile the {PerfJitLogger} on Linux. + // Only compile the {LinuxPerfJitLogger} on Linux. -#if V8_OS_LINUX +#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h index 9cd501a969f7..3d2559f11cc2 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.h @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/src/diagnostics/perf-jit.h @@ -31,7 +31,7 @@ #include "include/v8config.h" - // {PerfJitLogger} is only implemented on Linux. + // {LinuxPerfJitLogger} is only implemented on Linux. -#if V8_OS_LINUX +#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc new file mode 100644 index 000000000000..c2413fe23a32 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_sandbox_sandbox.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/v8/src/sandbox/sandbox.cc.orig 2023-03-28 19:45:02 UTC ++++ src/3rdparty/chromium/v8/src/sandbox/sandbox.cc +@@ -49,7 +49,7 @@ static Address DetermineAddressSpaceLimit() { + } + #endif // V8_TARGET_ARCH_X64 + +-#if defined(V8_TARGET_ARCH_ARM64) && defined(V8_TARGET_OS_ANDROID) ++#if defined(V8_TARGET_ARCH_ARM64) && (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD)) + // On Arm64 Android assume a 40-bit virtual address space (39 bits for + // userspace and kernel each) as that appears to be the most common + // configuration and there seems to be no easy way to retrieve the actual diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index 69648672ffeb..1bc30bfee877 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,33 +1,33 @@ ---- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-09-26 10:05:50 UTC +--- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-03-28 19:45:02 UTC +++ src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -434,7 +434,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -432,7 +432,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, - LoadType type, LiftoffRegList pinned, - uint32_t* protected_load_pc, bool is_load_mem, - bool i64_offset) { -@@ -511,7 +511,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist + LoadType type, uint32_t* protected_load_pc, + bool /* is_load_mem */, bool i64_offset, + bool needs_shift) { +@@ -512,7 +512,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister src, + uintptr_t offset_imm, LiftoffRegister src, StoreType type, LiftoffRegList pinned, - uint32_t* protected_store_pc, bool is_store_mem) { - DCHECK_EQ(type.value_type() == kWasmI64, src.is_gp_pair()); -@@ -579,7 +579,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, + uint32_t* protected_store_pc, + bool /* is_store_mem */, bool /* i64_offset */) { +@@ -581,7 +581,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, - LoadType type, LiftoffRegList pinned) { + LoadType type, LiftoffRegList /* pinned */) { if (type.value() != LoadType::kI64Load) { - Load(dst, src_addr, offset_reg, offset_imm, type, pinned, nullptr, true); -@@ -598,7 +598,7 @@ void LiftoffAssembler::AtomicStore(Register dst_addr, + Load(dst, src_addr, offset_reg, offset_imm, type, nullptr, true); +@@ -600,7 +600,7 @@ void LiftoffAssembler::AtomicStore(Register dst_addr, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned) { DCHECK_NE(offset_reg, no_reg); DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -938,7 +938,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -940,7 +940,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg, -@@ -951,7 +951,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -953,7 +953,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -54,7 +54,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kSub, dst_addr, offset_reg, -@@ -963,7 +963,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -965,7 +965,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -63,7 +63,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAnd, dst_addr, offset_reg, -@@ -976,7 +976,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -978,7 +978,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kOr, dst_addr, offset_reg, offset_imm, -@@ -989,7 +989,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -991,7 +991,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kXor, dst_addr, offset_reg, -@@ -1002,7 +1002,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1004,7 +1004,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { -@@ -1016,7 +1016,7 @@ void LiftoffAssembler::AtomicCompareExchange( +@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicCompareExchange( } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt index c121c3ae5958..b646c72b656b 100644 --- a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt +++ b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/core/CMakeLists.txt.orig 2022-11-08 21:18:48 UTC +--- src/core/CMakeLists.txt.orig 2023-03-28 19:45:02 UTC +++ src/core/CMakeLists.txt -@@ -16,7 +16,7 @@ add_subdirectory(tools) +@@ -19,7 +19,7 @@ add_subdirectory(tools) # TOOLCHAIN SETUP ## @@ -9,22 +9,25 @@ setup_toolchains() endif() -@@ -366,12 +366,12 @@ foreach(arch ${archs}) +@@ -389,7 +389,7 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_embedded_build ) - if(LINUX) + if(LINUX OR FREEBSD) list(APPEND gnArgArg - use_cups=false - use_gio=false - use_gnome_keyring=false + use_gtk=false # GTK toolkit bindings + use_qt=false # Qt5 toolkit bindings +@@ -400,7 +400,7 @@ foreach(arch ${archs}) + use_glib=false + use_bluez=false + use_vaapi=false - use_udev=true + use_udev=false - use_bundled_fontconfig=false enable_session_service=false is_cfi=false -@@ -425,6 +425,10 @@ foreach(arch ${archs}) + use_ozone=true +@@ -450,6 +450,10 @@ foreach(arch ${archs}) extend_gn_list(gnArgArg ARGS use_pulseaudio CONDITION QT_FEATURE_webengine_system_pulseaudio diff --git a/www/qt6-webengine/pkg-plist b/www/qt6-webengine/pkg-plist index 011cf0cc0361..1be6714cb544 100644 --- a/www/qt6-webengine/pkg-plist +++ b/www/qt6-webengine/pkg-plist @@ -1,6 +1,5 @@ %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfdocument_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdffile_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfiohandler_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflink_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p.h %%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p_p.h @@ -80,6 +79,10 @@ %%QT_INCDIR%%/QtWebEngineCore/QWebEngineNotification %%QT_INCDIR%%/QtWebEngineCore/QWebEnginePage %%QT_INCDIR%%/QtWebEngineCore/QWebEngineProfile +%%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineViewAccessible +%%QT_INCDIR%%/QtWebEngineQuick/qquickwebengine_accessible.h +%%QT_INCDIR%%/QtWebEngineQuick/render_widget_host_view_qt_delegate_quickwindow.h +%%QT_INCDIR%%/QtWebEngineQuick/ui_delegates_manager.h %%QT_INCDIR%%/QtWebEngineCore/QWebEngineQuotaRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest %%QT_INCDIR%%/QtWebEngineCore/QWebEngineScript @@ -152,12 +155,17 @@ %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequick-config.h %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequickglobal.h %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequickversion.h +%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/autofillpopupwidget_p.h +%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchhandlewidget_p.h +%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengineview_p.h %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineView +%%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineViewAccessible %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgets %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsDepends %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsVersion +%%QT_INCDIR%%/QtWebEngineWidgets/qwebengine_accessible.h %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsglobal.h %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsversion.h %%QT_INCDIR%%/QtWebEngineWidgets/qwebengineview.h @@ -321,6 +329,7 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/AutofillPopup.qml %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/ColorDialog.qml %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/ConfirmDialog.qml +%%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/DirectoryPicker.qml %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/FilePicker.qml %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/Menu.qml %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/MenuItem.qml |