diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron39/files/patch-remoting_base_host__settings.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron39/files/patch-remoting_base_host__settings.cc')
| -rw-r--r-- | devel/electron39/files/patch-remoting_base_host__settings.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/devel/electron39/files/patch-remoting_base_host__settings.cc b/devel/electron39/files/patch-remoting_base_host__settings.cc new file mode 100644 index 000000000000..7a7c6d643459 --- /dev/null +++ b/devel/electron39/files/patch-remoting_base_host__settings.cc @@ -0,0 +1,20 @@ +--- remoting/base/host_settings.cc.orig 2022-02-28 16:54:41 UTC ++++ remoting/base/host_settings.cc +@@ -7,7 +7,7 @@ + #include "base/no_destructor.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) ++#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) + #include "remoting/base/file_host_settings.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -44,7 +44,7 @@ HostSettings::~HostSettings() = default; + + // static + HostSettings* HostSettings::GetInstance() { +-#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) ++#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) + static base::NoDestructor<FileHostSettings> instance( + FileHostSettings::GetSettingsFilePath()); + #elif BUILDFLAG(IS_WIN) |