Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 0 insertions, 29 deletions

diff --git a/devel/electron35/files/patch-remoting_host_it2me_it2me__host.cc b/devel/electron35/files/patch-remoting_host_it2me_it2me__host.cc
deleted file mode 100644
index 16725c0977bb..000000000000
--- a/devel/electron35/files/patch-remoting_host_it2me_it2me__host.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- remoting/host/it2me/it2me_host.cc.orig	2025-03-24 20:50:14 UTC
-+++ remoting/host/it2me/it2me_host.cc
-@@ -61,7 +61,7 @@
- #include "remoting/host/chromeos/features.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "remoting/host/linux/wayland_manager.h"
- #include "remoting/host/linux/wayland_utils.h"
- #endif  // BUILDFLAG(IS_LINUX)
-@@ -224,7 +224,7 @@ void It2MeHost::Connect(
- 
-   OnPolicyUpdate(std::move(policies));
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     WaylandManager::Get()->Init(host_context_->ui_task_runner());
-   }
-@@ -376,7 +376,7 @@ void It2MeHost::ConnectOnNetworkThread(
- 
-   // Set up the desktop environment options.
-   DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (IsRunningWayland()) {
-     options.desktop_capture_options()->set_prefer_cursor_embedded(true);
-   }