aboutsummaryrefslogtreecommitdiffstats
path: root/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
diff options
context:
space:
mode:
authorLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
committerLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
commit2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch)
tree25f0138e1af8902b92dacc8cce09b267447c17db /www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
parentf85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff)
parent1a30da80670973368b399f2b01fe9c04b91a1273 (diff)
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc')
-rw-r--r--www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
index 9081897217f9..6539dd3ec9e1 100644
--- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
+++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,6 +1,6 @@
---- remoting/host/me2me_desktop_environment.cc.orig 2025-09-11 13:19:19 UTC
+--- remoting/host/me2me_desktop_environment.cc.orig 2025-10-28 14:29:43 UTC
+++ remoting/host/me2me_desktop_environment.cc
-@@ -113,7 +113,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities()
+@@ -119,7 +119,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities()
capabilities += protocol::kRemoteWebAuthnCapability;
}
@@ -9,7 +9,7 @@
capabilities += " ";
capabilities += protocol::kMultiStreamCapability;
capabilities += " ";
-@@ -158,7 +158,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
+@@ -168,7 +168,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
// properly under Xvfb.
mutable_desktop_capture_options()->set_use_update_notifications(true);
@@ -18,7 +18,7 @@
// Setting this option to false means that the capture differ wrapper will not
// be used when the X11 capturer is selected. This reduces the X11 capture
// time by a few milliseconds per frame and is safe because we can rely on
-@@ -185,7 +185,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
+@@ -195,7 +195,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
// Otherwise, if the session is shared with the local user start monitoring
// the local input and create the in-session UI.