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/electron35/files/patch-chrome_common_channel__info__posix.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron35/files/patch-chrome_common_channel__info__posix.cc')
| -rw-r--r-- | devel/electron35/files/patch-chrome_common_channel__info__posix.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/devel/electron35/files/patch-chrome_common_channel__info__posix.cc b/devel/electron35/files/patch-chrome_common_channel__info__posix.cc deleted file mode 100644 index 231ab085553d..000000000000 --- a/devel/electron35/files/patch-chrome_common_channel__info__posix.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/common/channel_info_posix.cc.orig 2024-10-16 21:31:04 UTC -+++ chrome/common/channel_info_posix.cc -@@ -95,7 +95,7 @@ std::string GetChannelSuffixForDataDir() { - } - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string GetChannelSuffixForExtraFlagsEnvVarName() { - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - const auto channel_state = GetChannelImpl(); -@@ -123,7 +123,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() - - // TODO(crbug.com/40118868): 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::string GetDesktopName(base::Environment* env) { - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - // Google Chrome packaged as a snap is a special case: the application name |