diff options
Diffstat (limited to 'www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc')
| -rw-r--r-- | www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 7da4380afeac..36bb5af2192c 100644 --- a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2023-10-21 11:51:27 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" @@ -6,42 +6,42 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> - #include "base/linux_util.h" -@@ -76,7 +76,7 @@ bool CurrentProcessHasUiAccess() { +@@ -77,7 +77,7 @@ bool CurrentProcessHasUiAccess() { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Initialize Xlib for multi-threaded use, allowing non-Chromium code to - // use X11 safely (such as the WebRTC capturer, GTK ...) - x11::InitXlib(); -@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) + if (!IsRunningWayland()) { + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) +@@ -125,7 +125,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have // any command line arguments for gtk to consume. -@@ -254,7 +254,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Create an X11EventSource on all UI threads, so the global X11 connection - // (x11::Connection::Get()) can dispatch X events. - auto event_source = -@@ -276,7 +276,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) + scoped_refptr<AutoThreadTaskRunner> input_task_runner; + if (!IsRunningWayland()) { + // Create an X11EventSource on all UI threads, so the global X11 connection +@@ -284,7 +284,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { - delete ui::X11EventSource::GetInstance(); - })); +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) + if (!IsRunningWayland()) { + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); |