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

1 files changed, 0 insertions, 29 deletions

diff --git a/net-im/signal-desktop/files/patch-ts_state_ducks_user.ts b/net-im/signal-desktop/files/patch-ts_state_ducks_user.ts
deleted file mode 100644
index 12f1493dab46..000000000000
--- a/net-im/signal-desktop/files/patch-ts_state_ducks_user.ts
+++ /dev/null
@@ -1,29 +0,0 @@
---- ts/state/ducks/user.ts.orig	2023-10-19 19:29:53 UTC
-+++ ts/state/ducks/user.ts
-@@ -23,7 +23,7 @@ export type UserStateType = Readonly<{
-   isMainWindowMaximized: boolean;
-   localeMessages: LocaleMessagesType;
-   menuOptions: MenuOptionsType;
--  osName: 'linux' | 'macos' | 'windows' | undefined;
-+  osName: 'linux' | 'macos' | 'windows' | 'freebsd' | undefined;
-   ourAci: AciString | undefined;
-   ourConversationId: string | undefined;
-   ourDeviceId: number | undefined;
-@@ -114,7 +114,7 @@ export function getEmptyState(): UserStateType {
- // Reducer
- 
- export function getEmptyState(): UserStateType {
--  let osName: 'windows' | 'macos' | 'linux' | undefined;
-+  let osName: 'windows' | 'macos' | 'linux' | 'freebsd' | undefined;
- 
-   if (OS.isWindows()) {
-     osName = 'windows';
-@@ -122,6 +122,8 @@ export function getEmptyState(): UserStateType {
-     osName = 'macos';
-   } else if (OS.isLinux()) {
-     osName = 'linux';
-+  } else if (OS.isFreeBSD()) {
-+    osName = 'freebsd';
-   }
- 
-   return {